From b5b25afdb874f904a35d6852a0c2e2bd082fe48c Mon Sep 17 00:00:00 2001 From: purplerain Date: Fri, 12 Jul 2024 14:44:09 +0200 Subject: [PATCH] sync with OpenBSD -current --- 3RDPARTY | 6 +- MODULES | 20 +- app/appres/ChangeLog | 50 +- app/appres/Makefile.am | 2 +- app/appres/Makefile.in | 5 +- app/appres/aclocal.m4 | 76 +- app/appres/appres.c | 32 +- app/appres/config.guess | 1783 +-- app/appres/config.h.in | 10 +- app/appres/config.sub | 2954 +++-- app/appres/configure | 6425 +++++----- app/appres/configure.ac | 5 +- app/appres/install-sh | 414 +- app/appres/man/Makefile.am | 5 - app/appres/man/Makefile.in | 15 +- app/appres/man/appres.man | 4 +- app/appres/meson.build | 40 + dist/libxcb/ChangeLog | 441 + dist/libxcb/Makefile.am | 3 + dist/libxcb/autogen.sh | 11 +- dist/libxcb/configure.ac | 25 +- dist/libxcb/doc/tutorial/index.html | 4 +- dist/libxcb/m4/libtool.m4 | 232 +- dist/libxcb/m4/ltoptions.m4 | 4 +- dist/libxcb/m4/ltsugar.m4 | 2 +- dist/libxcb/m4/ltversion.m4 | 13 +- dist/libxcb/m4/lt~obsolete.m4 | 4 +- dist/libxcb/src/Makefile.am | 8 + dist/libxcb/src/c_client.py | 15 +- dist/libxcb/src/xcb_auth.c | 4 +- dist/libxcb/src/xcb_conn.c | 8 +- dist/libxcb/src/xcb_util.c | 149 +- dist/libxcb/tests/check_public.c | 49 +- dist/libxcb/xcb-dbe.pc.in | 11 + dist/libxcb/xcb-present.pc.in | 2 +- distrib/sets/lists/xbase/mi | 8 +- distrib/sets/lists/xshare/mi | 542 +- doc/Makefile | 4 +- doc/gl-docs/GL/Imakefile | 26 - doc/gl-docs/GL/gl/Imakefile | 432 - doc/gl-docs/GL/gl/Makefile | 450 - doc/gl-docs/GL/gl/accum.3gl | 156 - doc/gl-docs/GL/gl/activetextureARB.3gl | 54 - doc/gl-docs/GL/gl/alphafunc.3gl | 114 - doc/gl-docs/GL/gl/aretexturesresident.3gl | 91 - doc/gl-docs/GL/gl/arrayelement.3gl | 70 - doc/gl-docs/GL/gl/begin.3gl | 217 - doc/gl-docs/GL/gl/bindtexture.3gl | 114 - doc/gl-docs/GL/gl/bitmap.3gl | 132 - doc/gl-docs/GL/gl/blendcolor.3gl | 52 - doc/gl-docs/GL/gl/blendequation.3gl | 146 - doc/gl-docs/GL/gl/blendfunc.3gl | 250 - doc/gl-docs/GL/gl/calllist.3gl | 60 - doc/gl-docs/GL/gl/calllists.3gl | 165 - doc/gl-docs/GL/gl/clear.3gl | 98 - doc/gl-docs/GL/gl/clearaccum.3gl | 45 - doc/gl-docs/GL/gl/clearcolor.3gl | 44 - doc/gl-docs/GL/gl/cleardepth.3gl | 36 - doc/gl-docs/GL/gl/clearindex.3gl | 47 - doc/gl-docs/GL/gl/clearstencil.3gl | 45 - doc/gl-docs/GL/gl/clientactivetextureARB.3gl | 54 - doc/gl-docs/GL/gl/clipplane.3gl | 81 - doc/gl-docs/GL/gl/color.3gl | 269 - doc/gl-docs/GL/gl/colormask.3gl | 58 - doc/gl-docs/GL/gl/colormaterial.3gl | 94 - doc/gl-docs/GL/gl/colorpointer.3gl | 123 - doc/gl-docs/GL/gl/colorsubtable.3gl | 116 - doc/gl-docs/GL/gl/colortable.3gl | 306 - doc/gl-docs/GL/gl/colortableparameter.3gl | 86 - doc/gl-docs/GL/gl/convolutionfilter1d.3gl | 220 - doc/gl-docs/GL/gl/convolutionfilter2d.3gl | 236 - doc/gl-docs/GL/gl/convolutionparameter.3gl | 173 - doc/gl-docs/GL/gl/copycolorsubtable.3gl | 75 - doc/gl-docs/GL/gl/copycolortable.3gl | 160 - doc/gl-docs/GL/gl/copyconvolutionfilter1d.3gl | 164 - doc/gl-docs/GL/gl/copyconvolutionfilter2d.3gl | 176 - doc/gl-docs/GL/gl/copypixels.3gl | 249 - doc/gl-docs/GL/gl/copyteximage1d.3gl | 173 - doc/gl-docs/GL/gl/copyteximage2d.3gl | 179 - doc/gl-docs/GL/gl/copytexsubimage1d.3gl | 131 - doc/gl-docs/GL/gl/copytexsubimage2d.3gl | 151 - doc/gl-docs/GL/gl/copytexsubimage3d.3gl | 158 - doc/gl-docs/GL/gl/cullface.3gl | 58 - doc/gl-docs/GL/gl/deletelists.3gl | 50 - doc/gl-docs/GL/gl/deletetextures.3gl | 60 - doc/gl-docs/GL/gl/depthfunc.3gl | 88 - doc/gl-docs/GL/gl/depthmask.3gl | 46 - doc/gl-docs/GL/gl/depthrange.3gl | 65 - doc/gl-docs/GL/gl/drawarrays.3gl | 97 - doc/gl-docs/GL/gl/drawbuffer.3gl | 141 - doc/gl-docs/GL/gl/drawelements.3gl | 105 - doc/gl-docs/GL/gl/drawpixels.3gl | 545 - doc/gl-docs/GL/gl/drawrangeelements.3gl | 132 - doc/gl-docs/GL/gl/edgeflag.3gl | 65 - doc/gl-docs/GL/gl/edgeflagpointer.3gl | 100 - doc/gl-docs/GL/gl/enable.3gl | 505 - doc/gl-docs/GL/gl/enableclientstate.3gl | 115 - doc/gl-docs/GL/gl/evalcoord.3gl | 226 - doc/gl-docs/GL/gl/evalmesh.3gl | 189 - doc/gl-docs/GL/gl/evalpoint.3gl | 101 - doc/gl-docs/GL/gl/feedbackbuffer.3gl | 225 - doc/gl-docs/GL/gl/finish.3gl | 34 - doc/gl-docs/GL/gl/flush.3gl | 46 - doc/gl-docs/GL/gl/fog.3gl | 209 - doc/gl-docs/GL/gl/frontface.3gl | 66 - doc/gl-docs/GL/gl/frustum.3gl | 133 - doc/gl-docs/GL/gl/genlists.3gl | 49 - doc/gl-docs/GL/gl/gentextures.3gl | 63 - doc/gl-docs/GL/gl/get.3gl | 1798 --- doc/gl-docs/GL/gl/getclipplane.3gl | 53 - doc/gl-docs/GL/gl/getcolortable.3gl | 142 - doc/gl-docs/GL/gl/getcolortableparameter.3gl | 116 - doc/gl-docs/GL/gl/getconvolutionfilter.3gl | 145 - doc/gl-docs/GL/gl/getconvolutionparameter.3gl | 114 - doc/gl-docs/GL/gl/geterror.3gl | 102 - doc/gl-docs/GL/gl/gethistogram.3gl | 142 - doc/gl-docs/GL/gl/gethistogramparameter.3gl | 103 - doc/gl-docs/GL/gl/getlight.3gl | 187 - doc/gl-docs/GL/gl/getmap.3gl | 134 - doc/gl-docs/GL/gl/getmaterial.3gl | 133 - doc/gl-docs/GL/gl/getminmax.3gl | 149 - doc/gl-docs/GL/gl/getminmaxparameter.3gl | 76 - doc/gl-docs/GL/gl/getpixelmap.3gl | 156 - doc/gl-docs/GL/gl/getpointerv.3gl | 72 - doc/gl-docs/GL/gl/getpolygonstipple.3gl | 52 - doc/gl-docs/GL/gl/getseparablefilter.3gl | 152 - doc/gl-docs/GL/gl/getstring.3gl | 84 - doc/gl-docs/GL/gl/gettexenv.3gl | 80 - doc/gl-docs/GL/gl/gettexgen.3gl | 107 - doc/gl-docs/GL/gl/getteximage.3gl | 209 - doc/gl-docs/GL/gl/gettexlevelparameter.3gl | 182 - doc/gl-docs/GL/gl/gettexparameter.3gl | 142 - doc/gl-docs/GL/gl/hint.3gl | 104 - doc/gl-docs/GL/gl/histogram.3gl | 138 - doc/gl-docs/GL/gl/index.3gl | 99 - doc/gl-docs/GL/gl/indexmask.3gl | 57 - doc/gl-docs/GL/gl/indexpointer.3gl | 114 - doc/gl-docs/GL/gl/initnames.3gl | 38 - doc/gl-docs/GL/gl/interleavedarrays.3gl | 110 - doc/gl-docs/GL/gl/isenabled.3gl | 160 - doc/gl-docs/GL/gl/islist.3gl | 38 - doc/gl-docs/GL/gl/istexture.3gl | 46 - doc/gl-docs/GL/gl/light.3gl | 253 - doc/gl-docs/GL/gl/lightmodel.3gl | 179 - doc/gl-docs/GL/gl/linestipple.3gl | 87 - doc/gl-docs/GL/gl/linewidth.3gl | 96 - doc/gl-docs/GL/gl/listbase.3gl | 39 - doc/gl-docs/GL/gl/loadidentity.3gl | 56 - doc/gl-docs/GL/gl/loadmatrix.3gl | 95 - doc/gl-docs/GL/gl/loadname.3gl | 48 - doc/gl-docs/GL/gl/logicop.3gl | 112 - doc/gl-docs/GL/gl/map1.3gl | 271 - doc/gl-docs/GL/gl/map2.3gl | 331 - doc/gl-docs/GL/gl/mapgrid.3gl | 141 - doc/gl-docs/GL/gl/material.3gl | 213 - doc/gl-docs/GL/gl/matrixmode.3gl | 64 - doc/gl-docs/GL/gl/minmax.3gl | 120 - doc/gl-docs/GL/gl/multitexcoordARB.3gl | 301 - doc/gl-docs/GL/gl/multmatrix.3gl | 119 - doc/gl-docs/GL/gl/newlist.3gl | 153 - doc/gl-docs/GL/gl/normal.3gl | 123 - doc/gl-docs/GL/gl/normalpointer.3gl | 113 - doc/gl-docs/GL/gl/ortho.3gl | 105 - doc/gl-docs/GL/gl/passthrough.3gl | 55 - doc/gl-docs/GL/gl/pixelmap.3gl | 252 - doc/gl-docs/GL/gl/pixelstore.3gl | 506 - doc/gl-docs/GL/gl/pixeltransfer.3gl | 439 - doc/gl-docs/GL/gl/pixelzoom.3gl | 60 - doc/gl-docs/GL/gl/pointsize.3gl | 128 - doc/gl-docs/GL/gl/polygonmode.3gl | 103 - doc/gl-docs/GL/gl/polygonoffset.3gl | 73 - doc/gl-docs/GL/gl/polygonstipple.3gl | 80 - doc/gl-docs/GL/gl/prioritizetextures.3gl | 83 - doc/gl-docs/GL/gl/pushattrib.3gl | 267 - doc/gl-docs/GL/gl/pushclientattrib.3gl | 101 - doc/gl-docs/GL/gl/pushmatrix.3gl | 92 - doc/gl-docs/GL/gl/pushname.3gl | 68 - doc/gl-docs/GL/gl/rasterpos.3gl | 287 - doc/gl-docs/GL/gl/readbuffer.3gl | 81 - doc/gl-docs/GL/gl/readpixels.3gl | 348 - doc/gl-docs/GL/gl/rect.3gl | 117 - doc/gl-docs/GL/gl/rendermode.3gl | 107 - doc/gl-docs/GL/gl/resethistogram.3gl | 38 - doc/gl-docs/GL/gl/resetminmax.3gl | 41 - doc/gl-docs/GL/gl/rotate.3gl | 110 - doc/gl-docs/GL/gl/scale.3gl | 92 - doc/gl-docs/GL/gl/scissor.3gl | 69 - doc/gl-docs/GL/gl/selectbuffer.3gl | 113 - doc/gl-docs/GL/gl/separablefilter2d.3gl | 245 - doc/gl-docs/GL/gl/shademodel.3gl | 87 - doc/gl-docs/GL/gl/stencilfunc.3gl | 147 - doc/gl-docs/GL/gl/stencilmask.3gl | 53 - doc/gl-docs/GL/gl/stencilop.3gl | 143 - doc/gl-docs/GL/gl/texcoord.3gl | 237 - doc/gl-docs/GL/gl/texcoordpointer.3gl | 132 - doc/gl-docs/GL/gl/texenv.3gl | 196 - doc/gl-docs/GL/gl/texgen.3gl | 270 - doc/gl-docs/GL/gl/teximage1d.3gl | 449 - doc/gl-docs/GL/gl/teximage2d.3gl | 478 - doc/gl-docs/GL/gl/teximage3d.3gl | 470 - doc/gl-docs/GL/gl/texparameter.3gl | 348 - doc/gl-docs/GL/gl/texsubimage1d.3gl | 207 - doc/gl-docs/GL/gl/texsubimage2d.3gl | 216 - doc/gl-docs/GL/gl/texsubimage3d.3gl | 227 - doc/gl-docs/GL/gl/translate.3gl | 87 - doc/gl-docs/GL/gl/vertex.3gl | 189 - doc/gl-docs/GL/gl/vertexpointer.3gl | 124 - doc/gl-docs/GL/gl/viewport.3gl | 72 - doc/gl-docs/GL/glx/Imakefile | 77 - doc/gl-docs/GL/glx/Makefile | 34 - doc/gl-docs/GL/glx/xchoosevisual.3gl | 225 - doc/gl-docs/GL/glx/xcopycontext.3gl | 98 - doc/gl-docs/GL/glx/xcreatecontext.3gl | 117 - doc/gl-docs/GL/glx/xcreateglxpixmap.3gl | 76 - doc/gl-docs/GL/glx/xdestroycontext.3gl | 44 - doc/gl-docs/GL/glx/xdestroyglxpixmap.3gl | 43 - doc/gl-docs/GL/glx/xfreecontextext.3gl | 54 - doc/gl-docs/GL/glx/xgetclientstring.3gl | 64 - doc/gl-docs/GL/glx/xgetconfig.3gl | 177 - doc/gl-docs/GL/glx/xgetcontextidext.3gl | 47 - doc/gl-docs/GL/glx/xgetcurrentcontext.3gl | 30 - doc/gl-docs/GL/glx/xgetcurrentdisplay.3gl | 33 - doc/gl-docs/GL/glx/xgetcurrentdrawable.3gl | 28 - doc/gl-docs/GL/glx/ximportcontextext.3gl | 71 - doc/gl-docs/GL/glx/xintro.3gl | 239 - doc/gl-docs/GL/glx/xisdirect.3gl | 42 - doc/gl-docs/GL/glx/xmakecurrent.3gl | 107 - doc/gl-docs/GL/glx/xquerycontextinfoext.3gl | 67 - doc/gl-docs/GL/glx/xqueryextension.3gl | 52 - doc/gl-docs/GL/glx/xqueryextensionsstring.3gl | 48 - doc/gl-docs/GL/glx/xqueryserverstring.3gl | 58 - doc/gl-docs/GL/glx/xqueryversion.3gl | 51 - doc/gl-docs/GL/glx/xswapbuffers.3gl | 72 - doc/gl-docs/GL/glx/xusexfont.3gl | 76 - doc/gl-docs/GL/glx/xwaitgl.3gl | 42 - doc/gl-docs/GL/glx/xwaitx.3gl | 42 - doc/gl-docs/GLU/Imakefile | 150 - doc/gl-docs/GLU/Makefile | 62 - doc/gl-docs/GLU/begincurve.3gl | 65 - doc/gl-docs/GLU/beginpolygon.3gl | 76 - doc/gl-docs/GLU/beginsurface.3gl | 70 - doc/gl-docs/GLU/begintrim.3gl | 106 - doc/gl-docs/GLU/build1dmipmaplevels.3gl | 228 - doc/gl-docs/GLU/build1dmipmaps.3gl | 228 - doc/gl-docs/GLU/build2dmipmaplevels.3gl | 234 - doc/gl-docs/GLU/build2dmipmaps.3gl | 236 - doc/gl-docs/GLU/build3dmipmaplevels.3gl | 237 - doc/gl-docs/GLU/build3dmipmaps.3gl | 238 - doc/gl-docs/GLU/checkextension.3gl | 53 - doc/gl-docs/GLU/cylinder.3gl | 70 - doc/gl-docs/GLU/deletenurbsrenderer.3gl | 34 - doc/gl-docs/GLU/deletequadric.3gl | 34 - doc/gl-docs/GLU/deletetess.3gl | 33 - doc/gl-docs/GLU/disk.3gl | 70 - doc/gl-docs/GLU/errorstring.3gl | 47 - doc/gl-docs/GLU/getnurbsproperty.3gl | 55 - doc/gl-docs/GLU/getstring.3gl | 65 - doc/gl-docs/GLU/gettessproperty.3gl | 50 - doc/gl-docs/GLU/loadsamplingmatrices.3gl | 60 - doc/gl-docs/GLU/lookat.3gl | 101 - doc/gl-docs/GLU/newnurbsrenderer.3gl | 31 - doc/gl-docs/GLU/newquadric.3gl | 33 - doc/gl-docs/GLU/newtess.3gl | 30 - doc/gl-docs/GLU/nextcontour.3gl | 102 - doc/gl-docs/GLU/nurbscallback.3gl | 228 - doc/gl-docs/GLU/nurbscallbackdata.3gl | 41 - doc/gl-docs/GLU/nurbscallbackdataext.3gl | 38 - doc/gl-docs/GLU/nurbscurve.3gl | 99 - doc/gl-docs/GLU/nurbsproperty.3gl | 202 - doc/gl-docs/GLU/nurbssurface.3gl | 124 - doc/gl-docs/GLU/ortho2d.3gl | 41 - doc/gl-docs/GLU/partialdisk.3gl | 87 - doc/gl-docs/GLU/perspective.3gl | 96 - doc/gl-docs/GLU/pickmatrix.3gl | 94 - doc/gl-docs/GLU/project.3gl | 88 - doc/gl-docs/GLU/pwlcurve.3gl | 69 - doc/gl-docs/GLU/quadriccallback.3gl | 51 - doc/gl-docs/GLU/quadricdrawstyle.3gl | 57 - doc/gl-docs/GLU/quadricnormals.3gl | 51 - doc/gl-docs/GLU/quadricorientation.3gl | 49 - doc/gl-docs/GLU/quadrictexture.3gl | 45 - doc/gl-docs/GLU/scaleimage.3gl | 172 - doc/gl-docs/GLU/sphere.3gl | 66 - doc/gl-docs/GLU/tessbegincontour.3gl | 44 - doc/gl-docs/GLU/tessbeginpolygon.3gl | 73 - doc/gl-docs/GLU/tesscallback.3gl | 294 - doc/gl-docs/GLU/tessendpolygon.3gl | 68 - doc/gl-docs/GLU/tessnormal.3gl | 67 - doc/gl-docs/GLU/tessproperty.3gl | 99 - doc/gl-docs/GLU/tessvertex.3gl | 99 - doc/gl-docs/GLU/unproject.3gl | 78 - doc/gl-docs/GLU/unproject4.3gl | 103 - doc/gl-docs/GLw/Imakefile | 25 - doc/gl-docs/GLw/Makefile | 14 - doc/gl-docs/GLw/glwcreatemdrawingarea.gl | 50 - doc/gl-docs/GLw/glwdrawingarea.gl | 485 - doc/gl-docs/GLw/glwdrawingareamakecurrent.gl | 30 - doc/gl-docs/GLw/glwdrawingareaswapbuffers.gl | 30 - doc/gl-docs/Makefile | 6 - doc/gl-docs/Makefile.inc | 28 - lib/libX11/COPYING | 48 +- lib/libX11/ChangeLog | 1794 ++- lib/libX11/Makefile.bsd-wrapper | 5 +- lib/libX11/Makefile.in | 3 +- lib/libX11/NEWS | 185 - lib/libX11/README.md | 73 + lib/libX11/aclocal.m4 | 80 +- lib/libX11/config.guess | 1783 +-- lib/libX11/config.sub | 2954 +++-- lib/libX11/configure | 10626 +++++++++------- lib/libX11/configure.ac | 43 +- lib/libX11/include/Makefile.in | 1 + lib/libX11/include/X11/Xlib.h | 8 +- lib/libX11/include/X11/Xlibint.h | 39 +- lib/libX11/include/X11/Xutil.h | 4 +- lib/libX11/install-sh | 414 +- lib/libX11/man/Compose.man | 2 +- lib/libX11/man/Makefile.in | 1 + lib/libX11/man/XAddHost.man | 2 +- lib/libX11/man/XGetVisualInfo.man | 2 +- lib/libX11/man/XInitThreads.man | 8 +- lib/libX11/man/XOpenIM.man | 3 +- lib/libX11/man/XSetScreenSaver.man | 78 + lib/libX11/man/xkb/Makefile.am | 18 +- lib/libX11/man/xkb/Makefile.in | 19 +- lib/libX11/man/xkb/XkbActionCtrls.man | 4 +- ...tionSetCtrls.man => XkbActionSetCtrls.man} | 14 +- lib/libX11/man/xkb/XkbAddDeviceLedInfo.man | 8 +- lib/libX11/man/xkb/XkbAddGeomColor.man | 8 +- lib/libX11/man/xkb/XkbAddGeomDoodad.man | 8 +- lib/libX11/man/xkb/XkbAddGeomKey.man | 4 +- lib/libX11/man/xkb/XkbAddGeomKeyAlias.man | 8 +- lib/libX11/man/xkb/XkbAddGeomOutline.man | 6 +- lib/libX11/man/xkb/XkbAddGeomOverlay.man | 8 +- lib/libX11/man/xkb/XkbAddGeomOverlayKey.man | 8 +- lib/libX11/man/xkb/XkbAddGeomOverlayRow.man | 8 +- lib/libX11/man/xkb/XkbAddGeomProperty.man | 8 +- lib/libX11/man/xkb/XkbAddGeomRow.man | 6 +- lib/libX11/man/xkb/XkbAddGeomSection.man | 12 +- lib/libX11/man/xkb/XkbAddGeomShape.man | 8 +- lib/libX11/man/xkb/XkbAddSymInterpret.man | 10 +- lib/libX11/man/xkb/XkbAllocClientMap.man | 8 +- lib/libX11/man/xkb/XkbAllocCompatMap.man | 8 +- lib/libX11/man/xkb/XkbAllocControls.man | 6 +- lib/libX11/man/xkb/XkbAllocDeviceInfo.man | 16 +- lib/libX11/man/xkb/XkbAllocDeviceLedInfo.man | 113 - lib/libX11/man/xkb/XkbAllocGeomColors.man | 6 +- lib/libX11/man/xkb/XkbAllocGeomDoodads.man | 6 +- lib/libX11/man/xkb/XkbAllocGeomKeyAliases.man | 6 +- lib/libX11/man/xkb/XkbAllocGeomKeys.man | 6 +- lib/libX11/man/xkb/XkbAllocGeomOutlines.man | 6 +- .../man/xkb/XkbAllocGeomOverlayKeys.man | 6 +- .../man/xkb/XkbAllocGeomOverlayRows.man | 6 +- lib/libX11/man/xkb/XkbAllocGeomOverlays.man | 6 +- lib/libX11/man/xkb/XkbAllocGeomPoints.man | 6 +- lib/libX11/man/xkb/XkbAllocGeomProps.man | 10 +- lib/libX11/man/xkb/XkbAllocGeomRows.man | 6 +- .../man/xkb/XkbAllocGeomSectionDoodads.man | 6 +- lib/libX11/man/xkb/XkbAllocGeomSections.man | 6 +- lib/libX11/man/xkb/XkbAllocGeomShapes.man | 6 +- lib/libX11/man/xkb/XkbAllocGeometry.man | 6 +- lib/libX11/man/xkb/XkbAllocIndicatorMaps.man | 4 +- lib/libX11/man/xkb/XkbAllocKeyboard.man | 2 +- lib/libX11/man/xkb/XkbAllocNames.man | 10 +- lib/libX11/man/xkb/XkbAllocServerMap.man | 8 +- lib/libX11/man/xkb/XkbApplyCompatMapToKey.man | 8 +- lib/libX11/man/xkb/XkbBell.man | 10 +- lib/libX11/man/xkb/XkbBellEvent.man | 10 +- lib/libX11/man/xkb/XkbChangeControls.man | 3 +- lib/libX11/man/xkb/XkbChangeDeviceInfo.man | 8 +- .../man/xkb/XkbChangeEnabledControls.man | 12 +- lib/libX11/man/xkb/XkbChangeIndicators.man | 156 - lib/libX11/man/xkb/XkbChangeMap.man | 8 +- lib/libX11/man/xkb/XkbChangeNames.man | 12 +- lib/libX11/man/xkb/XkbChangeTypesOfKey.man | 14 +- lib/libX11/man/xkb/XkbComputeRowBounds.man | 8 +- .../man/xkb/XkbComputeSectionBounds.man | 6 +- lib/libX11/man/xkb/XkbComputeShapeBounds.man | 4 +- lib/libX11/man/xkb/XkbComputeShapeTop.man | 6 +- lib/libX11/man/xkb/XkbCopyKeyType.man | 6 +- lib/libX11/man/xkb/XkbCopyKeyTypes.man | 8 +- lib/libX11/man/xkb/XkbDeviceBell.man | 16 +- lib/libX11/man/xkb/XkbDeviceBellEvent.man | 16 +- lib/libX11/man/xkb/XkbFindOverlayForKey.man | 8 +- lib/libX11/man/xkb/XkbForceBell.man | 6 +- lib/libX11/man/xkb/XkbForceDeviceBell.man | 14 +- lib/libX11/man/xkb/XkbFreeClientMap.man | 8 +- lib/libX11/man/xkb/XkbFreeCompatMap.man | 8 +- lib/libX11/man/xkb/XkbFreeComponentList.man | 4 +- lib/libX11/man/xkb/XkbFreeControls.man | 8 +- lib/libX11/man/xkb/XkbFreeDeviceInfo.man | 8 +- lib/libX11/man/xkb/XkbFreeGeomColors.man | 10 +- lib/libX11/man/xkb/XkbFreeGeomDoodads.man | 8 +- lib/libX11/man/xkb/XkbFreeGeomKeyAliases.man | 10 +- lib/libX11/man/xkb/XkbFreeGeomKeys.man | 10 +- lib/libX11/man/xkb/XkbFreeGeomOutlines.man | 10 +- lib/libX11/man/xkb/XkbFreeGeomOverlayKeys.man | 10 +- lib/libX11/man/xkb/XkbFreeGeomOverlayRows.man | 10 +- lib/libX11/man/xkb/XkbFreeGeomOverlays.man | 10 +- lib/libX11/man/xkb/XkbFreeGeomPoints.man | 10 +- lib/libX11/man/xkb/XkbFreeGeomProperties.man | 10 +- lib/libX11/man/xkb/XkbFreeGeomRows.man | 10 +- lib/libX11/man/xkb/XkbFreeGeomSections.man | 10 +- lib/libX11/man/xkb/XkbFreeGeomShapes.man | 10 +- lib/libX11/man/xkb/XkbFreeGeometry.man | 8 +- lib/libX11/man/xkb/XkbFreeIndicatorMaps.man | 4 +- lib/libX11/man/xkb/XkbFreeKeyboard.man | 2 +- lib/libX11/man/xkb/XkbFreeNames.man | 8 +- lib/libX11/man/xkb/XkbFreeServerMap.man | 8 +- lib/libX11/man/xkb/XkbGetAccessXTimeout.man | 140 - lib/libX11/man/xkb/XkbGetAutoRepeatRate.man | 10 +- .../man/xkb/XkbGetAutoResetControls.man | 12 +- lib/libX11/man/xkb/XkbGetBounceKeysDelay.man | 211 - lib/libX11/man/xkb/XkbGetCompatMap.man | 8 +- lib/libX11/man/xkb/XkbGetControls.man | 8 +- lib/libX11/man/xkb/XkbGetControlsChanges.man | 8 +- .../man/xkb/XkbGetDetectableAutoRepeat.man | 6 +- .../man/xkb/XkbGetDeviceButtonActions.man | 12 +- lib/libX11/man/xkb/XkbGetDeviceInfo.man | 12 +- .../man/xkb/XkbGetDeviceInfoChanges.man | 8 +- lib/libX11/man/xkb/XkbGetDeviceLedInfo.man | 12 +- lib/libX11/man/xkb/XkbGetGeometry.man | 6 +- lib/libX11/man/xkb/XkbGetIndicatorChanges.man | 153 - lib/libX11/man/xkb/XkbGetIndicatorMap.man | 8 +- lib/libX11/man/xkb/XkbGetIndicatorState.man | 8 +- lib/libX11/man/xkb/XkbGetKeyActions.man | 10 +- lib/libX11/man/xkb/XkbGetKeyBehaviors.man | 10 +- .../man/xkb/XkbGetKeyExplicitComponents.man | 10 +- lib/libX11/man/xkb/XkbGetKeyModifierMap.man | 10 +- lib/libX11/man/xkb/XkbGetKeySyms.man | 10 +- lib/libX11/man/xkb/XkbGetKeyTypes.man | 14 +- lib/libX11/man/xkb/XkbGetKeyVirtualModMap.man | 10 +- lib/libX11/man/xkb/XkbGetKeyboard.man | 25 +- lib/libX11/man/xkb/XkbGetKeyboardByName.man | 14 +- lib/libX11/man/xkb/XkbGetMap.man | 8 +- lib/libX11/man/xkb/XkbGetNameChanges.man | 70 - lib/libX11/man/xkb/XkbGetNamedGeometry.man | 8 +- lib/libX11/man/xkb/XkbGetNamedIndicator.man | 22 +- lib/libX11/man/xkb/XkbGetNames.man | 10 +- lib/libX11/man/xkb/XkbGetSlowKeysDelay.man | 214 - lib/libX11/man/xkb/XkbGetState.man | 2 +- .../man/xkb/XkbGetStickyKeysOptions.man | 115 - lib/libX11/man/xkb/XkbGetUpdatedMap.man | 8 +- lib/libX11/man/xkb/XkbGetVirtualMods.man | 8 +- lib/libX11/man/xkb/XkbGetXlibControls.man | 4 +- lib/libX11/man/xkb/XkbIgnoreExtension.man | 2 +- .../man/xkb/XkbInitCanonicalKeyTypes.man | 8 +- lib/libX11/man/xkb/XkbKeyAction.man | 8 +- lib/libX11/man/xkb/XkbKeyActionEntry.man | 10 +- lib/libX11/man/xkb/XkbKeyActionsPtr.man | 6 +- lib/libX11/man/xkb/XkbKeyGroupInfo.man | 6 +- lib/libX11/man/xkb/XkbKeyGroupWidth.man | 8 +- lib/libX11/man/xkb/XkbKeyGroupsWidth.man | 6 +- lib/libX11/man/xkb/XkbKeyHasActions.man | 6 +- .../xkb/{XkbKeyType.man => XkbKeyKeyType.man} | 16 +- ...eyTypeIndex.man => XkbKeyKeyTypeIndex.man} | 16 +- lib/libX11/man/xkb/XkbKeyNumActions.man | 6 +- lib/libX11/man/xkb/XkbKeyNumGroups.man | 6 +- lib/libX11/man/xkb/XkbKeyNumSyms.man | 6 +- lib/libX11/man/xkb/XkbKeySymEntry.man | 10 +- lib/libX11/man/xkb/XkbKeySymsOffset.man | 66 - lib/libX11/man/xkb/XkbKeySymsPtr.man | 6 +- .../man/xkb/XkbKeyTypesForCoreSymbols.man | 14 +- lib/libX11/man/xkb/XkbKeycodeToKeysym.man | 10 +- lib/libX11/man/xkb/XkbKeysymToModifiers.man | 6 +- lib/libX11/man/xkb/XkbLatchGroup.man | 2 +- lib/libX11/man/xkb/XkbLatchModifiers.man | 2 +- lib/libX11/man/xkb/XkbLibraryVersion.man | 2 +- lib/libX11/man/xkb/XkbListComponents.man | 10 +- lib/libX11/man/xkb/XkbLockGroup.man | 2 +- lib/libX11/man/xkb/XkbLockModifiers.man | 2 +- lib/libX11/man/xkb/XkbLookupKeyBinding.man | 14 +- lib/libX11/man/xkb/XkbLookupKeySym.man | 12 +- lib/libX11/man/xkb/XkbModActionVMods.man | 4 +- lib/libX11/man/xkb/XkbNoteControlsChanges.man | 8 +- lib/libX11/man/xkb/XkbNoteDeviceChanges.man | 8 +- .../man/xkb/XkbNoteIndicatorChanges.man | 123 - lib/libX11/man/xkb/XkbNoteNameChanges.man | 8 +- lib/libX11/man/xkb/XkbOpenDisplay.man | 2 +- lib/libX11/man/xkb/XkbOutOfRangeGroupInfo.man | 4 +- .../man/xkb/XkbOutOfRangeGroupNumber.man | 4 +- lib/libX11/man/xkb/XkbPtrActionX.man | 4 +- lib/libX11/man/xkb/XkbPtrActionY.man | 4 +- lib/libX11/man/xkb/XkbQueryExtension.man | 2 +- .../man/xkb/XkbRefreshKeyboardMapping.man | 4 +- .../man/xkb/XkbResizeDeviceButtonActions.man | 6 +- lib/libX11/man/xkb/XkbResizeKeyActions.man | 8 +- lib/libX11/man/xkb/XkbResizeKeySyms.man | 8 +- lib/libX11/man/xkb/XkbResizeKeyType.man | 12 +- lib/libX11/man/xkb/XkbSAGroup.man | 4 +- lib/libX11/man/xkb/XkbSAPtrDfltValue.man | 4 +- lib/libX11/man/xkb/XkbSARedirectSetVMods.man | 6 +- .../man/xkb/XkbSARedirectSetVModsMask.man | 6 +- lib/libX11/man/xkb/XkbSARedirectVMods.man | 4 +- lib/libX11/man/xkb/XkbSARedirectVModsMask.man | 4 +- lib/libX11/man/xkb/XkbSAScreen.man | 4 +- lib/libX11/man/xkb/XkbSASetGroup.man | 6 +- lib/libX11/man/xkb/XkbSASetPtrDfltValue.man | 6 +- lib/libX11/man/xkb/XkbSASetScreen.man | 6 +- lib/libX11/man/xkb/XkbSelectEventDetails.man | 2 +- lib/libX11/man/xkb/XkbSelectEvents.man | 2 +- lib/libX11/man/xkb/XkbSetAccessXTimeout.man | 193 - lib/libX11/man/xkb/XkbSetAutoRepeatRate.man | 10 +- .../man/xkb/XkbSetAutoResetControls.man | 10 +- lib/libX11/man/xkb/XkbSetBounceKeysDelay.man | 206 - lib/libX11/man/xkb/XkbSetCompatMap.man | 2 +- lib/libX11/man/xkb/XkbSetControls.man | 8 +- lib/libX11/man/xkb/XkbSetDebuggingFlags.man | 18 +- .../man/xkb/XkbSetDetectableAutoRepeat.man | 8 +- .../man/xkb/XkbSetDeviceButtonActions.man | 10 +- lib/libX11/man/xkb/XkbSetDeviceInfo.man | 8 +- lib/libX11/man/xkb/XkbSetIgnoreLockMods.man | 14 +- lib/libX11/man/xkb/XkbSetIndicatorMap.man | 26 +- lib/libX11/man/xkb/XkbSetMap.man | 2 +- lib/libX11/man/xkb/XkbSetModActionVMods.man | 6 +- lib/libX11/man/xkb/XkbSetNamedIndicator.man | 20 +- lib/libX11/man/xkb/XkbSetNames.man | 12 +- lib/libX11/man/xkb/XkbSetPtrActionX.man | 6 +- lib/libX11/man/xkb/XkbSetPtrActionY.man | 6 +- .../man/xkb/XkbSetServerInternalMods.man | 14 +- lib/libX11/man/xkb/XkbSetXlibControls.man | 8 +- lib/libX11/man/xkb/XkbTranslateKeyCode.man | 12 +- lib/libX11/man/xkb/XkbTranslateKeySym.man | 14 +- lib/libX11/man/xkb/XkbUpdateMapFromCore.man | 14 +- lib/libX11/man/xkb/XkbVirtualModsToReal.man | 8 +- lib/libX11/modules/Makefile.in | 1 + lib/libX11/modules/im/Makefile.in | 1 + lib/libX11/modules/im/ximcp/Makefile.in | 1 + lib/libX11/modules/im/ximcp/imDefIc.c | 2 +- lib/libX11/modules/im/ximcp/imDefIm.c | 119 +- lib/libX11/modules/im/ximcp/imInsClbk.c | 3 + lib/libX11/modules/im/ximcp/imLcIc.c | 33 +- lib/libX11/modules/im/ximcp/imLcPrs.c | 2 +- lib/libX11/modules/im/ximcp/imRm.c | 29 +- lib/libX11/modules/im/ximcp/imTrX.c | 2 +- lib/libX11/modules/im/ximcp/imTrans.c | 2 +- lib/libX11/modules/im/ximcp/imTransR.c | 2 +- lib/libX11/modules/lc/Makefile.in | 1 + lib/libX11/modules/lc/Utf8/Makefile.in | 1 + lib/libX11/modules/lc/def/Makefile.in | 1 + lib/libX11/modules/lc/def/lcDefConv.c | 2 +- lib/libX11/modules/lc/gen/Makefile.in | 1 + lib/libX11/modules/lc/gen/lcGenConv.c | 2 +- lib/libX11/modules/om/Makefile.in | 1 + lib/libX11/modules/om/generic/Makefile.in | 1 + lib/libX11/nls/Makefile.in | 1 + lib/libX11/nls/am_ET.UTF-8/Compose.pre | 552 +- lib/libX11/nls/compose-check.pl | 2 +- lib/libX11/nls/compose.dir.pre | 4 +- lib/libX11/nls/en_US.UTF-8/Compose.pre | 1671 +-- lib/libX11/nls/en_US.UTF-8/XLC_LOCALE.pre | 59 +- lib/libX11/nls/ja.SJIS/XLC_LOCALE.pre | 214 - lib/libX11/nls/pt_BR.UTF-8/Compose.pre | 4 - lib/libX11/specs/Makefile.am | 2 +- lib/libX11/specs/Makefile.in | 3 +- lib/libX11/specs/XIM/Makefile.in | 1 + lib/libX11/specs/XKB/Makefile.in | 1 + lib/libX11/specs/XKB/ch08.xml | 319 +- lib/libX11/specs/XKB/ch10.xml | 764 +- lib/libX11/specs/XKB/ch15.xml | 61 +- lib/libX11/specs/XKB/ch16.xml | 8 +- lib/libX11/specs/XKB/ch18.xml | 79 - lib/libX11/specs/XKB/ch21.xml | 58 - lib/libX11/specs/i18n/Makefile.am | 2 +- lib/libX11/specs/i18n/Makefile.in | 3 +- lib/libX11/specs/i18n/compose/Makefile.in | 1 + .../specs/i18n/compose/compose-chart.pl | 2 +- lib/libX11/specs/i18n/framework/Makefile.in | 1 + lib/libX11/specs/i18n/localedb/Makefile.in | 1 + lib/libX11/specs/i18n/trans/Makefile.in | 1 + lib/libX11/specs/libX11/CH13.xml | 6 +- lib/libX11/specs/libX11/Makefile.in | 1 + lib/libX11/src/ChProp.c | 12 +- lib/libX11/src/ChkIfEv.c | 8 +- lib/libX11/src/CrGlCur.c | 35 - lib/libX11/src/DrArcs.c | 4 +- lib/libX11/src/DrLines.c | 6 +- lib/libX11/src/DrPoints.c | 8 +- lib/libX11/src/DrRects.c | 6 +- lib/libX11/src/DrSegs.c | 6 +- lib/libX11/src/FillArcs.c | 6 +- lib/libX11/src/FillPoly.c | 8 +- lib/libX11/src/FillRcts.c | 6 +- lib/libX11/src/GetDflt.c | 11 - lib/libX11/src/Host.c | 2 +- lib/libX11/src/IfEvent.c | 7 +- lib/libX11/src/ImUtil.c | 4 - lib/libX11/src/LiHosts.c | 2 +- lib/libX11/src/Makefile.am | 8 +- lib/libX11/src/Makefile.in | 21 +- lib/libX11/src/OpenDis.c | 5 + lib/libX11/src/PeekIfEv.c | 5 + lib/libX11/src/PutImage.c | 4 - lib/libX11/src/QuColors.c | 12 +- lib/libX11/src/RdBitF.c | 3 - lib/libX11/src/SetCRects.c | 10 +- lib/libX11/src/SetLocale.c | 47 +- lib/libX11/src/UIThrStubs.c | 157 - lib/libX11/src/WMProps.c | 8 - lib/libX11/src/WrBitF.c | 3 - lib/libX11/src/XlibInt.c | 17 +- lib/libX11/src/Xrm.c | 17 +- lib/libX11/src/config.h.in | 109 +- lib/libX11/src/globals.c | 47 +- lib/libX11/src/locking.c | 43 +- lib/libX11/src/reallocarray.h | 2 +- lib/libX11/src/util/Makefile.in | 1 + lib/libX11/src/xcms/Makefile.in | 1 + lib/libX11/src/xcms/cmsColNm.c | 3 - lib/libX11/src/xcms/cmsTrig.c | 4 - lib/libX11/src/xkb/Makefile.in | 1 + lib/libX11/src/xkb/XKB.c | 4 - lib/libX11/src/xkb/XKBBind.c | 63 +- lib/libX11/src/xkb/XKBCvt.c | 8 - lib/libX11/src/xkb/XKBExtDev.c | 6 +- lib/libX11/src/xkb/XKBNames.c | 1 + lib/libX11/src/xlibi18n/Makefile.in | 1 + lib/libX11/src/xlibi18n/XDefaultIMIF.c | 2 +- lib/libX11/src/xlibi18n/XDefaultOMIF.c | 2 +- lib/libX11/src/xlibi18n/XimTrInt.h | 2 +- lib/libX11/src/xlibi18n/XimTrX.h | 2 +- lib/libX11/src/xlibi18n/XimTrans.h | 2 +- lib/libX11/src/xlibi18n/XimintP.h | 2 +- lib/libX11/src/xlibi18n/XlcDL.c | 58 +- lib/libX11/src/xlibi18n/XlcSL.c | 2 +- lib/libX11/src/xlibi18n/lcDB.c | 13 - lib/libX11/src/xlibi18n/lcFile.c | 68 +- lib/libX11/src/xlibi18n/lcInit.c | 2 +- lib/libxcb/libxcb-dpms/shlib_version | 2 +- lib/libxcb/libxcb-dri3/shlib_version | 2 +- lib/libxcb/libxcb-present/shlib_version | 2 +- lib/libxcb/src/Makefile | 4 +- lib/libxcb/src/bigreq.h | 12 +- lib/libxcb/src/composite.h | 96 +- lib/libxcb/src/damage.h | 108 +- lib/libxcb/src/dpms.c | 53 + lib/libxcb/src/dpms.h | 68 +- lib/libxcb/src/dri3.c | 134 + lib/libxcb/src/dri3.h | 121 +- lib/libxcb/src/present.c | 182 + lib/libxcb/src/present.h | 113 +- lib/libxcb/src/randr.c | 8 +- lib/libxcb/src/shm.h | 176 +- lib/libxcb/src/xfixes.h | 16 +- lib/libxcb/src/xinput.c | 16 +- proto/xcb-proto/autogen.sh | 11 +- proto/xcb-proto/configure.ac | 2 +- proto/xcb-proto/src/bigreq.xml | 14 + proto/xcb-proto/src/composite.xml | 122 + proto/xcb-proto/src/damage.xml | 106 + proto/xcb-proto/src/dpms.xml | 19 +- proto/xcb-proto/src/dri3.xml | 14 +- proto/xcb-proto/src/present.xml | 30 +- proto/xcb-proto/src/screensaver.xml | 30 +- proto/xcb-proto/src/shm.xml | 214 + proto/xcb-proto/src/xfixes.xml | 25 +- share/mk/bsd.xorg.mk | 4 +- 657 files changed, 21464 insertions(+), 54675 deletions(-) create mode 100644 app/appres/meson.build create mode 100644 dist/libxcb/xcb-dbe.pc.in delete mode 100644 doc/gl-docs/GL/Imakefile delete mode 100644 doc/gl-docs/GL/gl/Imakefile delete mode 100644 doc/gl-docs/GL/gl/Makefile delete mode 100644 doc/gl-docs/GL/gl/accum.3gl delete mode 100644 doc/gl-docs/GL/gl/activetextureARB.3gl delete mode 100644 doc/gl-docs/GL/gl/alphafunc.3gl delete mode 100644 doc/gl-docs/GL/gl/aretexturesresident.3gl delete mode 100644 doc/gl-docs/GL/gl/arrayelement.3gl delete mode 100644 doc/gl-docs/GL/gl/begin.3gl delete mode 100644 doc/gl-docs/GL/gl/bindtexture.3gl delete mode 100644 doc/gl-docs/GL/gl/bitmap.3gl delete mode 100644 doc/gl-docs/GL/gl/blendcolor.3gl delete mode 100644 doc/gl-docs/GL/gl/blendequation.3gl delete mode 100644 doc/gl-docs/GL/gl/blendfunc.3gl delete mode 100644 doc/gl-docs/GL/gl/calllist.3gl delete mode 100644 doc/gl-docs/GL/gl/calllists.3gl delete mode 100644 doc/gl-docs/GL/gl/clear.3gl delete mode 100644 doc/gl-docs/GL/gl/clearaccum.3gl delete mode 100644 doc/gl-docs/GL/gl/clearcolor.3gl delete mode 100644 doc/gl-docs/GL/gl/cleardepth.3gl delete mode 100644 doc/gl-docs/GL/gl/clearindex.3gl delete mode 100644 doc/gl-docs/GL/gl/clearstencil.3gl delete mode 100644 doc/gl-docs/GL/gl/clientactivetextureARB.3gl delete mode 100644 doc/gl-docs/GL/gl/clipplane.3gl delete mode 100644 doc/gl-docs/GL/gl/color.3gl delete mode 100644 doc/gl-docs/GL/gl/colormask.3gl delete mode 100644 doc/gl-docs/GL/gl/colormaterial.3gl delete mode 100644 doc/gl-docs/GL/gl/colorpointer.3gl delete mode 100644 doc/gl-docs/GL/gl/colorsubtable.3gl delete mode 100644 doc/gl-docs/GL/gl/colortable.3gl delete mode 100644 doc/gl-docs/GL/gl/colortableparameter.3gl delete mode 100644 doc/gl-docs/GL/gl/convolutionfilter1d.3gl delete mode 100644 doc/gl-docs/GL/gl/convolutionfilter2d.3gl delete mode 100644 doc/gl-docs/GL/gl/convolutionparameter.3gl delete mode 100644 doc/gl-docs/GL/gl/copycolorsubtable.3gl delete mode 100644 doc/gl-docs/GL/gl/copycolortable.3gl delete mode 100644 doc/gl-docs/GL/gl/copyconvolutionfilter1d.3gl delete mode 100644 doc/gl-docs/GL/gl/copyconvolutionfilter2d.3gl delete mode 100644 doc/gl-docs/GL/gl/copypixels.3gl delete mode 100644 doc/gl-docs/GL/gl/copyteximage1d.3gl delete mode 100644 doc/gl-docs/GL/gl/copyteximage2d.3gl delete mode 100644 doc/gl-docs/GL/gl/copytexsubimage1d.3gl delete mode 100644 doc/gl-docs/GL/gl/copytexsubimage2d.3gl delete mode 100644 doc/gl-docs/GL/gl/copytexsubimage3d.3gl delete mode 100644 doc/gl-docs/GL/gl/cullface.3gl delete mode 100644 doc/gl-docs/GL/gl/deletelists.3gl delete mode 100644 doc/gl-docs/GL/gl/deletetextures.3gl delete mode 100644 doc/gl-docs/GL/gl/depthfunc.3gl delete mode 100644 doc/gl-docs/GL/gl/depthmask.3gl delete mode 100644 doc/gl-docs/GL/gl/depthrange.3gl delete mode 100644 doc/gl-docs/GL/gl/drawarrays.3gl delete mode 100644 doc/gl-docs/GL/gl/drawbuffer.3gl delete mode 100644 doc/gl-docs/GL/gl/drawelements.3gl delete mode 100644 doc/gl-docs/GL/gl/drawpixels.3gl delete mode 100644 doc/gl-docs/GL/gl/drawrangeelements.3gl delete mode 100644 doc/gl-docs/GL/gl/edgeflag.3gl delete mode 100644 doc/gl-docs/GL/gl/edgeflagpointer.3gl delete mode 100644 doc/gl-docs/GL/gl/enable.3gl delete mode 100644 doc/gl-docs/GL/gl/enableclientstate.3gl delete mode 100644 doc/gl-docs/GL/gl/evalcoord.3gl delete mode 100644 doc/gl-docs/GL/gl/evalmesh.3gl delete mode 100644 doc/gl-docs/GL/gl/evalpoint.3gl delete mode 100644 doc/gl-docs/GL/gl/feedbackbuffer.3gl delete mode 100644 doc/gl-docs/GL/gl/finish.3gl delete mode 100644 doc/gl-docs/GL/gl/flush.3gl delete mode 100644 doc/gl-docs/GL/gl/fog.3gl delete mode 100644 doc/gl-docs/GL/gl/frontface.3gl delete mode 100644 doc/gl-docs/GL/gl/frustum.3gl delete mode 100644 doc/gl-docs/GL/gl/genlists.3gl delete mode 100644 doc/gl-docs/GL/gl/gentextures.3gl delete mode 100644 doc/gl-docs/GL/gl/get.3gl delete mode 100644 doc/gl-docs/GL/gl/getclipplane.3gl delete mode 100644 doc/gl-docs/GL/gl/getcolortable.3gl delete mode 100644 doc/gl-docs/GL/gl/getcolortableparameter.3gl delete mode 100644 doc/gl-docs/GL/gl/getconvolutionfilter.3gl delete mode 100644 doc/gl-docs/GL/gl/getconvolutionparameter.3gl delete mode 100644 doc/gl-docs/GL/gl/geterror.3gl delete mode 100644 doc/gl-docs/GL/gl/gethistogram.3gl delete mode 100644 doc/gl-docs/GL/gl/gethistogramparameter.3gl delete mode 100644 doc/gl-docs/GL/gl/getlight.3gl delete mode 100644 doc/gl-docs/GL/gl/getmap.3gl delete mode 100644 doc/gl-docs/GL/gl/getmaterial.3gl delete mode 100644 doc/gl-docs/GL/gl/getminmax.3gl delete mode 100644 doc/gl-docs/GL/gl/getminmaxparameter.3gl delete mode 100644 doc/gl-docs/GL/gl/getpixelmap.3gl delete mode 100644 doc/gl-docs/GL/gl/getpointerv.3gl delete mode 100644 doc/gl-docs/GL/gl/getpolygonstipple.3gl delete mode 100644 doc/gl-docs/GL/gl/getseparablefilter.3gl delete mode 100644 doc/gl-docs/GL/gl/getstring.3gl delete mode 100644 doc/gl-docs/GL/gl/gettexenv.3gl delete mode 100644 doc/gl-docs/GL/gl/gettexgen.3gl delete mode 100644 doc/gl-docs/GL/gl/getteximage.3gl delete mode 100644 doc/gl-docs/GL/gl/gettexlevelparameter.3gl delete mode 100644 doc/gl-docs/GL/gl/gettexparameter.3gl delete mode 100644 doc/gl-docs/GL/gl/hint.3gl delete mode 100644 doc/gl-docs/GL/gl/histogram.3gl delete mode 100644 doc/gl-docs/GL/gl/index.3gl delete mode 100644 doc/gl-docs/GL/gl/indexmask.3gl delete mode 100644 doc/gl-docs/GL/gl/indexpointer.3gl delete mode 100644 doc/gl-docs/GL/gl/initnames.3gl delete mode 100644 doc/gl-docs/GL/gl/interleavedarrays.3gl delete mode 100644 doc/gl-docs/GL/gl/isenabled.3gl delete mode 100644 doc/gl-docs/GL/gl/islist.3gl delete mode 100644 doc/gl-docs/GL/gl/istexture.3gl delete mode 100644 doc/gl-docs/GL/gl/light.3gl delete mode 100644 doc/gl-docs/GL/gl/lightmodel.3gl delete mode 100644 doc/gl-docs/GL/gl/linestipple.3gl delete mode 100644 doc/gl-docs/GL/gl/linewidth.3gl delete mode 100644 doc/gl-docs/GL/gl/listbase.3gl delete mode 100644 doc/gl-docs/GL/gl/loadidentity.3gl delete mode 100644 doc/gl-docs/GL/gl/loadmatrix.3gl delete mode 100644 doc/gl-docs/GL/gl/loadname.3gl delete mode 100644 doc/gl-docs/GL/gl/logicop.3gl delete mode 100644 doc/gl-docs/GL/gl/map1.3gl delete mode 100644 doc/gl-docs/GL/gl/map2.3gl delete mode 100644 doc/gl-docs/GL/gl/mapgrid.3gl delete mode 100644 doc/gl-docs/GL/gl/material.3gl delete mode 100644 doc/gl-docs/GL/gl/matrixmode.3gl delete mode 100644 doc/gl-docs/GL/gl/minmax.3gl delete mode 100644 doc/gl-docs/GL/gl/multitexcoordARB.3gl delete mode 100644 doc/gl-docs/GL/gl/multmatrix.3gl delete mode 100644 doc/gl-docs/GL/gl/newlist.3gl delete mode 100644 doc/gl-docs/GL/gl/normal.3gl delete mode 100644 doc/gl-docs/GL/gl/normalpointer.3gl delete mode 100644 doc/gl-docs/GL/gl/ortho.3gl delete mode 100644 doc/gl-docs/GL/gl/passthrough.3gl delete mode 100644 doc/gl-docs/GL/gl/pixelmap.3gl delete mode 100644 doc/gl-docs/GL/gl/pixelstore.3gl delete mode 100644 doc/gl-docs/GL/gl/pixeltransfer.3gl delete mode 100644 doc/gl-docs/GL/gl/pixelzoom.3gl delete mode 100644 doc/gl-docs/GL/gl/pointsize.3gl delete mode 100644 doc/gl-docs/GL/gl/polygonmode.3gl delete mode 100644 doc/gl-docs/GL/gl/polygonoffset.3gl delete mode 100644 doc/gl-docs/GL/gl/polygonstipple.3gl delete mode 100644 doc/gl-docs/GL/gl/prioritizetextures.3gl delete mode 100644 doc/gl-docs/GL/gl/pushattrib.3gl delete mode 100644 doc/gl-docs/GL/gl/pushclientattrib.3gl delete mode 100644 doc/gl-docs/GL/gl/pushmatrix.3gl delete mode 100644 doc/gl-docs/GL/gl/pushname.3gl delete mode 100644 doc/gl-docs/GL/gl/rasterpos.3gl delete mode 100644 doc/gl-docs/GL/gl/readbuffer.3gl delete mode 100644 doc/gl-docs/GL/gl/readpixels.3gl delete mode 100644 doc/gl-docs/GL/gl/rect.3gl delete mode 100644 doc/gl-docs/GL/gl/rendermode.3gl delete mode 100644 doc/gl-docs/GL/gl/resethistogram.3gl delete mode 100644 doc/gl-docs/GL/gl/resetminmax.3gl delete mode 100644 doc/gl-docs/GL/gl/rotate.3gl delete mode 100644 doc/gl-docs/GL/gl/scale.3gl delete mode 100644 doc/gl-docs/GL/gl/scissor.3gl delete mode 100644 doc/gl-docs/GL/gl/selectbuffer.3gl delete mode 100644 doc/gl-docs/GL/gl/separablefilter2d.3gl delete mode 100644 doc/gl-docs/GL/gl/shademodel.3gl delete mode 100644 doc/gl-docs/GL/gl/stencilfunc.3gl delete mode 100644 doc/gl-docs/GL/gl/stencilmask.3gl delete mode 100644 doc/gl-docs/GL/gl/stencilop.3gl delete mode 100644 doc/gl-docs/GL/gl/texcoord.3gl delete mode 100644 doc/gl-docs/GL/gl/texcoordpointer.3gl delete mode 100644 doc/gl-docs/GL/gl/texenv.3gl delete mode 100644 doc/gl-docs/GL/gl/texgen.3gl delete mode 100644 doc/gl-docs/GL/gl/teximage1d.3gl delete mode 100644 doc/gl-docs/GL/gl/teximage2d.3gl delete mode 100644 doc/gl-docs/GL/gl/teximage3d.3gl delete mode 100644 doc/gl-docs/GL/gl/texparameter.3gl delete mode 100644 doc/gl-docs/GL/gl/texsubimage1d.3gl delete mode 100644 doc/gl-docs/GL/gl/texsubimage2d.3gl delete mode 100644 doc/gl-docs/GL/gl/texsubimage3d.3gl delete mode 100644 doc/gl-docs/GL/gl/translate.3gl delete mode 100644 doc/gl-docs/GL/gl/vertex.3gl delete mode 100644 doc/gl-docs/GL/gl/vertexpointer.3gl delete mode 100644 doc/gl-docs/GL/gl/viewport.3gl delete mode 100644 doc/gl-docs/GL/glx/Imakefile delete mode 100644 doc/gl-docs/GL/glx/Makefile delete mode 100644 doc/gl-docs/GL/glx/xchoosevisual.3gl delete mode 100644 doc/gl-docs/GL/glx/xcopycontext.3gl delete mode 100644 doc/gl-docs/GL/glx/xcreatecontext.3gl delete mode 100644 doc/gl-docs/GL/glx/xcreateglxpixmap.3gl delete mode 100644 doc/gl-docs/GL/glx/xdestroycontext.3gl delete mode 100644 doc/gl-docs/GL/glx/xdestroyglxpixmap.3gl delete mode 100644 doc/gl-docs/GL/glx/xfreecontextext.3gl delete mode 100644 doc/gl-docs/GL/glx/xgetclientstring.3gl delete mode 100644 doc/gl-docs/GL/glx/xgetconfig.3gl delete mode 100644 doc/gl-docs/GL/glx/xgetcontextidext.3gl delete mode 100644 doc/gl-docs/GL/glx/xgetcurrentcontext.3gl delete mode 100644 doc/gl-docs/GL/glx/xgetcurrentdisplay.3gl delete mode 100644 doc/gl-docs/GL/glx/xgetcurrentdrawable.3gl delete mode 100644 doc/gl-docs/GL/glx/ximportcontextext.3gl delete mode 100644 doc/gl-docs/GL/glx/xintro.3gl delete mode 100644 doc/gl-docs/GL/glx/xisdirect.3gl delete mode 100644 doc/gl-docs/GL/glx/xmakecurrent.3gl delete mode 100644 doc/gl-docs/GL/glx/xquerycontextinfoext.3gl delete mode 100644 doc/gl-docs/GL/glx/xqueryextension.3gl delete mode 100644 doc/gl-docs/GL/glx/xqueryextensionsstring.3gl delete mode 100644 doc/gl-docs/GL/glx/xqueryserverstring.3gl delete mode 100644 doc/gl-docs/GL/glx/xqueryversion.3gl delete mode 100644 doc/gl-docs/GL/glx/xswapbuffers.3gl delete mode 100644 doc/gl-docs/GL/glx/xusexfont.3gl delete mode 100644 doc/gl-docs/GL/glx/xwaitgl.3gl delete mode 100644 doc/gl-docs/GL/glx/xwaitx.3gl delete mode 100644 doc/gl-docs/GLU/Imakefile delete mode 100644 doc/gl-docs/GLU/Makefile delete mode 100644 doc/gl-docs/GLU/begincurve.3gl delete mode 100644 doc/gl-docs/GLU/beginpolygon.3gl delete mode 100644 doc/gl-docs/GLU/beginsurface.3gl delete mode 100644 doc/gl-docs/GLU/begintrim.3gl delete mode 100644 doc/gl-docs/GLU/build1dmipmaplevels.3gl delete mode 100644 doc/gl-docs/GLU/build1dmipmaps.3gl delete mode 100644 doc/gl-docs/GLU/build2dmipmaplevels.3gl delete mode 100644 doc/gl-docs/GLU/build2dmipmaps.3gl delete mode 100644 doc/gl-docs/GLU/build3dmipmaplevels.3gl delete mode 100644 doc/gl-docs/GLU/build3dmipmaps.3gl delete mode 100644 doc/gl-docs/GLU/checkextension.3gl delete mode 100644 doc/gl-docs/GLU/cylinder.3gl delete mode 100644 doc/gl-docs/GLU/deletenurbsrenderer.3gl delete mode 100644 doc/gl-docs/GLU/deletequadric.3gl delete mode 100644 doc/gl-docs/GLU/deletetess.3gl delete mode 100644 doc/gl-docs/GLU/disk.3gl delete mode 100644 doc/gl-docs/GLU/errorstring.3gl delete mode 100644 doc/gl-docs/GLU/getnurbsproperty.3gl delete mode 100644 doc/gl-docs/GLU/getstring.3gl delete mode 100644 doc/gl-docs/GLU/gettessproperty.3gl delete mode 100644 doc/gl-docs/GLU/loadsamplingmatrices.3gl delete mode 100644 doc/gl-docs/GLU/lookat.3gl delete mode 100644 doc/gl-docs/GLU/newnurbsrenderer.3gl delete mode 100644 doc/gl-docs/GLU/newquadric.3gl delete mode 100644 doc/gl-docs/GLU/newtess.3gl delete mode 100644 doc/gl-docs/GLU/nextcontour.3gl delete mode 100644 doc/gl-docs/GLU/nurbscallback.3gl delete mode 100644 doc/gl-docs/GLU/nurbscallbackdata.3gl delete mode 100644 doc/gl-docs/GLU/nurbscallbackdataext.3gl delete mode 100644 doc/gl-docs/GLU/nurbscurve.3gl delete mode 100644 doc/gl-docs/GLU/nurbsproperty.3gl delete mode 100644 doc/gl-docs/GLU/nurbssurface.3gl delete mode 100644 doc/gl-docs/GLU/ortho2d.3gl delete mode 100644 doc/gl-docs/GLU/partialdisk.3gl delete mode 100644 doc/gl-docs/GLU/perspective.3gl delete mode 100644 doc/gl-docs/GLU/pickmatrix.3gl delete mode 100644 doc/gl-docs/GLU/project.3gl delete mode 100644 doc/gl-docs/GLU/pwlcurve.3gl delete mode 100644 doc/gl-docs/GLU/quadriccallback.3gl delete mode 100644 doc/gl-docs/GLU/quadricdrawstyle.3gl delete mode 100644 doc/gl-docs/GLU/quadricnormals.3gl delete mode 100644 doc/gl-docs/GLU/quadricorientation.3gl delete mode 100644 doc/gl-docs/GLU/quadrictexture.3gl delete mode 100644 doc/gl-docs/GLU/scaleimage.3gl delete mode 100644 doc/gl-docs/GLU/sphere.3gl delete mode 100644 doc/gl-docs/GLU/tessbegincontour.3gl delete mode 100644 doc/gl-docs/GLU/tessbeginpolygon.3gl delete mode 100644 doc/gl-docs/GLU/tesscallback.3gl delete mode 100644 doc/gl-docs/GLU/tessendpolygon.3gl delete mode 100644 doc/gl-docs/GLU/tessnormal.3gl delete mode 100644 doc/gl-docs/GLU/tessproperty.3gl delete mode 100644 doc/gl-docs/GLU/tessvertex.3gl delete mode 100644 doc/gl-docs/GLU/unproject.3gl delete mode 100644 doc/gl-docs/GLU/unproject4.3gl delete mode 100644 doc/gl-docs/GLw/Imakefile delete mode 100644 doc/gl-docs/GLw/Makefile delete mode 100644 doc/gl-docs/GLw/glwcreatemdrawingarea.gl delete mode 100644 doc/gl-docs/GLw/glwdrawingarea.gl delete mode 100644 doc/gl-docs/GLw/glwdrawingareamakecurrent.gl delete mode 100644 doc/gl-docs/GLw/glwdrawingareaswapbuffers.gl delete mode 100644 doc/gl-docs/Makefile delete mode 100644 doc/gl-docs/Makefile.inc delete mode 100644 lib/libX11/NEWS rename lib/libX11/man/xkb/{XkbSAActionSetCtrls.man => XkbActionSetCtrls.man} (94%) delete mode 100644 lib/libX11/man/xkb/XkbAllocDeviceLedInfo.man delete mode 100644 lib/libX11/man/xkb/XkbChangeIndicators.man delete mode 100644 lib/libX11/man/xkb/XkbGetAccessXTimeout.man delete mode 100644 lib/libX11/man/xkb/XkbGetBounceKeysDelay.man delete mode 100644 lib/libX11/man/xkb/XkbGetIndicatorChanges.man delete mode 100644 lib/libX11/man/xkb/XkbGetNameChanges.man delete mode 100644 lib/libX11/man/xkb/XkbGetSlowKeysDelay.man delete mode 100644 lib/libX11/man/xkb/XkbGetStickyKeysOptions.man rename lib/libX11/man/xkb/{XkbKeyType.man => XkbKeyKeyType.man} (88%) rename lib/libX11/man/xkb/{XkbKeyTypeIndex.man => XkbKeyKeyTypeIndex.man} (83%) delete mode 100644 lib/libX11/man/xkb/XkbKeySymsOffset.man delete mode 100644 lib/libX11/man/xkb/XkbNoteIndicatorChanges.man delete mode 100644 lib/libX11/man/xkb/XkbSetAccessXTimeout.man delete mode 100644 lib/libX11/man/xkb/XkbSetBounceKeysDelay.man delete mode 100644 lib/libX11/src/UIThrStubs.c diff --git a/3RDPARTY b/3RDPARTY index bf8d6fdd..c05cd008 100644 --- a/3RDPARTY +++ b/3RDPARTY @@ -1,5 +1,5 @@ -# $OpenBSD: 3RDPARTY,v 1.426 2024/06/01 12:48:00 matthieu Exp $ +# $OpenBSD: 3RDPARTY,v 1.427 2024/07/11 08:29:54 matthieu Exp $ # Package: Freetype Version: 2.13.0 @@ -15,13 +15,13 @@ Archive Site: http://invisible-island.net/xterm/xterm.html Package: Mesa Version 23.3.6 -Current Vers: 24.1.0 +Current Vers: 24.1.2 Maintainer: Brian Paul Archive Site: https://archive.mesa3d.org/ Package: libdrm Version: 2.4.120 -Current Vers: 2.4.120 +Current Vers: 2.4.122 Maintainer: Freedesktop.org Archive Site: https://dri.freedesktop.org/libdrm/ diff --git a/MODULES b/MODULES index bb05b712..5f430307 100644 --- a/MODULES +++ b/MODULES @@ -1,9 +1,9 @@ -# $OpenBSD: MODULES,v 1.522 2024/06/01 12:48:00 matthieu Exp $ +# $OpenBSD: MODULES,v 1.523 2024/07/11 08:29:54 matthieu Exp $ # # X.Org maintained modules # -app/appres 1.0.6 +app/appres 1.0.7 app/bdftopcf 1.1.1 app/beforelight 1.0.6 app/bitmap 1.1.1 @@ -149,21 +149,21 @@ font/xfree86-type1 1.0.5 lib/libICE 1.1.1 lib/libSM 1.2.4 -lib/libX11 1.8.9 needs-update +lib/libX11 1.8.9 lib/libXScrnSaver 1.2.4 lib/libXau 1.0.11 -lib/libXaw 1.0.16 needs-update +lib/libXaw 1.0.16 lib/libXcomposite 0.4.6 -lib/libXcursor 1.2.2 needs-update +lib/libXcursor 1.2.2 lib/libXdamage 1.1.6 -lib/libXdmcp 1.1.5 needs-update -lib/libXext 1.3.6 needs-update +lib/libXdmcp 1.1.5 +lib/libXext 1.3.6 lib/libXfixes 6.0.1 lib/libXfont2 2.0.6 lib/libXft 2.3.8 lib/libXi 1.8.1 lib/libXinerama 1.1.5 -lib/libXmu 1.2.1 needs-update +lib/libXmu 1.2.1 lib/libXpm 3.5.17 lib/libXpresent 1.0.1 lib/libXrandr 1.5.4 @@ -184,13 +184,13 @@ lib/libxshmfence 1.3.2 lib/libxtrans 1.5.0 lib/pixman 0.43.4 needs-update lib/xcb-util 0.4.1 -lib/xcb-util-cursor 0.1.5 needs-update +lib/xcb-util-cursor 0.1.5 lib/xcb-util-image 0.4.1 lib/xcb-util-keysyms 0.4.1 lib/xcb-util-renderutil 0.3.10 lib/xcb-util-wm 0.4.2 -proto/xcb-proto 1.17.0 needs-update +proto/xcb-proto 1.17.0 proto/xorgproto 2024.1 util/cf 1.0.4 diff --git a/app/appres/ChangeLog b/app/appres/ChangeLog index 9783fdf5..c22f00ed 100644 --- a/app/appres/ChangeLog +++ b/app/appres/ChangeLog @@ -1,3 +1,49 @@ +commit 07075bda9cd863fa10f47993271dbe7e6e256d71 +Author: Alan Coopersmith +Date: Sun Jun 16 10:32:47 2024 -0700 + + appres 1.0.7 + + Signed-off-by: Alan Coopersmith + Part-of: + +commit b297a7738a02b3fb7a8842e054c4068195038c38 +Author: Alan Coopersmith +Date: Sun Apr 7 13:58:13 2024 -0700 + + meson: Add a meson build system + + Signed-off-by: Alan Coopersmith + Part-of: + +commit 2b5316265c5ce6c7dbd8f726826d5d5a7385febd +Author: Alan Coopersmith +Date: Sun Apr 7 12:53:58 2024 -0700 + + configure: use @-style substitutions for man pages instead of __-style + + Moves substitution of variables from Makefile.am to configure.ac + in preparation for allowing meson.build to do the same. + + Signed-off-by: Alan Coopersmith + Part-of: + +commit 888aece87c0af4e0b326d4d92fcc079f249a7f73 +Author: Alan Coopersmith +Date: Thu Feb 9 12:25:47 2023 -0800 + + Accept -help, -version, & -V without requiring display to open + + Signed-off-by: Alan Coopersmith + +commit 163ba88d2d98369df78c2700b634cf62012f8c31 +Author: Alan Coopersmith +Date: Thu Jul 28 17:30:21 2022 -0700 + + gitlab CI: stop requiring Signed-off-by in commits + + Signed-off-by: Alan Coopersmith + commit 55db329c8363e6ca969c27652f0da714364065bd Author: Alan Coopersmith Date: Sun Apr 3 11:54:44 2022 -0700 @@ -467,7 +513,7 @@ Date: Fri Oct 14 00:25:40 2005 +0000 Use sed to fill in variables in man page commit 61d84d9c527921b252706b251ce29caac4eb5ad4 -Author: Kristian Høgsberg +Author: Kristian Høgsberg Date: Fri Sep 23 20:34:52 2005 +0000 Add some content to these. @@ -513,7 +559,7 @@ Date: Fri Jul 1 16:55:14 2005 +0000 More freedestkop->freedesktop typo fixes commit e6418cf03e9a7f835a7ee7d958ea6a1d4318f7b5 -Author: Søren Sandmann Pedersen +Author: Søren Sandmann Pedersen Date: Wed Jun 22 23:52:44 2005 +0000 - Add script that can generate the build system for applications diff --git a/app/appres/Makefile.am b/app/appres/Makefile.am index 98f8b6fe..f0d2746c 100644 --- a/app/appres/Makefile.am +++ b/app/appres/Makefile.am @@ -40,4 +40,4 @@ ChangeLog: dist-hook: ChangeLog INSTALL -EXTRA_DIST = README.md +EXTRA_DIST = README.md meson.build diff --git a/app/appres/Makefile.in b/app/appres/Makefile.in index 6b428dc6..a06a0141 100644 --- a/app/appres/Makefile.in +++ b/app/appres/Makefile.in @@ -205,7 +205,6 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CHANGELOG_CMD = @CHANGELOG_CMD@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -216,11 +215,9 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ EXEEXT = @EXEEXT@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ -GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ @@ -316,7 +313,7 @@ appres_SOURCES = \ appres.c MAINTAINERCLEANFILES = ChangeLog INSTALL -EXTRA_DIST = README.md +EXTRA_DIST = README.md meson.build all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive diff --git a/app/appres/aclocal.m4 b/app/appres/aclocal.m4 index 394b072b..34cc28c0 100644 --- a/app/appres/aclocal.m4 +++ b/app/appres/aclocal.m4 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, -[m4_warning([this file was generated for autoconf 2.69. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],, +[m4_warning([this file was generated for autoconf 2.71. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) @@ -1318,7 +1318,7 @@ AC_SUBST([am__untar]) dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. dnl -dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. +dnl Copyright (c) 2005, 2023, Oracle and/or its affiliates. dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the "Software"), @@ -1355,7 +1355,7 @@ dnl DEALINGS IN THE SOFTWARE. # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.19.2]) +m4_define([vers_have], [1.20.1]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -1376,7 +1376,7 @@ AM_MAINTAINER_MODE # such as man pages and config files AC_DEFUN([XORG_PROG_RAWCPP],[ AC_REQUIRE([AC_PROG_CPP]) -AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], +AC_PATH_TOOL(RAWCPP, [cpp], [${CPP}], [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) # Check for flag to avoid builtin definitions - assumes unix is predefined, @@ -1402,10 +1402,10 @@ rm -f conftest.$ac_ext AC_MSG_CHECKING([if $RAWCPP requires -traditional]) AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp preserve "whitespace"?]])]) -if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then +if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve "'` -eq 1 ; then AC_MSG_RESULT([no]) else - if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then + if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve "'` -eq 1 ; then TRADITIONALCPPFLAGS="-traditional" RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" AC_MSG_RESULT([yes]) @@ -1686,7 +1686,7 @@ AC_SUBST(MAKE_HTML) # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-xmlto option, it allows maximum flexibilty in making decisions +# the --with-xmlto option, it allows maximum flexibility in making decisions # as whether or not to use the xmlto package. When DEFAULT is not specified, # --with-xmlto assumes 'auto'. # @@ -1900,7 +1900,7 @@ AM_CONDITIONAL([HAVE_PERL], [test "$have_perl" = yes]) # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-asciidoc option, it allows maximum flexibilty in making decisions +# the --with-asciidoc option, it allows maximum flexibility in making decisions # as whether or not to use the asciidoc package. When DEFAULT is not specified, # --with-asciidoc assumes 'auto'. # @@ -1970,7 +1970,7 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes]) # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-doxygen option, it allows maximum flexibilty in making decisions +# the --with-doxygen option, it allows maximum flexibility in making decisions # as whether or not to use the doxygen package. When DEFAULT is not specified, # --with-doxygen assumes 'auto'. # @@ -2054,7 +2054,7 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes]) # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-groff option, it allows maximum flexibilty in making decisions +# the --with-groff option, it allows maximum flexibility in making decisions # as whether or not to use the groff package. When DEFAULT is not specified, # --with-groff assumes 'auto'. # @@ -2162,7 +2162,7 @@ AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes]) # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-fop option, it allows maximum flexibilty in making decisions +# the --with-fop option, it allows maximum flexibility in making decisions # as whether or not to use the fop package. When DEFAULT is not specified, # --with-fop assumes 'auto'. # @@ -2256,7 +2256,7 @@ AC_SUBST([M4], [$ac_cv_path_M4]) # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-ps2pdf option, it allows maximum flexibilty in making decisions +# the --with-ps2pdf option, it allows maximum flexibility in making decisions # as whether or not to use the ps2pdf package. When DEFAULT is not specified, # --with-ps2pdf assumes 'auto'. # @@ -2311,7 +2311,7 @@ AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes]) # not at the appropriate level. This macro enables a builder to skip all # documentation targets except traditional man pages. # Combined with the specific tool checking macros XORG_WITH_*, it provides -# maximum flexibilty in controlling documentation building. +# maximum flexibility in controlling documentation building. # Refer to: # XORG_WITH_XMLTO --with-xmlto # XORG_WITH_ASCIIDOC --with-asciidoc @@ -2344,7 +2344,7 @@ AC_MSG_RESULT([$build_docs]) # # This macro enables a builder to skip all developer documentation. # Combined with the specific tool checking macros XORG_WITH_*, it provides -# maximum flexibilty in controlling documentation building. +# maximum flexibility in controlling documentation building. # Refer to: # XORG_WITH_XMLTO --with-xmlto # XORG_WITH_ASCIIDOC --with-asciidoc @@ -2377,7 +2377,7 @@ AC_MSG_RESULT([$build_devel_docs]) # # This macro enables a builder to skip all functional specification targets. # Combined with the specific tool checking macros XORG_WITH_*, it provides -# maximum flexibilty in controlling documentation building. +# maximum flexibility in controlling documentation building. # Refer to: # XORG_WITH_XMLTO --with-xmlto # XORG_WITH_ASCIIDOC --with-asciidoc @@ -2852,7 +2852,11 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) AC_DEFUN([XORG_COMPILER_BRAND], [ AC_LANG_CASE( [C], [ - AC_REQUIRE([AC_PROG_CC_C99]) + dnl autoconf-2.70 folded AC_PROG_CC_C99 into AC_PROG_CC + dnl and complains that AC_PROG_CC_C99 is obsolete + m4_version_prereq([2.70], + [AC_REQUIRE([AC_PROG_CC])], + [AC_REQUIRE([AC_PROG_CC_C99])]) ], [C++], [ AC_REQUIRE([AC_PROG_CXX]) @@ -2868,7 +2872,7 @@ AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) # Minimum version: 1.16.0 # # Test if the compiler works when passed the given flag as a command line argument. -# If it succeeds, the flag is appeneded to the given variable. If not, it tries the +# If it succeeds, the flag is appended to the given variable. If not, it tries the # next flag in the list until there are no more options. # # Note that this does not guarantee that the compiler supports the flag as some @@ -2884,7 +2888,11 @@ AC_LANG_COMPILER_REQUIRE AC_LANG_CASE( [C], [ - AC_REQUIRE([AC_PROG_CC_C99]) + dnl autoconf-2.70 folded AC_PROG_CC_C99 into AC_PROG_CC + dnl and complains that AC_PROG_CC_C99 is obsolete + m4_version_prereq([2.70], + [AC_REQUIRE([AC_PROG_CC])], + [AC_REQUIRE([AC_PROG_CC_C99])]) define([PREFIX], [C]) define([CACHE_PREFIX], [cc]) define([COMPILER], [$CC]) @@ -3025,7 +3033,7 @@ XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op]) # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) -# Turn some warnings into errors, so we don't accidently get successful builds +# Turn some warnings into errors, so we don't accidentally get successful builds # when there are problems that should be fixed. if test "x$SELECTIVE_WERROR" = "xyes" ; then @@ -3134,23 +3142,35 @@ AC_SUBST([BASE_]PREFIX[FLAGS]) AC_LANG_CASE([C], AC_SUBST([CWARNFLAGS])) ]) # XORG_STRICT_OPTION -# XORG_DEFAULT_OPTIONS -# -------------------- -# Minimum version: 1.3.0 +# XORG_DEFAULT_NOCODE_OPTIONS +# --------------------------- +# Minimum version: 1.20.0 # -# Defines default options for X.Org modules. +# Defines default options for X.Org modules which don't compile code, +# such as fonts, bitmaps, cursors, and docs. # -AC_DEFUN([XORG_DEFAULT_OPTIONS], [ +AC_DEFUN([XORG_DEFAULT_NOCODE_OPTIONS], [ AC_REQUIRE([AC_PROG_INSTALL]) -XORG_COMPILER_FLAGS -XORG_CWARNFLAGS -XORG_STRICT_OPTION XORG_RELEASE_VERSION XORG_CHANGELOG XORG_INSTALL XORG_MANPAGE_SECTIONS m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) +]) # XORG_DEFAULT_NOCODE_OPTIONS + +# XORG_DEFAULT_OPTIONS +# -------------------- +# Minimum version: 1.3.0 +# +# Defines default options for X.Org modules which compile code. +# +AC_DEFUN([XORG_DEFAULT_OPTIONS], [ +AC_REQUIRE([AC_PROG_INSTALL]) +XORG_COMPILER_FLAGS +XORG_CWARNFLAGS +XORG_STRICT_OPTION +XORG_DEFAULT_NOCODE_OPTIONS ]) # XORG_DEFAULT_OPTIONS # XORG_INSTALL() diff --git a/app/appres/appres.c b/app/appres/appres.c index edae0eff..7b26d4d4 100644 --- a/app/appres/appres.c +++ b/app/appres/appres.c @@ -42,7 +42,7 @@ static char *ProgramName; static XrmQuark XrmQString; static void _X_NORETURN -usage (void) +usage (int exitval) { fprintf (stderr, "usage: %s [class [instance]] [-1] [-V] [toolkitoptions]\n" @@ -50,7 +50,7 @@ usage (void) "-V print command version and exit\n" "The number of class and instance elements must be equal.\n", ProgramName); - exit (1); + exit (exitval); } /* stolen from Xlib Xrm.c */ @@ -133,6 +133,23 @@ main (int argc, char *argv[]) int mode = XrmEnumAllLevels; ProgramName = argv[0]; + + /* Handle args that don't require opening a display */ + for (int n = 1; n < argc; n++) { + const char *argn = argv[n]; + /* accept single or double dash for -help & -version, but not -V */ + if (argn[0] == '-' && argn[1] == '-') { + argn++; + } + if (strcmp(argn, "-help") == 0) { + usage(0); + } + if ((strcmp(argn, "-version") == 0) || (strcmp(argv[n], "-V") == 0)) { + puts(PACKAGE_STRING); + exit(0); + } + } + if (argc > 1 && argv[1][0] != '-') { cname = argv[1]; if (argc > 2 && argv[2][0] != '-') @@ -143,7 +160,8 @@ main (int argc, char *argv[]) XrmStringToNameList(iname, names); for (i = 0; names[i]; i++) ; - if (!i || classes[i] || !classes[i-1]) usage (); + if (!i || classes[i] || !classes[i-1]) + usage(1); argv[0] = XrmNameToString(names[0]); toplevel = XtAppInitialize(&xtcontext, XrmClassToString(classes[0]), @@ -154,21 +172,17 @@ main (int argc, char *argv[]) for (i = 1; i < argc; i++) { if (!strcmp(argv[i], "-1")) mode = XrmEnumOneLevel; - else if (!strcmp(argv[i], "-V")) { - printf("%s\n", PACKAGE_STRING); - exit(0); - } else if (argv[i][0] == '-') { fprintf(stderr, "%s: unrecognized option '%s'\n", ProgramName, argv[i]); - usage(); + usage(1); } else if (!cname) cname = argv[i]; else if (!iname) iname = argv[i]; else - usage(); + usage(1); } if (!iname) { diff --git a/app/appres/config.guess b/app/appres/config.guess index 247d84db..f6d217a4 100644 --- a/app/appres/config.guess +++ b/app/appres/config.guess @@ -1,14 +1,14 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2024 Free Software Foundation, Inc. -timestamp='2012-09-25' +# shellcheck disable=SC2006,SC2268 # see below for rationale + +timestamp='2024-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -17,33 +17,39 @@ timestamp='2012-09-25' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess +# +# Please send patches to . + + +# The "shellcheck disable" line above the timestamp inhibits complaints +# about features and limitations of the classic Bourne shell that were +# superseded or lifted in POSIX. However, this script identifies a wide +# variety of pre-POSIX systems that do not have POSIX shells at all, and +# even some reasonably current systems (Solaris 10 as case-in-point) still +# have a pre-POSIX /bin/sh. + me=`echo "$0" | sed -e 's,.*/,,'` usage="\ Usage: $0 [OPTION] -Output the configuration name of the system \`$me' is run on. +Output the configuration name of the system '$me' is run on. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -54,15 +60,13 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2024 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" -Try \`$me --help' for more information." +Try '$me --help' for more information." # Parse command line while test $# -gt 0 ; do @@ -90,57 +94,109 @@ if test $# != 0; then exit 1 fi -trap 'exit 1' 1 2 15 +# Just in case it came from the environment. +GUESS= # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires # temporary files to be created and, as you can see below, it is a # headache to deal with in a portable fashion. -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. +# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still +# use 'HOST_CC' if defined, but it is deprecated. # Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +tmp= +# shellcheck disable=SC2172 +trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 + +set_cc_for_build() { + # prevent multiple calls if $tmp is already set + test "$tmp" && return 0 + : "${TMPDIR=/tmp}" + # shellcheck disable=SC2039,SC3028 + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } + dummy=$tmp/dummy + case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in + ,,) echo "int x;" > "$dummy.c" + for driver in cc gcc c89 c99 ; do + if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then + CC_FOR_BUILD=$driver + break + fi + done + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; + esac +} # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then +if test -f /.attbin/uname ; then PATH=$PATH:/.attbin ; export PATH fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case $UNAME_SYSTEM in +Linux|GNU|GNU/*) + LIBC=unknown + + set_cc_for_build + cat <<-EOF > "$dummy.c" + #if defined(__ANDROID__) + LIBC=android + #else + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #elif defined(__GLIBC__) + LIBC=gnu + #elif defined(__LLVM_LIBC__) + LIBC=llvm + #else + #include + /* First heuristic to detect musl libc. */ + #ifdef __DEFINED_va_list + LIBC=musl + #endif + #endif + #endif + EOF + cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "$cc_set_libc" + + # Second heuristic to detect musl libc. + if [ "$LIBC" = unknown ] && + command -v ldd >/dev/null && + ldd --version 2>&1 | grep -q ^musl; then + LIBC=musl + fi + + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + if [ "$LIBC" = unknown ]; then + LIBC=gnu + fi + ;; +esac + # Note: order is significant - the case branches are not exclusive. -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -152,22 +208,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + echo unknown)` + case $UNAME_MACHINE_ARCH in + aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + earmv*) + arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; + *) machine=$UNAME_MACHINE_ARCH-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in + # to ELF recently (or will in the future) and ABI. + case $UNAME_MACHINE_ARCH in + earm*) + os=netbsdelf + ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build + set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -182,49 +248,80 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in os=netbsd ;; esac + # Determine ABI tags. + case $UNAME_MACHINE_ARCH in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in + case $UNAME_VERSION in Debian*) release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; + GUESS=$machine-${os}${release}${abi-} + ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE + ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE + ;; *:SecBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-secbsd${UNAME_RELEASE} - exit ;; + UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` + GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE + ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE + ;; + *:MidnightBSD:*:*) + GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE + ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE + ;; *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE + ;; + *:OS108:*:*) + GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE + ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; + GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE + ;; *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE + ;; + *:Sortix:*:*) + GUESS=$UNAME_MACHINE-unknown-sortix + ;; + *:Twizzler:*:*) + GUESS=$UNAME_MACHINE-unknown-twizzler + ;; + *:Redox:*:*) + GUESS=$UNAME_MACHINE-unknown-redox + ;; + mips:OSF1:*.*) + GUESS=mips-dec-osf1 + ;; alpha:OSF1:*:*) + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + trap '' 0 case $UNAME_RELEASE in *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -238,163 +335,158 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in + case $ALPHA_CPU_TYPE in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; + OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + GUESS=$UNAME_MACHINE-dec-osf$OSF_REL + ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; + GUESS=m68k-unknown-sysv4 + ;; *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; + GUESS=$UNAME_MACHINE-unknown-amigaos + ;; *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit ;; + GUESS=$UNAME_MACHINE-unknown-morphos + ;; *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; + GUESS=i370-ibm-openedition + ;; *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; + GUESS=s390-ibm-zvmoe + ;; *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; + GUESS=powerpc-ibm-os400 + ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; + GUESS=arm-acorn-riscix$UNAME_RELEASE + ;; arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; + GUESS=arm-unknown-riscos + ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; + GUESS=hppa1.1-hitachi-hiuxmpp + ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; + case `(/bin/universe) 2>/dev/null` in + att) GUESS=pyramid-pyramid-sysv3 ;; + *) GUESS=pyramid-pyramid-bsd ;; + esac + ;; NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; + GUESS=pyramid-pyramid-svr4 + ;; DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; + GUESS=sparc-icl-nx6 + ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; + sparc) GUESS=sparc-icl-nx7 ;; + esac + ;; s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL + ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-hal-solaris2$SUN_REL + ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris2$SUN_REL + ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} - exit ;; + GUESS=i386-pc-auroraux$UNAME_RELEASE + ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" + set_cc_for_build + SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH="x86_64" + SUN_ARCH=x86_64 fi fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$SUN_ARCH-pc-solaris2$SUN_REL + ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris3$SUN_REL + ;; sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in + case `/usr/bin/arch -k` in Series*|S4*) UNAME_RELEASE=`uname -v` ;; esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; + # Japanese Language versions have a version number like '4.1.3-JL'. + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` + GUESS=sparc-sun-sunos$SUN_REL + ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; + GUESS=m68k-sun-sunos$UNAME_RELEASE + ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in + test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 + case `/bin/arch` in sun3) - echo m68k-sun-sunos${UNAME_RELEASE} + GUESS=m68k-sun-sunos$UNAME_RELEASE ;; sun4) - echo sparc-sun-sunos${UNAME_RELEASE} + GUESS=sparc-sun-sunos$UNAME_RELEASE ;; esac - exit ;; + ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; + GUESS=sparc-auspex-sunos$UNAME_RELEASE + ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -404,44 +496,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + GUESS=m68k-milan-mint$UNAME_RELEASE + ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + GUESS=m68k-hades-mint$UNAME_RELEASE + ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + GUESS=m68k-unknown-mint$UNAME_RELEASE + ;; m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; + GUESS=m68k-apple-machten$UNAME_RELEASE + ;; powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; + GUESS=powerpc-apple-machten$UNAME_RELEASE + ;; RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; + GUESS=mips-dec-mach_bsd4.3 + ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; + GUESS=mips-dec-ultrix$UNAME_RELEASE + ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; + GUESS=vax-dec-ultrix$UNAME_RELEASE + ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; + GUESS=clipper-intergraph-clix$UNAME_RELEASE + ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ int main (int argc, char *argv[]) { @@ -450,95 +542,96 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in #endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); #endif #endif exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && + dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} - exit ;; + GUESS=mips-mips-riscos$UNAME_RELEASE + ;; Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; + GUESS=powerpc-motorola-powermax + ;; Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; + GUESS=powerpc-harris-powermax + ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; + GUESS=powerpc-harris-powermax + ;; Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; + GUESS=powerpc-harris-powerunix + ;; m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; + GUESS=m88k-harris-cxux7 + ;; m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; + GUESS=m88k-motorola-sysv4 + ;; m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; + GUESS=m88k-motorola-sysv3 + ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] + if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ + test "$TARGET_BINARY_INTERFACE"x = x then - echo m88k-dg-dgux${UNAME_RELEASE} + GUESS=m88k-dg-dgux$UNAME_RELEASE else - echo m88k-dg-dguxbcs${UNAME_RELEASE} + GUESS=m88k-dg-dguxbcs$UNAME_RELEASE fi else - echo i586-dg-dgux${UNAME_RELEASE} + GUESS=i586-dg-dgux$UNAME_RELEASE fi - exit ;; + ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; + GUESS=m88k-dolphin-sysv3 + ;; M88*:*:R3*:*) # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; + GUESS=m88k-motorola-sysv3 + ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; + GUESS=m88k-tektronix-sysv3 + ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; + GUESS=m68k-tektronix-bsd + ;; *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; + IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'` + GUESS=mips-sgi-irix$IRIX_REL + ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id + ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; + GUESS=i386-ibm-aix + ;; ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then + if test -x /usr/bin/oslevel ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; + GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV + ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #include main() @@ -549,76 +642,77 @@ EOF exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then - echo "$SYSTEM_NAME" + GUESS=$SYSTEM_NAME else - echo rs6000-ibm-aix3.2.5 + GUESS=rs6000-ibm-aix3.2.5 fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 + GUESS=rs6000-ibm-aix3.2.4 else - echo rs6000-ibm-aix3.2 + GUESS=rs6000-ibm-aix3.2 fi - exit ;; + ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if test -x /usr/bin/lslpp ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \ + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; + GUESS=$IBM_ARCH-ibm-aix$IBM_REV + ;; *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit ;; + GUESS=rs6000-ibm-aix + ;; + ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) + GUESS=romp-ibm-bsd4.4 + ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 + GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to + ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; + GUESS=rs6000-bull-bosx + ;; DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; + GUESS=m68k-bull-sysv3 + ;; 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; + GUESS=m68k-hp-bsd + ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; + GUESS=m68k-hp-bsd4.4 + ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + case $UNAME_MACHINE in + 9000/31?) HP_ARCH=m68000 ;; + 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then + if test -x /usr/bin/getconf; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + case $sc_cpu_version in + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + case $sc_kernel_bits in + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + if test "$HP_ARCH" = ""; then + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE #include @@ -651,13 +745,13 @@ EOF exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if test "$HP_ARCH" = hppa2.0w then - eval $set_cc_for_build + set_cc_for_build # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -668,23 +762,23 @@ EOF # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; + GUESS=$HP_ARCH-hp-hpux$HPUX_REV + ;; ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit ;; + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + GUESS=ia64-hp-hpux$HPUX_REV + ;; 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #include int main () @@ -709,38 +803,38 @@ EOF exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit ;; + GUESS=unknown-hitachi-hiuxwe2 + ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) + GUESS=hppa1.1-hp-bsd + ;; 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; + GUESS=hppa1.0-hp-bsd + ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; + GUESS=hppa1.0-hp-mpeix + ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) + GUESS=hppa1.1-hp-osf + ;; hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; + GUESS=hppa1.0-hp-osf + ;; i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk + if test -x /usr/sbin/sysversion ; then + GUESS=$UNAME_MACHINE-unknown-osf1mk else - echo ${UNAME_MACHINE}-unknown-osf1 + GUESS=$UNAME_MACHINE-unknown-osf1 fi - exit ;; + ;; parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; + GUESS=hppa1.1-hp-lites + ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; + GUESS=c1-convex-bsd + ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd @@ -748,139 +842,174 @@ EOF fi exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; + GUESS=c34-convex-bsd + ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; + GUESS=c38-convex-bsd + ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; + GUESS=c4-convex-bsd + ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=ymp-cray-unicos$CRAY_REL + ;; CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=t90-cray-unicos$CRAY_REL + ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=alphaev5-cray-unicosmk$CRAY_REL + ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=sv1-cray-unicos$CRAY_REL + ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=craynv-cray-unicosmp$CRAY_REL + ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` + GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE + ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; + GUESS=sparc-unknown-bsdi$UNAME_RELEASE + ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE + ;; + arm:FreeBSD:*:*) + UNAME_PROCESSOR=`uname -p` + set_cc_for_build + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi + else + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf + fi + ;; *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in + UNAME_PROCESSOR=`uname -p` + case $UNAME_PROCESSOR in amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=x86_64 ;; + i386) + UNAME_PROCESSOR=i586 ;; esac - exit ;; + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL + ;; i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; + GUESS=$UNAME_MACHINE-pc-cygwin + ;; *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 - exit ;; + GUESS=$UNAME_MACHINE-pc-mingw64 + ;; *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:MSYS*:*) - echo ${UNAME_MACHINE}-pc-msys - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; + GUESS=$UNAME_MACHINE-pc-mingw32 + ;; + *:MSYS*:*) + GUESS=$UNAME_MACHINE-pc-msys + ;; i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; + GUESS=$UNAME_MACHINE-pc-pw32 + ;; + *:SerenityOS:*:*) + GUESS=$UNAME_MACHINE-pc-serenity + ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case $UNAME_MACHINE in x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; + GUESS=i586-pc-interix$UNAME_RELEASE + ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + GUESS=x86_64-unknown-interix$UNAME_RELEASE + ;; IA64) - echo ia64-unknown-interix${UNAME_RELEASE} - exit ;; + GUESS=ia64-unknown-interix$UNAME_RELEASE + ;; esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit ;; + GUESS=$UNAME_MACHINE-pc-uwin + ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; + GUESS=x86_64-pc-cygwin + ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=powerpcle-unknown-solaris2$SUN_REL + ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; + GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'` + GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL + ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; + GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC + ;; + x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-pc-managarm-mlibc" + ;; + *:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" + ;; + *:Minix:*:*) + GUESS=$UNAME_MACHINE-unknown-minix + ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + set_cc_for_build + CPU=$UNAME_MACHINE + LIBCABI=$LIBC + if test "$CC_FOR_BUILD" != no_compiler_found; then + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __ARM_EABI__ + #ifdef __ARM_PCS_VFP + ABI=eabihf + #else + ABI=eabi + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;; + esac + fi + GUESS=$CPU-unknown-linux-$LIBCABI + ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -890,168 +1019,246 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; arm*:Linux:*:*) - eval $set_cc_for_build + set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf fi fi - exit ;; + ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; + e2k:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit ;; + GUESS=$UNAME_MACHINE-pc-linux-$LIBC + ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + k1om:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + kvx:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + kvx:cos:*:*) + GUESS=$UNAME_MACHINE-unknown-cos + ;; + kvx:mbr:*:*) + GUESS=$UNAME_MACHINE-unknown-mbr + ;; + loongarch32:Linux:*:* | loongarch64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + IS_GLIBC=0 + test x"${LIBC}" = xgnu && IS_GLIBC=1 + sed 's/^ //' << EOF > "$dummy.c" #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el + #undef mips + #undef mipsel + #undef mips64 + #undef mips64el + #if ${IS_GLIBC} && defined(_ABI64) + LIBCABI=gnuabi64 + #else + #if ${IS_GLIBC} && defined(_ABIN32) + LIBCABI=gnuabin32 + #else + LIBCABI=${LIBC} + #endif + #endif + + #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa64r6 + #else + #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa32r6 + #else + #if defined(__mips64) + CPU=mips64 + #else + CPU=mips + #endif + #endif + #endif + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el + MIPS_ENDIAN=el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} + MIPS_ENDIAN= #else - CPU= + MIPS_ENDIAN= #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'` + eval "$cc_set_vars" + test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } + ;; + mips64el:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + openrisc*:Linux:*:*) + GUESS=or1k-unknown-linux-$LIBC + ;; + or32:Linux:*:* | or1k*:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; - or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu - exit ;; + GUESS=sparc-unknown-linux-$LIBC + ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit ;; + GUESS=hppa64-unknown-linux-$LIBC + ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;; + PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;; + *) GUESS=hppa-unknown-linux-$LIBC ;; esac - exit ;; + ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; + GUESS=powerpc64-unknown-linux-$LIBC + ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; + GUESS=powerpc-unknown-linux-$LIBC + ;; + ppc64le:Linux:*:*) + GUESS=powerpc64le-unknown-linux-$LIBC + ;; + ppcle:Linux:*:*) + GUESS=powerpcle-unknown-linux-$LIBC + ;; + riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; + GUESS=$UNAME_MACHINE-ibm-linux-$LIBC + ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-dec-linux-$LIBC + ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + set_cc_for_build + CPU=$UNAME_MACHINE + LIBCABI=$LIBC + if test "$CC_FOR_BUILD" != no_compiler_found; then + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __i386__ + ABI=x86 + #else + #ifdef __ILP32__ + ABI=x32 + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + x86) CPU=i686 ;; + x32) LIBCABI=${LIBC}x32 ;; + esac + fi + GUESS=$CPU-pc-linux-$LIBCABI + ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; + GUESS=i386-sequent-sysv4 + ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; + GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION + ;; i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility + # If we were able to find 'uname', then EMX Unix compatibility # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; + GUESS=$UNAME_MACHINE-pc-os2-emx + ;; i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit ;; + GUESS=$UNAME_MACHINE-unknown-stop + ;; i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit ;; + GUESS=$UNAME_MACHINE-unknown-atheos + ;; i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; + GUESS=$UNAME_MACHINE-pc-syllable + ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; + GUESS=i386-unknown-lynxos$UNAME_RELEASE + ;; i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + GUESS=$UNAME_MACHINE-pc-msdosdjgpp + ;; + i*86:*:4.*:*) + UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL fi - exit ;; + ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in @@ -1059,12 +1266,12 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; + GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1074,43 +1281,43 @@ EOF && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL else - echo ${UNAME_MACHINE}-pc-sysv32 + GUESS=$UNAME_MACHINE-pc-sysv32 fi - exit ;; + ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; + GUESS=i586-pc-msdosdjgpp + ;; Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; + GUESS=i386-pc-mach3 + ;; paragon:*:*:*) - echo i860-intel-osf1 - exit ;; + GUESS=i860-intel-osf1 + ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4 fi - exit ;; + ;; mini*:CTIX:SYS*5:*) # "miniframe" - echo m68010-convergent-sysv - exit ;; + GUESS=m68010-convergent-sysv + ;; mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; + GUESS=m68k-convergent-sysv + ;; M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; + GUESS=m68k-diab-dnix + ;; M68*:*:R3V[5678]*:*) test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) @@ -1118,9 +1325,9 @@ EOF test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; @@ -1129,226 +1336,290 @@ EOF test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; + GUESS=m68k-unknown-lynxos$UNAME_RELEASE + ;; mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; + GUESS=m68k-atari-sysv4 + ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; + GUESS=sparc-unknown-lynxos$UNAME_RELEASE + ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; + GUESS=rs6000-unknown-lynxos$UNAME_RELEASE + ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; + GUESS=powerpc-unknown-lynxos$UNAME_RELEASE + ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit ;; + GUESS=mips-dde-sysv$UNAME_RELEASE + ;; RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; + GUESS=mips-sni-sysv4 + ;; RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; + GUESS=mips-sni-sysv4 + ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 + GUESS=$UNAME_MACHINE-sni-sysv4 else - echo ns32k-sni-sysv + GUESS=ns32k-sni-sysv fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + ;; + PENTIUM:*:4.0*:*) # Unisys 'ClearPath HMP IX 4000' SVR4/MP effort # says - echo i586-unisys-sysv4 - exit ;; + GUESS=i586-unisys-sysv4 + ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; + GUESS=hppa1.1-stratus-sysv4 + ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; + GUESS=i860-stratus-sysv4 + ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; + GUESS=$UNAME_MACHINE-stratus-vos + ;; *:VOS:*:*) # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; + GUESS=hppa1.1-stratus-vos + ;; mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit ;; + GUESS=m68k-apple-aux$UNAME_RELEASE + ;; news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; + GUESS=mips-sony-newsos6 + ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + if test -d /usr/nec; then + GUESS=mips-nec-sysv$UNAME_RELEASE else - echo mips-unknown-sysv${UNAME_RELEASE} + GUESS=mips-unknown-sysv$UNAME_RELEASE fi - exit ;; + ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; + GUESS=powerpc-be-beos + ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; + GUESS=powerpc-apple-beos + ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; + GUESS=i586-pc-beos + ;; BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; - x86_64:Haiku:*:*) - echo x86_64-unknown-haiku - exit ;; + GUESS=i586-pc-haiku + ;; + ppc:Haiku:*:*) # Haiku running on Apple PowerPC + GUESS=powerpc-apple-haiku + ;; + *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) + GUESS=$UNAME_MACHINE-unknown-haiku + ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; + GUESS=sx4-nec-superux$UNAME_RELEASE + ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit ;; + GUESS=sx5-nec-superux$UNAME_RELEASE + ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; + GUESS=sx6-nec-superux$UNAME_RELEASE + ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; + GUESS=sx7-nec-superux$UNAME_RELEASE + ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; + GUESS=sx8-nec-superux$UNAME_RELEASE + ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; + GUESS=sx8r-nec-superux$UNAME_RELEASE + ;; + SX-ACE:SUPER-UX:*:*) + GUESS=sxace-nec-superux$UNAME_RELEASE + ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; + GUESS=powerpc-apple-rhapsody$UNAME_RELEASE + ;; *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE + ;; + arm64:Darwin:*:*) + GUESS=aarch64-apple-darwin$UNAME_RELEASE + ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + UNAME_PROCESSOR=`uname -p` case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; unknown) UNAME_PROCESSOR=powerpc ;; esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; + if command -v xcode-select > /dev/null 2> /dev/null && \ + ! xcode-select --print-path > /dev/null 2> /dev/null ; then + # Avoid executing cc if there is no toolchain installed as + # cc will be a stub that puts up a graphical alert + # prompting the user to install developer tools. + CC_FOR_BUILD=no_compiler_found + else + set_cc_for_build + fi + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # uname -m returns i386 or x86_64 + UNAME_PROCESSOR=$UNAME_MACHINE + fi + GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE + ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then + if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE + ;; *:QNX:*:4*) - echo i386-pc-qnx - exit ;; - NEO-?:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} - exit ;; + GUESS=i386-pc-qnx + ;; + NEO-*:NONSTOP_KERNEL:*:*) + GUESS=neo-tandem-nsk$UNAME_RELEASE + ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; + GUESS=nse-tandem-nsk$UNAME_RELEASE + ;; + NSR-*:NONSTOP_KERNEL:*:*) + GUESS=nsr-tandem-nsk$UNAME_RELEASE + ;; + NSV-*:NONSTOP_KERNEL:*:*) + GUESS=nsv-tandem-nsk$UNAME_RELEASE + ;; + NSX-*:NONSTOP_KERNEL:*:*) + GUESS=nsx-tandem-nsk$UNAME_RELEASE + ;; *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; + GUESS=mips-compaq-nonstopux + ;; BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; + GUESS=bs2000-siemens-sysv + ;; DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE + ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + if test "${cputype-}" = 386; then UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" + elif test "x${cputype-}" != x; then + UNAME_MACHINE=$cputype fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; + GUESS=$UNAME_MACHINE-unknown-plan9 + ;; *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; + GUESS=pdp10-unknown-tops10 + ;; *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; + GUESS=pdp10-unknown-tenex + ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; + GUESS=pdp10-dec-tops20 + ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; + GUESS=pdp10-xkl-tops20 + ;; *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; + GUESS=pdp10-unknown-tops20 + ;; *:ITS:*:*) - echo pdp10-unknown-its - exit ;; + GUESS=pdp10-unknown-its + ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit ;; + GUESS=mips-sei-seiux$UNAME_RELEASE + ;; *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; + DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL + ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; + case $UNAME_MACHINE in + A*) GUESS=alpha-dec-vms ;; + I*) GUESS=ia64-dec-vms ;; + V*) GUESS=vax-dec-vms ;; esac ;; *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; + GUESS=i386-pc-xenix + ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; + SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'` + GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL + ;; i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; + GUESS=$UNAME_MACHINE-pc-rdos + ;; + i*86:Fiwix:*:*) + GUESS=$UNAME_MACHINE-pc-fiwix + ;; + *:AROS:*:*) + GUESS=$UNAME_MACHINE-unknown-aros + ;; x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx - exit ;; + GUESS=$UNAME_MACHINE-unknown-esx + ;; + amd64:Isilon\ OneFS:*:*) + GUESS=x86_64-unknown-onefs + ;; + *:Unleashed:*:*) + GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE + ;; + *:Ironclad:*:*) + GUESS=$UNAME_MACHINE-unknown-ironclad + ;; esac -eval $set_cc_for_build -cat >$dummy.c < "$dummy.c" < -# include +#include +#include +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#include +#if defined(_SIZE_T_) || defined(SIGLOST) +#include +#endif +#endif #endif main () { @@ -1361,22 +1632,14 @@ main () #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - #if defined (NeXT) #if !defined (__ARCHITECTURE__) #define __ARCHITECTURE__ "m68k" @@ -1416,39 +1679,54 @@ main () #endif #if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); + struct utsname un; + uname(&un); + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); #endif #if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif +#if !defined (ultrix) +#include +#if defined (BSD) +#if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +#else +#if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#endif +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#else +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname un; + uname (&un); + printf ("vax-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("vax-dec-ultrix\n"); exit (0); +#endif +#endif +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname *un; + uname (&un); + printf ("mips-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("mips-dec-ultrix\n"); exit (0); +#endif +#endif #endif #if defined (alliant) && defined (i860) @@ -1459,54 +1737,46 @@ main () } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && +$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. +test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } +echo "$0: unable to guess system type" >&2 -# Convex versions that predate uname can use getsysinfo(1) +case $UNAME_MACHINE:$UNAME_SYSTEM in + mips:Linux | mips64:Linux) + # If we got here on MIPS GNU/Linux, output extra information. + cat >&2 <&2 < in order to provide the needed -information to handle your system. +our_year=`echo $timestamp | sed 's,-.*,,'` +thisyear=`date +%Y` +# shellcheck disable=SC2003 +script_age=`expr "$thisyear" - "$our_year"` +if test "$script_age" -lt 3 ; then + cat >&2 </dev/null` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} +UNAME_MACHINE = "$UNAME_MACHINE" +UNAME_RELEASE = "$UNAME_RELEASE" +UNAME_SYSTEM = "$UNAME_SYSTEM" +UNAME_VERSION = "$UNAME_VERSION" EOF +fi exit 1 # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/app/appres/config.h.in b/app/appres/config.h.in index 7c9cfb1c..38128131 100644 --- a/app/appres/config.h.in +++ b/app/appres/config.h.in @@ -3,12 +3,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H @@ -57,7 +57,9 @@ /* Patch version of this package */ #undef PACKAGE_VERSION_PATCHLEVEL -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS /* Version number of package */ diff --git a/app/appres/config.sub b/app/appres/config.sub index e842e0ef..2c6a07ab 100644 --- a/app/appres/config.sub +++ b/app/appres/config.sub @@ -1,36 +1,33 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2024 Free Software Foundation, Inc. -timestamp='2012-12-06' +# shellcheck disable=SC2006,SC2268 # see below for rationale -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +timestamp='2024-01-01' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches to . # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -38,7 +35,7 @@ timestamp='2012-12-06' # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -55,15 +52,21 @@ timestamp='2012-12-06' # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. +# The "shellcheck disable" line above the timestamp inhibits complaints +# about features and limitations of the classic Bourne shell that were +# superseded or lifted in POSIX. However, this script identifies a wide +# variety of pre-POSIX systems that do not have POSIX shells at all, and +# even some reasonably current systems (Solaris 10 as case-in-point) still +# have a pre-POSIX /bin/sh. + me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -73,15 +76,13 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2024 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" -Try \`$me --help' for more information." +Try '$me --help' for more information." # Parse command line while test $# -gt 0 ; do @@ -97,12 +98,12 @@ while test $# -gt 0 ; do - ) # Use stdin as input. break ;; -* ) - echo "$me: invalid option $1$help" + echo "$me: invalid option $1$help" >&2 exit 1 ;; *local*) # First pass through any local machine types. - echo $1 + echo "$1" exit ;; * ) @@ -118,1207 +119,1167 @@ case $# in exit 1;; esac -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac +# Split fields of configuration type +# shellcheck disable=SC2162 +saved_IFS=$IFS +IFS="-" read field1 field2 field3 field4 <&2 +# Separate into logical components for further validation +case $1 in + *-*-*-*-*) + echo "Invalid configuration '$1': more than four components" >&2 exit 1 ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) + *-*-*-*) + basic_machine=$field1-$field2 + basic_os=$field3-$field4 ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown + *-*-*) + # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two + # parts + maybe_os=$field2-$field3 + case $maybe_os in + nto-qnx* | linux-* | uclinux-uclibc* \ + | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ + | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ + | storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \ + | windows-* ) + basic_machine=$field1 + basic_os=$maybe_os + ;; + android-linux) + basic_machine=$field1-unknown + basic_os=linux-android + ;; + *) + basic_machine=$field1-$field2 + basic_os=$field3 + ;; + esac ;; + *-*) + # A lone config we happen to match not fitting any pattern + case $field1-$field2 in + decstation-3100) + basic_machine=mips-dec + basic_os= + ;; + *-*) + # Second component is usually, but not always the OS + case $field2 in + # Prevent following clause from handling this valid os + sun*os*) + basic_machine=$field1 + basic_os=$field2 + ;; + zephyr*) + basic_machine=$field1-unknown + basic_os=$field2 + ;; + # Manufacturers + dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ + | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ + | unicom* | ibm* | next | hp | isi* | apollo | altos* \ + | convergent* | ncr* | news | 32* | 3600* | 3100* \ + | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ + | ultra | tti* | harris | dolphin | highlevel | gould \ + | cbm | ns | masscomp | apple | axis | knuth | cray \ + | microblaze* | sim | cisco \ + | oki | wec | wrs | winbond) + basic_machine=$field1-$field2 + basic_os= + ;; + *) + basic_machine=$field1 + basic_os=$field2 + ;; + esac + ;; + esac + ;; + *) + # Convert single-component short-hands not valid as part of + # multi-component configurations. + case $field1 in + 386bsd) + basic_machine=i386-pc + basic_os=bsd + ;; + a29khif) + basic_machine=a29k-amd + basic_os=udi + ;; + adobe68k) + basic_machine=m68010-adobe + basic_os=scout + ;; + alliant) + basic_machine=fx80-alliant + basic_os= + ;; + altos | altos3068) + basic_machine=m68k-altos + basic_os= + ;; + am29k) + basic_machine=a29k-none + basic_os=bsd + ;; + amdahl) + basic_machine=580-amdahl + basic_os=sysv + ;; + amiga) + basic_machine=m68k-unknown + basic_os= + ;; + amigaos | amigados) + basic_machine=m68k-unknown + basic_os=amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + basic_os=sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + basic_os=sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + basic_os=bsd + ;; + aros) + basic_machine=i386-pc + basic_os=aros + ;; + aux) + basic_machine=m68k-apple + basic_os=aux + ;; + balance) + basic_machine=ns32k-sequent + basic_os=dynix + ;; + blackfin) + basic_machine=bfin-unknown + basic_os=linux + ;; + cegcc) + basic_machine=arm-unknown + basic_os=cegcc + ;; + convex-c1) + basic_machine=c1-convex + basic_os=bsd + ;; + convex-c2) + basic_machine=c2-convex + basic_os=bsd + ;; + convex-c32) + basic_machine=c32-convex + basic_os=bsd + ;; + convex-c34) + basic_machine=c34-convex + basic_os=bsd + ;; + convex-c38) + basic_machine=c38-convex + basic_os=bsd + ;; + cray) + basic_machine=j90-cray + basic_os=unicos + ;; + crds | unos) + basic_machine=m68k-crds + basic_os= + ;; + da30) + basic_machine=m68k-da30 + basic_os= + ;; + decstation | pmax | pmin | dec3100 | decstatn) + basic_machine=mips-dec + basic_os= + ;; + delta88) + basic_machine=m88k-motorola + basic_os=sysv3 + ;; + dicos) + basic_machine=i686-pc + basic_os=dicos + ;; + djgpp) + basic_machine=i586-pc + basic_os=msdosdjgpp + ;; + ebmon29k) + basic_machine=a29k-amd + basic_os=ebmon + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + basic_os=ose + ;; + gmicro) + basic_machine=tron-gmicro + basic_os=sysv + ;; + go32) + basic_machine=i386-pc + basic_os=go32 + ;; + h8300hms) + basic_machine=h8300-hitachi + basic_os=hms + ;; + h8300xray) + basic_machine=h8300-hitachi + basic_os=xray + ;; + h8500hms) + basic_machine=h8500-hitachi + basic_os=hms + ;; + harris) + basic_machine=m88k-harris + basic_os=sysv3 + ;; + hp300 | hp300hpux) + basic_machine=m68k-hp + basic_os=hpux + ;; + hp300bsd) + basic_machine=m68k-hp + basic_os=bsd + ;; + hppaosf) + basic_machine=hppa1.1-hp + basic_os=osf + ;; + hppro) + basic_machine=hppa1.1-hp + basic_os=proelf + ;; + i386mach) + basic_machine=i386-mach + basic_os=mach + ;; + isi68 | isi) + basic_machine=m68k-isi + basic_os=sysv + ;; + m68knommu) + basic_machine=m68k-unknown + basic_os=linux + ;; + magnum | m3230) + basic_machine=mips-mips + basic_os=sysv + ;; + merlin) + basic_machine=ns32k-utek + basic_os=sysv + ;; + mingw64) + basic_machine=x86_64-pc + basic_os=mingw64 + ;; + mingw32) + basic_machine=i686-pc + basic_os=mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + basic_os=mingw32ce + ;; + monitor) + basic_machine=m68k-rom68k + basic_os=coff + ;; + morphos) + basic_machine=powerpc-unknown + basic_os=morphos + ;; + moxiebox) + basic_machine=moxie-unknown + basic_os=moxiebox + ;; + msdos) + basic_machine=i386-pc + basic_os=msdos + ;; + msys) + basic_machine=i686-pc + basic_os=msys + ;; + mvs) + basic_machine=i370-ibm + basic_os=mvs + ;; + nacl) + basic_machine=le32-unknown + basic_os=nacl + ;; + ncr3000) + basic_machine=i486-ncr + basic_os=sysv4 + ;; + netbsd386) + basic_machine=i386-pc + basic_os=netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + basic_os=linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + basic_os=newsos + ;; + news1000) + basic_machine=m68030-sony + basic_os=newsos + ;; + necv70) + basic_machine=v70-nec + basic_os=sysv + ;; + nh3000) + basic_machine=m68k-harris + basic_os=cxux + ;; + nh[45]000) + basic_machine=m88k-harris + basic_os=cxux + ;; + nindy960) + basic_machine=i960-intel + basic_os=nindy + ;; + mon960) + basic_machine=i960-intel + basic_os=mon960 + ;; + nonstopux) + basic_machine=mips-compaq + basic_os=nonstopux + ;; + os400) + basic_machine=powerpc-ibm + basic_os=os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + basic_os=ose + ;; + os68k) + basic_machine=m68k-none + basic_os=os68k + ;; + paragon) + basic_machine=i860-intel + basic_os=osf + ;; + parisc) + basic_machine=hppa-unknown + basic_os=linux + ;; + psp) + basic_machine=mipsallegrexel-sony + basic_os=psp + ;; + pw32) + basic_machine=i586-unknown + basic_os=pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + basic_os=rdos + ;; + rdos32) + basic_machine=i386-pc + basic_os=rdos + ;; + rom68k) + basic_machine=m68k-rom68k + basic_os=coff + ;; + sa29200) + basic_machine=a29k-amd + basic_os=udi + ;; + sei) + basic_machine=mips-sei + basic_os=seiux + ;; + sequent) + basic_machine=i386-sequent + basic_os= + ;; + sps7) + basic_machine=m68k-bull + basic_os=sysv2 + ;; + st2000) + basic_machine=m68k-tandem + basic_os= + ;; + stratus) + basic_machine=i860-stratus + basic_os=sysv4 + ;; + sun2) + basic_machine=m68000-sun + basic_os= + ;; + sun2os3) + basic_machine=m68000-sun + basic_os=sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + basic_os=sunos4 + ;; + sun3) + basic_machine=m68k-sun + basic_os= + ;; + sun3os3) + basic_machine=m68k-sun + basic_os=sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + basic_os=sunos4 + ;; + sun4) + basic_machine=sparc-sun + basic_os= + ;; + sun4os3) + basic_machine=sparc-sun + basic_os=sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + basic_os=sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + basic_os=solaris2 + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + basic_os= + ;; + sv1) + basic_machine=sv1-cray + basic_os=unicos + ;; + symmetry) + basic_machine=i386-sequent + basic_os=dynix + ;; + t3e) + basic_machine=alphaev5-cray + basic_os=unicos + ;; + t90) + basic_machine=t90-cray + basic_os=unicos + ;; + toad1) + basic_machine=pdp10-xkl + basic_os=tops20 + ;; + tpf) + basic_machine=s390x-ibm + basic_os=tpf + ;; + udi29k) + basic_machine=a29k-amd + basic_os=udi + ;; + ultra3) + basic_machine=a29k-nyu + basic_os=sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + basic_os=none + ;; + vaxv) + basic_machine=vax-dec + basic_os=sysv + ;; + vms) + basic_machine=vax-dec + basic_os=vms + ;; + vsta) + basic_machine=i386-pc + basic_os=vsta + ;; + vxworks960) + basic_machine=i960-wrs + basic_os=vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + basic_os=vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + basic_os=vxworks + ;; + xbox) + basic_machine=i686-pc + basic_os=mingw32 + ;; + ymp) + basic_machine=ymp-cray + basic_os=unicos + ;; + *) + basic_machine=$1 + basic_os= + ;; + esac + ;; +esac + +# Decode 1-component or ad-hoc basic machines +case $basic_machine in + # Here we handle the default manufacturer of certain CPU types. It is in + # some cases the only manufacturer, in others, it is the most popular. + w89k) + cpu=hppa1.1 + vendor=winbond + ;; + op50n) + cpu=hppa1.1 + vendor=oki + ;; + op60c) + cpu=hppa1.1 + vendor=oki + ;; + ibm*) + cpu=i370 + vendor=ibm + ;; + orion105) + cpu=clipper + vendor=highlevel + ;; + mac | mpw | mac-mpw) + cpu=m68k + vendor=apple + ;; + pmac | pmac-mpw) + cpu=powerpc + vendor=apple + ;; + # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att + cpu=m68000 + vendor=att ;; 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux + cpu=we32k + vendor=att ;; bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec + cpu=powerpc + vendor=ibm + basic_os=cnk ;; decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 + cpu=pdp10 + vendor=dec + basic_os=tops10 ;; decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 + cpu=pdp10 + vendor=dec + basic_os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola + cpu=m68k + vendor=motorola ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd + dpx2*) + cpu=m68k + vendor=bull + basic_os=sysv3 ;; encore | umax | mmax) - basic_machine=ns32k-encore + cpu=ns32k + vendor=encore ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose + elxsi) + cpu=elxsi + vendor=elxsi + basic_os=${basic_os:-bsd} ;; fx2800) - basic_machine=i860-alliant + cpu=i860 + vendor=alliant ;; genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 + cpu=ns32k + vendor=ns ;; h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux + cpu=hppa1.1 + vendor=hitachi + basic_os=hiuxwe2 ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp + cpu=m68000 + vendor=hp ;; hp9k3[2-9][0-9]) - basic_machine=m68k-hp + cpu=m68k + vendor=hp ;; hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k78[0-9] | hp78[0-9]) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm + cpu=hppa1.0 + vendor=hp ;; i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv32 ;; i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv4 ;; i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv ;; i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=solaris2 ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta + j90 | j90-cray) + cpu=j90 + vendor=cray + basic_os=${basic_os:-unicos} ;; iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) + cpu=mips + vendor=sgi + case $basic_os in + irix*) ;; *) - os=-irix4 + basic_os=irix4 ;; esac ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze*) - basic_machine=microblaze-xilinx - ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; miniframe) - basic_machine=m68000-convergent + cpu=m68000 + vendor=convergent ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - msys) - basic_machine=i386-pc - os=-msys - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - nacl) - basic_machine=le32-unknown - os=-nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos + *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) + cpu=m68k + vendor=atari + basic_os=mint ;; news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos + cpu=mips + vendor=sony + basic_os=newsos ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) + next | m*-next) + cpu=m68k + vendor=next + case $basic_os in + openstep*) + ;; + nextstep*) ;; - -ns2*) - os=-nextstep2 + ns2*) + basic_os=nextstep2 ;; *) - os=-nextstep3 + basic_os=nextstep3 ;; esac ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; np1) - basic_machine=np1-gould - ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) - basic_machine=nsr-tandem + cpu=np1 + vendor=gould ;; op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k + cpu=hppa1.1 + vendor=oki + basic_os=proelf ;; pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux + cpu=hppa1.1 + vendor=hitachi + basic_os=hiuxwe2 ;; pbd) - basic_machine=sparc-tti + cpu=sparc + vendor=tti ;; pbb) - basic_machine=m68k-tti + cpu=m68k + vendor=tti ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + pc532) + cpu=ns32k + vendor=pc532 ;; pn) - basic_machine=pn-gould + cpu=pn + vendor=gould ;; - power) basic_machine=power-ibm - ;; - ppc | ppcbe) basic_machine=powerpc-unknown - ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + power) + cpu=power + vendor=ibm ;; ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=-rdos - ;; - rdos32) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff + cpu=i386 + vendor=ibm ;; rm[46]00) - basic_machine=mips-siemens + cpu=mips + vendor=siemens ;; rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown + cpu=romp + vendor=ibm ;; sde) - basic_machine=mipsisa32-sde - os=-elf + cpu=mipsisa32 + vendor=sde + basic_os=${basic_os:-elf} ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh5el) - basic_machine=sh5le-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - strongarm-* | thumb-*) - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tile*) - basic_machine=$basic_machine-unknown - os=-linux-gnu - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 + simso-wrs) + cpu=sparclite + vendor=wrs + basic_os=vxworks ;; tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms + cpu=m68k + vendor=ncr ;; vpp*|vx|vx-*) - basic_machine=f301-fujitsu + cpu=f301 + vendor=fujitsu ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none + w65) + cpu=w65 + vendor=wdc ;; w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - xscale-* | xscalee[bl]-*) - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim + cpu=hppa1.1 + vendor=winbond + basic_os=proelf ;; none) - basic_machine=none-none - os=-none + cpu=none + vendor=none + ;; + leon|leon[3-9]) + cpu=sparc + vendor=$basic_machine + ;; + leon-*|leon[3-9]-*) + cpu=sparc + vendor=`echo "$basic_machine" | sed 's/-.*//'` ;; -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond + *-*) + # shellcheck disable=SC2162 + saved_IFS=$IFS + IFS="-" read cpu vendor <&2 - exit 1 + cpu=$basic_machine + vendor=unknown + ;; +esac + +unset -v basic_machine + +# Decode basic machines in the full and proper CPU-Company form. +case $cpu-$vendor in + # Here we handle the default manufacturer of certain CPU types in canonical form. It is in + # some cases the only manufacturer, in others, it is the most popular. + craynv-unknown) + vendor=cray + basic_os=${basic_os:-unicosmp} + ;; + c90-unknown | c90-cray) + vendor=cray + basic_os=${Basic_os:-unicos} + ;; + fx80-unknown) + vendor=alliant + ;; + romp-unknown) + vendor=ibm + ;; + mmix-unknown) + vendor=knuth + ;; + microblaze-unknown | microblazeel-unknown) + vendor=xilinx + ;; + rs6000-unknown) + vendor=ibm + ;; + vax-unknown) + vendor=dec + ;; + pdp11-unknown) + vendor=dec + ;; + we32k-unknown) + vendor=att + ;; + cydra-unknown) + vendor=cydrome + ;; + i370-ibm*) + vendor=ibm + ;; + orion-unknown) + vendor=highlevel + ;; + xps-unknown | xps100-unknown) + cpu=xps100 + vendor=honeywell + ;; + + # Here we normalize CPU types with a missing or matching vendor + armh-unknown | armh-alt) + cpu=armv7l + vendor=alt + basic_os=${basic_os:-linux-gnueabihf} + ;; + dpx20-unknown | dpx20-bull) + cpu=rs6000 + vendor=bull + basic_os=${basic_os:-bosx} + ;; + + # Here we normalize CPU types irrespective of the vendor + amd64-*) + cpu=x86_64 + ;; + blackfin-*) + cpu=bfin + basic_os=linux + ;; + c54x-*) + cpu=tic54x + ;; + c55x-*) + cpu=tic55x + ;; + c6x-*) + cpu=tic6x + ;; + e500v[12]-*) + cpu=powerpc + basic_os=${basic_os}"spe" + ;; + mips3*-*) + cpu=mips64 + ;; + ms1-*) + cpu=mt + ;; + m68knommu-*) + cpu=m68k + basic_os=linux + ;; + m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*) + cpu=s12z + ;; + openrisc-*) + cpu=or32 + ;; + parisc-*) + cpu=hppa + basic_os=linux + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + cpu=i586 + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*) + cpu=i686 + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + cpu=i686 + ;; + pentium4-*) + cpu=i786 + ;; + pc98-*) + cpu=i386 + ;; + ppc-* | ppcbe-*) + cpu=powerpc + ;; + ppcle-* | powerpclittle-*) + cpu=powerpcle + ;; + ppc64-*) + cpu=powerpc64 + ;; + ppc64le-* | powerpc64little-*) + cpu=powerpc64le + ;; + sb1-*) + cpu=mipsisa64sb1 + ;; + sb1el-*) + cpu=mipsisa64sb1el + ;; + sh5e[lb]-*) + cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'` + ;; + spur-*) + cpu=spur + ;; + strongarm-* | thumb-*) + cpu=arm + ;; + tx39-*) + cpu=mipstx39 + ;; + tx39el-*) + cpu=mipstx39el + ;; + x64-*) + cpu=x86_64 + ;; + xscale-* | xscalee[bl]-*) + cpu=`echo "$cpu" | sed 's/^xscale/arm/'` + ;; + arm64-* | aarch64le-*) + cpu=aarch64 + ;; + + # Recognize the canonical CPU Types that limit and/or modify the + # company names they are paired with. + cr16-*) + basic_os=${basic_os:-elf} + ;; + crisv32-* | etraxfs*-*) + cpu=crisv32 + vendor=axis + ;; + cris-* | etrax*-*) + cpu=cris + vendor=axis + ;; + crx-*) + basic_os=${basic_os:-elf} + ;; + neo-tandem) + cpu=neo + vendor=tandem + ;; + nse-tandem) + cpu=nse + vendor=tandem + ;; + nsr-tandem) + cpu=nsr + vendor=tandem + ;; + nsv-tandem) + cpu=nsv + vendor=tandem + ;; + nsx-tandem) + cpu=nsx + vendor=tandem + ;; + mipsallegrexel-sony) + cpu=mipsallegrexel + vendor=sony + ;; + tile*-*) + basic_os=${basic_os:-linux-gnu} + ;; + + *) + # Recognize the canonical CPU types that are allowed with any + # company name. + case $cpu in + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be | aarch64c | arm64ec \ + | abacus \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ + | alphapca5[67] | alpha64pca5[67] \ + | am33_2.0 \ + | amdgcn \ + | arc | arceb | arc32 | arc64 \ + | arm | arm[lb]e | arme[lb] | armv* \ + | avr | avr32 \ + | asmjs \ + | ba \ + | be32 | be64 \ + | bfin | bpf | bs2000 \ + | c[123]* | c30 | [cjt]90 | c4x \ + | c8051 | clipper | craynv | csky | cydra \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | elxsi | epiphany \ + | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ + | javascript \ + | h8300 | h8500 \ + | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i*86 | i860 | i960 | ia16 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | kvx \ + | le32 | le64 \ + | lm32 \ + | loongarch32 | loongarch64 \ + | m32c | m32r | m32rle \ + | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ + | m88110 | m88k | maxq | mb | mcore | mep | metag \ + | microblaze | microblazeel \ + | mips* \ + | mmix \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nanomips* \ + | nds32 | nds32le | nds32be \ + | nfp \ + | nios | nios2 | nios2eb | nios2el \ + | none | np1 | ns16k | ns32k | nvptx \ + | open8 \ + | or1k* \ + | or32 \ + | orion \ + | picochip \ + | pdp10 | pdp11 | pj | pjl | pn | power \ + | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ + | pru \ + | pyramid \ + | riscv | riscv32 | riscv32be | riscv64 | riscv64be \ + | rl78 | romp | rs6000 | rx \ + | s390 | s390x \ + | score \ + | sh | shl \ + | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ + | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \ + | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ + | spu \ + | tahoe \ + | thumbv7* \ + | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ + | tron \ + | ubicom32 \ + | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ + | vax \ + | vc4 \ + | visium \ + | w65 \ + | wasm32 | wasm64 \ + | we32k \ + | x86 | x86_64 | xc16x | xgate | xps100 \ + | xstormy16 | xtensa* \ + | ymp \ + | z8k | z80) + ;; + + *) + echo "Invalid configuration '$1': machine '$cpu-$vendor' not recognized" 1>&2 + exit 1 + ;; + esac ;; esac # Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` +case $vendor in + digital*) + vendor=dec ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + commodore*) + vendor=cbm ;; *) ;; @@ -1326,203 +1287,226 @@ esac # Decode manufacturer-specific aliases for certain operating systems. -if [ x"$os" != x"" ] +if test x"$basic_os" != x then + +# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just +# set os. +obj= +case $basic_os in + gnu/linux*) + kernel=linux + os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'` + ;; + os2-emx) + kernel=os2 + os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'` + ;; + nto-qnx*) + kernel=nto + os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'` + ;; + *-*) + # shellcheck disable=SC2162 + saved_IFS=$IFS + IFS="-" read kernel os <&2 - exit 1 + # No normalization, but not necessarily accepted, that comes below. ;; esac + else # Here we handle the default operating systems that come with various machines. @@ -1535,258 +1519,452 @@ else # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. -case $basic_machine in +kernel= +obj= +case $cpu-$vendor in score-*) - os=-elf + os= + obj=elf ;; spu-*) - os=-elf + os= + obj=elf ;; *-acorn) - os=-riscix1.2 + os=riscix1.2 ;; arm*-rebel) - os=-linux + kernel=linux + os=gnu ;; arm*-semi) - os=-aout + os= + obj=aout ;; c4x-* | tic4x-*) - os=-coff + os= + obj=coff + ;; + c8051-*) + os= + obj=elf + ;; + clipper-intergraph) + os=clix ;; hexagon-*) - os=-elf + os= + obj=elf ;; tic54x-*) - os=-coff + os= + obj=coff ;; tic55x-*) - os=-coff + os= + obj=coff ;; tic6x-*) - os=-coff + os= + obj=coff ;; # This must come before the *-dec entry. pdp10-*) - os=-tops20 + os=tops20 ;; pdp11-*) - os=-none + os=none ;; *-dec | vax-*) - os=-ultrix4.2 + os=ultrix4.2 ;; m68*-apollo) - os=-domain + os=domain ;; i386-sun) - os=-sunos4.0.2 + os=sunos4.0.2 ;; m68000-sun) - os=-sunos3 + os=sunos3 ;; m68*-cisco) - os=-aout + os= + obj=aout ;; mep-*) - os=-elf + os= + obj=elf ;; mips*-cisco) - os=-elf + os= + obj=elf ;; - mips*-*) - os=-elf + mips*-*|nanomips*-*) + os= + obj=elf ;; or32-*) - os=-coff + os= + obj=coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 + os=sysv3 ;; sparc-* | *-sun) - os=-sunos4.1.1 + os=sunos4.1.1 + ;; + pru-*) + os= + obj=elf ;; *-be) - os=-beos - ;; - *-haiku) - os=-haiku + os=beos ;; *-ibm) - os=-aix + os=aix ;; *-knuth) - os=-mmixware + os=mmixware ;; *-wec) - os=-proelf + os=proelf ;; *-winbond) - os=-proelf + os=proelf ;; *-oki) - os=-proelf + os=proelf ;; *-hp) - os=-hpux + os=hpux ;; *-hitachi) - os=-hiux + os=hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv + os=sysv ;; *-cbm) - os=-amigaos + os=amigaos ;; *-dg) - os=-dgux + os=dgux ;; *-dolphin) - os=-sysv3 + os=sysv3 ;; m68k-ccur) - os=-rtu + os=rtu ;; m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs + os=luna ;; *-next) - os=-nextstep3 + os=nextstep + ;; + *-sequent) + os=ptx + ;; + *-crds) + os=unos + ;; + *-ns) + os=genix + ;; + i370-*) + os=mvs ;; *-gould) - os=-sysv + os=sysv ;; *-highlevel) - os=-bsd + os=bsd ;; *-encore) - os=-bsd + os=bsd ;; *-sgi) - os=-irix + os=irix ;; *-siemens) - os=-sysv4 + os=sysv4 ;; *-masscomp) - os=-rtu + os=rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=-uxpv + os=uxpv ;; *-rom68k) - os=-coff + os= + obj=coff ;; *-*bug) - os=-coff + os= + obj=coff ;; *-apple) - os=-macos + os=macos ;; *-atari*) - os=-mint + os=mint + ;; + *-wrs) + os=vxworks ;; *) - os=-none + os=none ;; esac + fi +# Now, validate our (potentially fixed-up) individual pieces (OS, OBJ). + +case $os in + # Sometimes we do "kernel-libc", so those need to count as OSes. + llvm* | musl* | newlib* | relibc* | uclibc*) + ;; + # Likewise for "kernel-abi" + eabi* | gnueabi*) + ;; + # VxWorks passes extra cpu info in the 4th filed. + simlinux | simwindows | spe) + ;; + # See `case $cpu-$os` validation below + ghcjs) + ;; + # Now accept the basic system types. + # The portable systems comes first. + # Each alternative MUST end in a * to match a version number. + gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ + | hiux* | abug | nacl* | netware* | windows* \ + | os9* | macos* | osx* | ios* | tvos* | watchos* \ + | mpw* | magic* | mmixware* | mon960* | lnews* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* | twizzler* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | mirbsd* | netbsd* | dicos* | openedition* | ose* \ + | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \ + | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ + | bosx* | nextstep* | cxux* | oabi* \ + | ptx* | ecoff* | winnt* | domain* | vsta* \ + | udi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* | serenity* \ + | cygwin* | msys* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | mint* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ + | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ + | fiwix* | mlibc* | cos* | mbr* | ironclad* ) + ;; + # This one is extra strict with allowed versions + sco3.2v2 | sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + # This refers to builds using the UEFI calling convention + # (which depends on the architecture) and PE file format. + # Note that this is both a different calling convention and + # different file format than that of GNU-EFI + # (x86_64-w64-mingw32). + uefi) + ;; + none) + ;; + kernel* | msvc* ) + # Restricted further below + ;; + '') + if test x"$obj" = x + then + echo "Invalid configuration '$1': Blank OS only allowed with explicit machine code file format" 1>&2 + fi + ;; + *) + echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2 + exit 1 + ;; +esac + +case $obj in + aout* | coff* | elf* | pe*) + ;; + '') + # empty is fine + ;; + *) + echo "Invalid configuration '$1': Machine code format '$obj' not recognized" 1>&2 + exit 1 + ;; +esac + +# Here we handle the constraint that a (synthetic) cpu and os are +# valid only in combination with each other and nowhere else. +case $cpu-$os in + # The "javascript-unknown-ghcjs" triple is used by GHC; we + # accept it here in order to tolerate that, but reject any + # variations. + javascript-ghcjs) + ;; + javascript-* | *-ghcjs) + echo "Invalid configuration '$1': cpu '$cpu' is not valid with os '$os$obj'" 1>&2 + exit 1 + ;; +esac + +# As a final step for OS-related things, validate the OS-kernel combination +# (given a valid OS), if there is a kernel. +case $kernel-$os-$obj in + linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \ + | linux-mlibc*- | linux-musl*- | linux-newlib*- \ + | linux-relibc*- | linux-uclibc*- ) + ;; + uclinux-uclibc*- ) + ;; + managarm-mlibc*- | managarm-kernel*- ) + ;; + windows*-msvc*-) + ;; + -dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \ + | -uclibc*- ) + # These are just libc implementations, not actual OSes, and thus + # require a kernel. + echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2 + exit 1 + ;; + -kernel*- ) + echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2 + exit 1 + ;; + *-kernel*- ) + echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2 + exit 1 + ;; + *-msvc*- ) + echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2 + exit 1 + ;; + kfreebsd*-gnu*- | kopensolaris*-gnu*-) + ;; + vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-) + ;; + nto-qnx*-) + ;; + os2-emx-) + ;; + *-eabi*- | *-gnueabi*-) + ;; + none--*) + # None (no kernel, i.e. freestanding / bare metal), + # can be paired with an machine code file format + ;; + -*-) + # Blank kernel with real OS is always fine. + ;; + --*) + # Blank kernel and OS with real machine code file format is always fine. + ;; + *-*-*) + echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2 + exit 1 + ;; +esac + # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) +case $vendor in + unknown) + case $cpu-$os in + *-riscix*) vendor=acorn ;; - -sunos*) + *-sunos*) vendor=sun ;; - -cnk*|-aix*) + *-cnk* | *-aix*) vendor=ibm ;; - -beos*) + *-beos*) vendor=be ;; - -hpux*) + *-hpux*) vendor=hp ;; - -mpeix*) + *-mpeix*) vendor=hp ;; - -hiux*) + *-hiux*) vendor=hitachi ;; - -unos*) + *-unos*) vendor=crds ;; - -dgux*) + *-dgux*) vendor=dg ;; - -luna*) + *-luna*) vendor=omron ;; - -genix*) + *-genix*) vendor=ns ;; - -mvs* | -opened*) + *-clix*) + vendor=intergraph + ;; + *-mvs* | *-opened*) vendor=ibm ;; - -os400*) + *-os400*) vendor=ibm ;; - -ptx*) + s390-* | s390x-*) + vendor=ibm + ;; + *-ptx*) vendor=sequent ;; - -tpf*) + *-tpf*) vendor=ibm ;; - -vxsim* | -vxworks* | -windiss*) + *-vxsim* | *-vxworks* | *-windiss*) vendor=wrs ;; - -aux*) + *-aux*) vendor=apple ;; - -hms*) + *-hms*) vendor=hitachi ;; - -mpw* | -macos*) + *-mpw* | *-macos*) vendor=apple ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) vendor=atari ;; - -vos*) + *-vos*) vendor=stratus ;; esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; esac -echo $basic_machine$os +echo "$cpu-$vendor${kernel:+-$kernel}${os:+-$os}${obj:+-$obj}" exit # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/app/appres/configure b/app/appres/configure index 06c8448b..e1ce9014 100644 --- a/app/appres/configure +++ b/app/appres/configure @@ -1,11 +1,12 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for appres 1.0.6. +# Generated by GNU Autoconf 2.71 for appres 1.0.7. # # Report bugs to . # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -16,14 +17,16 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -33,46 +36,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -81,13 +84,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -96,8 +92,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -109,30 +109,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. @@ -154,20 +134,22 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else +else \$as_nop case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( @@ -187,42 +169,53 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; } as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +then : -else +else \$as_nop exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 +blah=\$(echo \$(echo blah)) +test x\"\$blah\" = xblah || exit 1 test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 test \$(( 1 + 1 )) = 2 || exit 1" - if (eval "$as_required") 2>/dev/null; then : + if (eval "$as_required") 2>/dev/null +then : as_have_required=yes -else +else $as_nop as_have_required=no fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +then : -else +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base + as_shell=$as_dir$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null +then : break 2 fi fi @@ -230,14 +223,21 @@ fi esac as_found=false done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi +fi - if test "x$CONFIG_SHELL" != x; then : + if test "x$CONFIG_SHELL" != x +then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also @@ -255,18 +255,19 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." + if test x$as_have_required = xno +then : + printf "%s\n" "$0: This script requires a shell more modern than all" + printf "%s\n" "$0: the shells that I found on your system." + if test ${ZSH_VERSION+y} ; then + printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" + printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and + printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and $0: https://gitlab.freedesktop.org/xorg/app/appres/issues $0: about your system, including any error possibly output $0: before this message. Then install a modern shell, or @@ -295,6 +296,7 @@ as_fn_unset () } as_unset=as_fn_unset + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -312,6 +314,14 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -326,7 +336,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -335,7 +345,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -374,12 +384,13 @@ as_fn_executable_p () # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -391,18 +402,27 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -414,9 +434,9 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -443,7 +463,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -487,7 +507,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall @@ -501,6 +521,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits exit } + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -514,6 +538,13 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -581,48 +612,44 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='appres' PACKAGE_TARNAME='appres' -PACKAGE_VERSION='1.0.6' -PACKAGE_STRING='appres 1.0.6' +PACKAGE_VERSION='1.0.7' +PACKAGE_STRING='appres 1.0.7' PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/appres/issues' PACKAGE_URL='' ac_unique_file="Makefile.am" # Factoring default headers for most tests. ac_includes_default="\ -#include -#ifdef HAVE_SYS_TYPES_H -# include +#include +#ifdef HAVE_STDIO_H +# include #endif -#ifdef HAVE_SYS_STAT_H -# include -#endif -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif #endif #ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include -# endif # include #endif -#ifdef HAVE_STRINGS_H -# include -#endif #ifdef HAVE_INTTYPES_H # include #endif #ifdef HAVE_STDINT_H # include #endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif #ifdef HAVE_UNISTD_H # include #endif" +ac_header_c_list= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -664,9 +691,6 @@ CHANGELOG_CMD STRICT_CFLAGS CWARNFLAGS BASE_CFLAGS -EGREP -GREP -CPP am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE @@ -766,7 +790,6 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR @@ -840,8 +863,6 @@ do *) ac_optarg=yes ;; esac - # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_dashdash$ac_option in --) ac_dashdash=yes ;; @@ -882,9 +903,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -908,9 +929,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1121,9 +1142,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1137,9 +1158,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1183,9 +1204,9 @@ Try \`$0 --help' for more information" *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1201,7 +1222,7 @@ if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1265,7 +1286,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | +printf "%s\n" X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1322,7 +1343,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures appres 1.0.6 to adapt to many kinds of systems. +\`configure' configures appres 1.0.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1393,7 +1414,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of appres 1.0.6:";; + short | recursive ) echo "Configuration of appres 1.0.7:";; esac cat <<\_ACEOF @@ -1425,7 +1446,6 @@ Some influential environment variables: LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory - CPP C preprocessor PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH directories to add to pkg-config's search path @@ -1454,9 +1474,9 @@ if test "$ac_init_help" = "recursive"; then case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1484,7 +1504,8 @@ esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -1492,7 +1513,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1501,10 +1522,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -appres configure 1.0.6 -generated by GNU Autoconf 2.69 +appres configure 1.0.7 +generated by GNU Autoconf 2.71 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1521,14 +1542,14 @@ fi ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1536,14 +1557,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1553,25 +1575,28 @@ fi } # ac_fn_c_try_compile -# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES -# --------------------------------------------- +# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR +# ------------------------------------------------------------------ # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -# accordingly. -ac_fn_c_check_decl () +# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR. +ac_fn_check_decl () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack as_decl_name=`echo $2|sed 's/ *(.*//'` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +printf %s "checking whether $as_decl_name is declared... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 -$as_echo_n "checking whether $as_decl_name is declared... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + eval ac_save_FLAGS=\$$6 + as_fn_append $6 " $5" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { #ifndef $as_decl_name #ifdef __cplusplus @@ -1585,98 +1610,22 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + eval $6=\$ac_save_FLAGS + fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -} # ac_fn_c_check_decl - -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run +} # ac_fn_check_decl # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES # ------------------------------------------------------- @@ -1685,26 +1634,28 @@ fi ac_fn_c_check_header_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1715,14 +1666,14 @@ $as_echo "$ac_res" >&6; } ac_fn_c_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext + rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1730,17 +1681,18 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1754,14 +1706,34 @@ fi as_fn_set_status $ac_retval } # ac_fn_c_try_link +ac_configure_args_raw= +for ac_arg +do + case $ac_arg in + *\'*) + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append ac_configure_args_raw " '$ac_arg'" +done + +case $ac_configure_args_raw in + *$as_nl*) + ac_safe_unquote= ;; + *) + ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. + ac_unsafe_a="$ac_unsafe_z#~" + ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" + ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; +esac + cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by appres $as_me 1.0.6, which was -generated by GNU Autoconf 2.69. Invocation command line was +It was created by appres $as_me 1.0.7, which was +generated by GNU Autoconf 2.71. Invocation command line was - $ $0 $@ + $ $0$ac_configure_args_raw _ACEOF exec 5>>config.log @@ -1794,8 +1766,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + printf "%s\n" "PATH: $as_dir" done IFS=$as_save_IFS @@ -1830,7 +1806,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -1865,11 +1841,13 @@ done # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - $as_echo "## ---------------- ## + printf "%s\n" "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -1880,8 +1858,8 @@ trap 'exit_status=$? case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -1905,7 +1883,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - $as_echo "## ----------------- ## + printf "%s\n" "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -1913,14 +1891,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + printf "%s\n" "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -1928,15 +1906,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - $as_echo "## ----------- ## + printf "%s\n" "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -1944,8 +1922,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; echo fi test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" + printf "%s\n" "$as_me: caught signal $ac_signal" + printf "%s\n" "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -1959,63 +1937,48 @@ ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -$as_echo "/* confdefs.h */" > confdefs.h +printf "%s\n" "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF +printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF +printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF +printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF +printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF +printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_files="$CONFIG_SITE" elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + ac_site_files="$prefix/share/config.site $prefix/etc/config.site" else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" + +for ac_site_file in $ac_site_files do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} + case $ac_site_file in #( + */*) : + ;; #( + *) : + ac_site_file=./$ac_site_file ;; +esac + if test -f "$ac_site_file" && test -r "$ac_site_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file See \`config.log' for more details" "$LINENO" 5; } fi @@ -2025,19 +1988,434 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +printf "%s\n" "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +# Test code for whether the C compiler supports C89 (global declarations) +ac_c_conftest_c89_globals=' +/* Does the compiler advertise C89 conformance? + Do not test the value of __STDC__, because some compilers set it to 0 + while being otherwise adequately conformant. */ +#if !defined __STDC__ +# error "Compiler does not advertise C89 conformance" +#endif + +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ +struct buf { int x; }; +struct buf * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not \xHH hex character constants. + These do not provoke an error unfortunately, instead are silently treated + as an "x". The following induces an error, until -std is added to get + proper ANSI mode. Curiously \x00 != x always comes out true, for an + array size at least. It is necessary to write \x00 == 0 to get something + that is true only with -std. */ +int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) '\''x'\'' +int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), + int, int);' + +# Test code for whether the C compiler supports C89 (body of main). +ac_c_conftest_c89_main=' +ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); +' + +# Test code for whether the C compiler supports C99 (global declarations) +ac_c_conftest_c99_globals=' +// Does the compiler advertise C99 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L +# error "Compiler does not advertise C99 conformance" +#endif + +#include +extern int puts (const char *); +extern int printf (const char *, ...); +extern int dprintf (int, const char *, ...); +extern void *malloc (size_t); + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +// dprintf is used instead of fprintf to avoid needing to declare +// FILE and stderr. +#define debug(...) dprintf (2, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + #error "your preprocessor is broken" +#endif +#if BIG_OK +#else + #error "your preprocessor is broken" +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case '\''s'\'': // string + str = va_arg (args_copy, const char *); + break; + case '\''d'\'': // int + number = va_arg (args_copy, int); + break; + case '\''f'\'': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +} +' + +# Test code for whether the C compiler supports C99 (body of main). +ac_c_conftest_c99_main=' + // Check bool. + _Bool success = false; + success |= (argc != 0); + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[0] = argv[0][0]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' + || dynamic_array[ni.number - 1] != 543); +' + +# Test code for whether the C compiler supports C11 (global declarations) +ac_c_conftest_c11_globals=' +// Does the compiler advertise C11 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L +# error "Compiler does not advertise C11 conformance" +#endif + +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; + +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); + +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; +' + +# Test code for whether the C compiler supports C11 (body of main). +ac_c_conftest_c11_main=' + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); + v1.i = 2; + v1.w.k = 5; + ok |= v1.i != 5; +' + +# Test code for whether the C compiler supports C11 (complete). +ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} +${ac_c_conftest_c11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + ${ac_c_conftest_c11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C99 (complete). +ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + return ok; +} +" + +# Test code for whether the C compiler supports C89 (complete). +ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + return ok; +} +" + +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" +as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" +as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" +as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" +as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" +as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" +as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" +as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" +as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" + +# Auxiliary files required by this configure script. +ac_aux_files="config.guess config.sub missing install-sh" + +# Locations in which to look for auxiliary files. +ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.." + +# Search for a directory containing all of the required auxiliary files, +# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. +# If we don't find one directory that contains all the files we need, +# we report the set of missing files from the *first* directory in +# $ac_aux_dir_candidates and give up. +ac_missing_aux_files="" +ac_first_candidate=: +printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in $ac_aux_dir_candidates +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + as_found=: + + printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 + ac_aux_dir_found=yes + ac_install_sh= + for ac_aux in $ac_aux_files + do + # As a special case, if "install-sh" is required, that requirement + # can be satisfied by any of "install-sh", "install.sh", or "shtool", + # and $ac_install_sh is set appropriately for whichever one is found. + if test x"$ac_aux" = x"install-sh" + then + if test -f "${as_dir}install-sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 + ac_install_sh="${as_dir}install-sh -c" + elif test -f "${as_dir}install.sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 + ac_install_sh="${as_dir}install.sh -c" + elif test -f "${as_dir}shtool"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 + ac_install_sh="${as_dir}shtool install -c" + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} install-sh" + else + break + fi + fi + else + if test -f "${as_dir}${ac_aux}"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" + else + break + fi + fi + fi + done + if test "$ac_aux_dir_found" = yes; then + ac_aux_dir="$as_dir" + break + fi + ac_first_candidate=false + + as_found=false +done +IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 +fi + + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +if test -f "${ac_aux_dir}config.guess"; then + ac_config_guess="$SHELL ${ac_aux_dir}config.guess" +fi +if test -f "${ac_aux_dir}config.sub"; then + ac_config_sub="$SHELL ${ac_aux_dir}config.sub" +fi +if test -f "$ac_aux_dir/configure"; then + ac_configure="$SHELL ${ac_aux_dir}configure" +fi + # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -2048,12 +2426,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -2062,24 +2440,24 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -2089,11 +2467,12 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2113,36 +2492,9 @@ ac_config_headers="$ac_config_headers config.h" # Initialize Automake am__api_version='1.12' -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -# Find a good install program. We prefer a C program (faster), + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: # SysV /etc/install, /usr/sbin/install @@ -2156,20 +2508,25 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +printf %s "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${ac_cv_path_install+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + # Account for fact that we put trailing slashes in our PATH walk. +case $as_dir in #(( + ./ | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; @@ -2179,13 +2536,13 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # program-specific install script used by HP pwplus--don't use. : else @@ -2193,12 +2550,12 @@ case $as_dir/ in #(( echo one > conftest.one echo two > conftest.two mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && test -s conftest.one && test -s conftest.two && test -s conftest.dir/conftest.one && test -s conftest.dir/conftest.two then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" break 3 fi fi @@ -2214,7 +2571,7 @@ IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir fi - if test "${ac_cv_path_install+set}" = set; then + if test ${ac_cv_path_install+y}; then INSTALL=$ac_cv_path_install else # As a last resort, use the slow shell script. Don't cache a @@ -2224,8 +2581,8 @@ fi INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +printf "%s\n" "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -2235,8 +2592,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -$as_echo_n "checking whether build environment is sane... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +printf %s "checking whether build environment is sane... " >&6; } # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -2290,8 +2647,8 @@ else as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } # If we didn't sleep, we still need to ensure time stamps of config.status and # generated files are strictly newer. am_sleep_pid= @@ -2310,12 +2667,13 @@ test "$program_suffix" != NONE && # Double any \ or $. # By default was `s,x,x', remove it if useless. ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` +program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"` # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` -if test x"${MISSING+set}" != xset; then + + if test x"${MISSING+set}" != xset; then case $am_aux_dir in *\ * | *\ *) MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; @@ -2328,8 +2686,8 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2349,11 +2707,12 @@ if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -2361,11 +2720,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2376,11 +2739,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2389,11 +2752,12 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -2401,11 +2765,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2416,11 +2784,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +printf "%s\n" "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -2428,8 +2796,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -2441,25 +2809,31 @@ fi fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5 +printf %s "checking for a race-free mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if ${ac_cv_path_mkdir+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${ac_cv_path_mkdir+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ + as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue + case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir ('*'coreutils) '* | \ + 'BusyBox '* | \ 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext break 3;; esac done @@ -2470,7 +2844,7 @@ IFS=$as_save_IFS fi test -d ./--version && rmdir ./--version - if test "${ac_cv_path_mkdir+set}" = set; then + if test ${ac_cv_path_mkdir+y}; then MKDIR_P="$ac_cv_path_mkdir -p" else # As a last resort, use the slow shell script. Don't cache a @@ -2480,18 +2854,19 @@ fi MKDIR_P="$ac_install_sh -d" fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +printf "%s\n" "$MKDIR_P" >&6; } for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AWK+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else @@ -2499,11 +2874,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2514,24 +2893,25 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +printf "%s\n" "$AWK" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -n "$AWK" && break done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 -else +ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval test \${ac_cv_prog_make_${ac_make}_set+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat >conftest.make <<\_ACEOF SHELL = /bin/sh all: @@ -2547,12 +2927,12 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2587,17 +2967,13 @@ fi # Define the identity of the package. PACKAGE='appres' - VERSION='1.0.6' + VERSION='1.0.7' -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF +printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF +printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h # Some tools Automake needs. @@ -2646,17 +3022,18 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then : +if test ${enable_maintainer_mode+y} +then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -else +else $as_nop USE_MAINTAINER_MODE=no fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +printf "%s\n" "$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= MAINTAINER_MODE_FALSE='#' @@ -2669,6 +3046,15 @@ fi + + + + + + + + + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -2681,8 +3067,8 @@ am__doit: .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +printf %s "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= _am_result=none @@ -2709,12 +3095,13 @@ if test "$am__include" = "#"; then fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +printf "%s\n" "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : +if test ${enable_dependency_tracking+y} +then : enableval=$enable_dependency_tracking; fi @@ -2740,11 +3127,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2752,11 +3140,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2767,11 +3159,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2780,11 +3172,12 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -2792,11 +3185,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2807,11 +3204,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2819,8 +3216,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2833,11 +3230,12 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2845,11 +3243,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2860,11 +3262,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2873,11 +3275,12 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2886,15 +3289,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2910,18 +3317,18 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2932,11 +3339,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2944,11 +3352,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2959,11 +3371,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2976,11 +3388,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -2988,11 +3401,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3003,11 +3420,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3019,8 +3436,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -3028,25 +3445,129 @@ esac fi fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +fi + + +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do +for ac_option in --version -v -V -qversion -version; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -3056,7 +3577,7 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -3064,7 +3585,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -3076,9 +3597,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +printf %s "checking whether the C compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -3099,11 +3620,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -3120,7 +3642,7 @@ do # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -3136,44 +3658,46 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else +else $as_nop ac_file='' fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables See \`config.log' for more details" "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +printf %s "checking for C compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -3187,15 +3711,15 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -3204,7 +3728,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -3216,8 +3740,8 @@ _ACEOF ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -3225,10 +3749,10 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -3236,39 +3760,40 @@ $as_echo "$ac_try_echo"; } >&5 *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details" "$LINENO" 5; } fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -3282,11 +3807,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -3295,31 +3821,32 @@ $as_echo "$ac_try_echo"; } >&5 break;; esac done -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -3329,29 +3856,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+set} +ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -3360,57 +3891,60 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes -else +else $as_nop CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -3425,94 +3959,144 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c11=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi + +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi + +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} +$ac_c_conftest_c89_program _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC - fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 +fi fi ac_ext=c @@ -3523,11 +4107,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +printf %s "checking dependency style of $depcc... " >&6; } +if test ${am_cv_CC_dependencies_compiler_type+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -3634,8 +4219,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -3649,578 +4234,101 @@ else fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 -$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } -if ${ac_cv_prog_cc_c99+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c99=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5 +printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; } +if test ${ac_cv_c_undeclared_builtin_options+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_save_CFLAGS=$CFLAGS + ac_cv_c_undeclared_builtin_options='cannot detect' + for ac_arg in '' -fno-builtin; do + CFLAGS="$ac_save_CFLAGS $ac_arg" + # This test program should *not* compile successfully. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -#include -#include -#include - -// Check varargs macros. These examples are taken from C99 6.10.3.5. -#define debug(...) fprintf (stderr, __VA_ARGS__) -#define showlist(...) puts (#__VA_ARGS__) -#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) -static void -test_varargs_macros (void) -{ - int x = 1234; - int y = 5678; - debug ("Flag"); - debug ("X = %d\n", x); - showlist (The first, second, and third items.); - report (x>y, "x is %d but y is %d", x, y); -} - -// Check long long types. -#define BIG64 18446744073709551615ull -#define BIG32 4294967295ul -#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) -#if !BIG_OK - your preprocessor is broken; -#endif -#if BIG_OK -#else - your preprocessor is broken; -#endif -static long long int bignum = -9223372036854775807LL; -static unsigned long long int ubignum = BIG64; - -struct incomplete_array -{ - int datasize; - double data[]; -}; - -struct named_init { - int number; - const wchar_t *name; - double average; -}; - -typedef const char *ccp; - -static inline int -test_restrict (ccp restrict text) -{ - // See if C++-style comments work. - // Iterate through items via the restricted pointer. - // Also check for declarations in for loops. - for (unsigned int i = 0; *(text+i) != '\0'; ++i) - continue; - return 0; -} - -// Check varargs and va_copy. -static void -test_varargs (const char *format, ...) -{ - va_list args; - va_start (args, format); - va_list args_copy; - va_copy (args_copy, args); - - const char *str; - int number; - float fnumber; - - while (*format) - { - switch (*format++) - { - case 's': // string - str = va_arg (args_copy, const char *); - break; - case 'd': // int - number = va_arg (args_copy, int); - break; - case 'f': // float - fnumber = va_arg (args_copy, double); - break; - default: - break; - } - } - va_end (args_copy); - va_end (args); -} int -main () +main (void) { - - // Check bool. - _Bool success = false; - - // Check restrict. - if (test_restrict ("String literal") == 0) - success = true; - char *restrict newvar = "Another string"; - - // Check varargs. - test_varargs ("s, d' f .", "string", 65, 34.234); - test_varargs_macros (); - - // Check flexible array members. - struct incomplete_array *ia = - malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); - ia->datasize = 10; - for (int i = 0; i < ia->datasize; ++i) - ia->data[i] = i * 1.234; - - // Check named initializers. - struct named_init ni = { - .number = 34, - .name = L"Test wide string", - .average = 543.34343, - }; - - ni.number = 58; - - int dynamic_array[ni.number]; - dynamic_array[ni.number - 1] = 543; - - // work around unused variable warnings - return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' - || dynamic_array[ni.number - 1] != 543); - +(void) strchr; ; return 0; } _ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c99=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c99" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC +if ac_fn_c_try_compile "$LINENO" +then : -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c99" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c99" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 -$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c99" != xno; then : - -fi - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +else $as_nop + # This test program should compile successfully. + # No library function is consistently available on + # freestanding implementations, so test against a dummy + # declaration. Include always-available headers on the + # off chance that they somehow elicit warnings. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include #include +#include +#include +#include +extern void ac_decl (int, char *); int -main () +main (void) { +(void) ac_decl (0, (char *) 0); + (void) ac_decl; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no +if ac_fn_c_try_compile "$LINENO" +then : + if test x"$ac_arg" = x +then : + ac_cv_c_undeclared_builtin_options='none needed' +else $as_nop + ac_cv_c_undeclared_builtin_options=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no + break fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + done + CFLAGS=$ac_save_CFLAGS fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5 +printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; } + case $ac_cv_c_undeclared_builtin_options in #( + 'cannot detect') : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot make $CC report undeclared builtins +See \`config.log' for more details" "$LINENO" 5; } ;; #( + 'none needed') : + ac_c_undeclared_builtin_options='' ;; #( + *) : + ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;; +esac +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi done @@ -4228,24 +4336,37 @@ done -ac_fn_c_check_decl "$LINENO" "__clang__" "ac_cv_have_decl___clang__" "$ac_includes_default" -if test "x$ac_cv_have_decl___clang__" = xyes; then : + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + + + +ac_fn_check_decl "$LINENO" "__clang__" "ac_cv_have_decl___clang__" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl___clang__" = xyes +then : CLANGCC="yes" -else +else $as_nop CLANGCC="no" fi - -ac_fn_c_check_decl "$LINENO" "__INTEL_COMPILER" "ac_cv_have_decl___INTEL_COMPILER" "$ac_includes_default" -if test "x$ac_cv_have_decl___INTEL_COMPILER" = xyes; then : +ac_fn_check_decl "$LINENO" "__INTEL_COMPILER" "ac_cv_have_decl___INTEL_COMPILER" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl___INTEL_COMPILER" = xyes +then : INTELCC="yes" -else +else $as_nop INTELCC="no" fi - -ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default" -if test "x$ac_cv_have_decl___SUNPRO_C" = xyes; then : +ac_fn_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl___SUNPRO_C" = xyes +then : SUNCC="yes" -else +else $as_nop SUNCC="no" fi @@ -4256,16 +4377,16 @@ fi - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. @@ -4275,11 +4396,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4291,11 +4416,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4304,11 +4429,12 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. @@ -4318,11 +4444,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4334,11 +4464,11 @@ esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -4346,8 +4476,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -4359,37 +4489,40 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PKG_CONFIG="" fi fi -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else + + # Make sure we can run config.sub. +$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +printf %s "checking build system type... " >&6; } +if test ${ac_cv_build+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_build_alias=$build_alias test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 +ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +printf "%s\n" "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -4408,21 +4541,22 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +printf %s "checking host system type... " >&6; } +if test ${ac_cv_host+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +printf "%s\n" "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -4441,11 +4575,12 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +printf %s "checking for a sed that does not truncate output... " >&6; } +if test ${ac_cv_path_SED+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ for ac_i in 1 2 3 4 5 6 7; do ac_script="$ac_script$as_nl$ac_script" @@ -4459,10 +4594,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in sed gsed + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + ac_path_SED="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED @@ -4471,13 +4611,13 @@ case `"$ac_path_SED" --version 2>&1` in ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" + printf "%s\n" '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -4505,8 +4645,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +printf "%s\n" "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -4516,9 +4656,10 @@ $as_echo "$ac_cv_path_SED" >&6; } # Check whether --enable-selective-werror was given. -if test "${enable_selective_werror+set}" = set; then : +if test ${enable_selective_werror+y} +then : enableval=$enable_selective_werror; SELECTIVE_WERROR=$enableval -else +else $as_nop SELECTIVE_WERROR=yes fi @@ -4551,24 +4692,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -4578,24 +4721,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -4613,29 +4758,31 @@ found="no" CFLAGS="$CFLAGS -Wall" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wall" >&5 -$as_echo_n "checking if $CC supports -Wall... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wall" >&5 +printf %s "checking if $CC supports -Wall... " >&6; } cacheid=xorg_cv_cc_flag__Wall - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -4643,8 +4790,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wall" found="yes" @@ -4669,24 +4816,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -4696,24 +4845,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -4731,29 +4882,31 @@ found="no" CFLAGS="$CFLAGS -Wpointer-arith" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-arith" >&5 -$as_echo_n "checking if $CC supports -Wpointer-arith... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-arith" >&5 +printf %s "checking if $CC supports -Wpointer-arith... " >&6; } cacheid=xorg_cv_cc_flag__Wpointer_arith - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -4761,8 +4914,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wpointer-arith" found="yes" @@ -4787,24 +4940,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -4814,24 +4969,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -4849,29 +5006,31 @@ found="no" CFLAGS="$CFLAGS -Wmissing-declarations" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-declarations" >&5 -$as_echo_n "checking if $CC supports -Wmissing-declarations... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-declarations" >&5 +printf %s "checking if $CC supports -Wmissing-declarations... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_declarations - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -4879,8 +5038,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-declarations" found="yes" @@ -4905,24 +5064,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -4932,24 +5093,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -4967,29 +5130,31 @@ found="no" CFLAGS="$CFLAGS -Wformat=2" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat=2" >&5 -$as_echo_n "checking if $CC supports -Wformat=2... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat=2" >&5 +printf %s "checking if $CC supports -Wformat=2... " >&6; } cacheid=xorg_cv_cc_flag__Wformat_2 - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -4997,8 +5162,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wformat=2" found="yes" @@ -5016,29 +5181,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -Wformat" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat" >&5 -$as_echo_n "checking if $CC supports -Wformat... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat" >&5 +printf %s "checking if $CC supports -Wformat... " >&6; } cacheid=xorg_cv_cc_flag__Wformat - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -5046,8 +5213,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wformat" found="yes" @@ -5074,24 +5241,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5101,24 +5270,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5136,29 +5307,31 @@ found="no" CFLAGS="$CFLAGS -Wstrict-prototypes" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wstrict-prototypes" >&5 -$as_echo_n "checking if $CC supports -Wstrict-prototypes... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wstrict-prototypes" >&5 +printf %s "checking if $CC supports -Wstrict-prototypes... " >&6; } cacheid=xorg_cv_cc_flag__Wstrict_prototypes - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -5166,8 +5339,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wstrict-prototypes" found="yes" @@ -5192,24 +5365,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5219,24 +5394,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5254,29 +5431,31 @@ found="no" CFLAGS="$CFLAGS -Wmissing-prototypes" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-prototypes" >&5 -$as_echo_n "checking if $CC supports -Wmissing-prototypes... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-prototypes" >&5 +printf %s "checking if $CC supports -Wmissing-prototypes... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_prototypes - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -5284,8 +5463,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-prototypes" found="yes" @@ -5310,24 +5489,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5337,24 +5518,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5372,29 +5555,31 @@ found="no" CFLAGS="$CFLAGS -Wnested-externs" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnested-externs" >&5 -$as_echo_n "checking if $CC supports -Wnested-externs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnested-externs" >&5 +printf %s "checking if $CC supports -Wnested-externs... " >&6; } cacheid=xorg_cv_cc_flag__Wnested_externs - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -5402,8 +5587,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wnested-externs" found="yes" @@ -5428,24 +5613,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5455,24 +5642,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5490,29 +5679,31 @@ found="no" CFLAGS="$CFLAGS -Wbad-function-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wbad-function-cast" >&5 -$as_echo_n "checking if $CC supports -Wbad-function-cast... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wbad-function-cast" >&5 +printf %s "checking if $CC supports -Wbad-function-cast... " >&6; } cacheid=xorg_cv_cc_flag__Wbad_function_cast - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -5520,8 +5711,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wbad-function-cast" found="yes" @@ -5546,24 +5737,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5573,24 +5766,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5608,29 +5803,31 @@ found="no" CFLAGS="$CFLAGS -Wold-style-definition" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wold-style-definition" >&5 -$as_echo_n "checking if $CC supports -Wold-style-definition... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wold-style-definition" >&5 +printf %s "checking if $CC supports -Wold-style-definition... " >&6; } cacheid=xorg_cv_cc_flag__Wold_style_definition - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -5638,8 +5835,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wold-style-definition" found="yes" @@ -5657,29 +5854,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -fd" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -fd" >&5 -$as_echo_n "checking if $CC supports -fd... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -fd" >&5 +printf %s "checking if $CC supports -fd... " >&6; } cacheid=xorg_cv_cc_flag__fd - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -5687,8 +5886,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -fd" found="yes" @@ -5713,24 +5912,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5740,24 +5941,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5775,29 +5978,31 @@ found="no" CFLAGS="$CFLAGS -Wdeclaration-after-statement" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wdeclaration-after-statement" >&5 -$as_echo_n "checking if $CC supports -Wdeclaration-after-statement... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wdeclaration-after-statement" >&5 +printf %s "checking if $CC supports -Wdeclaration-after-statement... " >&6; } cacheid=xorg_cv_cc_flag__Wdeclaration_after_statement - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -5805,8 +6010,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wdeclaration-after-statement" found="yes" @@ -5835,24 +6040,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5862,24 +6069,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5897,29 +6106,31 @@ found="no" CFLAGS="$CFLAGS -Wunused" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wunused" >&5 -$as_echo_n "checking if $CC supports -Wunused... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wunused" >&5 +printf %s "checking if $CC supports -Wunused... " >&6; } cacheid=xorg_cv_cc_flag__Wunused - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -5927,8 +6138,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wunused" found="yes" @@ -5953,24 +6164,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -5980,24 +6193,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6015,29 +6230,31 @@ found="no" CFLAGS="$CFLAGS -Wuninitialized" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wuninitialized" >&5 -$as_echo_n "checking if $CC supports -Wuninitialized... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wuninitialized" >&5 +printf %s "checking if $CC supports -Wuninitialized... " >&6; } cacheid=xorg_cv_cc_flag__Wuninitialized - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6045,8 +6262,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wuninitialized" found="yes" @@ -6071,24 +6288,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6098,24 +6317,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6133,29 +6354,31 @@ found="no" CFLAGS="$CFLAGS -Wshadow" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wshadow" >&5 -$as_echo_n "checking if $CC supports -Wshadow... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wshadow" >&5 +printf %s "checking if $CC supports -Wshadow... " >&6; } cacheid=xorg_cv_cc_flag__Wshadow - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6163,8 +6386,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wshadow" found="yes" @@ -6189,24 +6412,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6216,24 +6441,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6251,29 +6478,31 @@ found="no" CFLAGS="$CFLAGS -Wmissing-noreturn" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-noreturn" >&5 -$as_echo_n "checking if $CC supports -Wmissing-noreturn... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-noreturn" >&5 +printf %s "checking if $CC supports -Wmissing-noreturn... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_noreturn - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6281,8 +6510,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-noreturn" found="yes" @@ -6307,24 +6536,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6334,24 +6565,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6369,29 +6602,31 @@ found="no" CFLAGS="$CFLAGS -Wmissing-format-attribute" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-format-attribute" >&5 -$as_echo_n "checking if $CC supports -Wmissing-format-attribute... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-format-attribute" >&5 +printf %s "checking if $CC supports -Wmissing-format-attribute... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_format_attribute - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6399,8 +6634,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-format-attribute" found="yes" @@ -6426,24 +6661,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6453,24 +6690,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6488,29 +6727,31 @@ found="no" CFLAGS="$CFLAGS -Wlogical-op" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wlogical-op" >&5 -$as_echo_n "checking if $CC supports -Wlogical-op... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wlogical-op" >&5 +printf %s "checking if $CC supports -Wlogical-op... " >&6; } cacheid=xorg_cv_cc_flag__Wlogical_op - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6518,8 +6759,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wlogical-op" found="yes" @@ -6535,7 +6776,7 @@ $as_echo "$supported" >&6; } # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) -# Turn some warnings into errors, so we don't accidently get successful builds +# Turn some warnings into errors, so we don't accidentally get successful builds # when there are problems that should be fixed. if test "x$SELECTIVE_WERROR" = "xyes" ; then @@ -6556,24 +6797,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6583,24 +6826,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6618,29 +6863,31 @@ found="no" CFLAGS="$CFLAGS -Werror=implicit" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=implicit" >&5 -$as_echo_n "checking if $CC supports -Werror=implicit... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=implicit" >&5 +printf %s "checking if $CC supports -Werror=implicit... " >&6; } cacheid=xorg_cv_cc_flag__Werror_implicit - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6648,8 +6895,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=implicit" found="yes" @@ -6667,29 +6914,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5 -$as_echo_n "checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5 +printf %s "checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; } cacheid=xorg_cv_cc_flag__errwarn_E_NO_EXPLICIT_TYPE_GIVEN__errwarn_E_NO_IMPLICIT_DECL_ALLOWED - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6697,8 +6946,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" found="yes" @@ -6723,24 +6972,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6750,24 +7001,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6785,29 +7038,31 @@ found="no" CFLAGS="$CFLAGS -Werror=nonnull" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=nonnull" >&5 -$as_echo_n "checking if $CC supports -Werror=nonnull... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=nonnull" >&5 +printf %s "checking if $CC supports -Werror=nonnull... " >&6; } cacheid=xorg_cv_cc_flag__Werror_nonnull - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6815,8 +7070,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=nonnull" found="yes" @@ -6841,24 +7096,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6868,24 +7125,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6903,29 +7162,31 @@ found="no" CFLAGS="$CFLAGS -Werror=init-self" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=init-self" >&5 -$as_echo_n "checking if $CC supports -Werror=init-self... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=init-self" >&5 +printf %s "checking if $CC supports -Werror=init-self... " >&6; } cacheid=xorg_cv_cc_flag__Werror_init_self - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -6933,8 +7194,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=init-self" found="yes" @@ -6959,24 +7220,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -6986,24 +7249,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7021,29 +7286,31 @@ found="no" CFLAGS="$CFLAGS -Werror=main" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=main" >&5 -$as_echo_n "checking if $CC supports -Werror=main... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=main" >&5 +printf %s "checking if $CC supports -Werror=main... " >&6; } cacheid=xorg_cv_cc_flag__Werror_main - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7051,8 +7318,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=main" found="yes" @@ -7077,24 +7344,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7104,24 +7373,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7139,29 +7410,31 @@ found="no" CFLAGS="$CFLAGS -Werror=missing-braces" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=missing-braces" >&5 -$as_echo_n "checking if $CC supports -Werror=missing-braces... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=missing-braces" >&5 +printf %s "checking if $CC supports -Werror=missing-braces... " >&6; } cacheid=xorg_cv_cc_flag__Werror_missing_braces - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7169,8 +7442,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=missing-braces" found="yes" @@ -7195,24 +7468,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7222,24 +7497,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7257,29 +7534,31 @@ found="no" CFLAGS="$CFLAGS -Werror=sequence-point" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=sequence-point" >&5 -$as_echo_n "checking if $CC supports -Werror=sequence-point... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=sequence-point" >&5 +printf %s "checking if $CC supports -Werror=sequence-point... " >&6; } cacheid=xorg_cv_cc_flag__Werror_sequence_point - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7287,8 +7566,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=sequence-point" found="yes" @@ -7313,24 +7592,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7340,24 +7621,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7375,29 +7658,31 @@ found="no" CFLAGS="$CFLAGS -Werror=return-type" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=return-type" >&5 -$as_echo_n "checking if $CC supports -Werror=return-type... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=return-type" >&5 +printf %s "checking if $CC supports -Werror=return-type... " >&6; } cacheid=xorg_cv_cc_flag__Werror_return_type - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7405,8 +7690,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=return-type" found="yes" @@ -7424,29 +7709,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5 -$as_echo_n "checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5 +printf %s "checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; } cacheid=xorg_cv_cc_flag__errwarn_E_FUNC_HAS_NO_RETURN_STMT - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7454,8 +7741,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT" found="yes" @@ -7480,24 +7767,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7507,24 +7796,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7542,29 +7833,31 @@ found="no" CFLAGS="$CFLAGS -Werror=trigraphs" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=trigraphs" >&5 -$as_echo_n "checking if $CC supports -Werror=trigraphs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=trigraphs" >&5 +printf %s "checking if $CC supports -Werror=trigraphs... " >&6; } cacheid=xorg_cv_cc_flag__Werror_trigraphs - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7572,8 +7865,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=trigraphs" found="yes" @@ -7598,24 +7891,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7625,24 +7920,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7660,29 +7957,31 @@ found="no" CFLAGS="$CFLAGS -Werror=array-bounds" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=array-bounds" >&5 -$as_echo_n "checking if $CC supports -Werror=array-bounds... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=array-bounds" >&5 +printf %s "checking if $CC supports -Werror=array-bounds... " >&6; } cacheid=xorg_cv_cc_flag__Werror_array_bounds - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7690,8 +7989,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=array-bounds" found="yes" @@ -7716,24 +8015,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7743,24 +8044,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7778,29 +8081,31 @@ found="no" CFLAGS="$CFLAGS -Werror=write-strings" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=write-strings" >&5 -$as_echo_n "checking if $CC supports -Werror=write-strings... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=write-strings" >&5 +printf %s "checking if $CC supports -Werror=write-strings... " >&6; } cacheid=xorg_cv_cc_flag__Werror_write_strings - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7808,8 +8113,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=write-strings" found="yes" @@ -7834,24 +8139,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7861,24 +8168,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7896,29 +8205,31 @@ found="no" CFLAGS="$CFLAGS -Werror=address" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=address" >&5 -$as_echo_n "checking if $CC supports -Werror=address... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=address" >&5 +printf %s "checking if $CC supports -Werror=address... " >&6; } cacheid=xorg_cv_cc_flag__Werror_address - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -7926,8 +8237,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=address" found="yes" @@ -7952,24 +8263,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -7979,24 +8292,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8014,29 +8329,31 @@ found="no" CFLAGS="$CFLAGS -Werror=int-to-pointer-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=int-to-pointer-cast" >&5 -$as_echo_n "checking if $CC supports -Werror=int-to-pointer-cast... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=int-to-pointer-cast" >&5 +printf %s "checking if $CC supports -Werror=int-to-pointer-cast... " >&6; } cacheid=xorg_cv_cc_flag__Werror_int_to_pointer_cast - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8044,8 +8361,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=int-to-pointer-cast" found="yes" @@ -8063,29 +8380,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION" >&5 -$as_echo_n "checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION" >&5 +printf %s "checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; } cacheid=xorg_cv_cc_flag__errwarn_E_BAD_PTR_INT_COMBINATION - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8093,8 +8412,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION" found="yes" @@ -8119,24 +8438,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8146,24 +8467,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8181,29 +8504,31 @@ found="no" CFLAGS="$CFLAGS -Werror=pointer-to-int-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=pointer-to-int-cast" >&5 -$as_echo_n "checking if $CC supports -Werror=pointer-to-int-cast... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=pointer-to-int-cast" >&5 +printf %s "checking if $CC supports -Werror=pointer-to-int-cast... " >&6; } cacheid=xorg_cv_cc_flag__Werror_pointer_to_int_cast - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8211,8 +8536,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=pointer-to-int-cast" found="yes" @@ -8221,8 +8546,8 @@ $as_echo "$supported" >&6; } # Also -errwarn=E_BAD_PTR_INT_COMBINATION else -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&5 -$as_echo "$as_me: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&5 +printf "%s\n" "$as_me: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&2;} @@ -8240,24 +8565,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8267,24 +8594,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8302,29 +8631,31 @@ found="no" CFLAGS="$CFLAGS -Wimplicit" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wimplicit" >&5 -$as_echo_n "checking if $CC supports -Wimplicit... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wimplicit" >&5 +printf %s "checking if $CC supports -Wimplicit... " >&6; } cacheid=xorg_cv_cc_flag__Wimplicit - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8332,8 +8663,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wimplicit" found="yes" @@ -8358,24 +8689,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8385,24 +8718,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8420,29 +8755,31 @@ found="no" CFLAGS="$CFLAGS -Wnonnull" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnonnull" >&5 -$as_echo_n "checking if $CC supports -Wnonnull... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnonnull" >&5 +printf %s "checking if $CC supports -Wnonnull... " >&6; } cacheid=xorg_cv_cc_flag__Wnonnull - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8450,8 +8787,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wnonnull" found="yes" @@ -8476,24 +8813,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8503,24 +8842,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8538,29 +8879,31 @@ found="no" CFLAGS="$CFLAGS -Winit-self" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Winit-self" >&5 -$as_echo_n "checking if $CC supports -Winit-self... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Winit-self" >&5 +printf %s "checking if $CC supports -Winit-self... " >&6; } cacheid=xorg_cv_cc_flag__Winit_self - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8568,8 +8911,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Winit-self" found="yes" @@ -8594,24 +8937,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8621,24 +8966,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8656,29 +9003,31 @@ found="no" CFLAGS="$CFLAGS -Wmain" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmain" >&5 -$as_echo_n "checking if $CC supports -Wmain... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmain" >&5 +printf %s "checking if $CC supports -Wmain... " >&6; } cacheid=xorg_cv_cc_flag__Wmain - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8686,8 +9035,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmain" found="yes" @@ -8712,24 +9061,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8739,24 +9090,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8774,29 +9127,31 @@ found="no" CFLAGS="$CFLAGS -Wmissing-braces" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-braces" >&5 -$as_echo_n "checking if $CC supports -Wmissing-braces... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-braces" >&5 +printf %s "checking if $CC supports -Wmissing-braces... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_braces - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8804,8 +9159,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-braces" found="yes" @@ -8830,24 +9185,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8857,24 +9214,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8892,29 +9251,31 @@ found="no" CFLAGS="$CFLAGS -Wsequence-point" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wsequence-point" >&5 -$as_echo_n "checking if $CC supports -Wsequence-point... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wsequence-point" >&5 +printf %s "checking if $CC supports -Wsequence-point... " >&6; } cacheid=xorg_cv_cc_flag__Wsequence_point - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -8922,8 +9283,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wsequence-point" found="yes" @@ -8948,24 +9309,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -8975,24 +9338,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9010,29 +9375,31 @@ found="no" CFLAGS="$CFLAGS -Wreturn-type" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wreturn-type" >&5 -$as_echo_n "checking if $CC supports -Wreturn-type... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wreturn-type" >&5 +printf %s "checking if $CC supports -Wreturn-type... " >&6; } cacheid=xorg_cv_cc_flag__Wreturn_type - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9040,8 +9407,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wreturn-type" found="yes" @@ -9066,24 +9433,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9093,24 +9462,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9128,29 +9499,31 @@ found="no" CFLAGS="$CFLAGS -Wtrigraphs" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wtrigraphs" >&5 -$as_echo_n "checking if $CC supports -Wtrigraphs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wtrigraphs" >&5 +printf %s "checking if $CC supports -Wtrigraphs... " >&6; } cacheid=xorg_cv_cc_flag__Wtrigraphs - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9158,8 +9531,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wtrigraphs" found="yes" @@ -9184,24 +9557,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9211,24 +9586,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9246,29 +9623,31 @@ found="no" CFLAGS="$CFLAGS -Warray-bounds" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Warray-bounds" >&5 -$as_echo_n "checking if $CC supports -Warray-bounds... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Warray-bounds" >&5 +printf %s "checking if $CC supports -Warray-bounds... " >&6; } cacheid=xorg_cv_cc_flag__Warray_bounds - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9276,8 +9655,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Warray-bounds" found="yes" @@ -9302,24 +9681,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9329,24 +9710,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9364,29 +9747,31 @@ found="no" CFLAGS="$CFLAGS -Wwrite-strings" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wwrite-strings" >&5 -$as_echo_n "checking if $CC supports -Wwrite-strings... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wwrite-strings" >&5 +printf %s "checking if $CC supports -Wwrite-strings... " >&6; } cacheid=xorg_cv_cc_flag__Wwrite_strings - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9394,8 +9779,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wwrite-strings" found="yes" @@ -9420,24 +9805,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9447,24 +9834,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9482,29 +9871,31 @@ found="no" CFLAGS="$CFLAGS -Waddress" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Waddress" >&5 -$as_echo_n "checking if $CC supports -Waddress... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Waddress" >&5 +printf %s "checking if $CC supports -Waddress... " >&6; } cacheid=xorg_cv_cc_flag__Waddress - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9512,8 +9903,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Waddress" found="yes" @@ -9538,24 +9929,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9565,24 +9958,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9600,29 +9995,31 @@ found="no" CFLAGS="$CFLAGS -Wint-to-pointer-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wint-to-pointer-cast" >&5 -$as_echo_n "checking if $CC supports -Wint-to-pointer-cast... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wint-to-pointer-cast" >&5 +printf %s "checking if $CC supports -Wint-to-pointer-cast... " >&6; } cacheid=xorg_cv_cc_flag__Wint_to_pointer_cast - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9630,8 +10027,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wint-to-pointer-cast" found="yes" @@ -9656,24 +10053,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9683,24 +10082,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9718,29 +10119,31 @@ found="no" CFLAGS="$CFLAGS -Wpointer-to-int-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-to-int-cast" >&5 -$as_echo_n "checking if $CC supports -Wpointer-to-int-cast... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-to-int-cast" >&5 +printf %s "checking if $CC supports -Wpointer-to-int-cast... " >&6; } cacheid=xorg_cv_cc_flag__Wpointer_to_int_cast - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9748,8 +10151,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wpointer-to-int-cast" found="yes" @@ -9778,9 +10181,10 @@ fi # Check whether --enable-strict-compilation was given. -if test "${enable_strict_compilation+set}" = set; then : +if test ${enable_strict_compilation+y} +then : enableval=$enable_strict_compilation; STRICT_COMPILE=$enableval -else +else $as_nop STRICT_COMPILE=no fi @@ -9807,24 +10211,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9834,24 +10240,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9869,29 +10277,31 @@ found="no" CFLAGS="$CFLAGS -pedantic" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -pedantic" >&5 -$as_echo_n "checking if $CC supports -pedantic... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -pedantic" >&5 +printf %s "checking if $CC supports -pedantic... " >&6; } cacheid=xorg_cv_cc_flag__pedantic - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -9899,8 +10309,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then STRICT_CFLAGS="$STRICT_CFLAGS -pedantic" found="yes" @@ -9925,24 +10335,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9952,24 +10364,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -9987,29 +10401,31 @@ found="no" CFLAGS="$CFLAGS -Werror" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror" >&5 -$as_echo_n "checking if $CC supports -Werror... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror" >&5 +printf %s "checking if $CC supports -Werror... " >&6; } cacheid=xorg_cv_cc_flag__Werror - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -10017,8 +10433,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then STRICT_CFLAGS="$STRICT_CFLAGS -Werror" found="yes" @@ -10036,29 +10452,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -errwarn" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn" >&5 -$as_echo_n "checking if $CC supports -errwarn... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn" >&5 +printf %s "checking if $CC supports -errwarn... " >&6; } cacheid=xorg_cv_cc_flag__errwarn - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -10066,8 +10484,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then STRICT_CFLAGS="$STRICT_CFLAGS -errwarn" found="yes" @@ -10095,24 +10513,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10122,24 +10542,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -10157,29 +10579,31 @@ found="no" CFLAGS="$CFLAGS -Werror=attributes" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=attributes" >&5 -$as_echo_n "checking if $CC supports -Werror=attributes... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=attributes" >&5 +printf %s "checking if $CC supports -Werror=attributes... " >&6; } cacheid=xorg_cv_cc_flag__Werror_attributes - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -10187,8 +10611,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then STRICT_CFLAGS="$STRICT_CFLAGS -Werror=attributes" found="yes" @@ -10207,6 +10631,8 @@ fi + + cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` _ACEOF @@ -10216,18 +10642,14 @@ _ACEOF PVM="0" fi -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION_MINOR $PVM -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION_MINOR $PVM" >>confdefs.h PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` if test "x$PVP" = "x"; then PVP="0" fi -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION_PATCHLEVEL $PVP -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION_PATCHLEVEL $PVP" >>confdefs.h @@ -10257,11 +10679,12 @@ case $host_os in # Solaris 2.0 - 11.3 use SysV man page section numbers, so we # check for a man page file found in later versions that use # traditional section numbers instead - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5 -$as_echo_n "checking for /usr/share/man/man7/attributes.7... " >&6; } -if ${ac_cv_file__usr_share_man_man7_attributes_7+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5 +printf %s "checking for /usr/share/man/man7/attributes.7... " >&6; } +if test ${ac_cv_file__usr_share_man_man7_attributes_7+y} +then : + printf %s "(cached) " >&6 +else $as_nop test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "/usr/share/man/man7/attributes.7"; then @@ -10270,11 +10693,12 @@ else ac_cv_file__usr_share_man_man7_attributes_7=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5 -$as_echo "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; } -if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5 +printf "%s\n" "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; } +if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes +then : SYSV_MAN_SECTIONS=false -else +else $as_nop SYSV_MAN_SECTIONS=true fi @@ -10369,7 +10793,8 @@ MAN_SUBSTS="\ # Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : +if test ${enable_silent_rules+y} +then : enableval=$enable_silent_rules; fi @@ -10379,12 +10804,13 @@ case $enable_silent_rules in # ((( *) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +printf %s "checking whether $am_make supports nested variables... " >&6; } +if test ${am_cv_make_support_nested_variables+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if printf "%s\n" 'TRUE=$(BAR$(V)) BAR0=false BAR1=true V=1 @@ -10396,8 +10822,8 @@ else am_cv_make_support_nested_variables=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } if test $am_cv_make_support_nested_variables = yes; then AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' @@ -10409,20 +10835,21 @@ AM_BACKSLASH='\' + # Checks for pkg-config packages pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for x11 xt xproto >= 7.0.17" >&5 -$as_echo_n "checking for x11 xt xproto >= 7.0.17... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x11 xt xproto >= 7.0.17" >&5 +printf %s "checking for x11 xt xproto >= 7.0.17... " >&6; } if test -n "$APPRES_CFLAGS"; then pkg_cv_APPRES_CFLAGS="$APPRES_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xt xproto >= 7.0.17\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xt xproto >= 7.0.17\""; } >&5 ($PKG_CONFIG --exists --print-errors "x11 xt xproto >= 7.0.17") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_APPRES_CFLAGS=`$PKG_CONFIG --cflags "x11 xt xproto >= 7.0.17" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -10436,10 +10863,10 @@ if test -n "$APPRES_LIBS"; then pkg_cv_APPRES_LIBS="$APPRES_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xt xproto >= 7.0.17\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 xt xproto >= 7.0.17\""; } >&5 ($PKG_CONFIG --exists --print-errors "x11 xt xproto >= 7.0.17") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_APPRES_LIBS=`$PKG_CONFIG --libs "x11 xt xproto >= 7.0.17" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -10453,8 +10880,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -10480,10 +10907,10 @@ Alternatively, you may set the environment variables APPRES_CFLAGS and APPRES_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -10497,11 +10924,15 @@ See \`config.log' for more details" "$LINENO" 5; } else APPRES_CFLAGS=$pkg_cv_APPRES_CFLAGS APPRES_LIBS=$pkg_cv_APPRES_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi +# Substitute config variables in man pages +ac_config_files="$ac_config_files man/appres.1:man/appres.man" + + ac_config_files="$ac_config_files Makefile man/Makefile" cat >confcache <<\_ACEOF @@ -10531,8 +10962,8 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -10562,15 +10993,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +printf "%s\n" "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -10584,8 +11015,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;} fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -10602,7 +11033,7 @@ U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -10613,14 +11044,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 -$as_echo_n "checking that generated files are newer than configure... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +printf %s "checking that generated files are newer than configure... " >&6; } if test -n "$am_sleep_pid"; then # Hide warnings about reused PIDs. wait $am_sleep_pid 2>/dev/null fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 -$as_echo "done" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5 +printf "%s\n" "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -10646,8 +11077,8 @@ fi ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -10670,14 +11101,16 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -10687,46 +11120,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -10735,13 +11168,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -10750,8 +11176,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -10763,30 +11193,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # as_fn_error STATUS ERROR [LINENO LOG_FD] @@ -10799,13 +11209,14 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -10832,18 +11243,20 @@ as_fn_unset () { eval $1=; unset $1;} } as_unset=as_fn_unset + # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -10855,12 +11268,13 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` @@ -10891,7 +11305,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -10913,6 +11327,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -10926,6 +11344,12 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -10967,7 +11391,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -10976,7 +11400,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -11038,8 +11462,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by appres $as_me 1.0.6, which was -generated by GNU Autoconf 2.69. Invocation command line was +This file was extended by appres $as_me 1.0.7, which was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -11101,14 +11525,16 @@ $config_commands Report bugs to ." _ACEOF +ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` +ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -appres config.status 1.0.6 -configured by $0, generated by GNU Autoconf 2.69, +appres config.status 1.0.7 +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -11148,15 +11574,15 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; + printf "%s\n" "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; + printf "%s\n" "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -11164,7 +11590,7 @@ do --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; @@ -11173,7 +11599,7 @@ do as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; + printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; @@ -11201,7 +11627,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -11215,7 +11641,7 @@ exec 5>>config.log sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - $as_echo "$ac_log" + printf "%s\n" "$ac_log" } >&5 _ACEOF @@ -11235,6 +11661,7 @@ do case $ac_config_target in "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "man/appres.1") CONFIG_FILES="$CONFIG_FILES man/appres.1:man/appres.man" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; @@ -11248,9 +11675,9 @@ done # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands + test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files + test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers + test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands fi # Have a temporary directory for convenience. Make it in the build tree @@ -11586,7 +12013,7 @@ do esac || as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done @@ -11594,17 +12021,17 @@ do # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +printf "%s\n" "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | + ac_sed_conf_input=`printf "%s\n" "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -11621,7 +12048,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | +printf "%s\n" X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -11645,9 +12072,9 @@ $as_echo X"$ac_file" | case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -11709,8 +12136,8 @@ ac_sed_dataroot=' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -11754,9 +12181,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -11772,20 +12199,20 @@ which seems to be undefined. Please make sure it is defined" >&2;} # if test x"$ac_file" != x-; then { - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi @@ -11805,7 +12232,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$_am_arg" : 'X\(//\)[^/]' \| \ X"$_am_arg" : 'X\(//\)$' \| \ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$_am_arg" | +printf "%s\n" X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -11825,8 +12252,8 @@ $as_echo X"$_am_arg" | s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -$as_echo "$as_me: executing $ac_file commands" >&6;} + :C) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +printf "%s\n" "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -11858,7 +12285,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | +printf "%s\n" X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -11900,7 +12327,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | +printf "%s\n" X"$file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -11959,7 +12386,7 @@ if test "$no_create" != yes; then $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi diff --git a/app/appres/configure.ac b/app/appres/configure.ac index bd4bcf8b..e92c02af 100644 --- a/app/appres/configure.ac +++ b/app/appres/configure.ac @@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure. # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([appres], [1.0.6], +AC_INIT([appres], [1.0.7], [https://gitlab.freedesktop.org/xorg/app/appres/issues], [appres]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([config.h]) @@ -40,6 +40,9 @@ XORG_DEFAULT_OPTIONS # Checks for pkg-config packages PKG_CHECK_MODULES(APPRES, [x11 xt xproto >= 7.0.17]) +# Substitute config variables in man pages +AC_CONFIG_FILES([man/appres.1:man/appres.man]) + AC_CONFIG_FILES([ Makefile man/Makefile]) diff --git a/app/appres/install-sh b/app/appres/install-sh index 377bb868..ec298b53 100644 --- a/app/appres/install-sh +++ b/app/appres/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2020-11-14.01; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,22 +64,16 @@ mvprog=${MVPROG-mv} rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. mode=0755 +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -97,7 +87,7 @@ dir_arg= dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -114,18 +104,28 @@ Options: --version display version info and exit. -c (ignored) - -C install only if different (preserve the last data modification time) + -C install only if different (preserve data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. + +If -S is not specified, no backups are attempted. + +Email bug reports to bug-automake@gnu.org. +Automake home page: https://www.gnu.org/software/automake/ " while test $# -ne 0; do @@ -137,46 +137,62 @@ while test $# -ne 0; do -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; + + -p) cpprog="$cpprog -p";; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -S) backupsuffix="$2" + shift;; - -T) no_target_directory=true;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; + + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -207,6 +223,15 @@ if test $# -eq 0; then exit 0 fi +if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 @@ -223,16 +248,16 @@ if test -z "$dir_arg"; then *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -250,6 +275,10 @@ do dstdir=$dst test -d "$dstdir" dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -266,178 +295,148 @@ do fi dst=$dst_arg - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. + # If destination is a directory, append the input filename. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst - dst=$dstdir/`basename "$src"` + dstbase=`basename "$src"` + case $dst in + */) dst=$dst$dstbase;; + *) dst=$dst/$dstbase;; + esac dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi fi + case $dstdir in + */) dstdirslash=$dstdir;; + *) dstdirslash=$dstdir/;; + esac + obsolete_mkdir_used=false if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac + posix_mkdir=false + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" else - mkdir_mode= + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + trap '' 0;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else - # The umask is ridiculous, or mkdir does not conform to POSIX, + # mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -450,14 +449,25 @@ do else # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ + dsttmp=${dstdirslash}_inst.$$_ + rmtmp=${dstdirslash}_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -472,20 +482,24 @@ do # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then rm -f "$dsttmp" else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -493,24 +507,24 @@ do # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 @@ -519,9 +533,9 @@ do done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/app/appres/man/Makefile.am b/app/appres/man/Makefile.am index 76a8224f..0c8ce755 100644 --- a/app/appres/man/Makefile.am +++ b/app/appres/man/Makefile.am @@ -5,8 +5,3 @@ appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) EXTRA_DIST = $(appman_PRE) CLEANFILES = $(appman_DATA) -SUFFIXES = .$(APP_MAN_SUFFIX) .man - -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ diff --git a/app/appres/man/Makefile.in b/app/appres/man/Makefile.in index d1aac19d..977c5e57 100644 --- a/app/appres/man/Makefile.in +++ b/app/appres/man/Makefile.in @@ -52,14 +52,14 @@ build_triplet = @build@ host_triplet = @host@ subdir = man DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(top_srcdir)/mkinstalldirs + $(srcdir)/appres.man $(top_srcdir)/mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = appres.1 CONFIG_CLEAN_VPATH_FILES = AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -128,7 +128,6 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CHANGELOG_CMD = @CHANGELOG_CMD@ -CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CWARNFLAGS = @CWARNFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -139,11 +138,9 @@ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ -EGREP = @EGREP@ EXEEXT = @EXEEXT@ FILE_MAN_DIR = @FILE_MAN_DIR@ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@ -GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_CMD = @INSTALL_CMD@ INSTALL_DATA = @INSTALL_DATA@ @@ -237,11 +234,9 @@ appman_PRE = appres.man appman_DATA = $(appman_PRE:man=$(APP_MAN_SUFFIX)) EXTRA_DIST = $(appman_PRE) CLEANFILES = $(appman_DATA) -SUFFIXES = .$(APP_MAN_SUFFIX) .man all: all-am .SUFFIXES: -.SUFFIXES: .$(APP_MAN_SUFFIX) .man $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -272,6 +267,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +appres.1: $(top_builddir)/config.status $(srcdir)/appres.man + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-appmanDATA: $(appman_DATA) @$(NORMAL_INSTALL) @list='$(appman_DATA)'; test -n "$(appmandir)" || list=; \ @@ -450,10 +447,6 @@ uninstall-am: uninstall-appmanDATA pdf-am ps ps-am uninstall uninstall-am uninstall-appmanDATA -# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure -.man.$(APP_MAN_SUFFIX): - $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ - # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/appres/man/appres.man b/app/appres/man/appres.man index 10ec801b..8e78a9d2 100644 --- a/app/appres/man/appres.man +++ b/app/appres/man/appres.man @@ -22,7 +22,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.TH APPRES 1 __xorgversion__ +.TH APPRES 1 "@PACKAGE_STRING@" "@XORG_MAN_PAGE@" .SH NAME appres \- list X application resource database .SH SYNOPSIS @@ -86,6 +86,6 @@ will list the resources matching the \fIxterm\fP vt100 widget. The -V option prints the appres command version and exits. .SH "SEE ALSO" .PP -X(__miscmansuffix__), xrdb(__appmansuffix__), listres(__appmansuffix__) +X(@MISC_MAN_SUFFIX@), xrdb(@APP_MAN_SUFFIX@), listres(@APP_MAN_SUFFIX@) .SH AUTHOR Jim Fulton, MIT X Consortium diff --git a/app/appres/meson.build b/app/appres/meson.build new file mode 100644 index 00000000..bf11979d --- /dev/null +++ b/app/appres/meson.build @@ -0,0 +1,40 @@ +project('appres', 'c', + version : '1.0.7', + license : 'MIT', + default_options: ['warning_level=3'], +) + +cc = meson.get_compiler('c') + +prefix = get_option('prefix') + +package_string = '@0@ @1@'.format(meson.project_name(), meson.project_version()) + +conf_data = configuration_data() +conf_data.set('PACKAGE_STRING', '"@0@"'.format(package_string)) +configure_file(output : 'config.h', configuration : conf_data) +add_global_arguments('-DHAVE_CONFIG_H', language : 'c') + +x11_dep = dependency('x11', required: true) +xmuu_dep = dependency('xt', required: true) +xproto_dep = dependency('xproto', required: true, version: '>= 7.0.17') + +sources = ['appres.c'] +executable('appres', sources, + dependencies: [x11_dep, xmuu_dep, xproto_dep], + install: true) + +man = join_paths(prefix, get_option('mandir')) + +man_conf = configuration_data() +man_conf.set('PACKAGE_STRING', package_string) +man_conf.set('APP_MAN_SUFFIX', '1') +man_conf.set('MISC_MAN_SUFFIX', '7') +man_conf.set('XORG_MAN_PAGE', 'X Version 11') + +install_man(configure_file( + input: 'man/appres.man', + output: 'appres.1', + install_dir: join_paths(man, 'man1'), + configuration: man_conf +)) diff --git a/dist/libxcb/ChangeLog b/dist/libxcb/ChangeLog index 8722e5a5..fb827566 100644 --- a/dist/libxcb/ChangeLog +++ b/dist/libxcb/ChangeLog @@ -1,3 +1,444 @@ +commit 622152ee42a310876f10602601206954b8d0613e +Author: Matt Turner +Date: Fri Apr 12 12:35:55 2024 -0400 + + libxcb 1.17.0 + +commit 4574ab269b082bf412e1b6fb5f09daf8134acd0b +Author: Matt Turner +Date: Fri Apr 12 12:35:32 2024 -0400 + + configure.ac: Require xcb-proto >= 1.17.0 + + Signed-off-by: Matt Turner + +commit b78d304531bfe2359baf40db06099d9158d398d4 +Author: Uli Schlachter +Date: Sun Sep 17 12:43:43 2023 +0200 + + Always write C code in UTF-8 + + Some people apparently use non-utf8 locales and this caused errors when + xcb-proto started using some "fancy" quote marks. Fix this by always + using utf8 encoding. + + Fixes: https://gitlab.freedesktop.org/xorg/lib/libxcb/-/issues/72 + Signed-off-by: Uli Schlachter + +commit 389f22d1cb53e47337e96d9f78a3ef0001e8e588 +Author: Erik Kurzinger +Date: Wed Mar 20 07:06:01 2024 -0700 + + Add xcb-dri3 dependency to xcb-present.pc.in + + Present version 1.4 introduces a dependency on DRI3 for the DRI3Syncobj + protocol type. + + Signed-off-by: Erik Kurzinger + +commit 86a478032ba93f30adbc0ce96eecd3420fdf7ed1 +Author: Alan Coopersmith +Date: Sat Mar 2 12:01:54 2024 -0800 + + xcb_popcount: Use __builtin_popcount if compiler supports it + + If the compiler knows of a better implementation for counting the number + of bits set in a word for the target CPU, let it use that, instead of the + classic algorithm optimized for PDP-6. + + Signed-off-by: Alan Coopersmith + +commit c268499c305317d2e9a67cc590c9147e11438fc7 +Author: Alan Coopersmith +Date: Sat Mar 2 11:47:47 2024 -0800 + + tests: fix -Werror=discarded-qualifiers errors in check_public.c + + check_public.c: In function ‘parse_display_pass’: + check_public.c:32:32: error: passing argument 1 of ‘putenv’ discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] + 32 | putenv("DISPLAY="); + | ^~~~~~~~~~ + In file included from check_public.c:4: + /usr/include/stdlib.h:148:19: note: expected ‘char *’ but argument is of type ‘const char *’ + 148 | extern int putenv(char *); + | ^~~~~~ + check_public.c:57:16: error: passing argument 1 of ‘putenv’ discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] + 57 | putenv("DISPLAY="); + | ^~~~~~~~~~ + /usr/include/stdlib.h:148:19: note: expected ‘char *’ but argument is of type ‘const char *’ + 148 | extern int putenv(char *); + | ^~~~~~ + check_public.c: In function ‘parse_display_fail’: + check_public.c:73:32: error: passing argument 1 of ‘putenv’ discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] + 73 | putenv("DISPLAY="); + | ^~~~~~~~~~ + /usr/include/stdlib.h:148:19: note: expected ‘char *’ but argument is of type ‘const char *’ + 148 | extern int putenv(char *); + | ^~~~~~ + check_public.c:99:16: error: passing argument 1 of ‘putenv’ discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] + 99 | putenv("DISPLAY="); + | ^~~~~~~~~~ + /usr/include/stdlib.h:148:19: note: expected ‘char *’ but argument is of type ‘const char *’ + 148 | extern int putenv(char *); + | ^~~~~~ + check_public.c: In function ‘public_suite’: + check_public.c:244:16: error: passing argument 1 of ‘putenv’ discards ‘const’ qualifier from pointer target type [-Werror=discarded-qualifiers] + 244 | putenv("DISPLAY="); + | ^~~~~~~~~~ + /usr/include/stdlib.h:148:19: note: expected ‘char *’ but argument is of type ‘const char *’ + 148 | extern int putenv(char *); + | ^~~~~~ + cc1: all warnings being treated as errors + + Signed-off-by: Alan Coopersmith + +commit c671b9b30aecada4e43cb48e0dee46d19fb5cb9c +Author: Alan Coopersmith +Date: Sat Mar 2 11:13:37 2024 -0800 + + libxcb 1.16.1 + + Signed-off-by: Alan Coopersmith + +commit 3c946010c8521497b0fba2c8bc9bde184622345a +Author: Fergus Dall +Date: Tue Nov 7 17:42:42 2023 +1100 + + Enable large file support + + Signed-off-by: Fergus Dall + +commit 02a7bbed391859c79864b9aacf040d84f103d38a +Author: Peter Williams +Date: Thu Aug 24 21:50:29 2023 -0400 + + Fix compilation on Windows + + Merge request !30 broke compilation on Windows by introducing unbalanced + curly braces. This change restores the previous behavior on Windows: + only TCP is supported. + +commit 18c3f055e7c02db6f15ae56f6995639635d1b055 +Author: Alan Coopersmith +Date: Sun Aug 20 11:34:31 2023 -0700 + + gitlab CI: use latest xcbproto from git to build against + + Closes issue #70 + + Signed-off-by: Alan Coopersmith + +commit 453115f7eeb694de9f41ea842a29bbb31b90c8dd +Author: Thomas Klausner +Date: Sat Aug 19 19:34:51 2023 +0200 + + configure.ac: drop `pthread-stubs` dependency on NetBSD + +commit f11691a09893d2329948521e32a18c13b0b03d01 +Author: Alan Coopersmith +Date: Sun Aug 20 10:22:19 2023 -0700 + + gitlab CI: regenerate container used for builds + + This updates the included xcb-proto to the newly required 1.16. + As explained in issue #70, this is a quick workaround, not the + long-term fix for this problem. + + Signed-off-by: Alan Coopersmith + +commit cc4b93c9cd93bad15b7106747b0213e4b9c53a1c +Author: Matt Turner +Date: Wed Aug 16 16:09:50 2023 -0400 + + libxcb 1.16 + + Signed-off-by: Matt Turner + +commit 1519334652837cb7b2a8f8117628ea3cc744f7cb +Author: Matt Turner +Date: Wed Aug 16 16:08:46 2023 -0400 + + configure.ac: Require xcb-proto >= 1.16.0 + + Signed-off-by: Matt Turner + +commit 038636786ad1914f3daf3503ae9611f40dffbb8f +Author: Ilya Pominov +Date: Sun Apr 2 11:35:16 2023 +0300 + + c_client: Fix crash in xcb_randr_set_monitor + + Take into account c_need_sizeof when evaluating + xcb_protocol_request_t.count + + Incorrect xcb_protocol_request_t.count causes a segmentation fault when + calling functions: + - xcb_randr_set_monitor{_checked} + - xcb_input_change_feedback_control{_checked} + - xcb_input_change_device_control{_unchecked} + + Steps to reproduce: + Call xcb_randr_set_monitor() with valid arguments + + OBSERVED RESULT + Segmentation fault + ``` + Process terminating with default action of signal 11 (SIGSEGV) + Access not within mapped region at address 0x780 + at 0x4852925: memmove (in /usr/libexec/valgrind/vgpreload_memcheck- + amd64-linux.so) + by 0x486967C: memcpy (string_fortified.h:29) + by 0x486967C: send_request (xcb_out.c:59) + by 0x486967C: send_request (xcb_out.c:46) + by 0x486967C: xcb_send_request_with_fds64 (xcb_out.c:338) + by 0x48699FC: xcb_send_request (xcb_out.c:359) + by 0x4891F11: xcb_randr_set_monitor_checked (randr.c:5350) + ``` + + EXPECTED RESULT + Function returns cookie + + Amend: 77b594f9583ea0247ff27130316d8e045da7f921 + + Signed-off-by: Ilya Pominov + +commit 8935793f1f3751a6aa9d78955c7d6236177986de +Author: Demi Marie Obenour +Date: Sat Mar 25 15:27:33 2023 -0400 + + Add tests for unix socket parsing + + Signed-off-by: Demi Marie Obenour + +commit 095255531b90f0b442e6ca41fb3752a058562d07 +Author: Demi Marie Obenour +Date: Fri Aug 12 22:02:02 2022 -0400 + + DISPLAY starting with / or unix: is always a socket path + + If DISPLAY starts with / or unix:, do not check for anything but a full + filesystem socket path. In particular, abstract AF_UNIX sockets and TCP + sockets will not be used in this case. Also be stricter about parsing + the screen part of /path.screen displays, and bail out after all stat() + errors other than ENOENT. + + Signed-off-by: Demi Marie Obenour + +commit ccdef1a8a5b6956a3fb7115d634db213433dca75 +Author: Demi Marie Obenour +Date: Sun Jul 3 17:57:11 2022 -0400 + + Allow full paths to sockets on non-macOS + + When combined with xorg/lib/libxtrans!7, this allows CVE-2020-25697 to + be mitigated by placing the AF_UNIX socket in a secure directory on the + filesystem. + + This enables HAVE_LAUNCHD unconditionally and deletes the configure + switch. + + Signed-off-by: Demi Marie Obenour + +commit 18e109d755c5ce18157fdabb6de8ee6845b348ff +Author: Matthieu Herrb +Date: Tue Feb 28 14:19:21 2023 +0100 + + Fix xcb_connect() call with a custom xcb_auth_info_t + + If the function implementing xcb_connect is called directly with a + custom xcb_auth_info_t then checking that the screen in $DISPLAY + is valid is skipped. + + Reported by chohag AT jtan DOT com + + Signed-off-by: Matthieu Herrb + +commit fd04ab24a5e99d53874789439d3ffb0eb82574f7 +Author: Jan Beich +Date: Fri Feb 10 14:16:20 2023 +0000 + + configure.ac: drop `pthread-stubs` dependency on DragonFly and FreeBSD + + All `pthread_*` symbols used by libxcb have stubs in libc. So, stop + linking against libpthread. + +commit 4d1a578dd5348909ade2a853d806272326d228d7 +Author: Alan Coopersmith +Date: Thu Feb 9 14:56:38 2023 -0800 + + Raise minimum required version of Python from 2.6 to 3.0 + + Trying to build with Python 2.7.14 fails with: + File "./c_client.py", line 2270 + key = (*self.name[:-1], field.enum) + ^ + SyntaxError: invalid syntax + + Fixes: 33f3dbe ("Fix handling of documented enum parameters") + Signed-off-by: Alan Coopersmith + +commit e2a3e80eb837eaaa834a01a2741d4c249c984442 +Author: Alan Coopersmith +Date: Mon Feb 6 15:48:49 2023 -0800 + + configure.ac: Remove obsolete AC_HEADER_STDC + + Nothing checks for the STDC_HEADERS flag this set, and all supported + systems have C89 compatible headers now. + + Clears autoconf warnings of: + configure.ac:93: warning: The macro `AC_HEADER_STDC' is obsolete. + configure.ac:93: You should run autoupdate. + ./lib/autoconf/headers.m4:704: AC_HEADER_STDC is expanded from... + configure.ac:93: the top level + + Signed-off-by: Alan Coopersmith + +commit 3333d5bde8baaca8981e806ef86b74f4adb77ba7 +Author: Daniel G +Date: Mon Jan 9 16:21:35 2023 +0000 + + Fix indentation. + +commit 973b510e954f6989ed773f8b357ca50fbc99bced +Author: Daniel G +Date: Sat Jan 7 19:35:47 2023 +0000 + + Fix windows build. + +commit cb8c70f5a65b4bd68b449dcaa637c3c4753e2f81 +Author: Jeremy Huddleston Sequoia +Date: Sat Nov 26 14:55:07 2022 -0800 + + xcb_conn: Add a check for NULL to silence a UBSan runtime error + + xcb_conn.c:314:60: runtime error: applying zero offset to null pointer + + Signed-off-by: Jeremy Huddleston Sequoia + +commit 33f3dbe3699a92e8ca18f470adac456e0b935e75 +Author: Demi Marie Obenour +Date: Sun Oct 16 01:50:53 2022 -0400 + + Fix handling of documented enum parameters + + Previously this would crash the code generator. + + Signed-off-by: Demi Marie Obenour + +commit c9513aac2d78808f63b83d71072c2c483b20162d +Author: Demi Marie Obenour +Date: Sat Aug 28 12:25:05 2021 -0400 + + Fix a compiler warning + + The warning is harmless but annoying. + + Signed-off-by: Demi Marie Obenour + +commit 06e1ef43bbb8c84fc243fa6a53c81147a3a24273 +Author: Alan Coopersmith +Date: Tue Oct 4 11:30:09 2022 -0700 + + configure.ac: drop dependency `pthread-stubs` on Solaris + + On Solaris 10 and later, the pthread functions are directly in libc, + and libpthread only has metadata to redirect calls from it to the + libc functions. + + On Solaris 9 and older (no longer supported), libc contained its own + thread stubs that libpthread then overrode. + + Signed-off-by: Alan Coopersmith + +commit d53ad60d774176c5b057e2ed4d03a4658ee13690 +Author: PaperChalice +Date: Sat Aug 13 13:11:10 2022 +0800 + + configure.ac: drop dependency `pthread-stubs` on macOS + + `libpthread.dylib` on macOS is an alias of `libSystem.B.dylib`, + every program should link against `libSystem.B.dylib`. + +commit e2ee5aabe9f731b7231b0d4a5a21367d1aced6ed +Author: Uli Schlachter +Date: Wed Sep 14 14:53:35 2022 +0200 + + Improve tutorial example + + This tutorial example only handles XCB_EXPOSURE and XCB_KEY_RELEASE + events and ignores everything else. Thus, there is no point in asking + for more kinds of events. + + A while ago, I ported this tutorial to x11rb [1]. Recently, I received a + pull request [2] removing these unnecessary event masks. This commit is + thus only partially by me and the 'issue' was originally found by the + author of [2]. + + [1]: https://github.com/psychon/x11rb/blob/master/x11rb/examples/tutorial.rs + [2]: https://github.com/psychon/x11rb/pull/754 + + Signed-off-by: Uli Schlachter + +commit 9dcb08170898d3bd5ddb3bc26c514a6bfccf3fae +Author: Mihail Konev +Date: Thu Jan 26 13:52:49 2017 +1000 + + autogen: add default patch prefix + + Signed-off-by: Mihail Konev + Signed-off-by: Alan Coopersmith + +commit 7d798d3ccbe537f2f102665447ec3e15a8cdb1a1 +Author: Emil Velikov +Date: Mon Mar 9 12:00:52 2015 +0000 + + autogen.sh: use quoted string variables + + Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent + fall-outs, when they contain space. + + Signed-off-by: Emil Velikov + Reviewed-by: Peter Hutterer + Signed-off-by: Peter Hutterer + Signed-off-by: Alan Coopersmith + +commit 7071b4a13c1e4df13b138748feebadc17fe2522b +Author: Peter Hutterer +Date: Tue Jan 24 10:32:07 2017 +1000 + + autogen.sh: use exec instead of waiting for configure to finish + + Syncs the invocation of configure with the one from the server. + + Signed-off-by: Peter Hutterer + Reviewed-by: Emil Velikov + Signed-off-by: Alan Coopersmith + +commit ee60239b7308f98a7a32e2a567681e00c6b652f5 +Author: Alan Coopersmith +Date: Mon Jul 18 17:55:43 2022 -0700 + + gitlab CI: add a basic build test + + Signed-off-by: Alan Coopersmith + +commit 3123dfe723648c5abeab429e7cb4bd194ceeb8f6 +Author: Mike Sharov +Date: Wed Jun 22 10:56:37 2022 -0400 + + Require xcb-proto >= 1.15.1, which has Dbe + + Signed-off-by: Mike Sharov + +commit 816407655f75cf8ae505432cb743c316e009679d +Author: Mike Sharov +Date: Thu Jun 2 13:27:48 2022 -0400 + + Build DOUBLE-BUFFER extension. + + Signed-off-by: Mike Sharov + commit c2c4a2cd1947e559718acdba19ef6e7db731dbeb Author: Matt Turner Date: Tue May 3 15:09:54 2022 -0700 diff --git a/dist/libxcb/Makefile.am b/dist/libxcb/Makefile.am index fbf6e048..499c652f 100644 --- a/dist/libxcb/Makefile.am +++ b/dist/libxcb/Makefile.am @@ -12,6 +12,9 @@ endif if BUILD_DAMAGE pkgconfig_DATA += xcb-damage.pc endif +if BUILD_DBE +pkgconfig_DATA += xcb-dbe.pc +endif if BUILD_DPMS pkgconfig_DATA += xcb-dpms.pc endif diff --git a/dist/libxcb/autogen.sh b/dist/libxcb/autogen.sh index fc34bd55..cb039471 100644 --- a/dist/libxcb/autogen.sh +++ b/dist/libxcb/autogen.sh @@ -1,14 +1,17 @@ #! /bin/sh -srcdir=`dirname $0` +srcdir=`dirname "$0"` test -z "$srcdir" && srcdir=. ORIGDIR=`pwd` -cd $srcdir +cd "$srcdir" autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? +cd "$ORIGDIR" || exit $? + +git config --local --get format.subjectPrefix >/dev/null 2>&1 || + git config --local format.subjectPrefix "PATCH libxcb" if test -z "$NOCONFIGURE"; then - $srcdir/configure "$@" + exec "$srcdir"/configure "$@" fi diff --git a/dist/libxcb/configure.ac b/dist/libxcb/configure.ac index 4198a508..4e6f028f 100644 --- a/dist/libxcb/configure.ac +++ b/dist/libxcb/configure.ac @@ -2,8 +2,8 @@ dnl Process this file with autoconf to produce a configure script. # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([libxcb],[1.15], - [https://gitlab.freedesktop.org/xorg/lib/libxcb/issues], +AC_INIT([libxcb],[1.17.0], + [https://gitlab.freedesktop.org/xorg/lib/libxcb/-/issues], [libxcb]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) @@ -12,12 +12,13 @@ AC_CONFIG_HEADERS([src/config.h]) # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-xz]) -AM_PATH_PYTHON([2.6]) +AM_PATH_PYTHON([3.0]) # Set common system defines for POSIX extensions, such as _GNU_SOURCE # Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL) # to avoid autoconf errors. AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE # Initialize libtool LT_PREREQ([2.2]) @@ -50,10 +51,10 @@ fi AC_SUBST(HTML_CHECK_RESULT) # Checks for pkg-config packages -PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.14) +PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.17.0) NEEDED="xau >= 0.99.2" case $host_os in -linux*) ;; +linux*|darwin*|solaris*|dragonfly*|freebsd*|netbsd*) ;; *) NEEDED="$NEEDED pthread-stubs" ;; esac PKG_CHECK_MODULES(NEEDED, $NEEDED) @@ -90,7 +91,6 @@ XCBPROTO_XCBPYTHONDIR=`$PKG_CONFIG --variable=pythondir xcb-proto` AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR) AC_SUBST(XCBPROTO_XCBPYTHONDIR) -AC_HEADER_STDC AC_SEARCH_LIBS(getaddrinfo, socket) AC_SEARCH_LIBS(connect, socket) @@ -221,6 +221,7 @@ esac XCB_EXTENSION(Composite, yes) XCB_EXTENSION(Damage, yes) +XCB_EXTENSION(Dbe, yes) XCB_EXTENSION(DPMS, yes) XCB_EXTENSION(DRI2, yes) XCB_EXTENSION(DRI3, $have_sendmsg) @@ -247,16 +248,6 @@ XCB_EXTENSION(XTest, yes) XCB_EXTENSION(Xv, yes) XCB_EXTENSION(XvMC, yes) -AC_ARG_WITH(launchd, AS_HELP_STRING([--with-launchd], [Build with support for Apple's launchd (default: auto)]), [LAUNCHD=$withval], [LAUNCHD=auto]) -if test "x$LAUNCHD" = xauto; then - unset LAUNCHD - AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no], [$PATH$PATH_SEPARATOR/sbin]) -fi - -if test "x$LAUNCHD" = xyes ; then - AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available]) -fi - AC_ARG_WITH(serverside-support, AS_HELP_STRING([--with-serverside-support], [Build with support for server-side usage of xcb. This is still EXPERIMENTAL! ABI/API may change! (default: no)]), [XCB_SERVERSIDE_SUPPORT=$withval], [XCB_SERVERSIDE_SUPPORT=no]) AM_CONDITIONAL(XCB_SERVERSIDE_SUPPORT, test "x$XCB_SERVERSIDE_SUPPORT" = "xyes") @@ -273,6 +264,7 @@ AC_CONFIG_FILES([ xcb.pc xcb-composite.pc xcb-damage.pc +xcb-dbe.pc xcb-dpms.pc xcb-dri2.pc xcb-dri3.pc @@ -321,6 +313,7 @@ echo "" echo " X11 extensions" echo " Composite...........: ${BUILD_COMPOSITE}" echo " Damage..............: ${BUILD_DAMAGE}" +echo " Dbe.................: ${BUILD_DBE}" echo " Dpms................: ${BUILD_DPMS}" echo " Dri2................: ${BUILD_DRI2}" echo " Dri3................: ${BUILD_DRI3}" diff --git a/dist/libxcb/doc/tutorial/index.html b/dist/libxcb/doc/tutorial/index.html index ea083374..1bc9f2e6 100644 --- a/dist/libxcb/doc/tutorial/index.html +++ b/dist/libxcb/doc/tutorial/index.html @@ -2297,9 +2297,7 @@ int main () values[0] = screen->white_pixel; values[1] = XCB_EVENT_MASK_KEY_RELEASE | - XCB_EVENT_MASK_BUTTON_PRESS | - XCB_EVENT_MASK_EXPOSURE | - XCB_EVENT_MASK_POINTER_MOTION; + XCB_EVENT_MASK_EXPOSURE; cookie_window = xcb_create_window_checked (c, screen->root_depth, window, screen->root, diff --git a/dist/libxcb/m4/libtool.m4 b/dist/libxcb/m4/libtool.m4 index 7d7f6ff6..3e165ceb 100644 --- a/dist/libxcb/m4/libtool.m4 +++ b/dist/libxcb/m4/libtool.m4 @@ -1,6 +1,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -31,7 +32,7 @@ m4_define([_LT_COPYING], [dnl # along with this program. If not, see . ]) -# serial 58 LT_INIT +# serial 59 LT_INIT # LT_PREREQ(VERSION) @@ -181,6 +182,7 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_DECL_FILECMD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl @@ -219,8 +221,8 @@ esac ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -778,7 +780,7 @@ _LT_EOF # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -1042,8 +1044,8 @@ int forced_loaded() { return 2;} _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1067,17 +1069,12 @@ _LT_EOF _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[[012]][[,.]]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*|11.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[[012]],*|,*powerpc*-darwin[[5-8]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -1126,12 +1123,12 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], output_verbose_link_cmd=func_echo_all _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], [ if test yes != "$lt_cv_apple_cc_single_mod"; then _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1245,7 +1242,8 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) # _LT_WITH_SYSROOT # ---------------- AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) +[m4_require([_LT_DECL_SED])dnl +AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], [AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], [Search for dependent libraries within DIR (or the compiler's sysroot @@ -1262,7 +1260,7 @@ case $with_sysroot in #( fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -1292,7 +1290,7 @@ ia64-*-hpux*) # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -1309,7 +1307,7 @@ ia64-*-hpux*) echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -1321,7 +1319,7 @@ ia64-*-hpux*) ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -1343,7 +1341,7 @@ mips64*-*linux*) echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then emul=elf - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -1351,7 +1349,7 @@ mips64*-*linux*) emul="${emul}64" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -1359,7 +1357,7 @@ mips64*-*linux*) emul="${emul}ltsmip" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -1379,14 +1377,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -1454,7 +1452,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -1493,9 +1491,22 @@ need_locks=$enable_libtool_lock m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} -: ${AR_FLAGS=cru} _LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. + +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS +_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. +_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}], + [Flags to create an archive]) AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], [lt_cv_ar_at_file=no @@ -1708,18 +1719,13 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; - mint*) - # On MiNT this can take a long time and run out of memory. - lt_cv_sys_max_cmd_len=8192; - ;; - amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd* | secbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd* | secbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1762,7 +1768,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[ ]]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -2212,26 +2218,35 @@ m4_defun([_LT_CMD_STRIPLIB], striplib= old_striplib= AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) +if test -z "$STRIP"; then + AC_MSG_RESULT([no]) else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP"; then + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) - else + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac + ;; + esac + fi fi _LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) _LT_DECL([], [striplib], [1]) @@ -2554,7 +2569,7 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; @@ -2564,14 +2579,14 @@ m4_if([$1], [],[ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -2590,7 +2605,7 @@ m4_if([$1], [],[ done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -2627,7 +2642,7 @@ m4_if([$1], [],[ ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -2660,7 +2675,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -3472,7 +3487,7 @@ beos*) bsdi[[45]]*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -3506,14 +3521,14 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|SecBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -3527,7 +3542,7 @@ haiku*) ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' @@ -3574,7 +3589,7 @@ netbsd*) newos6*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -3701,13 +3716,13 @@ else mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -3733,7 +3748,7 @@ else # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -3973,7 +3988,7 @@ esac if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" @@ -3991,20 +4006,20 @@ fi # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ @@ -4028,7 +4043,7 @@ for ac_symprfx in "" "_"; do if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, + # Also find C++ and __fastcall symbols from MSVC++ or ICC, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ @@ -4046,9 +4061,9 @@ for ac_symprfx in "" "_"; do " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -4335,7 +4350,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -4418,7 +4433,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4754,7 +4769,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4937,7 +4952,7 @@ m4_if([$1], [CXX], [ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) @@ -4945,7 +4960,7 @@ m4_if([$1], [CXX], [ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) + cl* | icl*) _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ;; *) @@ -5002,15 +5017,15 @@ dnl Note also adjust exclude_expsyms for C++ above. case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; openbsd* | bitrig* | secbsd*) @@ -5062,7 +5077,7 @@ dnl Note also adjust exclude_expsyms for C++ above. _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -5174,6 +5189,7 @@ _LT_EOF emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; interix[[3-9]]*) @@ -5188,7 +5204,7 @@ _LT_EOF # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -5231,7 +5247,7 @@ _LT_EOF _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes @@ -5243,7 +5259,7 @@ _LT_EOF if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi @@ -5259,7 +5275,7 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -5391,7 +5407,7 @@ _LT_EOF if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -5574,12 +5590,12 @@ _LT_EOF cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl*) - # Native MSVC + cl* | icl*) + # Native MSVC or ICC _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=yes @@ -5620,7 +5636,7 @@ _LT_EOF fi' ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Tell ltmain to make .lib files, not .a files. @@ -5668,7 +5684,7 @@ _LT_EOF ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes @@ -5879,6 +5895,7 @@ _LT_EOF emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; osf3*) @@ -6649,8 +6666,8 @@ if test yes != "$_lt_caught_CXX_error"; then cygwin* | mingw* | pw32* | cegcc*) case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC + ,cl* | no,cl* | ,icl* | no,icl*) + # Native MSVC or ICC # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' @@ -6748,6 +6765,7 @@ if test yes != "$_lt_caught_CXX_error"; then emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; dgux*) @@ -6778,7 +6796,7 @@ if test yes != "$_lt_caught_CXX_error"; then _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_TAGVAR(ld_shlibs, $1)=yes @@ -6915,7 +6933,7 @@ if test yes != "$_lt_caught_CXX_error"; then # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in @@ -7055,13 +7073,13 @@ if test yes != "$_lt_caught_CXX_error"; then _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -8207,6 +8225,14 @@ _LT_DECL([], [DLLTOOL], [1], [DLL creation program]) AC_SUBST([DLLTOOL]) ]) +# _LT_DECL_FILECMD +# ---------------- +# Check for a file(cmd) program that can be used to detect file type and magic +m4_defun([_LT_DECL_FILECMD], +[AC_CHECK_TOOL([FILECMD], [file], [:]) +_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) +])# _LD_DECL_FILECMD + # _LT_DECL_SED # ------------ # Check for a fully-functional sed program, that truncates diff --git a/dist/libxcb/m4/ltoptions.m4 b/dist/libxcb/m4/ltoptions.m4 index 94b08297..b0b5e9c2 100644 --- a/dist/libxcb/m4/ltoptions.m4 +++ b/dist/libxcb/m4/ltoptions.m4 @@ -1,7 +1,7 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives diff --git a/dist/libxcb/m4/ltsugar.m4 b/dist/libxcb/m4/ltsugar.m4 index 48bc9344..902508bd 100644 --- a/dist/libxcb/m4/ltsugar.m4 +++ b/dist/libxcb/m4/ltsugar.m4 @@ -1,6 +1,6 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software # Foundation, Inc. # Written by Gary V. Vaughan, 2004 # diff --git a/dist/libxcb/m4/ltversion.m4 b/dist/libxcb/m4/ltversion.m4 index fa04b52a..b155d0ac 100644 --- a/dist/libxcb/m4/ltversion.m4 +++ b/dist/libxcb/m4/ltversion.m4 @@ -1,6 +1,7 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, +# Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +10,15 @@ # @configure_input@ -# serial 4179 ltversion.m4 +# serial 4245 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.6]) -m4_define([LT_PACKAGE_REVISION], [2.4.6]) +m4_define([LT_PACKAGE_VERSION], [2.4.7]) +m4_define([LT_PACKAGE_REVISION], [2.4.7]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.6' -macro_revision='2.4.6' +[macro_version='2.4.7' +macro_revision='2.4.7' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/dist/libxcb/m4/lt~obsolete.m4 b/dist/libxcb/m4/lt~obsolete.m4 index c6b26f88..0f7a8759 100644 --- a/dist/libxcb/m4/lt~obsolete.m4 +++ b/dist/libxcb/m4/lt~obsolete.m4 @@ -1,7 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives diff --git a/dist/libxcb/src/Makefile.am b/dist/libxcb/src/Makefile.am index c2984b3f..9861a2dd 100644 --- a/dist/libxcb/src/Makefile.am +++ b/dist/libxcb/src/Makefile.am @@ -40,6 +40,14 @@ libxcb_damage_la_LIBADD = $(XCB_LIBS) nodist_libxcb_damage_la_SOURCES = damage.c damage.h endif +EXTSOURCES += dbe.c +if BUILD_DBE +lib_LTLIBRARIES += libxcb-dbe.la +libxcb_dbe_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ +libxcb_dbe_la_LIBADD = $(XCB_LIBS) +nodist_libxcb_dbe_la_SOURCES = dbe.c dbe.h +endif + EXTSOURCES += dpms.c if BUILD_DPMS lib_LTLIBRARIES += libxcb-dpms.la diff --git a/dist/libxcb/src/c_client.py b/dist/libxcb/src/c_client.py index fd256f01..b7db543d 100644 --- a/dist/libxcb/src/c_client.py +++ b/dist/libxcb/src/c_client.py @@ -331,7 +331,7 @@ def c_close(self): _h(' */') # Write header file - hfile = open('%s.h' % _ns.header, 'w') + hfile = open('%s.h' % _ns.header, 'w', encoding='UTF-8') for list in _hlines: for line in list: hfile.write(line) @@ -339,7 +339,7 @@ def c_close(self): hfile.close() # Write source file - cfile = open('%s.c' % _ns.header, 'w') + cfile = open('%s.c' % _ns.header, 'w', encoding='UTF-8') for list in _clines: for line in list: cfile.write(line) @@ -2266,13 +2266,13 @@ def _c_request_helper(self, name, void, regular, aux=False, reply_fds=False): elif base_func_name == 'xcb_create_window' and field.c_field_name == 'value_mask': field.enum = 'CW' if field.enum: - # XXX: why the 'xcb' prefix? - key = ('xcb', field.enum) + assert 2 <= len(self.name) <= 3 + key = (*self.name[:-1], field.enum) tname = _t(key) if namecount[tname] > 1: tname = _t(key + ('enum',)) - _h(' * @param %s A bitmask of #%s values.' % (field.c_field_name, tname)) + _h(' * @param %s A bitmask of #%s values.', field.c_field_name, tname) if self.doc and field.field_name in self.doc.fields: desc = self.doc.fields[field.field_name] @@ -2280,7 +2280,8 @@ def _c_request_helper(self, name, void, regular, aux=False, reply_fds=False): desc = desc.replace('`%s`' % name, '\\a %s' % (name)) desc = desc.split("\n") desc = [line if line != '' else '\\n' for line in desc] - _h(' * @param %s %s' % (field.c_field_name, "\n * ".join(desc))) + _h(' * @param %s %s', field.c_field_name, "\n * ".join(desc)) + # If there is no documentation yet, we simply don't generate an # @param tag. Doxygen will then warn about missing documentation. @@ -2339,7 +2340,7 @@ def _c_request_helper(self, name, void, regular, aux=False, reply_fds=False): for field in param_fields: if not field.type.fixed_size() and field.wire: count = count + 2 - if field.type.c_need_serialize: + if field.type.c_need_serialize or field.type.c_need_sizeof: # _serialize() keeps track of padding automatically count -= 1 dimension = count + 2 diff --git a/dist/libxcb/src/xcb_auth.c b/dist/libxcb/src/xcb_auth.c index 8ebe9a43..8c6e9b9e 100644 --- a/dist/libxcb/src/xcb_auth.c +++ b/dist/libxcb/src/xcb_auth.c @@ -73,7 +73,7 @@ enum auth_protos { #define AUTH_PROTO_XDM_AUTHORIZATION "XDM-AUTHORIZATION-1" #define AUTH_PROTO_MIT_MAGIC_COOKIE "MIT-MAGIC-COOKIE-1" -static char *authnames[N_AUTH_PROTOS] = { +static const char *authnames[N_AUTH_PROTOS] = { #ifdef HASXDMAUTH AUTH_PROTO_XDM_AUTHORIZATION, #endif @@ -165,7 +165,7 @@ static Xauth *get_authptr(struct sockaddr *sockname, int display) return XauGetBestAuthByAddr (family, (unsigned short) addrlen, addr, (unsigned short) dispbuflen, dispbuf, - N_AUTH_PROTOS, authnames, authnameslen); + N_AUTH_PROTOS, (char **)authnames, authnameslen); } #ifdef HASXDMAUTH diff --git a/dist/libxcb/src/xcb_conn.c b/dist/libxcb/src/xcb_conn.c index 3084c18f..8f91f431 100644 --- a/dist/libxcb/src/xcb_conn.c +++ b/dist/libxcb/src/xcb_conn.c @@ -310,9 +310,11 @@ static int write_vec(xcb_connection_t *c, struct iovec **vector, int *count) int cur = (*vector)->iov_len; if(cur > n) cur = n; - (*vector)->iov_len -= cur; - (*vector)->iov_base = (char *) (*vector)->iov_base + cur; - n -= cur; + if(cur) { + (*vector)->iov_len -= cur; + (*vector)->iov_base = (char *) (*vector)->iov_base + cur; + n -= cur; + } if((*vector)->iov_len) break; } diff --git a/dist/libxcb/src/xcb_util.c b/dist/libxcb/src/xcb_util.c index 0296ce0d..c58999a4 100644 --- a/dist/libxcb/src/xcb_util.c +++ b/dist/libxcb/src/xcb_util.c @@ -60,16 +60,27 @@ # include #endif -#ifdef HAVE_LAUNCHD #include + +#ifndef __has_builtin +# define __has_builtin(x) 0 #endif int xcb_popcount(uint32_t mask) { +#if __has_builtin(__builtin_popcount) + return __builtin_popcount(mask); +#else + /* + * Count the number of bits set to 1 in a 32-bit word. + * Algorithm from MIT AI Lab Memo 239: "HAKMEM", ITEM 169. + * https://dspace.mit.edu/handle/1721.1/6086 + */ uint32_t y; y = (mask >> 1) & 033333333333; y = mask - y - ((y >> 1) & 033333333333); return ((y + (y >> 3)) & 030707070707) % 077; +#endif } int xcb_sumof(uint8_t *list, int len) @@ -82,7 +93,6 @@ int xcb_sumof(uint8_t *list, int len) return s; } -#ifdef HAVE_LAUNCHD /* Return true and parse if name matches [.] * Upon success: * host = @@ -95,19 +105,30 @@ static int _xcb_parse_display_path_to_socket(const char *name, char **host, char { struct stat sbuf; char path[PATH_MAX]; - int _screen = 0; + size_t len; + int _screen = 0, res; - strlcpy(path, name, sizeof(path)); - if (0 != stat(path, &sbuf)) { - char *dot = strrchr(path, '.'); - if (!dot) + len = strlen(name); + if (len >= sizeof(path)) + return 0; + memcpy(path, name, len + 1); + res = stat(path, &sbuf); + if (0 != res) { + unsigned long lscreen; + char *dot, *endptr; + if (res != -1 || (errno != ENOENT && errno != ENOTDIR)) + return 0; + dot = strrchr(path, '.'); + if (!dot || dot[1] < '1' || dot[1] > '9') return 0; *dot = '\0'; - + errno = 0; + lscreen = strtoul(dot + 1, &endptr, 10); + if (lscreen > INT_MAX || !endptr || *endptr || errno) + return 0; if (0 != stat(path, &sbuf)) return 0; - - _screen = atoi(dot + 1); + _screen = (int)lscreen; } if (host) { @@ -133,7 +154,6 @@ static int _xcb_parse_display_path_to_socket(const char *name, char **host, char return 1; } -#endif static int _xcb_parse_display(const char *name, char **host, char **protocol, int *displayp, int *screenp) @@ -146,10 +166,13 @@ static int _xcb_parse_display(const char *name, char **host, char **protocol, if(!name) return 0; -#ifdef HAVE_LAUNCHD /* First check for [.] */ - if (_xcb_parse_display_path_to_socket(name, host, protocol, displayp, screenp)) - return 1; + if (name[0] == '/') + return _xcb_parse_display_path_to_socket(name, host, protocol, displayp, screenp); + +#ifndef __OpenBSD__ + if (strncmp(name, "unix:", 5) == 0) + return _xcb_parse_display_path_to_socket(name + 5, host, protocol, displayp, screenp); #endif slash = strrchr(name, '/'); @@ -236,41 +259,46 @@ static int _xcb_open(const char *host, char *protocol, const int display) char *file = NULL; int actual_filelen; - /* If protocol or host is "unix", fall through to Unix socket code below */ - if ((!protocol || (strcmp("unix",protocol) != 0)) && - (*host != '\0') && (strcmp("unix",host) != 0)) - { - /* display specifies TCP */ - unsigned short port = X_TCP_PORT + display; - return _xcb_open_tcp(host, protocol, port); - } +#ifndef _WIN32 + if (protocol && strcmp("unix", protocol) == 0 && host && host[0] == '/') { + /* Full path to socket provided, ignore everything else */ + filelen = strlen(host) + 1; + if (filelen > INT_MAX) + return -1; + file = malloc(filelen); + if (file == NULL) + return -1; + memcpy(file, host, filelen); + actual_filelen = (int)(filelen - 1); + } else { +#endif + /* If protocol or host is "unix", fall through to Unix socket code below */ + if ((!protocol || (strcmp("unix",protocol) != 0)) && + (*host != '\0') && (strcmp("unix",host) != 0)) + { + /* display specifies TCP */ + unsigned short port = X_TCP_PORT + display; + return _xcb_open_tcp(host, protocol, port); + } #ifndef _WIN32 #if defined(HAVE_TSOL_LABEL_H) && defined(HAVE_IS_SYSTEM_LABELED) - /* Check special path for Unix sockets under Solaris Trusted Extensions */ - if (is_system_labeled()) - { - struct stat sbuf; - const char *tsol_base = "/var/tsol/doors/.X11-unix/X"; - char tsol_socket[PATH_MAX]; + /* Check special path for Unix sockets under Solaris Trusted Extensions */ + if (is_system_labeled()) + { + const char *tsol_base = "/var/tsol/doors/.X11-unix/X"; + char tsol_socket[PATH_MAX]; + struct stat sbuf; - snprintf(tsol_socket, sizeof(tsol_socket), "%s%d", tsol_base, display); + snprintf(tsol_socket, sizeof(tsol_socket), "%s%d", tsol_base, display); - if (stat(tsol_socket, &sbuf) == 0) - base = tsol_base; - } + if (stat(tsol_socket, &sbuf) == 0) + base = tsol_base; + else if (errno != ENOENT) + return 0; + } #endif -#ifdef HAVE_LAUNCHD - struct stat sbuf; - if (0 == stat(host, &sbuf)) { - file = strdup(host); - if(file == NULL) - return -1; - filelen = actual_filelen = strlen(file); - } else -#endif - { filelen = strlen(base) + 1 + sizeof(display) * 3 + 1; file = malloc(filelen); if(file == NULL) @@ -278,24 +306,23 @@ static int _xcb_open(const char *host, char *protocol, const int display) /* display specifies Unix socket */ actual_filelen = snprintf(file, filelen, "%s%d", base, display); - } - if(actual_filelen < 0) - { - free(file); - return -1; - } - /* snprintf may truncate the file */ - filelen = MIN(actual_filelen, filelen - 1); + if(actual_filelen < 0) + { + free(file); + return -1; + } + /* snprintf may truncate the file */ + filelen = MIN(actual_filelen, filelen - 1); #ifdef HAVE_ABSTRACT_SOCKETS - fd = _xcb_open_abstract(protocol, file, filelen); - if (fd >= 0 || (errno != ENOENT && errno != ECONNREFUSED)) - { - free(file); - return fd; - } - + fd = _xcb_open_abstract(protocol, file, filelen); + if (fd >= 0 || (errno != ENOENT && errno != ECONNREFUSED)) + { + free(file); + return fd; + } #endif + } fd = _xcb_open_unix(protocol, file); free(file); @@ -389,7 +416,11 @@ static int _xcb_open_tcp(const char *host, char *protocol, const unsigned short fd = _xcb_socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol); if (_xcb_do_connect(fd, addr->ai_addr, addr->ai_addrlen) >= 0) break; +#ifdef _WIN32 + closesocket(fd); +#else close(fd); +#endif fd = -1; } freeaddrinfo(results); @@ -528,10 +559,8 @@ xcb_connection_t *xcb_connect_to_display_with_auth_info(const char *displayname, if(auth) { c = xcb_connect_to_fd(fd, auth); - goto out; } - - if(_xcb_get_auth_info(fd, &ourauth, display)) + else if(_xcb_get_auth_info(fd, &ourauth, display)) { c = xcb_connect_to_fd(fd, &ourauth); free(ourauth.name); diff --git a/dist/libxcb/tests/check_public.c b/dist/libxcb/tests/check_public.c index aed40c8f..e0b374b6 100644 --- a/dist/libxcb/tests/check_public.c +++ b/dist/libxcb/tests/check_public.c @@ -1,6 +1,10 @@ #include +#include #include #include +#ifdef __unix__ +#include +#endif #include "check_suites.h" #include "xcb.h" #include "xcbext.h" @@ -12,6 +16,10 @@ typedef enum test_type_t { } test_type_t; static const char *const test_string[] = { "", "via $DISPLAY " }; +/* putenv(3) takes a pointer to a writable string that it adds directly + to the environment, so it must be in persistent memory, not on the stack */ +static char display_env[] = "DISPLAY="; + static void parse_display_pass(const char *name, const char *host, const int display, const int screen) { int success; @@ -25,7 +33,7 @@ static void parse_display_pass(const char *name, const char *host, const int dis if(test_type == TEST_ARGUMENT) { argument = name; - putenv("DISPLAY="); + putenv(display_env); } else if(test_type == TEST_ENVIRONMENT) { @@ -50,7 +58,7 @@ static void parse_display_pass(const char *name, const char *host, const int dis ck_assert_msg(strcmp(host, got_host) == 0, "screenless parse %sproduced unexpected hostname '%s' for '%s': expected '%s'", test_string[test_type], got_host, name, host); ck_assert_msg(display == got_display, "screenless parse %sproduced unexpected display '%d' for '%s': expected '%d'", test_string[test_type], got_display, name, display); } - putenv("DISPLAY="); + putenv(display_env); } static void parse_display_fail(const char *name) @@ -66,7 +74,7 @@ static void parse_display_fail(const char *name) if(test_type == TEST_ARGUMENT) { argument = name; - putenv("DISPLAY="); + putenv(display_env); } else if(test_type == TEST_ENVIRONMENT) { @@ -92,11 +100,42 @@ static void parse_display_fail(const char *name) ck_assert_msg(got_host == (char *) -1, "host changed on parse failure %sfor '%s': got %p", test_string[test_type], name, got_host); ck_assert_msg(got_display == -42, "display changed on parse failure %sfor '%s': got %d", test_string[test_type], name, got_display); } - putenv("DISPLAY="); + putenv(display_env); } START_TEST(parse_display_unix) { +#ifdef __unix__ + char buf[sizeof "/tmp/xcb-test.XXXXXXX"]; + char buf2[sizeof(buf) + 7]; + int r, v; + memcpy(buf, "/tmp/xcb-test.XXXXXXX", sizeof buf); + v = mkstemp(buf); + ck_assert_msg(v >= 0, "cannot create temporary file"); + parse_display_pass(buf, buf, 0, 0); + r = snprintf(buf2, sizeof buf2, "unix:%s", buf); + if (r < 5 || r >= (int)sizeof buf2) { + ck_assert_msg(0, "snprintf() failed (return value %d)", r); + unlink(buf); + return; + } + parse_display_pass(buf2, buf, 0, 0); + r = snprintf(buf2, sizeof buf2, "unix:%s.1", buf); + if (r < 7 || r >= (int)sizeof buf2) { + ck_assert_msg(0, "snprintf() failed (return value %d)", r); + unlink(buf); + return; + } + parse_display_pass(buf2, buf, 0, 1); + r = snprintf(buf2, sizeof buf2, "%s.1", buf); + if (r < 2 || r >= (int)sizeof buf2) { + ck_assert_msg(0, "snprintf() failed (return value %d)", r); + unlink(buf); + return; + } + parse_display_pass(buf2, buf, 0, 1); + unlink(buf); +#endif parse_display_pass(":0", "", 0, 0); parse_display_pass(":1", "", 1, 0); parse_display_pass(":0.1", "", 0, 1); @@ -206,7 +245,7 @@ END_TEST Suite *public_suite(void) { Suite *s = suite_create("Public API"); - putenv("DISPLAY="); + putenv(display_env); suite_add_test(s, parse_display_unix, "xcb_parse_display unix"); suite_add_test(s, parse_display_ip, "xcb_parse_display ip"); suite_add_test(s, parse_display_ipv4, "xcb_parse_display ipv4"); diff --git a/dist/libxcb/xcb-dbe.pc.in b/dist/libxcb/xcb-dbe.pc.in new file mode 100644 index 00000000..05df0d5d --- /dev/null +++ b/dist/libxcb/xcb-dbe.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: XCB Dbe +Description: XCB Double Buffer Extension +Version: @PACKAGE_VERSION@ +Requires.private: xcb +Libs: -L${libdir} -lxcb-dbe +Cflags: -I${includedir} diff --git a/dist/libxcb/xcb-present.pc.in b/dist/libxcb/xcb-present.pc.in index 2e0cff8e..2459d1d6 100644 --- a/dist/libxcb/xcb-present.pc.in +++ b/dist/libxcb/xcb-present.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: XCB Present Description: XCB Present Extension Version: @PACKAGE_VERSION@ -Requires.private: xcb xcb-randr xcb-xfixes xcb-sync +Requires.private: xcb xcb-randr xcb-xfixes xcb-sync xcb-dri3 Libs: -L${libdir} -lxcb-present Cflags: -I${includedir} diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi index 9cd6600a..f0c5a93a 100644 --- a/distrib/sets/lists/xbase/mi +++ b/distrib/sets/lists/xbase/mi @@ -217,7 +217,7 @@ ./usr/X11R6/lib/libX11-xcb.so.2.0 ./usr/X11R6/lib/libX11.a ./usr/X11R6/lib/libX11.la -./usr/X11R6/lib/libX11.so.18.0 +./usr/X11R6/lib/libX11.so.18.1 ./usr/X11R6/lib/libXRes.a ./usr/X11R6/lib/libXRes.la ./usr/X11R6/lib/libXRes.so.5.1 @@ -322,11 +322,11 @@ ./usr/X11R6/lib/libxcb-damage.a ./usr/X11R6/lib/libxcb-damage.so.1.0 ./usr/X11R6/lib/libxcb-dpms.a -./usr/X11R6/lib/libxcb-dpms.so.1.0 +./usr/X11R6/lib/libxcb-dpms.so.1.1 ./usr/X11R6/lib/libxcb-dri2.a ./usr/X11R6/lib/libxcb-dri2.so.1.1 ./usr/X11R6/lib/libxcb-dri3.a -./usr/X11R6/lib/libxcb-dri3.so.0.2 +./usr/X11R6/lib/libxcb-dri3.so.0.3 ./usr/X11R6/lib/libxcb-ewmh.a ./usr/X11R6/lib/libxcb-ewmh.la ./usr/X11R6/lib/libxcb-ewmh.so.2.0 @@ -342,7 +342,7 @@ ./usr/X11R6/lib/libxcb-keysyms.la ./usr/X11R6/lib/libxcb-keysyms.so.3.0 ./usr/X11R6/lib/libxcb-present.a -./usr/X11R6/lib/libxcb-present.so.0.1 +./usr/X11R6/lib/libxcb-present.so.0.2 ./usr/X11R6/lib/libxcb-randr.a ./usr/X11R6/lib/libxcb-randr.so.2.3 ./usr/X11R6/lib/libxcb-record.a diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi index ca1a72b6..66ae6e38 100644 --- a/distrib/sets/lists/xshare/mi +++ b/distrib/sets/lists/xshare/mi @@ -1129,11 +1129,6 @@ ./usr/X11R6/man/man3/FcValueSave.3 ./usr/X11R6/man/man3/FcWeightFromOpenType.3 ./usr/X11R6/man/man3/FcWeightToOpenType.3 -./usr/X11R6/man/man3/GLwCreateMDrawingArea.3 -./usr/X11R6/man/man3/GLwDrawingArea.3 -./usr/X11R6/man/man3/GLwDrawingAreaMakeCurrent.3 -./usr/X11R6/man/man3/GLwDrawingAreaSwapBuffers.3 -./usr/X11R6/man/man3/GLwMDrawingArea.3 ./usr/X11R6/man/man3/HeightMMOfScreen.3 ./usr/X11R6/man/man3/HeightOfScreen.3 ./usr/X11R6/man/man3/ImageByteOrder.3 @@ -1989,6 +1984,7 @@ ./usr/X11R6/man/man3/XineramaQueryScreens.3 ./usr/X11R6/man/man3/XineramaQueryVersion.3 ./usr/X11R6/man/man3/XkbActionCtrls.3 +./usr/X11R6/man/man3/XkbActionSetCtrls.3 ./usr/X11R6/man/man3/XkbAddDeviceLedInfo.3 ./usr/X11R6/man/man3/XkbAddGeomColor.3 ./usr/X11R6/man/man3/XkbAddGeomDoodad.3 @@ -2007,7 +2003,6 @@ ./usr/X11R6/man/man3/XkbAllocCompatMap.3 ./usr/X11R6/man/man3/XkbAllocControls.3 ./usr/X11R6/man/man3/XkbAllocDeviceInfo.3 -./usr/X11R6/man/man3/XkbAllocDeviceLedInfo.3 ./usr/X11R6/man/man3/XkbAllocGeomColors.3 ./usr/X11R6/man/man3/XkbAllocGeomDoodads.3 ./usr/X11R6/man/man3/XkbAllocGeomKeyAliases.3 @@ -2033,7 +2028,6 @@ ./usr/X11R6/man/man3/XkbChangeControls.3 ./usr/X11R6/man/man3/XkbChangeDeviceInfo.3 ./usr/X11R6/man/man3/XkbChangeEnabledControls.3 -./usr/X11R6/man/man3/XkbChangeIndicators.3 ./usr/X11R6/man/man3/XkbChangeMap.3 ./usr/X11R6/man/man3/XkbChangeNames.3 ./usr/X11R6/man/man3/XkbChangeTypesOfKey.3 @@ -2071,10 +2065,8 @@ ./usr/X11R6/man/man3/XkbFreeKeyboard.3 ./usr/X11R6/man/man3/XkbFreeNames.3 ./usr/X11R6/man/man3/XkbFreeServerMap.3 -./usr/X11R6/man/man3/XkbGetAccessXTimeout.3 ./usr/X11R6/man/man3/XkbGetAutoRepeatRate.3 ./usr/X11R6/man/man3/XkbGetAutoResetControls.3 -./usr/X11R6/man/man3/XkbGetBounceKeysDelay.3 ./usr/X11R6/man/man3/XkbGetCompatMap.3 ./usr/X11R6/man/man3/XkbGetControls.3 ./usr/X11R6/man/man3/XkbGetControlsChanges.3 @@ -2084,7 +2076,6 @@ ./usr/X11R6/man/man3/XkbGetDeviceInfoChanges.3 ./usr/X11R6/man/man3/XkbGetDeviceLedInfo.3 ./usr/X11R6/man/man3/XkbGetGeometry.3 -./usr/X11R6/man/man3/XkbGetIndicatorChanges.3 ./usr/X11R6/man/man3/XkbGetIndicatorMap.3 ./usr/X11R6/man/man3/XkbGetIndicatorState.3 ./usr/X11R6/man/man3/XkbGetKeyActions.3 @@ -2097,14 +2088,11 @@ ./usr/X11R6/man/man3/XkbGetKeyboard.3 ./usr/X11R6/man/man3/XkbGetKeyboardByName.3 ./usr/X11R6/man/man3/XkbGetMap.3 -./usr/X11R6/man/man3/XkbGetNameChanges.3 ./usr/X11R6/man/man3/XkbGetNamedDeviceIndicator.3 ./usr/X11R6/man/man3/XkbGetNamedGeometry.3 ./usr/X11R6/man/man3/XkbGetNamedIndicator.3 ./usr/X11R6/man/man3/XkbGetNames.3 -./usr/X11R6/man/man3/XkbGetSlowKeysDelay.3 ./usr/X11R6/man/man3/XkbGetState.3 -./usr/X11R6/man/man3/XkbGetStickyKeysOptions.3 ./usr/X11R6/man/man3/XkbGetUpdatedMap.3 ./usr/X11R6/man/man3/XkbGetVirtualMods.3 ./usr/X11R6/man/man3/XkbGetXlibControls.3 @@ -2117,14 +2105,13 @@ ./usr/X11R6/man/man3/XkbKeyGroupWidth.3 ./usr/X11R6/man/man3/XkbKeyGroupsWidth.3 ./usr/X11R6/man/man3/XkbKeyHasActions.3 +./usr/X11R6/man/man3/XkbKeyKeyType.3 +./usr/X11R6/man/man3/XkbKeyKeyTypeIndex.3 ./usr/X11R6/man/man3/XkbKeyNumActions.3 ./usr/X11R6/man/man3/XkbKeyNumGroups.3 ./usr/X11R6/man/man3/XkbKeyNumSyms.3 ./usr/X11R6/man/man3/XkbKeySymEntry.3 -./usr/X11R6/man/man3/XkbKeySymsOffset.3 ./usr/X11R6/man/man3/XkbKeySymsPtr.3 -./usr/X11R6/man/man3/XkbKeyType.3 -./usr/X11R6/man/man3/XkbKeyTypeIndex.3 ./usr/X11R6/man/man3/XkbKeyTypesForCoreSymbols.3 ./usr/X11R6/man/man3/XkbKeycodeToKeysym.3 ./usr/X11R6/man/man3/XkbKeysymToModifiers.3 @@ -2139,7 +2126,6 @@ ./usr/X11R6/man/man3/XkbModActionVMods.3 ./usr/X11R6/man/man3/XkbNoteControlsChanges.3 ./usr/X11R6/man/man3/XkbNoteDeviceChanges.3 -./usr/X11R6/man/man3/XkbNoteIndicatorChanges.3 ./usr/X11R6/man/man3/XkbNoteNameChanges.3 ./usr/X11R6/man/man3/XkbOpenDisplay.3 ./usr/X11R6/man/man3/XkbOutOfRangeGroupInfo.3 @@ -2152,7 +2138,6 @@ ./usr/X11R6/man/man3/XkbResizeKeyActions.3 ./usr/X11R6/man/man3/XkbResizeKeySyms.3 ./usr/X11R6/man/man3/XkbResizeKeyType.3 -./usr/X11R6/man/man3/XkbSAActionSetCtrls.3 ./usr/X11R6/man/man3/XkbSAGroup.3 ./usr/X11R6/man/man3/XkbSAPtrDfltValue.3 ./usr/X11R6/man/man3/XkbSARedirectSetVMods.3 @@ -2165,10 +2150,8 @@ ./usr/X11R6/man/man3/XkbSASetScreen.3 ./usr/X11R6/man/man3/XkbSelectEventDetails.3 ./usr/X11R6/man/man3/XkbSelectEvents.3 -./usr/X11R6/man/man3/XkbSetAccessXTimeout.3 ./usr/X11R6/man/man3/XkbSetAutoRepeatRate.3 ./usr/X11R6/man/man3/XkbSetAutoResetControls.3 -./usr/X11R6/man/man3/XkbSetBounceKeysDelay.3 ./usr/X11R6/man/man3/XkbSetCompatMap.3 ./usr/X11R6/man/man3/XkbSetControls.3 ./usr/X11R6/man/man3/XkbSetDebuggingFlags.3 @@ -2603,525 +2586,6 @@ ./usr/X11R6/man/man3/XwcTextListToTextProperty.3 ./usr/X11R6/man/man3/XwcTextPerCharExtents.3 ./usr/X11R6/man/man3/XwcTextPropertyToTextList.3 -./usr/X11R6/man/man3/glAccum.3 -./usr/X11R6/man/man3/glActiveTextureARB.3 -./usr/X11R6/man/man3/glAlphaFunc.3 -./usr/X11R6/man/man3/glAreTexturesResident.3 -./usr/X11R6/man/man3/glArrayElement.3 -./usr/X11R6/man/man3/glBegin.3 -./usr/X11R6/man/man3/glBindTexture.3 -./usr/X11R6/man/man3/glBitmap.3 -./usr/X11R6/man/man3/glBlendColor.3 -./usr/X11R6/man/man3/glBlendEquation.3 -./usr/X11R6/man/man3/glBlendFunc.3 -./usr/X11R6/man/man3/glCallList.3 -./usr/X11R6/man/man3/glCallLists.3 -./usr/X11R6/man/man3/glClear.3 -./usr/X11R6/man/man3/glClearAccum.3 -./usr/X11R6/man/man3/glClearColor.3 -./usr/X11R6/man/man3/glClearDepth.3 -./usr/X11R6/man/man3/glClearIndex.3 -./usr/X11R6/man/man3/glClearStencil.3 -./usr/X11R6/man/man3/glClientActiveTextureARB.3 -./usr/X11R6/man/man3/glClipPlane.3 -./usr/X11R6/man/man3/glColor.3 -./usr/X11R6/man/man3/glColor3b.3 -./usr/X11R6/man/man3/glColor3bv.3 -./usr/X11R6/man/man3/glColor3d.3 -./usr/X11R6/man/man3/glColor3dv.3 -./usr/X11R6/man/man3/glColor3f.3 -./usr/X11R6/man/man3/glColor3fv.3 -./usr/X11R6/man/man3/glColor3i.3 -./usr/X11R6/man/man3/glColor3iv.3 -./usr/X11R6/man/man3/glColor3s.3 -./usr/X11R6/man/man3/glColor3sv.3 -./usr/X11R6/man/man3/glColor3ub.3 -./usr/X11R6/man/man3/glColor3ubv.3 -./usr/X11R6/man/man3/glColor3ui.3 -./usr/X11R6/man/man3/glColor3uiv.3 -./usr/X11R6/man/man3/glColor3us.3 -./usr/X11R6/man/man3/glColor3usv.3 -./usr/X11R6/man/man3/glColor4b.3 -./usr/X11R6/man/man3/glColor4bv.3 -./usr/X11R6/man/man3/glColor4d.3 -./usr/X11R6/man/man3/glColor4dv.3 -./usr/X11R6/man/man3/glColor4f.3 -./usr/X11R6/man/man3/glColor4fv.3 -./usr/X11R6/man/man3/glColor4i.3 -./usr/X11R6/man/man3/glColor4iv.3 -./usr/X11R6/man/man3/glColor4s.3 -./usr/X11R6/man/man3/glColor4sv.3 -./usr/X11R6/man/man3/glColor4ub.3 -./usr/X11R6/man/man3/glColor4ubv.3 -./usr/X11R6/man/man3/glColor4ui.3 -./usr/X11R6/man/man3/glColor4uiv.3 -./usr/X11R6/man/man3/glColor4us.3 -./usr/X11R6/man/man3/glColor4usv.3 -./usr/X11R6/man/man3/glColorMask.3 -./usr/X11R6/man/man3/glColorMaterial.3 -./usr/X11R6/man/man3/glColorPointer.3 -./usr/X11R6/man/man3/glColorSubTable.3 -./usr/X11R6/man/man3/glColorTable.3 -./usr/X11R6/man/man3/glColorTableParameter.3 -./usr/X11R6/man/man3/glColorTableParameterfv.3 -./usr/X11R6/man/man3/glColorTableParameteriv.3 -./usr/X11R6/man/man3/glConvolutionFilter1D.3 -./usr/X11R6/man/man3/glConvolutionFilter2D.3 -./usr/X11R6/man/man3/glConvolutionParameter.3 -./usr/X11R6/man/man3/glCopyColorSubTable.3 -./usr/X11R6/man/man3/glCopyColorTable.3 -./usr/X11R6/man/man3/glCopyConvolutionFilter1D.3 -./usr/X11R6/man/man3/glCopyConvolutionFilter2D.3 -./usr/X11R6/man/man3/glCopyPixels.3 -./usr/X11R6/man/man3/glCopyTexImage1D.3 -./usr/X11R6/man/man3/glCopyTexImage2D.3 -./usr/X11R6/man/man3/glCopyTexSubImage1D.3 -./usr/X11R6/man/man3/glCopyTexSubImage2D.3 -./usr/X11R6/man/man3/glCopyTexSubImage3D.3 -./usr/X11R6/man/man3/glCullFace.3 -./usr/X11R6/man/man3/glDeleteLists.3 -./usr/X11R6/man/man3/glDeleteTextures.3 -./usr/X11R6/man/man3/glDepthFunc.3 -./usr/X11R6/man/man3/glDepthMask.3 -./usr/X11R6/man/man3/glDepthRange.3 -./usr/X11R6/man/man3/glDisable.3 -./usr/X11R6/man/man3/glDisableClientState.3 -./usr/X11R6/man/man3/glDrawArrays.3 -./usr/X11R6/man/man3/glDrawBuffer.3 -./usr/X11R6/man/man3/glDrawElements.3 -./usr/X11R6/man/man3/glDrawPixels.3 -./usr/X11R6/man/man3/glDrawRangeElements.3 -./usr/X11R6/man/man3/glEdgeFlag.3 -./usr/X11R6/man/man3/glEdgeFlagPointer.3 -./usr/X11R6/man/man3/glEdgeFlagv.3 -./usr/X11R6/man/man3/glEnable.3 -./usr/X11R6/man/man3/glEnableClientState.3 -./usr/X11R6/man/man3/glEnd.3 -./usr/X11R6/man/man3/glEndList.3 -./usr/X11R6/man/man3/glEvalCoord.3 -./usr/X11R6/man/man3/glEvalCoord1d.3 -./usr/X11R6/man/man3/glEvalCoord1dv.3 -./usr/X11R6/man/man3/glEvalCoord1fv.3 -./usr/X11R6/man/man3/glEvalCoord2d.3 -./usr/X11R6/man/man3/glEvalCoord2dv.3 -./usr/X11R6/man/man3/glEvalCoord2f.3 -./usr/X11R6/man/man3/glEvalCoord2fv.3 -./usr/X11R6/man/man3/glEvalMesh.3 -./usr/X11R6/man/man3/glEvalMesh1.3 -./usr/X11R6/man/man3/glEvalMesh2.3 -./usr/X11R6/man/man3/glEvalPoint.3 -./usr/X11R6/man/man3/glEvalPoint1.3 -./usr/X11R6/man/man3/glEvalPoint2.3 -./usr/X11R6/man/man3/glFeedbackBuffer.3 -./usr/X11R6/man/man3/glFinish.3 -./usr/X11R6/man/man3/glFlush.3 -./usr/X11R6/man/man3/glFog.3 -./usr/X11R6/man/man3/glFogf.3 -./usr/X11R6/man/man3/glFogfv.3 -./usr/X11R6/man/man3/glFogi.3 -./usr/X11R6/man/man3/glFogiv.3 -./usr/X11R6/man/man3/glFrontFace.3 -./usr/X11R6/man/man3/glFrustum.3 -./usr/X11R6/man/man3/glGenLists.3 -./usr/X11R6/man/man3/glGenTextures.3 -./usr/X11R6/man/man3/glGet.3 -./usr/X11R6/man/man3/glGetBooleanv.3 -./usr/X11R6/man/man3/glGetClipPlane.3 -./usr/X11R6/man/man3/glGetColorTable.3 -./usr/X11R6/man/man3/glGetColorTableParameter.3 -./usr/X11R6/man/man3/glGetColorTableParameterfv.3 -./usr/X11R6/man/man3/glGetColorTableParameteriv.3 -./usr/X11R6/man/man3/glGetConvolutionFilter.3 -./usr/X11R6/man/man3/glGetConvolutionParameter.3 -./usr/X11R6/man/man3/glGetDoublev.3 -./usr/X11R6/man/man3/glGetError.3 -./usr/X11R6/man/man3/glGetFloatv.3 -./usr/X11R6/man/man3/glGetHistogram.3 -./usr/X11R6/man/man3/glGetHistogramParameter.3 -./usr/X11R6/man/man3/glGetIntegerv.3 -./usr/X11R6/man/man3/glGetLight.3 -./usr/X11R6/man/man3/glGetLightfv.3 -./usr/X11R6/man/man3/glGetLightiv.3 -./usr/X11R6/man/man3/glGetMap.3 -./usr/X11R6/man/man3/glGetMapdv.3 -./usr/X11R6/man/man3/glGetMapfv.3 -./usr/X11R6/man/man3/glGetMapiv.3 -./usr/X11R6/man/man3/glGetMaterial.3 -./usr/X11R6/man/man3/glGetMaterialfv.3 -./usr/X11R6/man/man3/glGetMaterialiv.3 -./usr/X11R6/man/man3/glGetMinmax.3 -./usr/X11R6/man/man3/glGetMinmaxParameter.3 -./usr/X11R6/man/man3/glGetPixelMap.3 -./usr/X11R6/man/man3/glGetPixelMapfv.3 -./usr/X11R6/man/man3/glGetPixelMapuiv.3 -./usr/X11R6/man/man3/glGetPixelMapusv.3 -./usr/X11R6/man/man3/glGetPointerv.3 -./usr/X11R6/man/man3/glGetPolygonStipple.3 -./usr/X11R6/man/man3/glGetSeparableFilter.3 -./usr/X11R6/man/man3/glGetString.3 -./usr/X11R6/man/man3/glGetTexEnv.3 -./usr/X11R6/man/man3/glGetTexEnvfv.3 -./usr/X11R6/man/man3/glGetTexEnviv.3 -./usr/X11R6/man/man3/glGetTexGen.3 -./usr/X11R6/man/man3/glGetTexGendv.3 -./usr/X11R6/man/man3/glGetTexGenfv.3 -./usr/X11R6/man/man3/glGetTexGeniv.3 -./usr/X11R6/man/man3/glGetTexImage.3 -./usr/X11R6/man/man3/glGetTexLevelParameter.3 -./usr/X11R6/man/man3/glGetTexLevelParameterfv.3 -./usr/X11R6/man/man3/glGetTexLevelParameteriv.3 -./usr/X11R6/man/man3/glGetTexParameter.3 -./usr/X11R6/man/man3/glGetTexParameterfv.3 -./usr/X11R6/man/man3/glGetTexParameteriv.3 -./usr/X11R6/man/man3/glHint.3 -./usr/X11R6/man/man3/glHistogram.3 -./usr/X11R6/man/man3/glIndex.3 -./usr/X11R6/man/man3/glIndexMask.3 -./usr/X11R6/man/man3/glIndexPointer.3 -./usr/X11R6/man/man3/glIndexd.3 -./usr/X11R6/man/man3/glIndexdv.3 -./usr/X11R6/man/man3/glIndexf.3 -./usr/X11R6/man/man3/glIndexfv.3 -./usr/X11R6/man/man3/glIndexi.3 -./usr/X11R6/man/man3/glIndexiv.3 -./usr/X11R6/man/man3/glIndexs.3 -./usr/X11R6/man/man3/glIndexsv.3 -./usr/X11R6/man/man3/glIndexub.3 -./usr/X11R6/man/man3/glIndexubv.3 -./usr/X11R6/man/man3/glInitNames.3 -./usr/X11R6/man/man3/glInterleavedArrays.3 -./usr/X11R6/man/man3/glIsEnabled.3 -./usr/X11R6/man/man3/glIsTexture.3 -./usr/X11R6/man/man3/glIslist.3 -./usr/X11R6/man/man3/glLight.3 -./usr/X11R6/man/man3/glLightModel.3 -./usr/X11R6/man/man3/glLightModelf.3 -./usr/X11R6/man/man3/glLightModelfv.3 -./usr/X11R6/man/man3/glLightModeli.3 -./usr/X11R6/man/man3/glLightModeliv.3 -./usr/X11R6/man/man3/glLightf.3 -./usr/X11R6/man/man3/glLightfv.3 -./usr/X11R6/man/man3/glLighti.3 -./usr/X11R6/man/man3/glLightiv.3 -./usr/X11R6/man/man3/glLineStipple.3 -./usr/X11R6/man/man3/glLineWidth.3 -./usr/X11R6/man/man3/glListBase.3 -./usr/X11R6/man/man3/glLoadIdentity.3 -./usr/X11R6/man/man3/glLoadMatrix.3 -./usr/X11R6/man/man3/glLoadMatrixd.3 -./usr/X11R6/man/man3/glLoadMatrixf.3 -./usr/X11R6/man/man3/glLoadName.3 -./usr/X11R6/man/man3/glLogicOp.3 -./usr/X11R6/man/man3/glMap1.3 -./usr/X11R6/man/man3/glMap1d.3 -./usr/X11R6/man/man3/glMap1f.3 -./usr/X11R6/man/man3/glMap2.3 -./usr/X11R6/man/man3/glMap2d.3 -./usr/X11R6/man/man3/glMap2f.3 -./usr/X11R6/man/man3/glMapGrid.3 -./usr/X11R6/man/man3/glMapGrid1d.3 -./usr/X11R6/man/man3/glMapGrid1f.3 -./usr/X11R6/man/man3/glMapGrid2d.3 -./usr/X11R6/man/man3/glMapGrid2f.3 -./usr/X11R6/man/man3/glMaterial.3 -./usr/X11R6/man/man3/glMaterialf.3 -./usr/X11R6/man/man3/glMaterialfv.3 -./usr/X11R6/man/man3/glMateriali.3 -./usr/X11R6/man/man3/glMaterialiv.3 -./usr/X11R6/man/man3/glMatrixMode.3 -./usr/X11R6/man/man3/glMinmax.3 -./usr/X11R6/man/man3/glMultMatrix.3 -./usr/X11R6/man/man3/glMultMatrixd.3 -./usr/X11R6/man/man3/glMultMatrixf.3 -./usr/X11R6/man/man3/glMultiTexCoord1dARB.3 -./usr/X11R6/man/man3/glMultiTexCoord1dvARB.3 -./usr/X11R6/man/man3/glMultiTexCoord1fARB.3 -./usr/X11R6/man/man3/glMultiTexCoord1fvARB.3 -./usr/X11R6/man/man3/glMultiTexCoord1iARB.3 -./usr/X11R6/man/man3/glMultiTexCoord1ivARB.3 -./usr/X11R6/man/man3/glMultiTexCoord1sARB.3 -./usr/X11R6/man/man3/glMultiTexCoord1svARB.3 -./usr/X11R6/man/man3/glMultiTexCoord2dARB.3 -./usr/X11R6/man/man3/glMultiTexCoord2dvARB.3 -./usr/X11R6/man/man3/glMultiTexCoord2fARB.3 -./usr/X11R6/man/man3/glMultiTexCoord2fvARB.3 -./usr/X11R6/man/man3/glMultiTexCoord2iARB.3 -./usr/X11R6/man/man3/glMultiTexCoord2ivARB.3 -./usr/X11R6/man/man3/glMultiTexCoord2sARB.3 -./usr/X11R6/man/man3/glMultiTexCoord2svARB.3 -./usr/X11R6/man/man3/glMultiTexCoord3dARB.3 -./usr/X11R6/man/man3/glMultiTexCoord3dvARB.3 -./usr/X11R6/man/man3/glMultiTexCoord3fARB.3 -./usr/X11R6/man/man3/glMultiTexCoord3fvARB.3 -./usr/X11R6/man/man3/glMultiTexCoord3iARB.3 -./usr/X11R6/man/man3/glMultiTexCoord3ivARB.3 -./usr/X11R6/man/man3/glMultiTexCoord3sARB.3 -./usr/X11R6/man/man3/glMultiTexCoord3svARB.3 -./usr/X11R6/man/man3/glMultiTexCoord4dARB.3 -./usr/X11R6/man/man3/glMultiTexCoord4dvARB.3 -./usr/X11R6/man/man3/glMultiTexCoord4fARB.3 -./usr/X11R6/man/man3/glMultiTexCoord4fvARB.3 -./usr/X11R6/man/man3/glMultiTexCoord4iARB.3 -./usr/X11R6/man/man3/glMultiTexCoord4ivARB.3 -./usr/X11R6/man/man3/glMultiTexCoord4sARB.3 -./usr/X11R6/man/man3/glMultiTexCoord4svARB.3 -./usr/X11R6/man/man3/glMultiTexCoordARB.3 -./usr/X11R6/man/man3/glNewList.3 -./usr/X11R6/man/man3/glNormal.3 -./usr/X11R6/man/man3/glNormal3b.3 -./usr/X11R6/man/man3/glNormal3bv.3 -./usr/X11R6/man/man3/glNormal3d.3 -./usr/X11R6/man/man3/glNormal3dv.3 -./usr/X11R6/man/man3/glNormal3f.3 -./usr/X11R6/man/man3/glNormal3fv.3 -./usr/X11R6/man/man3/glNormal3i.3 -./usr/X11R6/man/man3/glNormal3iv.3 -./usr/X11R6/man/man3/glNormal3s.3 -./usr/X11R6/man/man3/glNormal3sv.3 -./usr/X11R6/man/man3/glNormalPointer.3 -./usr/X11R6/man/man3/glOrtho.3 -./usr/X11R6/man/man3/glPassThrough.3 -./usr/X11R6/man/man3/glPixelMap.3 -./usr/X11R6/man/man3/glPixelMapfv.3 -./usr/X11R6/man/man3/glPixelMapuiv.3 -./usr/X11R6/man/man3/glPixelMapusv.3 -./usr/X11R6/man/man3/glPixelStore.3 -./usr/X11R6/man/man3/glPixelStoref.3 -./usr/X11R6/man/man3/glPixelStorei.3 -./usr/X11R6/man/man3/glPixelTransfer.3 -./usr/X11R6/man/man3/glPixelTransferf.3 -./usr/X11R6/man/man3/glPixelTransferi.3 -./usr/X11R6/man/man3/glPixelZoom.3 -./usr/X11R6/man/man3/glPointSize.3 -./usr/X11R6/man/man3/glPolygonMode.3 -./usr/X11R6/man/man3/glPolygonOffset.3 -./usr/X11R6/man/man3/glPolygonStipple.3 -./usr/X11R6/man/man3/glPopAttrib.3 -./usr/X11R6/man/man3/glPopClientAttrib.3 -./usr/X11R6/man/man3/glPopMatrix.3 -./usr/X11R6/man/man3/glPopName.3 -./usr/X11R6/man/man3/glPrioritizeTextures.3 -./usr/X11R6/man/man3/glPushAttrib.3 -./usr/X11R6/man/man3/glPushClientAttrib.3 -./usr/X11R6/man/man3/glPushMatrix.3 -./usr/X11R6/man/man3/glPushName.3 -./usr/X11R6/man/man3/glRasterPos.3 -./usr/X11R6/man/man3/glRasterPos2d.3 -./usr/X11R6/man/man3/glRasterPos2dv.3 -./usr/X11R6/man/man3/glRasterPos2f.3 -./usr/X11R6/man/man3/glRasterPos2fv.3 -./usr/X11R6/man/man3/glRasterPos2i.3 -./usr/X11R6/man/man3/glRasterPos2iv.3 -./usr/X11R6/man/man3/glRasterPos2s.3 -./usr/X11R6/man/man3/glRasterPos2sv.3 -./usr/X11R6/man/man3/glRasterPos3d.3 -./usr/X11R6/man/man3/glRasterPos3dv.3 -./usr/X11R6/man/man3/glRasterPos3f.3 -./usr/X11R6/man/man3/glRasterPos3fv.3 -./usr/X11R6/man/man3/glRasterPos3i.3 -./usr/X11R6/man/man3/glRasterPos3iv.3 -./usr/X11R6/man/man3/glRasterPos3s.3 -./usr/X11R6/man/man3/glRasterPos3sv.3 -./usr/X11R6/man/man3/glRasterPos4d.3 -./usr/X11R6/man/man3/glRasterPos4dv.3 -./usr/X11R6/man/man3/glRasterPos4f.3 -./usr/X11R6/man/man3/glRasterPos4fv.3 -./usr/X11R6/man/man3/glRasterPos4i.3 -./usr/X11R6/man/man3/glRasterPos4iv.3 -./usr/X11R6/man/man3/glRasterPos4s.3 -./usr/X11R6/man/man3/glRasterPos4sv.3 -./usr/X11R6/man/man3/glReadBuffer.3 -./usr/X11R6/man/man3/glReadPixels.3 -./usr/X11R6/man/man3/glRect.3 -./usr/X11R6/man/man3/glRectd.3 -./usr/X11R6/man/man3/glRectdv.3 -./usr/X11R6/man/man3/glRectf.3 -./usr/X11R6/man/man3/glRectfv.3 -./usr/X11R6/man/man3/glRecti.3 -./usr/X11R6/man/man3/glRectiv.3 -./usr/X11R6/man/man3/glRects.3 -./usr/X11R6/man/man3/glRectsv.3 -./usr/X11R6/man/man3/glRenderMode.3 -./usr/X11R6/man/man3/glResetHistogram.3 -./usr/X11R6/man/man3/glResetMinmax.3 -./usr/X11R6/man/man3/glRotate.3 -./usr/X11R6/man/man3/glRotated.3 -./usr/X11R6/man/man3/glRotatef.3 -./usr/X11R6/man/man3/glScale.3 -./usr/X11R6/man/man3/glScaled.3 -./usr/X11R6/man/man3/glScalef.3 -./usr/X11R6/man/man3/glScissor.3 -./usr/X11R6/man/man3/glSelectBuffer.3 -./usr/X11R6/man/man3/glSeparableFilter2D.3 -./usr/X11R6/man/man3/glShadeModel.3 -./usr/X11R6/man/man3/glStencilFunc.3 -./usr/X11R6/man/man3/glStencilMask.3 -./usr/X11R6/man/man3/glStencilOp.3 -./usr/X11R6/man/man3/glTexCoord.3 -./usr/X11R6/man/man3/glTexCoord1d.3 -./usr/X11R6/man/man3/glTexCoord1dv.3 -./usr/X11R6/man/man3/glTexCoord1f.3 -./usr/X11R6/man/man3/glTexCoord1fv.3 -./usr/X11R6/man/man3/glTexCoord1i.3 -./usr/X11R6/man/man3/glTexCoord1iv.3 -./usr/X11R6/man/man3/glTexCoord1s.3 -./usr/X11R6/man/man3/glTexCoord1sv.3 -./usr/X11R6/man/man3/glTexCoord2d.3 -./usr/X11R6/man/man3/glTexCoord2dv.3 -./usr/X11R6/man/man3/glTexCoord2f.3 -./usr/X11R6/man/man3/glTexCoord2fv.3 -./usr/X11R6/man/man3/glTexCoord2i.3 -./usr/X11R6/man/man3/glTexCoord2iv.3 -./usr/X11R6/man/man3/glTexCoord2s.3 -./usr/X11R6/man/man3/glTexCoord2sv.3 -./usr/X11R6/man/man3/glTexCoord3d.3 -./usr/X11R6/man/man3/glTexCoord3dv.3 -./usr/X11R6/man/man3/glTexCoord3f.3 -./usr/X11R6/man/man3/glTexCoord3fv.3 -./usr/X11R6/man/man3/glTexCoord3i.3 -./usr/X11R6/man/man3/glTexCoord3iv.3 -./usr/X11R6/man/man3/glTexCoord3s.3 -./usr/X11R6/man/man3/glTexCoord3sv.3 -./usr/X11R6/man/man3/glTexCoord4d.3 -./usr/X11R6/man/man3/glTexCoord4dv.3 -./usr/X11R6/man/man3/glTexCoord4f.3 -./usr/X11R6/man/man3/glTexCoord4fv.3 -./usr/X11R6/man/man3/glTexCoord4i.3 -./usr/X11R6/man/man3/glTexCoord4iv.3 -./usr/X11R6/man/man3/glTexCoord4s.3 -./usr/X11R6/man/man3/glTexCoord4sv.3 -./usr/X11R6/man/man3/glTexCoordPointer.3 -./usr/X11R6/man/man3/glTexEnv.3 -./usr/X11R6/man/man3/glTexEnvf.3 -./usr/X11R6/man/man3/glTexEnvfv.3 -./usr/X11R6/man/man3/glTexEnvi.3 -./usr/X11R6/man/man3/glTexEnviv.3 -./usr/X11R6/man/man3/glTexGen.3 -./usr/X11R6/man/man3/glTexGend.3 -./usr/X11R6/man/man3/glTexGendv.3 -./usr/X11R6/man/man3/glTexGenf.3 -./usr/X11R6/man/man3/glTexGenfv.3 -./usr/X11R6/man/man3/glTexGeni.3 -./usr/X11R6/man/man3/glTexGeniv.3 -./usr/X11R6/man/man3/glTexImage1D.3 -./usr/X11R6/man/man3/glTexImage2D.3 -./usr/X11R6/man/man3/glTexImage3D.3 -./usr/X11R6/man/man3/glTexParameter.3 -./usr/X11R6/man/man3/glTexParameterf.3 -./usr/X11R6/man/man3/glTexParameterfv.3 -./usr/X11R6/man/man3/glTexParameteri.3 -./usr/X11R6/man/man3/glTexParameteriv.3 -./usr/X11R6/man/man3/glTexSubImage1D.3 -./usr/X11R6/man/man3/glTexSubImage2D.3 -./usr/X11R6/man/man3/glTexSubImage3D.3 -./usr/X11R6/man/man3/glTranslate.3 -./usr/X11R6/man/man3/glTranslated.3 -./usr/X11R6/man/man3/glTranslatef.3 -./usr/X11R6/man/man3/glVertex.3 -./usr/X11R6/man/man3/glVertex2d.3 -./usr/X11R6/man/man3/glVertex2dv.3 -./usr/X11R6/man/man3/glVertex2f.3 -./usr/X11R6/man/man3/glVertex2fv.3 -./usr/X11R6/man/man3/glVertex2i.3 -./usr/X11R6/man/man3/glVertex2iv.3 -./usr/X11R6/man/man3/glVertex2s.3 -./usr/X11R6/man/man3/glVertex2sv.3 -./usr/X11R6/man/man3/glVertex3d.3 -./usr/X11R6/man/man3/glVertex3dv.3 -./usr/X11R6/man/man3/glVertex3f.3 -./usr/X11R6/man/man3/glVertex3fv.3 -./usr/X11R6/man/man3/glVertex3i.3 -./usr/X11R6/man/man3/glVertex3iv.3 -./usr/X11R6/man/man3/glVertex3s.3 -./usr/X11R6/man/man3/glVertex3sv.3 -./usr/X11R6/man/man3/glVertex4d.3 -./usr/X11R6/man/man3/glVertex4dv.3 -./usr/X11R6/man/man3/glVertex4f.3 -./usr/X11R6/man/man3/glVertex4fv.3 -./usr/X11R6/man/man3/glVertex4i.3 -./usr/X11R6/man/man3/glVertex4iv.3 -./usr/X11R6/man/man3/glVertex4s.3 -./usr/X11R6/man/man3/glVertex4sv.3 -./usr/X11R6/man/man3/glVertexPointer.3 -./usr/X11R6/man/man3/glViewport.3 -./usr/X11R6/man/man3/glXChooseVisual.3 -./usr/X11R6/man/man3/glXCopyContext.3 -./usr/X11R6/man/man3/glXCreateContext.3 -./usr/X11R6/man/man3/glXCreateGLXPixmap.3 -./usr/X11R6/man/man3/glXDestroyContext.3 -./usr/X11R6/man/man3/glXDestroyGLXPixmap.3 -./usr/X11R6/man/man3/glXFreeContextEXT.3 -./usr/X11R6/man/man3/glXGetClientString.3 -./usr/X11R6/man/man3/glXGetConfig.3 -./usr/X11R6/man/man3/glXGetContextIDEXT.3 -./usr/X11R6/man/man3/glXGetCurrentContext.3 -./usr/X11R6/man/man3/glXGetCurrentDisplay.3 -./usr/X11R6/man/man3/glXGetCurrentDrawable.3 -./usr/X11R6/man/man3/glXImportContextEXT.3 -./usr/X11R6/man/man3/glXIntro.3 -./usr/X11R6/man/man3/glXIsDirect.3 -./usr/X11R6/man/man3/glXMakeCurrent.3 -./usr/X11R6/man/man3/glXQueryContextInfoEXT.3 -./usr/X11R6/man/man3/glXQueryExtension.3 -./usr/X11R6/man/man3/glXQueryExtensionsString.3 -./usr/X11R6/man/man3/glXQueryServerString.3 -./usr/X11R6/man/man3/glXQueryVersion.3 -./usr/X11R6/man/man3/glXSwapBuffers.3 -./usr/X11R6/man/man3/glXUseXFont.3 -./usr/X11R6/man/man3/glXWaitGL.3 -./usr/X11R6/man/man3/glXWaitX.3 -./usr/X11R6/man/man3/gluBeginCurve.3 -./usr/X11R6/man/man3/gluBeginPolygon.3 -./usr/X11R6/man/man3/gluBeginSurface.3 -./usr/X11R6/man/man3/gluBeginTrim.3 -./usr/X11R6/man/man3/gluBuild1DMipmaps.3 -./usr/X11R6/man/man3/gluBuild2DMipmaps.3 -./usr/X11R6/man/man3/gluCylinder.3 -./usr/X11R6/man/man3/gluDeleteNurbsRenderer.3 -./usr/X11R6/man/man3/gluDeleteQuadric.3 -./usr/X11R6/man/man3/gluDeleteTess.3 -./usr/X11R6/man/man3/gluDisk.3 -./usr/X11R6/man/man3/gluEndCurve.3 -./usr/X11R6/man/man3/gluEndPolygon.3 -./usr/X11R6/man/man3/gluEndSurface.3 -./usr/X11R6/man/man3/gluEndTrim.3 -./usr/X11R6/man/man3/gluErrorString.3 -./usr/X11R6/man/man3/gluGetNurbsProperty.3 -./usr/X11R6/man/man3/gluGetString.3 -./usr/X11R6/man/man3/gluGetTessProperty.3 -./usr/X11R6/man/man3/gluLoadSamplingMatrices.3 -./usr/X11R6/man/man3/gluLookAt.3 -./usr/X11R6/man/man3/gluNewNurbsRenderer.3 -./usr/X11R6/man/man3/gluNewQuadric.3 -./usr/X11R6/man/man3/gluNewTess.3 -./usr/X11R6/man/man3/gluNextContour.3 -./usr/X11R6/man/man3/gluNurbsCallback.3 -./usr/X11R6/man/man3/gluNurbsCallbackDataEXT.3 -./usr/X11R6/man/man3/gluNurbsCurve.3 -./usr/X11R6/man/man3/gluNurbsProperty.3 -./usr/X11R6/man/man3/gluNurbsSurface.3 -./usr/X11R6/man/man3/gluOrtho2D.3 -./usr/X11R6/man/man3/gluPartialDisk.3 -./usr/X11R6/man/man3/gluPerspective.3 -./usr/X11R6/man/man3/gluPickMatrix.3 -./usr/X11R6/man/man3/gluProject.3 -./usr/X11R6/man/man3/gluPwlCurve.3 -./usr/X11R6/man/man3/gluQuadricCallback.3 -./usr/X11R6/man/man3/gluQuadricDrawStyle.3 -./usr/X11R6/man/man3/gluQuadricNormals.3 -./usr/X11R6/man/man3/gluQuadricOrientation.3 -./usr/X11R6/man/man3/gluQuadricTexture.3 -./usr/X11R6/man/man3/gluScaleImage.3 -./usr/X11R6/man/man3/gluSphere.3 -./usr/X11R6/man/man3/gluTessBeginContour.3 -./usr/X11R6/man/man3/gluTessBeginPolygon.3 -./usr/X11R6/man/man3/gluTessCallback.3 -./usr/X11R6/man/man3/gluTessEndContour.3 -./usr/X11R6/man/man3/gluTessEndPolygon.3 -./usr/X11R6/man/man3/gluTessNormal.3 -./usr/X11R6/man/man3/gluTessProperty.3 -./usr/X11R6/man/man3/gluTessVertex.3 -./usr/X11R6/man/man3/gluUnProject.3 ./usr/X11R6/man/man3/shapelib.3 ./usr/X11R6/man/man3/synclib.3 ./usr/X11R6/man/man3/xtest1.3 diff --git a/doc/Makefile b/doc/Makefile index 3914e818..482e7f81 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.1 2006/11/29 17:42:27 matthieu Exp $ +# $OpenBSD: Makefile,v 1.2 2024/07/10 07:00:41 matthieu Exp $ -SUBDIR= gl-docs xorg-docs +SUBDIR= xorg-docs .include diff --git a/doc/gl-docs/GL/Imakefile b/doc/gl-docs/GL/Imakefile deleted file mode 100644 index 0613b962..00000000 --- a/doc/gl-docs/GL/Imakefile +++ /dev/null @@ -1,26 +0,0 @@ -XCOMM $XFree86: xc/doc/man/GL/Imakefile,v 1.2 1999/06/14 07:23:27 dawes Exp $ -XCOMM The contents of this file are subject to the GLX Public License Version 1.0 -XCOMM (the "License"). You may not use this file except in compliance with the -XCOMM License. You may obtain a copy of the License at Silicon Graphics, Inc., -XCOMM attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043 -XCOMM or at http://www.sgi.com/software/opensource/glx/license.html. -XCOMM -XCOMM Software distributed under the License is distributed on an "AS IS" -XCOMM basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY -XCOMM IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR -XCOMM PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific -XCOMM language governing rights and limitations under the License. -XCOMM -XCOMM The Original Software is GLX version 1.2 source code, released February, -XCOMM 1999. The developer of the Original Software is Silicon Graphics, Inc. -XCOMM Those portions of the Subject Software created by Silicon Graphics, Inc. -XCOMM are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved. - -#define IHaveSubdirs -#define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)' - -SUBDIRS = gl glx - -MakeSubdirs($(SUBDIRS)) -InstallManSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) diff --git a/doc/gl-docs/GL/gl/Imakefile b/doc/gl-docs/GL/gl/Imakefile deleted file mode 100644 index 216ffb98..00000000 --- a/doc/gl-docs/GL/gl/Imakefile +++ /dev/null @@ -1,432 +0,0 @@ -XCOMM $XFree86: xc/doc/man/GL/gl/Imakefile,v 1.3 2002/01/15 03:32:03 dawes Exp $ - -XCOMM License Applicability. Except to the extent portions of this file are -XCOMM made subject to an alternative license as permitted in the SGI Free -XCOMM Software License B, Version 1.1 (the "License"), the contents of this -XCOMM file are subject only to the provisions of the License. You may not use -XCOMM this file except in compliance with the License. You may obtain a Copy -XCOMM of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -XCOMM Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -XCOMM -XCOMM http://oss.sgi.com/projects/FreeB -XCOMM -XCOMM Note that, as provided in the License, the Software is distributed on an -XCOMM "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -XCOMM DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -XCOMM CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -XCOMM PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -XCOMM -XCOMM Original Code. The Original Code is: OpenGL Sample Implementation, -XCOMM Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -XCOMM Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -XCOMM Copyright in any portions created by third parties is as indicated -XCOMM elsewhere herein. All Rights Reserved. -XCOMM -XCOMM Additional Notice Provisions: The application programming interfaces -XCOMM established by SGI in conjunction with the Original Code are The -XCOMM OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -XCOMM April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -XCOMM 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -XCOMM Window System(R) (Version 1.3), released October 19, 1998. This software -XCOMM was created using the OpenGL(R) version 1.2.1 Sample Implementation -XCOMM published by SGI, but has not been independently verified as being -XCOMM compliant with the OpenGL(R) version 1.2.1 Specification. -XCOMM - -MANDIR = $(LIBMANDIR) -MANSUFFIX = $(LIBMANSUFFIX) -MSUFF = man - -InstallManPage(glAccum,$(MANDIR)) -InstallManPage(glActiveTextureARB,$(MANDIR)) -InstallManPage(glAlphaFunc,$(MANDIR)) -InstallManPage(glAreTexturesResident,$(MANDIR)) -InstallManPage(glArrayElement,$(MANDIR)) -InstallManPage(glBegin,$(MANDIR)) -InstallManPageAliases(glBegin,$(MANDIR),glEnd) -InstallManPage(glBindTexture,$(MANDIR)) -InstallManPage(glBitmap,$(MANDIR)) -InstallManPage(glBlendColor,$(MANDIR)) -InstallManPage(glBlendEquation,$(MANDIR)) -InstallManPage(glBlendFunc,$(MANDIR)) -InstallManPage(glCallList,$(MANDIR)) -InstallManPage(glCallLists,$(MANDIR)) -InstallManPage(glClear,$(MANDIR)) -InstallManPage(glClearAccum,$(MANDIR)) -InstallManPage(glClearColor,$(MANDIR)) -InstallManPage(glClearDepth,$(MANDIR)) -InstallManPage(glClearIndex,$(MANDIR)) -InstallManPage(glClearStencil,$(MANDIR)) -InstallManPage(glClientActiveTextureARB,$(MANDIR)) -InstallManPage(glClipPlane,$(MANDIR)) -InstallManPage(glColor,$(MANDIR)) -InstallManPageAliases(glColor,$(MANDIR),glColor3b glColor3d glColor3f glColor3i glColor3s glColor3ub glColor3ui glColor3us glColor4b glColor4d glColor4f glColor4i glColor4s glColor4ub glColor4ui glColor4us glColor3bv glColor3dv glColor3fv glColor3iv glColor3sv glColor3ubv glColor3uiv glColor3usv glColor4bv glColor4dv glColor4fv glColor4iv glColor4sv glColor4ubv glColor4uiv glColor4usv) -InstallManPage(glColorMask,$(MANDIR)) -InstallManPage(glColorMaterial,$(MANDIR)) -InstallManPage(glColorPointer,$(MANDIR)) -InstallManPage(glColorSubTable,$(MANDIR)) -InstallManPage(glColorTable,$(MANDIR)) -InstallManPage(glColorTableParameter,$(MANDIR)) -InstallManPageAliases(glColorTableParameter,$(MANDIR),glColorTableParameterfv glColorTableParameteriv) -InstallManPage(glConvolutionFilter1D,$(MANDIR)) -InstallManPage(glConvolutionFilter2D,$(MANDIR)) -InstallManPage(glConvolutionParameter,$(MANDIR)) -InstallManPage(glCopyColorSubTable,$(MANDIR)) -InstallManPage(glCopyColorTable,$(MANDIR)) -InstallManPage(glCopyConvolutionFilter1D,$(MANDIR)) -InstallManPage(glCopyConvolutionFilter2D,$(MANDIR)) -InstallManPage(glCopyPixels,$(MANDIR)) -InstallManPage(glCopyTexImage1D,$(MANDIR)) -InstallManPage(glCopyTexImage2D,$(MANDIR)) -InstallManPage(glCopyTexSubImage1D,$(MANDIR)) -InstallManPage(glCopyTexSubImage2D,$(MANDIR)) -InstallManPage(glCopyTexSubImage3D,$(MANDIR)) -InstallManPage(glCullFace,$(MANDIR)) -InstallManPage(glDeleteLists,$(MANDIR)) -InstallManPage(glDeleteTextures,$(MANDIR)) -InstallManPage(glDepthFunc,$(MANDIR)) -InstallManPage(glDepthMask,$(MANDIR)) -InstallManPage(glDepthRange,$(MANDIR)) -InstallManPage(glDrawArrays,$(MANDIR)) -InstallManPage(glDrawBuffer,$(MANDIR)) -InstallManPage(glDrawElements,$(MANDIR)) -InstallManPage(glDrawPixels,$(MANDIR)) -InstallManPage(glDrawRangeElements,$(MANDIR)) -InstallManPage(glEdgeFlag,$(MANDIR)) -InstallManPageAliases(glEdgeFlag,$(MANDIR),glEdgeFlagv) -InstallManPage(glEdgeFlagPointer,$(MANDIR)) -InstallManPage(glEnable,$(MANDIR)) -InstallManPageAliases(glEnable,$(MANDIR),glDisable) -InstallManPage(glEnableClientState,$(MANDIR)) -InstallManPageAliases(glEnableClientState,$(MANDIR),glDisableClientState) -InstallManPage(glEvalCoord,$(MANDIR)) -InstallManPageAliases(glEvalCoord,$(MANDIR),glEvalCoord1d glEvalCoord2d glEvalCoord2f glEvalCoord1dv glEvalCoord1fv glEvalCoord2dv glEvalCoord2fv) -InstallManPage(glEvalMesh,$(MANDIR)) -InstallManPageAliases(glEvalMesh,$(MANDIR),glEvalMesh1 glEvalMesh2) -InstallManPage(glEvalPoint,$(MANDIR)) -InstallManPageAliases(glEvalPoint,$(MANDIR),glEvalPoint1 glEvalPoint2) -InstallManPage(glFeedbackBuffer,$(MANDIR)) -InstallManPage(glFinish,$(MANDIR)) -InstallManPage(glFlush,$(MANDIR)) -InstallManPage(glFog,$(MANDIR)) -InstallManPageAliases(glFog,$(MANDIR),glFogf glFogi glFogfv glFogiv) -InstallManPage(glFrontFace,$(MANDIR)) -InstallManPage(glFrustum,$(MANDIR)) -InstallManPage(glGenLists,$(MANDIR)) -InstallManPage(glGenTextures,$(MANDIR)) -InstallManPage(glGet,$(MANDIR)) -InstallManPageAliases(glGet,$(MANDIR),glGetBooleanv glGetDoublev glGetFloatv glGetIntegerv) -InstallManPage(glGetClipPlane,$(MANDIR)) -InstallManPage(glGetColorTable,$(MANDIR)) -InstallManPage(glGetColorTableParameter,$(MANDIR)) -InstallManPageAliases(glGetColorTableParameter,$(MANDIR),glGetColorTableParameterfv glGetColorTableParameteriv) -InstallManPage(glGetConvolutionFilter,$(MANDIR)) -InstallManPage(glGetConvolutionParameter,$(MANDIR)) -InstallManPage(glGetError,$(MANDIR)) -InstallManPage(glGetHistogram,$(MANDIR)) -InstallManPage(glGetHistogramParameter,$(MANDIR)) -InstallManPage(glGetLight,$(MANDIR)) -InstallManPageAliases(glGetLight,$(MANDIR),glGetLightfv glGetLightiv) -InstallManPage(glGetMap,$(MANDIR)) -InstallManPageAliases(glGetMap,$(MANDIR),glGetMapdv glGetMapfv glGetMapiv) -InstallManPage(glGetMaterial,$(MANDIR)) -InstallManPageAliases(glGetMaterial,$(MANDIR),glGetMaterialfv glGetMaterialiv) -InstallManPage(glGetMinmax,$(MANDIR)) -InstallManPage(glGetMinmaxParameter,$(MANDIR)) -InstallManPage(glGetPixelMap,$(MANDIR)) -InstallManPageAliases(glGetPixelMap,$(MANDIR),glGetPixelMapfv glGetPixelMapuiv glGetPixelMapusv) -InstallManPage(glGetPointerv,$(MANDIR)) -InstallManPage(glGetPolygonStipple,$(MANDIR)) -InstallManPage(glGetSeparableFilter,$(MANDIR)) -InstallManPage(glGetString,$(MANDIR)) -InstallManPage(glGetTexEnv,$(MANDIR)) -InstallManPageAliases(glGetTexEnv,$(MANDIR),glGetTexEnvfv glGetTexEnviv) -InstallManPage(glGetTexGen,$(MANDIR)) -InstallManPageAliases(glGetTexGen,$(MANDIR),glGetTexGendv glGetTexGenfv glGetTexGeniv) -InstallManPage(glGetTexImage,$(MANDIR)) -InstallManPage(glGetTexLevelParameter,$(MANDIR)) -InstallManPageAliases(glGetTexLevelParameter,$(MANDIR),glGetTexLevelParameterfv glGetTexLevelParameteriv) -InstallManPage(glGetTexParameter,$(MANDIR)) -InstallManPageAliases(glGetTexParameter,$(MANDIR),glGetTexParameterfv glGetTexParameteriv) -InstallManPage(glHint,$(MANDIR)) -InstallManPage(glHistogram,$(MANDIR)) -InstallManPage(glIndex,$(MANDIR)) -InstallManPageAliases(glIndex,$(MANDIR),glIndexd glIndexf glIndexi glIndexs glIndexub glIndexdv glIndexfv glIndexiv glIndexsv glIndexubv) -InstallManPage(glIndexMask,$(MANDIR)) -InstallManPage(glIndexPointer,$(MANDIR)) -InstallManPage(glInitNames,$(MANDIR)) -InstallManPage(glInterleavedArrays,$(MANDIR)) -InstallManPage(glIsEnabled,$(MANDIR)) -InstallManPage(glIslist,$(MANDIR)) -InstallManPage(glIsTexture,$(MANDIR)) -InstallManPage(glLight,$(MANDIR)) -InstallManPageAliases(glLight,$(MANDIR),glLightf glLighti glLightfv glLightiv) -InstallManPage(glLightModel,$(MANDIR)) -InstallManPageAliases(glLightModel,$(MANDIR),glLightModelf glLightModeli glLightModelfv glLightModeliv) -InstallManPage(glLineStipple,$(MANDIR)) -InstallManPage(glLineWidth,$(MANDIR)) -InstallManPage(glListBase,$(MANDIR)) -InstallManPage(glLoadIdentity,$(MANDIR)) -InstallManPage(glLoadMatrix,$(MANDIR)) -InstallManPageAliases(glLoadMatrix,$(MANDIR),glLoadMatrixd glLoadMatrixf) -InstallManPage(glLoadName,$(MANDIR)) -InstallManPage(glLogicOp,$(MANDIR)) -InstallManPage(glMap1,$(MANDIR)) -InstallManPageAliases(glMap1,$(MANDIR),glMap1d glMap1f) -InstallManPage(glMap2,$(MANDIR)) -InstallManPageAliases(glMap2,$(MANDIR),glMap2d glMap2f) -InstallManPage(glMapGrid,$(MANDIR)) -InstallManPageAliases(glMapGrid,$(MANDIR),glMapGrid1d glMapGrid1f glMapGrid2d glMapGrid2f) -InstallManPage(glMaterial,$(MANDIR)) -InstallManPageAliases(glMaterial,$(MANDIR),glMaterialf glMateriali glMaterialfv glMaterialiv) -InstallManPage(glMatrixMode,$(MANDIR)) -InstallManPage(glMinmax,$(MANDIR)) -InstallManPage(glMultiTexCoordARB,$(MANDIR)) -InstallManPageAliases(glMultiTexCoordARB,$(MANDIR),glMultiTexCoord1dARB glMultiTexCoord1dvARB glMultiTexCoord1fARB glMultiTexCoord1fvARB glMultiTexCoord1iARB glMultiTexCoord1ivARB glMultiTexCoord1sARB glMultiTexCoord1svARB glMultiTexCoord2dARB glMultiTexCoord2dvARB glMultiTexCoord2fARB glMultiTexCoord2fvARB glMultiTexCoord2iARB glMultiTexCoord2ivARB glMultiTexCoord2sARB glMultiTexCoord2svARB glMultiTexCoord3dARB glMultiTexCoord3dvARB glMultiTexCoord3fARB glMultiTexCoord3fvARB glMultiTexCoord3iARB glMultiTexCoord3ivARB glMultiTexCoord3sARB glMultiTexCoord3svARB glMultiTexCoord4dARB glMultiTexCoord4dvARB glMultiTexCoord4fARB glMultiTexCoord4fvARB glMultiTexCoord4iARB glMultiTexCoord4ivARB glMultiTexCoord4sARB glMultiTexCoord4svARB) -InstallManPage(glMultMatrix,$(MANDIR)) -InstallManPageAliases(glMultMatrix,$(MANDIR),glMultMatrixd glMultMatrixf) -InstallManPage(glNewList,$(MANDIR)) -InstallManPageAliases(glNewList,$(MANDIR),glEndList) -InstallManPage(glNormal,$(MANDIR)) -InstallManPageAliases(glNormal,$(MANDIR),glNormal3b glNormal3d glNormal3f glNormal3i glNormal3s glNormal3bv glNormal3dv glNormal3fv glNormal3iv glNormal3sv) -InstallManPage(glNormalPointer,$(MANDIR)) -InstallManPage(glOrtho,$(MANDIR)) -InstallManPage(glPassThrough,$(MANDIR)) -InstallManPage(glPixelMap,$(MANDIR)) -InstallManPageAliases(glPixelMap,$(MANDIR),glPixelMapfv glPixelMapuiv glPixelMapusv) -InstallManPage(glPixelStore,$(MANDIR)) -InstallManPageAliases(glPixelStore,$(MANDIR),glPixelStoref glPixelStorei) -InstallManPage(glPixelTransfer,$(MANDIR)) -InstallManPageAliases(glPixelTransfer,$(MANDIR),glPixelTransferf glPixelTransferi) -InstallManPage(glPixelZoom,$(MANDIR)) -InstallManPage(glPointSize,$(MANDIR)) -InstallManPage(glPolygonMode,$(MANDIR)) -InstallManPage(glPolygonOffset,$(MANDIR)) -InstallManPage(glPolygonStipple,$(MANDIR)) -InstallManPage(glPrioritizeTextures,$(MANDIR)) -InstallManPage(glPushAttrib,$(MANDIR)) -InstallManPageAliases(glPushAttrib,$(MANDIR),glPopAttrib) -InstallManPage(glPushClientAttrib,$(MANDIR)) -InstallManPageAliases(glPushClientAttrib,$(MANDIR),glPopClientAttrib) -InstallManPage(glPushMatrix,$(MANDIR)) -InstallManPageAliases(glPushMatrix,$(MANDIR),glPopMatrix) -InstallManPage(glPushName,$(MANDIR)) -InstallManPageAliases(glPushName,$(MANDIR),glPopName) -InstallManPage(glRasterPos,$(MANDIR)) -InstallManPageAliases(glRasterPos,$(MANDIR),glRasterPos2d glRasterPos2f glRasterPos2i glRasterPos2s glRasterPos3d glRasterPos3f glRasterPos3i glRasterPos3s glRasterPos4d glRasterPos4f glRasterPos4i glRasterPos4s glRasterPos2dv glRasterPos2fv glRasterPos2iv glRasterPos2sv glRasterPos3dv glRasterPos3fv glRasterPos3iv glRasterPos3sv glRasterPos4dv glRasterPos4fv glRasterPos4iv glRasterPos4sv) -InstallManPage(glReadBuffer,$(MANDIR)) -InstallManPage(glReadPixels,$(MANDIR)) -InstallManPage(glRect,$(MANDIR)) -InstallManPageAliases(glRect,$(MANDIR),glRectd glRectf glRecti glRects glRectdv glRectfv glRectiv glRectsv) -InstallManPage(glRenderMode,$(MANDIR)) -InstallManPage(glResetHistogram,$(MANDIR)) -InstallManPage(glResetMinmax,$(MANDIR)) -InstallManPage(glRotate,$(MANDIR)) -InstallManPageAliases(glRotate,$(MANDIR),glRotated glRotatef) -InstallManPage(glScale,$(MANDIR)) -InstallManPageAliases(glScale,$(MANDIR),glScaled glScalef) -InstallManPage(glScissor,$(MANDIR)) -InstallManPage(glSelectBuffer,$(MANDIR)) -InstallManPage(glSeparableFilter2D,$(MANDIR)) -InstallManPage(glShadeModel,$(MANDIR)) -InstallManPage(glStencilFunc,$(MANDIR)) -InstallManPage(glStencilMask,$(MANDIR)) -InstallManPage(glStencilOp,$(MANDIR)) -InstallManPage(glTexCoord,$(MANDIR)) -InstallManPageAliases(glTexCoord,$(MANDIR),glTexCoord1d glTexCoord1f glTexCoord1i glTexCoord1s glTexCoord2d glTexCoord2f glTexCoord2i glTexCoord2s glTexCoord3d glTexCoord3f glTexCoord3i glTexCoord3s glTexCoord4d glTexCoord4f glTexCoord4i glTexCoord4s glTexCoord1dv glTexCoord1fv glTexCoord1iv glTexCoord1sv glTexCoord2dv glTexCoord2fv glTexCoord2iv glTexCoord2sv glTexCoord3dv glTexCoord3fv glTexCoord3iv glTexCoord3sv glTexCoord4dv glTexCoord4fv glTexCoord4iv glTexCoord4sv) -InstallManPage(glTexCoordPointer,$(MANDIR)) -InstallManPage(glTexEnv,$(MANDIR)) -InstallManPageAliases(glTexEnv,$(MANDIR),glTexEnvf glTexEnvi glTexEnvfv glTexEnviv) -InstallManPage(glTexGen,$(MANDIR)) -InstallManPageAliases(glTexGen,$(MANDIR),glTexGend glTexGenf glTexGeni glTexGendv glTexGenfv glTexGeniv) -InstallManPage(glTexImage1D,$(MANDIR)) -InstallManPage(glTexImage2D,$(MANDIR)) -InstallManPage(glTexImage3D,$(MANDIR)) -InstallManPage(glTexParameter,$(MANDIR)) -InstallManPageAliases(glTexParameter,$(MANDIR),glTexParameterf glTexParameteri glTexParameterfv glTexParameteriv) -InstallManPage(glTexSubImage1D,$(MANDIR)) -InstallManPage(glTexSubImage2D,$(MANDIR)) -InstallManPage(glTexSubImage3D,$(MANDIR)) -InstallManPage(glTranslate,$(MANDIR)) -InstallManPageAliases(glTranslate,$(MANDIR),glTranslated glTranslatef) -InstallManPage(glVertex,$(MANDIR)) -InstallManPageAliases(glVertex,$(MANDIR),glVertex2d glVertex2f glVertex2i glVertex2s glVertex3d glVertex3f glVertex3i glVertex3s glVertex4d glVertex4f glVertex4i glVertex4s glVertex2dv glVertex2fv glVertex2iv glVertex2sv glVertex3dv glVertex3fv glVertex3iv glVertex3sv glVertex4dv glVertex4fv glVertex4iv glVertex4sv) -InstallManPage(glVertexPointer,$(MANDIR)) -InstallManPage(glViewport,$(MANDIR)) - -#if 0 -GLMANDIR = $(OGLSAMPLESRCDIR)/main/doc/man/mangl/standard -GLSUFFIX = gl -#else -GLMANDIR = . -GLSUFFIX = 3gl -#endif - -LinkFile(glAccum.$(MSUFF), $(GLMANDIR)/accum.$(GLSUFFIX)) -LinkFile(glActiveTextureARB.$(MSUFF), $(GLMANDIR)/activetextureARB.$(GLSUFFIX)) -LinkFile(glAlphaFunc.$(MSUFF), $(GLMANDIR)/alphafunc.$(GLSUFFIX)) -LinkFile(glAreTexturesResident.$(MSUFF), $(GLMANDIR)/aretexturesresident.$(GLSUFFIX)) -LinkFile(glArrayElement.$(MSUFF), $(GLMANDIR)/arrayelement.$(GLSUFFIX)) -LinkFile(glBegin.$(MSUFF), $(GLMANDIR)/begin.$(GLSUFFIX)) -LinkFile(glBindTexture.$(MSUFF), $(GLMANDIR)/bindtexture.$(GLSUFFIX)) -LinkFile(glBitmap.$(MSUFF), $(GLMANDIR)/bitmap.$(GLSUFFIX)) -LinkFile(glBlendColor.$(MSUFF), $(GLMANDIR)/blendcolor.$(GLSUFFIX)) -LinkFile(glBlendEquation.$(MSUFF), $(GLMANDIR)/blendequation.$(GLSUFFIX)) -LinkFile(glBlendFunc.$(MSUFF), $(GLMANDIR)/blendfunc.$(GLSUFFIX)) -LinkFile(glCallList.$(MSUFF), $(GLMANDIR)/calllist.$(GLSUFFIX)) -LinkFile(glCallLists.$(MSUFF), $(GLMANDIR)/calllists.$(GLSUFFIX)) -LinkFile(glClear.$(MSUFF), $(GLMANDIR)/clear.$(GLSUFFIX)) -LinkFile(glClearAccum.$(MSUFF), $(GLMANDIR)/clearaccum.$(GLSUFFIX)) -LinkFile(glClearColor.$(MSUFF), $(GLMANDIR)/clearcolor.$(GLSUFFIX)) -LinkFile(glClearDepth.$(MSUFF), $(GLMANDIR)/cleardepth.$(GLSUFFIX)) -LinkFile(glClearIndex.$(MSUFF), $(GLMANDIR)/clearindex.$(GLSUFFIX)) -LinkFile(glClearStencil.$(MSUFF), $(GLMANDIR)/clearstencil.$(GLSUFFIX)) -LinkFile(glClientActiveTextureARB.$(MSUFF), $(GLMANDIR)/clientactivetextureARB.$(GLSUFFIX)) -LinkFile(glClipPlane.$(MSUFF), $(GLMANDIR)/clipplane.$(GLSUFFIX)) -LinkFile(glColor.$(MSUFF), $(GLMANDIR)/color.$(GLSUFFIX)) -LinkFile(glColorMask.$(MSUFF), $(GLMANDIR)/colormask.$(GLSUFFIX)) -LinkFile(glColorMaterial.$(MSUFF), $(GLMANDIR)/colormaterial.$(GLSUFFIX)) -LinkFile(glColorPointer.$(MSUFF), $(GLMANDIR)/colorpointer.$(GLSUFFIX)) -LinkFile(glColorSubTable.$(MSUFF), $(GLMANDIR)/colorsubtable.$(GLSUFFIX)) -LinkFile(glColorTable.$(MSUFF), $(GLMANDIR)/colortable.$(GLSUFFIX)) -LinkFile(glColorTableParameter.$(MSUFF), $(GLMANDIR)/colortableparameter.$(GLSUFFIX)) -LinkFile(glConvolutionFilter1D.$(MSUFF), $(GLMANDIR)/convolutionfilter1d.$(GLSUFFIX)) -LinkFile(glConvolutionFilter2D.$(MSUFF), $(GLMANDIR)/convolutionfilter2d.$(GLSUFFIX)) -LinkFile(glConvolutionParameter.$(MSUFF), $(GLMANDIR)/convolutionparameter.$(GLSUFFIX)) -LinkFile(glCopyColorSubTable.$(MSUFF), $(GLMANDIR)/copycolorsubtable.$(GLSUFFIX)) -LinkFile(glCopyColorTable.$(MSUFF), $(GLMANDIR)/copycolortable.$(GLSUFFIX)) -LinkFile(glCopyConvolutionFilter1D.$(MSUFF), $(GLMANDIR)/copyconvolutionfilter1d.$(GLSUFFIX)) -LinkFile(glCopyConvolutionFilter2D.$(MSUFF), $(GLMANDIR)/copyconvolutionfilter2d.$(GLSUFFIX)) -LinkFile(glCopyPixels.$(MSUFF), $(GLMANDIR)/copypixels.$(GLSUFFIX)) -LinkFile(glCopyTexImage1D.$(MSUFF), $(GLMANDIR)/copyteximage1d.$(GLSUFFIX)) -LinkFile(glCopyTexImage2D.$(MSUFF), $(GLMANDIR)/copyteximage2d.$(GLSUFFIX)) -LinkFile(glCopyTexSubImage1D.$(MSUFF), $(GLMANDIR)/copytexsubimage1d.$(GLSUFFIX)) -LinkFile(glCopyTexSubImage2D.$(MSUFF), $(GLMANDIR)/copytexsubimage2d.$(GLSUFFIX)) -LinkFile(glCopyTexSubImage3D.$(MSUFF), $(GLMANDIR)/copytexsubimage3d.$(GLSUFFIX)) -LinkFile(glCullFace.$(MSUFF), $(GLMANDIR)/cullface.$(GLSUFFIX)) -LinkFile(glDeleteLists.$(MSUFF), $(GLMANDIR)/deletelists.$(GLSUFFIX)) -LinkFile(glDeleteTextures.$(MSUFF), $(GLMANDIR)/deletetextures.$(GLSUFFIX)) -LinkFile(glDepthFunc.$(MSUFF), $(GLMANDIR)/depthfunc.$(GLSUFFIX)) -LinkFile(glDepthMask.$(MSUFF), $(GLMANDIR)/depthmask.$(GLSUFFIX)) -LinkFile(glDepthRange.$(MSUFF), $(GLMANDIR)/depthrange.$(GLSUFFIX)) -LinkFile(glDrawArrays.$(MSUFF), $(GLMANDIR)/drawarrays.$(GLSUFFIX)) -LinkFile(glDrawBuffer.$(MSUFF), $(GLMANDIR)/drawbuffer.$(GLSUFFIX)) -LinkFile(glDrawElements.$(MSUFF), $(GLMANDIR)/drawelements.$(GLSUFFIX)) -LinkFile(glDrawPixels.$(MSUFF), $(GLMANDIR)/drawpixels.$(GLSUFFIX)) -LinkFile(glDrawRangeElements.$(MSUFF), $(GLMANDIR)/drawrangeelements.$(GLSUFFIX)) -LinkFile(glEdgeFlag.$(MSUFF), $(GLMANDIR)/edgeflag.$(GLSUFFIX)) -LinkFile(glEdgeFlagPointer.$(MSUFF), $(GLMANDIR)/edgeflagpointer.$(GLSUFFIX)) -LinkFile(glEnable.$(MSUFF), $(GLMANDIR)/enable.$(GLSUFFIX)) -LinkFile(glEnableClientState.$(MSUFF), $(GLMANDIR)/enableclientstate.$(GLSUFFIX)) -LinkFile(glEvalCoord.$(MSUFF), $(GLMANDIR)/evalcoord.$(GLSUFFIX)) -LinkFile(glEvalMesh.$(MSUFF), $(GLMANDIR)/evalmesh.$(GLSUFFIX)) -LinkFile(glEvalPoint.$(MSUFF), $(GLMANDIR)/evalpoint.$(GLSUFFIX)) -LinkFile(glFeedbackBuffer.$(MSUFF), $(GLMANDIR)/feedbackbuffer.$(GLSUFFIX)) -LinkFile(glFinish.$(MSUFF), $(GLMANDIR)/finish.$(GLSUFFIX)) -LinkFile(glFlush.$(MSUFF), $(GLMANDIR)/flush.$(GLSUFFIX)) -LinkFile(glFog.$(MSUFF), $(GLMANDIR)/fog.$(GLSUFFIX)) -LinkFile(glFrontFace.$(MSUFF), $(GLMANDIR)/frontface.$(GLSUFFIX)) -LinkFile(glFrustum.$(MSUFF), $(GLMANDIR)/frustum.$(GLSUFFIX)) -LinkFile(glGenLists.$(MSUFF), $(GLMANDIR)/genlists.$(GLSUFFIX)) -LinkFile(glGenTextures.$(MSUFF), $(GLMANDIR)/gentextures.$(GLSUFFIX)) -LinkFile(glGet.$(MSUFF), $(GLMANDIR)/get.$(GLSUFFIX)) -LinkFile(glGetClipPlane.$(MSUFF), $(GLMANDIR)/getclipplane.$(GLSUFFIX)) -LinkFile(glGetColorTable.$(MSUFF), $(GLMANDIR)/getcolortable.$(GLSUFFIX)) -LinkFile(glGetColorTableParameter.$(MSUFF), $(GLMANDIR)/getcolortableparameter.$(GLSUFFIX)) -LinkFile(glGetConvolutionFilter.$(MSUFF), $(GLMANDIR)/getconvolutionfilter.$(GLSUFFIX)) -LinkFile(glGetConvolutionParameter.$(MSUFF), $(GLMANDIR)/getconvolutionparameter.$(GLSUFFIX)) -LinkFile(glGetError.$(MSUFF), $(GLMANDIR)/geterror.$(GLSUFFIX)) -LinkFile(glGetHistogram.$(MSUFF), $(GLMANDIR)/gethistogram.$(GLSUFFIX)) -LinkFile(glGetHistogramParameter.$(MSUFF), $(GLMANDIR)/gethistogramparameter.$(GLSUFFIX)) -LinkFile(glGetLight.$(MSUFF), $(GLMANDIR)/getlight.$(GLSUFFIX)) -LinkFile(glGetMap.$(MSUFF), $(GLMANDIR)/getmap.$(GLSUFFIX)) -LinkFile(glGetMaterial.$(MSUFF), $(GLMANDIR)/getmaterial.$(GLSUFFIX)) -LinkFile(glGetMinmax.$(MSUFF), $(GLMANDIR)/getminmax.$(GLSUFFIX)) -LinkFile(glGetMinmaxParameter.$(MSUFF), $(GLMANDIR)/getminmaxparameter.$(GLSUFFIX)) -LinkFile(glGetPixelMap.$(MSUFF), $(GLMANDIR)/getpixelmap.$(GLSUFFIX)) -LinkFile(glGetPointerv.$(MSUFF), $(GLMANDIR)/getpointerv.$(GLSUFFIX)) -LinkFile(glGetPolygonStipple.$(MSUFF), $(GLMANDIR)/getpolygonstipple.$(GLSUFFIX)) -LinkFile(glGetSeparableFilter.$(MSUFF), $(GLMANDIR)/getseparablefilter.$(GLSUFFIX)) -LinkFile(glGetString.$(MSUFF), $(GLMANDIR)/getstring.$(GLSUFFIX)) -LinkFile(glGetTexEnv.$(MSUFF), $(GLMANDIR)/gettexenv.$(GLSUFFIX)) -LinkFile(glGetTexGen.$(MSUFF), $(GLMANDIR)/gettexgen.$(GLSUFFIX)) -LinkFile(glGetTexImage.$(MSUFF), $(GLMANDIR)/getteximage.$(GLSUFFIX)) -LinkFile(glGetTexLevelParameter.$(MSUFF), $(GLMANDIR)/gettexlevelparameter.$(GLSUFFIX)) -LinkFile(glGetTexParameter.$(MSUFF), $(GLMANDIR)/gettexparameter.$(GLSUFFIX)) -LinkFile(glHint.$(MSUFF), $(GLMANDIR)/hint.$(GLSUFFIX)) -LinkFile(glHistogram.$(MSUFF), $(GLMANDIR)/histogram.$(GLSUFFIX)) -LinkFile(glIndex.$(MSUFF), $(GLMANDIR)/index.$(GLSUFFIX)) -LinkFile(glIndexMask.$(MSUFF), $(GLMANDIR)/indexmask.$(GLSUFFIX)) -LinkFile(glIndexPointer.$(MSUFF), $(GLMANDIR)/indexpointer.$(GLSUFFIX)) -LinkFile(glInitNames.$(MSUFF), $(GLMANDIR)/initnames.$(GLSUFFIX)) -LinkFile(glInterleavedArrays.$(MSUFF), $(GLMANDIR)/interleavedarrays.$(GLSUFFIX)) -LinkFile(glIsEnabled.$(MSUFF), $(GLMANDIR)/isenabled.$(GLSUFFIX)) -LinkFile(glIslist.$(MSUFF), $(GLMANDIR)/islist.$(GLSUFFIX)) -LinkFile(glIsTexture.$(MSUFF), $(GLMANDIR)/istexture.$(GLSUFFIX)) -LinkFile(glLight.$(MSUFF), $(GLMANDIR)/light.$(GLSUFFIX)) -LinkFile(glLightModel.$(MSUFF), $(GLMANDIR)/lightmodel.$(GLSUFFIX)) -LinkFile(glLineStipple.$(MSUFF), $(GLMANDIR)/linestipple.$(GLSUFFIX)) -LinkFile(glLineWidth.$(MSUFF), $(GLMANDIR)/linewidth.$(GLSUFFIX)) -LinkFile(glListBase.$(MSUFF), $(GLMANDIR)/listbase.$(GLSUFFIX)) -LinkFile(glLoadIdentity.$(MSUFF), $(GLMANDIR)/loadidentity.$(GLSUFFIX)) -LinkFile(glLoadMatrix.$(MSUFF), $(GLMANDIR)/loadmatrix.$(GLSUFFIX)) -LinkFile(glLoadName.$(MSUFF), $(GLMANDIR)/loadname.$(GLSUFFIX)) -LinkFile(glLogicOp.$(MSUFF), $(GLMANDIR)/logicop.$(GLSUFFIX)) -LinkFile(glMap1.$(MSUFF), $(GLMANDIR)/map1.$(GLSUFFIX)) -LinkFile(glMap2.$(MSUFF), $(GLMANDIR)/map2.$(GLSUFFIX)) -LinkFile(glMapGrid.$(MSUFF), $(GLMANDIR)/mapgrid.$(GLSUFFIX)) -LinkFile(glMaterial.$(MSUFF), $(GLMANDIR)/material.$(GLSUFFIX)) -LinkFile(glMatrixMode.$(MSUFF), $(GLMANDIR)/matrixmode.$(GLSUFFIX)) -LinkFile(glMinmax.$(MSUFF), $(GLMANDIR)/minmax.$(GLSUFFIX)) -LinkFile(glMultiTexCoordARB.$(MSUFF), $(GLMANDIR)/multitexcoordARB.$(GLSUFFIX)) -LinkFile(glMultMatrix.$(MSUFF), $(GLMANDIR)/multmatrix.$(GLSUFFIX)) -LinkFile(glNewList.$(MSUFF), $(GLMANDIR)/newlist.$(GLSUFFIX)) -LinkFile(glNormal.$(MSUFF), $(GLMANDIR)/normal.$(GLSUFFIX)) -LinkFile(glNormalPointer.$(MSUFF), $(GLMANDIR)/normalpointer.$(GLSUFFIX)) -LinkFile(glOrtho.$(MSUFF), $(GLMANDIR)/ortho.$(GLSUFFIX)) -LinkFile(glPassThrough.$(MSUFF), $(GLMANDIR)/passthrough.$(GLSUFFIX)) -LinkFile(glPixelMap.$(MSUFF), $(GLMANDIR)/pixelmap.$(GLSUFFIX)) -LinkFile(glPixelStore.$(MSUFF), $(GLMANDIR)/pixelstore.$(GLSUFFIX)) -LinkFile(glPixelTransfer.$(MSUFF), $(GLMANDIR)/pixeltransfer.$(GLSUFFIX)) -LinkFile(glPixelZoom.$(MSUFF), $(GLMANDIR)/pixelzoom.$(GLSUFFIX)) -LinkFile(glPointSize.$(MSUFF), $(GLMANDIR)/pointsize.$(GLSUFFIX)) -LinkFile(glPolygonMode.$(MSUFF), $(GLMANDIR)/polygonmode.$(GLSUFFIX)) -LinkFile(glPolygonOffset.$(MSUFF), $(GLMANDIR)/polygonoffset.$(GLSUFFIX)) -LinkFile(glPolygonStipple.$(MSUFF), $(GLMANDIR)/polygonstipple.$(GLSUFFIX)) -LinkFile(glPrioritizeTextures.$(MSUFF), $(GLMANDIR)/prioritizetextures.$(GLSUFFIX)) -LinkFile(glPushAttrib.$(MSUFF), $(GLMANDIR)/pushattrib.$(GLSUFFIX)) -LinkFile(glPushClientAttrib.$(MSUFF), $(GLMANDIR)/pushclientattrib.$(GLSUFFIX)) -LinkFile(glPushMatrix.$(MSUFF), $(GLMANDIR)/pushmatrix.$(GLSUFFIX)) -LinkFile(glPushName.$(MSUFF), $(GLMANDIR)/pushname.$(GLSUFFIX)) -LinkFile(glRasterPos.$(MSUFF), $(GLMANDIR)/rasterpos.$(GLSUFFIX)) -LinkFile(glReadBuffer.$(MSUFF), $(GLMANDIR)/readbuffer.$(GLSUFFIX)) -LinkFile(glReadPixels.$(MSUFF), $(GLMANDIR)/readpixels.$(GLSUFFIX)) -LinkFile(glRect.$(MSUFF), $(GLMANDIR)/rect.$(GLSUFFIX)) -LinkFile(glRenderMode.$(MSUFF), $(GLMANDIR)/rendermode.$(GLSUFFIX)) -LinkFile(glResetHistogram.$(MSUFF), $(GLMANDIR)/resethistogram.$(GLSUFFIX)) -LinkFile(glResetMinmax.$(MSUFF), $(GLMANDIR)/resetminmax.$(GLSUFFIX)) -LinkFile(glRotate.$(MSUFF), $(GLMANDIR)/rotate.$(GLSUFFIX)) -LinkFile(glScale.$(MSUFF), $(GLMANDIR)/scale.$(GLSUFFIX)) -LinkFile(glScissor.$(MSUFF), $(GLMANDIR)/scissor.$(GLSUFFIX)) -LinkFile(glSelectBuffer.$(MSUFF), $(GLMANDIR)/selectbuffer.$(GLSUFFIX)) -LinkFile(glSeparableFilter2D.$(MSUFF), $(GLMANDIR)/separablefilter2d.$(GLSUFFIX)) -LinkFile(glShadeModel.$(MSUFF), $(GLMANDIR)/shademodel.$(GLSUFFIX)) -LinkFile(glStencilFunc.$(MSUFF), $(GLMANDIR)/stencilfunc.$(GLSUFFIX)) -LinkFile(glStencilMask.$(MSUFF), $(GLMANDIR)/stencilmask.$(GLSUFFIX)) -LinkFile(glStencilOp.$(MSUFF), $(GLMANDIR)/stencilop.$(GLSUFFIX)) -LinkFile(glTexCoord.$(MSUFF), $(GLMANDIR)/texcoord.$(GLSUFFIX)) -LinkFile(glTexCoordPointer.$(MSUFF), $(GLMANDIR)/texcoordpointer.$(GLSUFFIX)) -LinkFile(glTexEnv.$(MSUFF), $(GLMANDIR)/texenv.$(GLSUFFIX)) -LinkFile(glTexGen.$(MSUFF), $(GLMANDIR)/texgen.$(GLSUFFIX)) -LinkFile(glTexImage1D.$(MSUFF), $(GLMANDIR)/teximage1d.$(GLSUFFIX)) -LinkFile(glTexImage2D.$(MSUFF), $(GLMANDIR)/teximage2d.$(GLSUFFIX)) -LinkFile(glTexImage3D.$(MSUFF), $(GLMANDIR)/teximage3d.$(GLSUFFIX)) -LinkFile(glTexParameter.$(MSUFF), $(GLMANDIR)/texparameter.$(GLSUFFIX)) -LinkFile(glTexSubImage1D.$(MSUFF), $(GLMANDIR)/texsubimage1d.$(GLSUFFIX)) -LinkFile(glTexSubImage2D.$(MSUFF), $(GLMANDIR)/texsubimage2d.$(GLSUFFIX)) -LinkFile(glTexSubImage3D.$(MSUFF), $(GLMANDIR)/texsubimage3d.$(GLSUFFIX)) -LinkFile(glTranslate.$(MSUFF), $(GLMANDIR)/translate.$(GLSUFFIX)) -LinkFile(glVertex.$(MSUFF), $(GLMANDIR)/vertex.$(GLSUFFIX)) -LinkFile(glVertexPointer.$(MSUFF), $(GLMANDIR)/vertexpointer.$(GLSUFFIX)) -LinkFile(glViewport.$(MSUFF), $(GLMANDIR)/viewport.$(GLSUFFIX)) - diff --git a/doc/gl-docs/GL/gl/Makefile b/doc/gl-docs/GL/gl/Makefile deleted file mode 100644 index 9d53a33f..00000000 --- a/doc/gl-docs/GL/gl/Makefile +++ /dev/null @@ -1,450 +0,0 @@ -# $OpenBSD: Makefile,v 1.1 2012/08/07 21:10:35 matthieu Exp $ - -X11BASE?= /usr/X11R6 -MANDIR?= ${X11BASE}/man/man - -MAN += glAccum.3 accum.3gl -MAN += glActiveTextureARB.3 activetextureARB.3gl -MAN += glAlphaFunc.3 alphafunc.3gl -MAN += glAreTexturesResident.3 aretexturesresident.3gl -MAN += glArrayElement.3 arrayelement.3gl -MAN += glBegin.3 begin.3gl -MAN += glBindTexture.3 bindtexture.3gl -MAN += glBitmap.3 bitmap.3gl -MAN += glBlendColor.3 blendcolor.3gl -MAN += glBlendEquation.3 blendequation.3gl -MAN += glBlendFunc.3 blendfunc.3gl -MAN += glCallList.3 calllist.3gl -MAN += glCallLists.3 calllists.3gl -MAN += glClear.3 clear.3gl -MAN += glClearAccum.3 clearaccum.3gl -MAN += glClearColor.3 clearcolor.3gl -MAN += glClearDepth.3 cleardepth.3gl -MAN += glClearIndex.3 clearindex.3gl -MAN += glClearStencil.3 clearstencil.3gl -MAN += glClientActiveTextureARB.3 clientactivetextureARB.3gl -MAN += glClipPlane.3 clipplane.3gl -MAN += glColor.3 color.3gl -MAN += glColorMask.3 colormask.3gl -MAN += glColorMaterial.3 colormaterial.3gl -MAN += glColorPointer.3 colorpointer.3gl -MAN += glColorSubTable.3 colorsubtable.3gl -MAN += glColorTable.3 colortable.3gl -MAN += glColorTableParameter.3 colortableparameter.3gl -MAN += glConvolutionFilter1D.3 convolutionfilter1d.3gl -MAN += glConvolutionFilter2D.3 convolutionfilter2d.3gl -MAN += glConvolutionParameter.3 convolutionparameter.3gl -MAN += glCopyColorSubTable.3 copycolorsubtable.3gl -MAN += glCopyColorTable.3 copycolortable.3gl -MAN += glCopyConvolutionFilter1D.3 copyconvolutionfilter1d.3gl -MAN += glCopyConvolutionFilter2D.3 copyconvolutionfilter2d.3gl -MAN += glCopyPixels.3 copypixels.3gl -MAN += glCopyTexImage1D.3 copyteximage1d.3gl -MAN += glCopyTexImage2D.3 copyteximage2d.3gl -MAN += glCopyTexSubImage1D.3 copytexsubimage1d.3gl -MAN += glCopyTexSubImage2D.3 copytexsubimage2d.3gl -MAN += glCopyTexSubImage3D.3 copytexsubimage3d.3gl -MAN += glCullFace.3 cullface.3gl -MAN += glDeleteLists.3 deletelists.3gl -MAN += glDeleteTextures.3 deletetextures.3gl -MAN += glDepthFunc.3 depthfunc.3gl -MAN += glDepthMask.3 depthmask.3gl -MAN += glDepthRange.3 depthrange.3gl -MAN += glDrawArrays.3 drawarrays.3gl -MAN += glDrawBuffer.3 drawbuffer.3gl -MAN += glDrawElements.3 drawelements.3gl -MAN += glDrawPixels.3 drawpixels.3gl -MAN += glDrawRangeElements.3 drawrangeelements.3gl -MAN += glEdgeFlag.3 edgeflag.3gl -MAN += glEdgeFlagPointer.3 edgeflagpointer.3gl -MAN += glEnable.3 enable.3gl -MAN += glEnableClientState.3 enableclientstate.3gl -MAN += glEvalCoord.3 evalcoord.3gl -MAN += glEvalMesh.3 evalmesh.3gl -MAN += glEvalPoint.3 evalpoint.3gl -MAN += glFeedbackBuffer.3 feedbackbuffer.3gl -MAN += glFinish.3 finish.3gl -MAN += glFlush.3 flush.3gl -MAN += glFog.3 fog.3gl -MAN += glFrontFace.3 frontface.3gl -MAN += glFrustum.3 frustum.3gl -MAN += glGenLists.3 genlists.3gl -MAN += glGenTextures.3 gentextures.3gl -MAN += glGet.3 get.3gl -MAN += glGetClipPlane.3 getclipplane.3gl -MAN += glGetColorTable.3 getcolortable.3gl -MAN += glGetColorTableParameter.3 getcolortableparameter.3gl -MAN += glGetConvolutionFilter.3 getconvolutionfilter.3gl -MAN += glGetConvolutionParameter.3 getconvolutionparameter.3gl -MAN += glGetError.3 geterror.3gl -MAN += glGetHistogram.3 gethistogram.3gl -MAN += glGetHistogramParameter.3 gethistogramparameter.3gl -MAN += glGetLight.3 getlight.3gl -MAN += glGetMap.3 getmap.3gl -MAN += glGetMaterial.3 getmaterial.3gl -MAN += glGetMinmax.3 getminmax.3gl -MAN += glGetMinmaxParameter.3 getminmaxparameter.3gl -MAN += glGetPixelMap.3 getpixelmap.3gl -MAN += glGetPointerv.3 getpointerv.3gl -MAN += glGetPolygonStipple.3 getpolygonstipple.3gl -MAN += glGetSeparableFilter.3 getseparablefilter.3gl -MAN += glGetString.3 getstring.3gl -MAN += glGetTexEnv.3 gettexenv.3gl -MAN += glGetTexGen.3 gettexgen.3gl -MAN += glGetTexImage.3 getteximage.3gl -MAN += glGetTexLevelParameter.3 gettexlevelparameter.3gl -MAN += glGetTexParameter.3 gettexparameter.3gl -MAN += glHint.3 hint.3gl -MAN += glHistogram.3 histogram.3gl -MAN += glIndex.3 index.3gl -MAN += glIndexMask.3 indexmask.3gl -MAN += glIndexPointer.3 indexpointer.3gl -MAN += glInitNames.3 initnames.3gl -MAN += glInterleavedArrays.3 interleavedarrays.3gl -MAN += glIsEnabled.3 isenabled.3gl -MAN += glIslist.3 islist.3gl -MAN += glIsTexture.3 istexture.3gl -MAN += glLight.3 light.3gl -MAN += glLightModel.3 lightmodel.3gl -MAN += glLineStipple.3 linestipple.3gl -MAN += glLineWidth.3 linewidth.3gl -MAN += glListBase.3 listbase.3gl -MAN += glLoadIdentity.3 loadidentity.3gl -MAN += glLoadMatrix.3 loadmatrix.3gl -MAN += glLoadName.3 loadname.3gl -MAN += glLogicOp.3 logicop.3gl -MAN += glMap1.3 map1.3gl -MAN += glMap2.3 map2.3gl -MAN += glMapGrid.3 mapgrid.3gl -MAN += glMaterial.3 material.3gl -MAN += glMatrixMode.3 matrixmode.3gl -MAN += glMinmax.3 minmax.3gl -MAN += glMultiTexCoordARB.3 multitexcoordARB.3gl -MAN += glMultMatrix.3 multmatrix.3gl -MAN += glNewList.3 newlist.3gl -MAN += glNormal.3 normal.3gl -MAN += glNormalPointer.3 normalpointer.3gl -MAN += glOrtho.3 ortho.3gl -MAN += glPassThrough.3 passthrough.3gl -MAN += glPixelMap.3 pixelmap.3gl -MAN += glPixelStore.3 pixelstore.3gl -MAN += glPixelTransfer.3 pixeltransfer.3gl -MAN += glPixelZoom.3 pixelzoom.3gl -MAN += glPointSize.3 pointsize.3gl -MAN += glPolygonMode.3 polygonmode.3gl -MAN += glPolygonOffset.3 polygonoffset.3gl -MAN += glPolygonStipple.3 polygonstipple.3gl -MAN += glPrioritizeTextures.3 prioritizetextures.3gl -MAN += glPushAttrib.3 pushattrib.3gl -MAN += glPushClientAttrib.3 pushclientattrib.3gl -MAN += glPushMatrix.3 pushmatrix.3gl -MAN += glPushName.3 pushname.3gl -MAN += glRasterPos.3 rasterpos.3gl -MAN += glReadBuffer.3 readbuffer.3gl -MAN += glReadPixels.3 readpixels.3gl -MAN += glRect.3 rect.3gl -MAN += glRenderMode.3 rendermode.3gl -MAN += glResetHistogram.3 resethistogram.3gl -MAN += glResetMinmax.3 resetminmax.3gl -MAN += glRotate.3 rotate.3gl -MAN += glScale.3 scale.3gl -MAN += glScissor.3 scissor.3gl -MAN += glSelectBuffer.3 selectbuffer.3gl -MAN += glSeparableFilter2D.3 separablefilter2d.3gl -MAN += glShadeModel.3 shademodel.3gl -MAN += glStencilFunc.3 stencilfunc.3gl -MAN += glStencilMask.3 stencilmask.3gl -MAN += glStencilOp.3 stencilop.3gl -MAN += glTexCoord.3 texcoord.3gl -MAN += glTexCoordPointer.3 texcoordpointer.3gl -MAN += glTexEnv.3 texenv.3gl -MAN += glTexGen.3 texgen.3gl -MAN += glTexImage1D.3 teximage1d.3gl -MAN += glTexImage2D.3 teximage2d.3gl -MAN += glTexImage3D.3 teximage3d.3gl -MAN += glTexParameter.3 texparameter.3gl -MAN += glTexSubImage1D.3 texsubimage1d.3gl -MAN += glTexSubImage2D.3 texsubimage2d.3gl -MAN += glTexSubImage3D.3 texsubimage3d.3gl -MAN += glTranslate.3 translate.3gl -MAN += glVertex.3 vertex.3gl -MAN += glVertexPointer.3 vertexpointer.3gl -MAN += glViewport.3 viewport.3gl - -LINKS += glBegin.3 glEnd.3 -LINKS += glColor.3 glColor3b.3 -LINKS += glColor.3 glColor3d.3 -LINKS += glColor.3 glColor3f.3 -LINKS += glColor.3 glColor3i.3 -LINKS += glColor.3 glColor3s.3 -LINKS += glColor.3 glColor3ub.3 -LINKS += glColor.3 glColor3ui.3 -LINKS += glColor.3 glColor3us.3 -LINKS += glColor.3 glColor4b.3 -LINKS += glColor.3 glColor4d.3 -LINKS += glColor.3 glColor4f.3 -LINKS += glColor.3 glColor4i.3 -LINKS += glColor.3 glColor4s.3 -LINKS += glColor.3 glColor4ub.3 -LINKS += glColor.3 glColor4ui.3 -LINKS += glColor.3 glColor4us.3 -LINKS += glColor.3 glColor3bv.3 -LINKS += glColor.3 glColor3dv.3 -LINKS += glColor.3 glColor3fv.3 -LINKS += glColor.3 glColor3iv.3 -LINKS += glColor.3 glColor3sv.3 -LINKS += glColor.3 glColor3ubv.3 -LINKS += glColor.3 glColor3uiv.3 -LINKS += glColor.3 glColor3usv.3 -LINKS += glColor.3 glColor4bv.3 -LINKS += glColor.3 glColor4dv.3 -LINKS += glColor.3 glColor4fv.3 -LINKS += glColor.3 glColor4iv.3 -LINKS += glColor.3 glColor4sv.3 -LINKS += glColor.3 glColor4ubv.3 -LINKS += glColor.3 glColor4uiv.3 -LINKS += glColor.3 glColor4usv.3 -LINKS += glColorTableParameter.3 glColorTableParameterfv.3 -LINKS += glColorTableParameter.3 glColorTableParameteriv.3 -LINKS += glEdgeFlag.3 glEdgeFlagv.3 -LINKS += glEnable.3 glDisable.3 -LINKS += glEnableClientState.3 glDisableClientState.3 -LINKS += glEvalCoord.3 glEvalCoord1d.3 -LINKS += glEvalCoord.3 glEvalCoord2d.3 -LINKS += glEvalCoord.3 glEvalCoord2f.3 -LINKS += glEvalCoord.3 glEvalCoord1dv.3 -LINKS += glEvalCoord.3 glEvalCoord1fv.3 -LINKS += glEvalCoord.3 glEvalCoord2dv.3 -LINKS += glEvalCoord.3 glEvalCoord2fv.3 -LINKS += glEvalMesh.3 glEvalMesh1.3 -LINKS += glEvalMesh.3 glEvalMesh2.3 -LINKS += glEvalPoint.3 glEvalPoint1.3 -LINKS += glEvalPoint.3 glEvalPoint2.3 -LINKS += glFog.3 glFogf.3 -LINKS += glFog.3 glFogi.3 -LINKS += glFog.3 glFogfv.3 -LINKS += glFog.3 glFogiv.3 -LINKS += glGet.3 glGetBooleanv.3 -LINKS += glGet.3 glGetDoublev.3 -LINKS += glGet.3 glGetFloatv.3 -LINKS += glGet.3 glGetIntegerv.3 -LINKS += glGetColorTableParameter.3 glGetColorTableParameterfv.3 -LINKS += glGetColorTableParameter.3 glGetColorTableParameteriv.3 -LINKS += glGetLight.3 glGetLightfv.3 -LINKS += glGetLight.3 glGetLightiv.3 -LINKS += glGetMap.3 glGetMapdv.3 -LINKS += glGetMap.3 glGetMapfv.3 -LINKS += glGetMap.3 glGetMapiv.3 -LINKS += glGetMaterial.3 glGetMaterialfv.3 -LINKS += glGetMaterial.3 glGetMaterialiv.3 -LINKS += glGetPixelMap.3 glGetPixelMapfv.3 -LINKS += glGetPixelMap.3 glGetPixelMapuiv.3 -LINKS += glGetPixelMap.3 glGetPixelMapusv.3 -LINKS += glGetTexEnv.3 glGetTexEnvfv.3 -LINKS += glGetTexEnv.3 glGetTexEnviv.3 -LINKS += glGetTexGen.3 glGetTexGendv.3 -LINKS += glGetTexGen.3 glGetTexGenfv.3 -LINKS += glGetTexGen.3 glGetTexGeniv.3 -LINKS += glGetTexLevelParameter.3 glGetTexLevelParameterfv.3 -LINKS += glGetTexLevelParameter.3 glGetTexLevelParameteriv.3 -LINKS += glGetTexParameter.3 glGetTexParameterfv.3 -LINKS += glGetTexParameter.3 glGetTexParameteriv.3 -LINKS += glIndex.3 glIndexd.3 -LINKS += glIndex.3 glIndexf.3 -LINKS += glIndex.3 glIndexi.3 -LINKS += glIndex.3 glIndexs.3 -LINKS += glIndex.3 glIndexub.3 -LINKS += glIndex.3 glIndexdv.3 -LINKS += glIndex.3 glIndexfv.3 -LINKS += glIndex.3 glIndexiv.3 -LINKS += glIndex.3 glIndexsv.3 -LINKS += glIndex.3 glIndexubv.3 -LINKS += glLight.3 glLightf.3 -LINKS += glLight.3 glLighti.3 -LINKS += glLight.3 glLightfv.3 -LINKS += glLight.3 glLightiv.3 -LINKS += glLightModel.3 glLightModelf.3 -LINKS += glLightModel.3 glLightModeli.3 -LINKS += glLightModel.3 glLightModelfv.3 -LINKS += glLightModel.3 glLightModeliv.3 -LINKS += glLoadMatrix.3 glLoadMatrixd.3 -LINKS += glLoadMatrix.3 glLoadMatrixf.3 -LINKS += glMap1.3 glMap1d.3 -LINKS += glMap1.3 glMap1f.3 -LINKS += glMap2.3 glMap2d.3 -LINKS += glMap2.3 glMap2f.3 -LINKS += glMapGrid.3 glMapGrid1d.3 -LINKS += glMapGrid.3 glMapGrid1f.3 -LINKS += glMapGrid.3 glMapGrid2d.3 -LINKS += glMapGrid.3 glMapGrid2f.3 -LINKS += glMaterial.3 glMaterialf.3 -LINKS += glMaterial.3 glMateriali.3 -LINKS += glMaterial.3 glMaterialfv.3 -LINKS += glMaterial.3 glMaterialiv.3 -LINKS += glMultMatrix.3 glMultMatrixd.3 -LINKS += glMultMatrix.3 glMultMatrixf.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord1dARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord1dvARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord1fARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord1fvARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord1iARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord1ivARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord1sARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord1svARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord2dARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord2dvARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord2fARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord2fvARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord2iARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord2ivARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord2sARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord2svARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord3dARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord3dvARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord3fARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord3fvARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord3iARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord3ivARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord3sARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord3svARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord4dARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord4dvARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord4fARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord4fvARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord4iARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord4ivARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord4sARB.3 -LINKS += glMultiTexCoordARB.3 glMultiTexCoord4svARB.3 -LINKS += glNewList.3 glEndList.3 -LINKS += glNormal.3 glNormal3b.3 -LINKS += glNormal.3 glNormal3d.3 -LINKS += glNormal.3 glNormal3f.3 -LINKS += glNormal.3 glNormal3i.3 -LINKS += glNormal.3 glNormal3s.3 -LINKS += glNormal.3 glNormal3bv.3 -LINKS += glNormal.3 glNormal3dv.3 -LINKS += glNormal.3 glNormal3fv.3 -LINKS += glNormal.3 glNormal3iv.3 -LINKS += glNormal.3 glNormal3sv.3 -LINKS += glPixelMap.3 glPixelMapfv.3 -LINKS += glPixelMap.3 glPixelMapuiv.3 -LINKS += glPixelMap.3 glPixelMapusv.3 -LINKS += glPixelStore.3 glPixelStoref.3 -LINKS += glPixelStore.3 glPixelStorei.3 -LINKS += glPixelTransfer.3 glPixelTransferf.3 -LINKS += glPixelTransfer.3 glPixelTransferi.3 -LINKS += glPushAttrib.3 glPopAttrib.3 -LINKS += glPushClientAttrib.3 glPopClientAttrib.3 -LINKS += glPushMatrix.3 glPopMatrix.3 -LINKS += glPushName.3 glPopName.3 -LINKS += glRasterPos.3 glRasterPos2d.3 -LINKS += glRasterPos.3 glRasterPos2f.3 -LINKS += glRasterPos.3 glRasterPos2i.3 -LINKS += glRasterPos.3 glRasterPos2s.3 -LINKS += glRasterPos.3 glRasterPos3d.3 -LINKS += glRasterPos.3 glRasterPos3f.3 -LINKS += glRasterPos.3 glRasterPos3i.3 -LINKS += glRasterPos.3 glRasterPos3s.3 -LINKS += glRasterPos.3 glRasterPos4d.3 -LINKS += glRasterPos.3 glRasterPos4f.3 -LINKS += glRasterPos.3 glRasterPos4i.3 -LINKS += glRasterPos.3 glRasterPos4s.3 -LINKS += glRasterPos.3 glRasterPos2dv.3 -LINKS += glRasterPos.3 glRasterPos2fv.3 -LINKS += glRasterPos.3 glRasterPos2iv.3 -LINKS += glRasterPos.3 glRasterPos2sv.3 -LINKS += glRasterPos.3 glRasterPos3dv.3 -LINKS += glRasterPos.3 glRasterPos3fv.3 -LINKS += glRasterPos.3 glRasterPos3iv.3 -LINKS += glRasterPos.3 glRasterPos3sv.3 -LINKS += glRasterPos.3 glRasterPos4dv.3 -LINKS += glRasterPos.3 glRasterPos4fv.3 -LINKS += glRasterPos.3 glRasterPos4iv.3 -LINKS += glRasterPos.3 glRasterPos4sv.3 -LINKS += glRect.3 glRectd.3 -LINKS += glRect.3 glRectf.3 -LINKS += glRect.3 glRecti.3 -LINKS += glRect.3 glRects.3 -LINKS += glRect.3 glRectdv.3 -LINKS += glRect.3 glRectfv.3 -LINKS += glRect.3 glRectiv.3 -LINKS += glRect.3 glRectsv.3 -LINKS += glRotate.3 glRotated.3 -LINKS += glRotate.3 glRotatef.3 -LINKS += glScale.3 glScaled.3 -LINKS += glScale.3 glScalef.3 -LINKS += glTexCoord.3 glTexCoord1d.3 -LINKS += glTexCoord.3 glTexCoord1f.3 -LINKS += glTexCoord.3 glTexCoord1i.3 -LINKS += glTexCoord.3 glTexCoord1s.3 -LINKS += glTexCoord.3 glTexCoord2d.3 -LINKS += glTexCoord.3 glTexCoord2f.3 -LINKS += glTexCoord.3 glTexCoord2i.3 -LINKS += glTexCoord.3 glTexCoord2s.3 -LINKS += glTexCoord.3 glTexCoord3d.3 -LINKS += glTexCoord.3 glTexCoord3f.3 -LINKS += glTexCoord.3 glTexCoord3i.3 -LINKS += glTexCoord.3 glTexCoord3s.3 -LINKS += glTexCoord.3 glTexCoord4d.3 -LINKS += glTexCoord.3 glTexCoord4f.3 -LINKS += glTexCoord.3 glTexCoord4i.3 -LINKS += glTexCoord.3 glTexCoord4s.3 -LINKS += glTexCoord.3 glTexCoord1dv.3 -LINKS += glTexCoord.3 glTexCoord1fv.3 -LINKS += glTexCoord.3 glTexCoord1iv.3 -LINKS += glTexCoord.3 glTexCoord1sv.3 -LINKS += glTexCoord.3 glTexCoord2dv.3 -LINKS += glTexCoord.3 glTexCoord2fv.3 -LINKS += glTexCoord.3 glTexCoord2iv.3 -LINKS += glTexCoord.3 glTexCoord2sv.3 -LINKS += glTexCoord.3 glTexCoord3dv.3 -LINKS += glTexCoord.3 glTexCoord3fv.3 -LINKS += glTexCoord.3 glTexCoord3iv.3 -LINKS += glTexCoord.3 glTexCoord3sv.3 -LINKS += glTexCoord.3 glTexCoord4dv.3 -LINKS += glTexCoord.3 glTexCoord4fv.3 -LINKS += glTexCoord.3 glTexCoord4iv.3 -LINKS += glTexCoord.3 glTexCoord4sv.3 -LINKS += glTexEnv.3 glTexEnvf.3 -LINKS += glTexEnv.3 glTexEnvi.3 -LINKS += glTexEnv.3 glTexEnvfv.3 -LINKS += glTexEnv.3 glTexEnviv.3 -LINKS += glTexGen.3 glTexGend.3 -LINKS += glTexGen.3 glTexGenf.3 -LINKS += glTexGen.3 glTexGeni.3 -LINKS += glTexGen.3 glTexGendv.3 -LINKS += glTexGen.3 glTexGenfv.3 -LINKS += glTexGen.3 glTexGeniv.3 -LINKS += glTexParameter.3 glTexParameterf.3 -LINKS += glTexParameter.3 glTexParameteri.3 -LINKS += glTexParameter.3 glTexParameterfv.3 -LINKS += glTexParameter.3 glTexParameteriv.3 -LINKS += glTranslate.3 glTranslated.3 -LINKS += glTranslate.3 glTranslatef.3 -LINKS += glVertex.3 glVertex2d.3 -LINKS += glVertex.3 glVertex2f.3 -LINKS += glVertex.3 glVertex2i.3 -LINKS += glVertex.3 glVertex2s.3 -LINKS += glVertex.3 glVertex3d.3 -LINKS += glVertex.3 glVertex3f.3 -LINKS += glVertex.3 glVertex3i.3 -LINKS += glVertex.3 glVertex3s.3 -LINKS += glVertex.3 glVertex4d.3 -LINKS += glVertex.3 glVertex4f.3 -LINKS += glVertex.3 glVertex4i.3 -LINKS += glVertex.3 glVertex4s.3 -LINKS += glVertex.3 glVertex2dv.3 -LINKS += glVertex.3 glVertex2fv.3 -LINKS += glVertex.3 glVertex2iv.3 -LINKS += glVertex.3 glVertex2sv.3 -LINKS += glVertex.3 glVertex3dv.3 -LINKS += glVertex.3 glVertex3fv.3 -LINKS += glVertex.3 glVertex3iv.3 -LINKS += glVertex.3 glVertex3sv.3 -LINKS += glVertex.3 glVertex4dv.3 -LINKS += glVertex.3 glVertex4fv.3 -LINKS += glVertex.3 glVertex4iv.3 -LINKS += glVertex.3 glVertex4sv.3 - -.include "../../Makefile.inc" -.include diff --git a/doc/gl-docs/GL/gl/accum.3gl b/doc/gl-docs/GL/gl/accum.3gl deleted file mode 100644 index ea7e30fe..00000000 --- a/doc/gl-docs/GL/gl/accum.3gl +++ /dev/null @@ -1,156 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 accum.gl -.ds Xs 43732 7 accum.gl -.TH GLACCUM 3G -.SH NAME -.B "glAccum -\- operate on the accumulation buffer - -.SH C SPECIFICATION -void \f3glAccum\fP( -GLenum \fIop\fP, -.nf -.ta \w'\f3void \fPglAccum( 'u - GLfloat \fIvalue\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIvalue\fP\ \ 'u -\f2op\fP -Specifies the accumulation buffer operation. -Symbolic constants -\%\f3GL_ACCUM\fP, -\%\f3GL_LOAD\fP, -\%\f3GL_ADD\fP, -\%\f3GL_MULT\fP, -and -\%\f3GL_RETURN\fP are accepted. -.TP -\f2value\fP -Specifies a floating-point value used in the accumulation buffer operation. -\f2op\fP determines how \f2value\fP is used. -.SH DESCRIPTION -The accumulation buffer is an extended-range color buffer. -Images are not rendered into it. -Rather, -images rendered into one of the color buffers -are added to the contents of the accumulation buffer after rendering. -Effects such as antialiasing (of points, lines, and polygons), -motion blur, -and depth of field can be created -by accumulating images generated with different transformation matrices. -.P -Each pixel in the accumulation buffer consists of -red, green, blue, and alpha values. -The number of bits per component in the accumulation buffer -depends on the implementation. You can examine this number -by calling \%\f3glGetIntegerv\fP four times, -with arguments \%\f3GL_ACCUM_RED_BITS\fP, -\%\f3GL_ACCUM_GREEN_BITS\fP, -\%\f3GL_ACCUM_BLUE_BITS\fP, -and \%\f3GL_ACCUM_ALPHA_BITS\fP. -Regardless of the number of bits per component, -the range of values stored by each component is [\-1,\ 1]. -The accumulation buffer pixels are mapped one-to-one with frame buffer pixels. -.P -\%\f3glAccum\fP operates on the accumulation buffer. -The first argument, \f2op\fP, -is a symbolic constant that selects an accumulation buffer operation. -The second argument, \f2value\fP, -is a floating-point value to be used in that operation. -Five operations are specified: -\%\f3GL_ACCUM\fP, \%\f3GL_LOAD\fP, \%\f3GL_ADD\fP, -\%\f3GL_MULT\fP, and \%\f3GL_RETURN\fP. -.P -All accumulation buffer operations are limited -to the area of the current scissor box and applied identically to -the red, green, blue, and alpha components of each pixel. -If a \%\f3glAccum\fP operation results in a value outside the range [\-1,\ 1], -the contents of an accumulation buffer pixel component are undefined. -.P -The operations are as follows: -.TP 14 -\%\f3GL_ACCUM\fP -Obtains R, G, B, and A values -from the buffer currently selected for reading (see \%\f3glReadBuffer\fP). -Each component value is divided by $2 sup n^-^1$, -where $n$ is the number of bits allocated to each color component -in the currently selected buffer. -The result is a floating-point value in the range [0,\ 1], -which is multiplied by \f2value\fP and added to the corresponding pixel component -in the accumulation buffer, -thereby updating the accumulation buffer. -.TP -\%\f3GL_LOAD\fP -Similar to \%\f3GL_ACCUM\fP, -except that the current value in the accumulation buffer is not used -in the calculation of the new value. -That is, the R, G, B, and A values from the currently selected buffer -are divided by $2 sup n^-^1$, -multiplied by \f2value\fP, -and then stored in the corresponding accumulation buffer cell, -overwriting the current value. -.TP -\%\f3GL_ADD\fP -Adds \f2value\fP to each R, G, B, and A -in the accumulation buffer. -.TP -\%\f3GL_MULT\fP -Multiplies each R, G, B, and A -in the accumulation buffer by \f2value\fP and returns the scaled component -to its corresponding accumulation buffer location. -.TP -\%\f3GL_RETURN\fP -Transfers accumulation buffer values -to the color buffer or buffers currently selected for writing. -Each R, G, B, and A component is multiplied by \f2value\fP, -then multiplied by $2 sup n^-^1$, -clamped to the range [0,$~2 sup n^-^1 $], and stored -in the corresponding display buffer cell. -The only fragment operations that are applied to this transfer are -pixel ownership, -scissor, -dithering, -and color writemasks. -.P -To clear the accumulation buffer, call \%\f3glClearAccum\fP with R, G, B, -and A values to set it to, then call \%\f3glClear\fP with the -accumulation buffer enabled. -.SH NOTES -Only pixels within the current scissor box are updated by a -\%\f3glAccum\fP operation. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2op\fP is not an accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if there is no accumulation buffer. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glAccum\fP -is executed between the execution of -\%\f3glBegin\fP and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_ACCUM_RED_BITS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_ACCUM_GREEN_BITS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_ACCUM_BLUE_BITS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_ACCUM_ALPHA_BITS\fP -.SH SEE ALSO -\%\f3glClear(3G)\fP, -\%\f3glClearAccum(3G)\fP, -\%\f3glCopyPixels(3G)\fP, -\%\f3glDrawBuffer(3G)\fP, -\%\f3glGet(3G)\fP, -\%\f3glReadBuffer(3G)\fP, -\%\f3glReadPixels(3G)\fP, -\%\f3glScissor(3G)\fP, -\%\f3glStencilOp(3G)\fP diff --git a/doc/gl-docs/GL/gl/activetextureARB.3gl b/doc/gl-docs/GL/gl/activetextureARB.3gl deleted file mode 100644 index db9f5854..00000000 --- a/doc/gl-docs/GL/gl/activetextureARB.3gl +++ /dev/null @@ -1,54 +0,0 @@ -.\" $XFree86$ -'\" et -'\"! eqn|tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 19:46 -.ds Dm 01 activetex -.ds Xs 15390 4 activetextureARB.gl -.TH GLACTIVETEXTUREARB 3G -.SH NAME -.B "glActiveTextureARB -\- select active texture unit - -.SH C SPECIFICATION -void \f3glActiveTextureARB\fP( -GLenum \fItexture\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2texture\fP\ \ 'u -\f2texture\fP -Specifies which texture unit to make active. The number -of texture units is implementation dependent, but must be at least -two. \f2texture\fP must be one of \%\f3GL_TEXTURE\fP$i$\f3_ARB\fP, where -0 \(<= $ i $ < \%\f3GL_MAX_TEXTURE_UNITS_ARB\fP, which is an -implementation-dependent value. The initial value is \%\f3GL_TEXTURE0_ARB\fP. -.SH DESCRIPTION -\%\f3glActiveTextureARB\fP selects which texture unit subsequent texture state calls will -affect. The number of texture units an implementation supports is -implementation dependent, but must be at least 2. -.P -Vertex arrays are client-side GL resources, which are selected by the -\%\f3glClientActiveTextureARB\fP routine. -.SH NOTES -\%\f3glActiveTextureARB\fP is only supported if \%\f3GL_ARB_multitexture\fP is included in the -string returned by \%\f3glGetString\fP when called with the argument -\%\f3GL_EXTENSIONS\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2texture\fP is not one of -\%\f3GL_TEXTURE\fP$i$\f3_ARB\fP, -.br -where 0 \(<= $ i $ < \%\f3GL_MAX_TEXTURE_UNITS_ARB\fP. -.SH SEE ALSO -\%\f3glClientActiveTextureARB(3G)\fP, -\%\f3glGetIntegerv(3G)\fP, -\%\f3glMultiTexCoordARB(3G)\fP, -\%\f3glTexParameter(3G)\fP - diff --git a/doc/gl-docs/GL/gl/alphafunc.3gl b/doc/gl-docs/GL/gl/alphafunc.3gl deleted file mode 100644 index 998d01c4..00000000 --- a/doc/gl-docs/GL/gl/alphafunc.3gl +++ /dev/null @@ -1,114 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 alphafunc -.ds Xs 25246 5 alphafunc.gl -.TH GLALPHAFUNC 3G -.SH NAME -.B "glAlphaFunc -\- specify the alpha test function - -.SH C SPECIFICATION -void \f3glAlphaFunc\fP( -GLenum \fIfunc\fP, -.nf -.ta \w'\f3void \fPglAlphaFunc( 'u - GLclampf \fIref\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2func\fP\ \ 'u -\f2func\fP -Specifies the alpha comparison function. -Symbolic constants -\%\f3GL_NEVER\fP, -\%\f3GL_LESS\fP, -\%\f3GL_EQUAL\fP, -\%\f3GL_LEQUAL\fP, -\%\f3GL_GREATER\fP, -\%\f3GL_NOTEQUAL\fP, -\%\f3GL_GEQUAL\fP, and -\%\f3GL_ALWAYS\fP are accepted. The initial value is \%\f3GL_ALWAYS\fP. -.TP -\f2ref\fP -Specifies the reference value that incoming alpha values are compared to. -This value is clamped to the range [0,\ 1], -where 0 represents the lowest possible alpha value -and 1 the highest possible value. -The initial reference value is 0. -.SH DESCRIPTION -The alpha test discards fragments depending on the outcome of a comparison -between an incoming fragment's alpha value and a constant reference value. -\%\f3glAlphaFunc\fP specifies the reference value and the comparison function. -The comparison is performed only if alpha testing is enabled. By -default, it is not enabled. -(See -\%\f3glEnable\fP and \%\f3glDisable\fP of \%\f3GL_ALPHA_TEST\fP.) -.P -\f2func\fP and \f2ref\fP specify the conditions under which -the pixel is drawn. -The incoming alpha value is compared to \f2ref\fP -using the function specified by \f2func\fP. -If the value passes the comparison, -the incoming fragment is drawn -if it also passes subsequent stencil and depth buffer tests. -If the value fails the comparison, -no change is made to the frame buffer at that pixel location. The -comparison functions are as follows: -.TP 18 -\%\f3GL_NEVER\fP -Never passes. -.TP -\%\f3GL_LESS\fP -Passes if the incoming alpha value is less than the reference value. -.TP -\%\f3GL_EQUAL\fP -Passes if the incoming alpha value is equal to the reference value. -.TP -\%\f3GL_LEQUAL\fP -Passes if the incoming alpha value is less than or equal to the reference value. -.TP -\%\f3GL_GREATER\fP -Passes if the incoming alpha value is greater than the reference value. -.TP -\%\f3GL_NOTEQUAL\fP -Passes if the incoming alpha value is not equal to the reference value. -.TP -\%\f3GL_GEQUAL\fP -Passes if the incoming alpha value is greater than or equal to -the reference value. -.TP -\%\f3GL_ALWAYS\fP -Always passes (initial value). -.P -\%\f3glAlphaFunc\fP operates on all pixel write operations, -including those resulting from the scan conversion of points, -lines, -polygons, -and bitmaps, -and from pixel draw and copy operations. -\%\f3glAlphaFunc\fP does not affect screen clear operations. -.SH NOTES -Alpha testing is performed only in RGBA mode. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2func\fP is not an accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glAlphaFunc\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_ALPHA_TEST_FUNC\fP -.br -\%\f3glGet\fP with argument \%\f3GL_ALPHA_TEST_REF\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_ALPHA_TEST\fP -.SH SEE ALSO -\%\f3glBlendFunc(3G)\fP, -\%\f3glClear(3G)\fP, -\%\f3glDepthFunc(3G)\fP, -\%\f3glEnable(3G)\fP, -\%\f3glStencilFunc(3G)\fP diff --git a/doc/gl-docs/GL/gl/aretexturesresident.3gl b/doc/gl-docs/GL/gl/aretexturesresident.3gl deleted file mode 100644 index 6de64d57..00000000 --- a/doc/gl-docs/GL/gl/aretexturesresident.3gl +++ /dev/null @@ -1,91 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 aretextur -.ds Xs 9130 5 aretexturesresident.gl -.TH GLARETEXTURESRESIDENT 3G -.SH NAME -.B "glAreTexturesResident -\- determine if textures are loaded in texture memory - -.SH C SPECIFICATION -GLboolean \f3glAreTexturesResident\fP( -GLsizei \fIn\fP, -.nf -.ta \w'\f3GLboolean \fPglAreTexturesResident( 'u - const GLuint \fI*textures\fP, - GLboolean \fI*residences\fP ) -.fi - -.SH PARAMETERS -.TP \w'\fIresidences\fP\ \ 'u -\f2n\fP -Specifies the number of textures to be queried. -.TP -\f2textures\fP -Specifies an array containing the names of the textures to be queried. -.TP -\f2residences\fP -Specifies an array in which the texture residence status is returned. -The residence status of a texture named by an element of \f2textures\fP is -returned in the corresponding element of \f2residences\fP. -.SH DESCRIPTION -GL establishes -a ``working set'' of textures that are resident in texture memory. -These textures can be bound to a texture target much more efficiently -than textures that are not resident. -.P -\%\f3glAreTexturesResident\fP queries the texture residence status of the \f2n\fP textures named by -the elements of \f2textures\fP. -If all the named textures are resident, -\%\f3glAreTexturesResident\fP returns \%\f3GL_TRUE\fP, -and the contents of \f2residences\fP are undisturbed. -If not all the named textures are resident, \%\f3glAreTexturesResident\fP returns \%\f3GL_FALSE\fP, -and detailed status is returned in the \f2n\fP elements of \f2residences\fP. -If an element of \f2residences\fP is \%\f3GL_TRUE\fP, then the texture named by -the corresponding element of \f2textures\fP is resident. -.P -The residence status of a single bound texture may also be queried -by calling -\%\f3glGetTexParameter\fP with the \f2target\fP argument set to the -target to which the texture is bound, and the \f2pname\fP argument -set to \%\f3GL_TEXTURE_RESIDENT\fP. -This is the only way that the residence status of a default texture can be -queried. -.SH NOTES -\%\f3glAreTexturesResident\fP is available only if the GL version is 1.1 or greater. -.P -\%\f3glAreTexturesResident\fP returns the residency status of the textures at the time of -invocation. It does not guarantee that the textures will remain -resident at any other time. -.P -If textures reside in virtual memory (there is no texture memory), they -are considered always resident. -.P -Some implementations may not load a texture until the first use of -that texture. -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if \f2n\fP is negative. -.P -\%\f3GL_INVALID_VALUE\fP is generated if any element in \f2textures\fP -is 0 or does not name a texture. In that case, the function returns -\%\f3GL_FALSE\fP and the contents of \f2residences\fP is indeterminate. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glAreTexturesResident\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetTexParameter\fP with parameter name \%\f3GL_TEXTURE_RESIDENT\fP -retrieves the residence status of a currently bound texture. -.SH SEE ALSO -\%\f3glBindTexture(3G)\fP, -\%\f3glGetTexParameter(3G)\fP, -\%\f3glPrioritizeTextures(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexImage3D(3G)\fP, -\%\f3glTexParameter(3G)\fP diff --git a/doc/gl-docs/GL/gl/arrayelement.3gl b/doc/gl-docs/GL/gl/arrayelement.3gl deleted file mode 100644 index 94643e63..00000000 --- a/doc/gl-docs/GL/gl/arrayelement.3gl +++ /dev/null @@ -1,70 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 arrayelem -.ds Xs 50127 5 arrayelement.gl -.TH GLARRAYELEMENT 3G -.SH NAME -.B "glArrayElement -\- render a vertex using the specified vertex array element - -.SH C SPECIFICATION -void \f3glArrayElement\fP( -GLint \fIi\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2i\fP\ \ 'u -\f2i\fP -Specifies an index into the enabled vertex data arrays. -.SH DESCRIPTION -\%\f3glArrayElement\fP commands are used within \%\f3glBegin\fP/\%\f3glEnd\fP pairs to -specify vertex and attribute data for point, line, and polygon -primitives. If \%\f3GL_VERTEX_ARRAY\fP is enabled when \%\f3glArrayElement\fP is called, a -single vertex is drawn, using -vertex and attribute data taken from location \f2i\fP of the enabled -arrays. If \%\f3GL_VERTEX_ARRAY\fP is not enabled, no drawing occurs but -the attributes corresponding to the enabled arrays are modified. -.P -Use \%\f3glArrayElement\fP to construct primitives by indexing vertex data, rather than -by streaming through arrays of data in first-to-last order. Because -each call specifies only a single vertex, it is possible to explicitly -specify per-primitive attributes such as a single normal per -individual triangle. -.P -Changes made to array data between the execution of \%\f3glBegin\fP and the -corresponding execution of \%\f3glEnd\fP may affect calls to \%\f3glArrayElement\fP that are made -within the same \%\f3glBegin\fP/\%\f3glEnd\fP period in non-sequential ways. -That is, a call to -.br -\%\f3glArrayElement\fP that precedes a change to array data may -access the changed data, and a call that follows a change to array data -may access original data. -.SH NOTES -\%\f3glArrayElement\fP is available only if the GL version is 1.1 or greater. -.P -\%\f3glArrayElement\fP is included in display lists. If \%\f3glArrayElement\fP is entered into a -display list, the necessary array data (determined by the array -pointers and enables) is also entered into the display list. Because -the array pointers and enables are client-side state, their values -affect display lists when the lists are created, not when the lists -are executed. -.SH SEE ALSO -\%\f3glClientActiveTextureARB(3G)\fP, -\%\f3glColorPointer(3G)\fP, -\%\f3glDrawArrays(3G)\fP, -\%\f3glEdgeFlagPointer(3G)\fP, -\%\f3glGetPointerv(3G)\fP, -\%\f3glIndexPointer(3G)\fP, -\%\f3glInterleavedArrays(3G)\fP, -\%\f3glNormalPointer(3G)\fP, -\%\f3glTexCoordPointer(3G)\fP, -\%\f3glVertexPointer(3G)\fP diff --git a/doc/gl-docs/GL/gl/begin.3gl b/doc/gl-docs/GL/gl/begin.3gl deleted file mode 100644 index 1789e7a6..00000000 --- a/doc/gl-docs/GL/gl/begin.3gl +++ /dev/null @@ -1,217 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 begin.gl -.ds Xs 5437 8 begin.gl -.TH GLBEGIN 3G -.SH NAME -.B "glBegin, glEnd -\- delimit the vertices of a primitive or a group of like primitives - -.SH C SPECIFICATION -void \f3glBegin\fP( -GLenum \fImode\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2mode\fP\ \ 'u -\f2mode\fP -Specifies the primitive or primitives that will be created from vertices -presented between \%\f3glBegin\fP and the subsequent \%\f3glEnd\fP. -Ten symbolic constants are accepted: -\%\f3GL_POINTS\fP, -\%\f3GL_LINES\fP, -\%\f3GL_LINE_STRIP\fP, -\%\f3GL_LINE_LOOP\fP, -\%\f3GL_TRIANGLES\fP, -\%\f3GL_TRIANGLE_STRIP\fP, -\%\f3GL_TRIANGLE_FAN\fP, -\%\f3GL_QUADS\fP, -\%\f3GL_QUAD_STRIP\fP, and -\%\f3GL_POLYGON\fP. -.SH C SPECIFICATION -void \f3glEnd\fP( void ) -.nf -.fi - -.SH DESCRIPTION -\%\f3glBegin\fP and \%\f3glEnd\fP delimit the vertices that define a primitive or -a group of like primitives. -\%\f3glBegin\fP accepts a single argument that specifies in which of ten ways the -vertices are interpreted. -Taking $n$ as an integer count starting at one, -and $N$ as the total number of vertices specified, -the interpretations are as follows: -.TP 23 -\%\f3GL_POINTS\fP -Treats each vertex as a single point. -Vertex $n$ defines point $n$. -$N$ points are drawn. -.TP -\%\f3GL_LINES\fP -Treats each pair of vertices as an independent line segment. -Vertices $2n^-^1$ and $2n$ define line $n$. -$N/2$ lines are drawn. -.TP -\%\f3GL_LINE_STRIP\fP -Draws a connected group of line segments from the first vertex -to the last. -Vertices $n$ and $n~+~1$ define line $n$. -$N^-^1$ lines are drawn. -.TP -\%\f3GL_LINE_LOOP\fP -Draws a connected group of line segments from the first vertex -to the last, -then back to the first. -Vertices $n$ and $n~+~1$ define line $n$. -The last line, however, is defined by vertices $N$ and $1$. -$N$ lines are drawn. -.TP -\%\f3GL_TRIANGLES\fP -Treats each triplet of vertices as an independent triangle. -Vertices $3n^-^2$, $3n^-^1$, and $3n$ define triangle $n$. -$N/3$ triangles are drawn. -.BP -.TP -\%\f3GL_TRIANGLE_STRIP\fP -Draws a connected group of triangles. One triangle is defined for each -vertex presented after the first two vertices. For odd $n$, vertices -$n$, $n~+~1$, and $n~+~2$ define triangle $n$. For even $n$, vertices -$n~+~1$, $n$, and $n~+~2$ define triangle $n$. $N^-^2$ triangles are -drawn. -.TP -\%\f3GL_TRIANGLE_FAN\fP -Draws a connected group of triangles. -One triangle is defined for each vertex presented after the first two vertices. -Vertices $1$, -$n~+~1$, -and $n~+~2$ define triangle $n$. -$N^-^2$ triangles are drawn. -.TP -\%\f3GL_QUADS\fP -Treats each group of four vertices as an independent quadrilateral. -Vertices $4n^-^3$, $4n^-^2$, $4n^-^1$, and $4n$ -define quadrilateral $n$. -$N/4$ quadrilaterals are drawn. -.TP -\%\f3GL_QUAD_STRIP\fP -Draws a connected group of quadrilaterals. -One quadrilateral is defined for each pair of vertices presented -after the first pair. -Vertices $2n^-^1$, $2n$, $2n~+~2$, and $2n~+~1$ define quadrilateral $n$. -$N/2^-^1$ quadrilaterals are drawn. -Note that the order in which vertices are used to construct a quadrilateral -from strip data is different from that used with independent data. -.TP -\%\f3GL_POLYGON\fP -Draws a single, -convex polygon. -Vertices $1$ through $N$ define this polygon. -.P -Only a subset of GL commands can be used between \%\f3glBegin\fP and \%\f3glEnd\fP. -The commands are -\%\f3glVertex\fP, -\%\f3glColor\fP, -\%\f3glIndex\fP, -\%\f3glNormal\fP, -\%\f3glTexCoord\fP, -\%\f3glEvalCoord\fP, -\%\f3glEvalPoint\fP, -\%\f3glArrayElement\fP, -\%\f3glMaterial\fP, and -\%\f3glEdgeFlag\fP. -Also, -it is acceptable to use -\%\f3glCallList\fP or -\%\f3glCallLists\fP to execute -display lists that include only the preceding commands. -If any other GL command is executed between \%\f3glBegin\fP and \%\f3glEnd\fP, -the error flag is set and the command is ignored. -.P -Regardless of the value chosen for \f2mode\fP, -there is no limit to the number of vertices that can be defined -between \%\f3glBegin\fP and \%\f3glEnd\fP. -Lines, -triangles, -quadrilaterals, -and polygons that are incompletely specified are not drawn. -Incomplete specification results when either too few vertices are -provided to specify even a single primitive or when an incorrect multiple -of vertices is specified. The incomplete primitive is ignored; the rest are drawn. -.P -The minimum specification of vertices -for each primitive is as follows: -1 for a point, -2 for a line, -3 for a triangle, -4 for a quadrilateral, -and 3 for a polygon. -Modes that require a certain multiple of vertices are -\%\f3GL_LINES\fP (2), -\%\f3GL_TRIANGLES\fP (3), -\%\f3GL_QUADS\fP (4), -and \%\f3GL_QUAD_STRIP\fP (2). -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2mode\fP is set to an unaccepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glBegin\fP is executed between a -\%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glEnd\fP is executed without being -preceded by a \%\f3glBegin\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if a command other than -\%\f3glVertex\fP, -\%\f3glColor\fP, -\%\f3glIndex\fP, -\%\f3glNormal\fP, -\%\f3glTexCoord\fP, -\%\f3glEvalCoord\fP, -\%\f3glEvalPoint\fP, -\%\f3glArrayElement\fP, -\%\f3glMaterial\fP, -\%\f3glEdgeFlag\fP, -\%\f3glCallList\fP, or -\%\f3glCallLists\fP is executed between -the execution of \%\f3glBegin\fP and the corresponding -execution \%\f3glEnd\fP. -.P -Execution of -\%\f3glEnableClientState\fP, -\%\f3glDisableClientState\fP, -\%\f3glEdgeFlagPointer\fP, -\%\f3glTexCoordPointer\fP, -\%\f3glColorPointer\fP, -\%\f3glIndexPointer\fP, -\%\f3glNormalPointer\fP, -.br -\%\f3glVertexPointer\fP, -\%\f3glInterleavedArrays\fP, or -\%\f3glPixelStore\fP is not allowed after a call to \%\f3glBegin\fP and before -the corresponding call to \%\f3glEnd\fP, -but an error may or may not be generated. -.SH SEE ALSO -\%\f3glArrayElement(3G)\fP, -\%\f3glCallList(3G)\fP, -\%\f3glCallLists(3G)\fP, -\%\f3glColor(3G)\fP, -\%\f3glEdgeFlag(3G)\fP, -\%\f3glEvalCoord(3G)\fP, -.br -\%\f3glEvalPoint(3G)\fP, -\%\f3glIndex(3G)\fP, -\%\f3glMaterial(3G)\fP, -\%\f3glNormal(3G)\fP, -\%\f3glTexCoord(3G)\fP, -\%\f3glVertex(3G)\fP - - diff --git a/doc/gl-docs/GL/gl/bindtexture.3gl b/doc/gl-docs/GL/gl/bindtexture.3gl deleted file mode 100644 index 3256b8a3..00000000 --- a/doc/gl-docs/GL/gl/bindtexture.3gl +++ /dev/null @@ -1,114 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 bindtextu -.ds Xs 62690 6 bindtexture.gl -.TH GLBINDTEXTURE 3G -.SH NAME -.B "glBindTexture -\- bind a named texture to a texturing target - -.SH C SPECIFICATION -void \f3glBindTexture\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglBindTexture( 'u - GLuint \fItexture\fP ) -.fi - -.SH PARAMETERS -.TP \w'\fItexture\fP\ \ 'u -\f2target\fP -Specifies the target to which the texture is bound. -Must be either -\%\f3GL_TEXTURE_1D\fP, -\%\f3GL_TEXTURE_2D\fP, or -\%\f3GL_TEXTURE_3D\fP. -.TP -\f2texture\fP -Specifies the name of a texture. -.SH DESCRIPTION -\%\f3glBindTexture\fP lets you create or use a named texture. Calling \%\f3glBindTexture\fP with -.br -\f2target\fP set to -\%\f3GL_TEXTURE_1D\fP, \%\f3GL_TEXTURE_2D\fP, \%\f3GL_TEXTURE_3D\fP and \f2texture\fP -set to the name -of the newtexture binds the texture name to the target. -When a texture is bound to a target, the previous binding for that -target is automatically broken. -.P -Texture names are unsigned integers. The value zero is reserved to -represent the default texture for each texture target. -Texture names and the corresponding texture contents are local to -the shared display-list space (see \%\f3glXCreateContext\fP) of the current -GL rendering context; -two rendering contexts share texture names only if they -also share display lists. -.P -You may use \%\f3glGenTextures\fP to generate a set of new texture names. -.P -When a texture is first bound, it assumes the dimensionality of its -target: A texture first bound to \%\f3GL_TEXTURE_1D\fP becomes -one-dimensional, and a texture first bound to \%\f3GL_TEXTURE_2D\fP becomes -two-dimensional, and a texture first bound to \%\f3GL_TEXTURE_3D\fP becomes -a three-dimensional texture. The state of a one-dimensional texture -immediately after it is first bound is equivalent to the state of the -default \%\f3GL_TEXTURE_1D\fP at GL initialization, and similarly for -two-, and three-dimensional textures. -.P -While a texture is bound, GL operations on the target to which it is -bound affect the bound texture, and queries of the target to which it -is bound return state from the bound texture. If texture mapping of -the dimensionality of the target to which a texture is bound is -active, the bound texture is used. -In effect, the texture targets become aliases for the textures currently -bound to them, and the texture name zero refers to the default textures -that were bound to them at initialization. -.P -A texture binding created with \%\f3glBindTexture\fP remains active until a different -texture is bound to the same target, or until the bound texture is -deleted with \%\f3glDeleteTextures\fP. -.P -Once created, a named texture may be re-bound to the target of the -matching dimensionality as often as needed. -It is usually much faster to use \%\f3glBindTexture\fP to bind an existing named -texture to one of the texture targets than it is to reload the texture image -using \%\f3glTexImage1D\fP, \%\f3glTexImage2D\fP, or \%\f3glTexImage3D\fP. -For additional control over performance, use -\%\f3glPrioritizeTextures\fP. -.P -\%\f3glBindTexture\fP is included in display lists. -.SH NOTES -\%\f3glBindTexture\fP is available only if the GL version is 1.1 or greater. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2texture\fP has a dimensionality -that doesn't match that of \f2target\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glBindTexture\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_TEXTURE_BINDING_1D\fP -.br -\%\f3glGet\fP with argument \%\f3GL_TEXTURE_BINDING_2D\fP -.br -\%\f3glGet\fP with argument \%\f3GL_TEXTURE_BINDING_3D\fP -.SH SEE ALSO -\%\f3glAreTexturesResident(3G)\fP, -\%\f3glDeleteTextures(3G)\fP, -\%\f3glGenTextures(3G)\fP, -\%\f3glGet(3G)\fP, -.br -\%\f3glGetTexParameter(3G)\fP, -\%\f3glIsTexture(3G)\fP, -\%\f3glPrioritizeTextures(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexParameter(3G)\fP diff --git a/doc/gl-docs/GL/gl/bitmap.3gl b/doc/gl-docs/GL/gl/bitmap.3gl deleted file mode 100644 index 0ff1d860..00000000 --- a/doc/gl-docs/GL/gl/bitmap.3gl +++ /dev/null @@ -1,132 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 bitmap.gl -.ds Xs 23189 6 bitmap.gl -.TH GLBITMAP 3G -.SH NAME -.B "glBitmap -\- draw a bitmap - -.SH C SPECIFICATION -void \f3glBitmap\fP( -GLsizei \fIwidth\fP, -.nf -.ta \w'\f3void \fPglBitmap( 'u - GLsizei \fIheight\fP, - GLfloat \fIxorig\fP, - GLfloat \fIyorig\fP, - GLfloat \fIxmove\fP, - GLfloat \fIymove\fP, - const GLubyte \fI*bitmap\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2width\fP\ \f2height\fP\ \ 'u -\f2width\fP, \f2height\fP -Specify the pixel width and height of the bitmap image. -.TP -\f2xorig\fP, \f2yorig\fP -Specify the location of the origin in the bitmap image. -The origin is measured from the lower left corner of the bitmap, -with right and up being the positive axes. -.TP -\f2xmove\fP, \f2ymove\fP -Specify the \f2x\fP and \f2y\fP offsets to be added to the current raster position -after the bitmap is drawn. -.TP -\f2bitmap\fP -Specifies the address of the bitmap image. -.SH DESCRIPTION -A bitmap is a binary image. -When drawn, -the bitmap is positioned relative to the current raster position, -and frame buffer pixels corresponding to 1's in the bitmap are -written using the current raster color or index. -Frame buffer pixels corresponding to 0's in the bitmap are not modified. -.P -\%\f3glBitmap\fP takes seven arguments. -The first pair specifies the width and height of the bitmap image. -The second pair specifies the location of the bitmap origin relative -to the lower left corner of the bitmap image. -The third pair of arguments specifies \f2x\fP and \f2y\fP offsets to be added -to the current raster position after the bitmap has been drawn. -The final argument is a pointer to the bitmap image itself. -.P -The bitmap image is interpreted like image data for the \%\f3glDrawPixels\fP -command, -with \f2width\fP and \f2height\fP corresponding to the width and height arguments -of that command, -and with \f2type\fP set to \%\f3GL_BITMAP\fP -and \f2format\fP set to \%\f3GL_COLOR_INDEX\fP. -.BP -Modes specified using \%\f3glPixelStore\fP affect the -interpretation of bitmap image data; -modes specified using \%\f3glPixelTransfer\fP do not. -.P -If the current raster position is invalid, \%\f3glBitmap\fP is ignored. -Otherwise, -the lower left corner of the bitmap image is positioned at the window coordinates -.ce -.sp -$ x sub w ~=~ \(lf ~ x sub r ~-~ x sub o ~ \(rf $ -.br -.sp -.ce -$ y sub w ~=~ \(lf ~ y sub r ~-~ y sub o ~ \(rf $ -.sp -where $ ( x sub r , y sub r ) $ is the raster position -and $ ( x sub o , y sub o ) $ is the bitmap origin. -Fragments are then generated for each pixel corresponding to a 1 (one) -in the bitmap image. -These fragments are generated using the current raster \f2z\fP coordinate, -color or color index, and current raster texture coordinates. -They are then treated just as if they had been generated -by a point, line, or polygon, -including texture mapping, -.br -fogging, -and all per-fragment operations such as alpha and depth testing. -.P -After the bitmap has been drawn, -the \f2x\fP and \f2y\fP coordinates of the current raster position are offset by -\f2xmove\fP and \f2ymove\fP. -No change is made to the \f2z\fP coordinate of the current raster position, -or to the current raster color, texture coordinates, or index. -.SH NOTES -To set a valid raster position outside the viewport, first set a valid -raster position inside the viewport, then call \%\f3glBitmap\fP with NULL -as the \f2bitmap\fP parameter and with \f2xmove\fP and \f2ymove\fP set to -the offsets of the new raster position. This technique is useful when -panning an image around the viewport. -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if \f2width\fP or \f2height\fP is negative. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glBitmap\fP -is executed between the execution of \%\f3glBegin\fP and the corresponding execution of -\%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_CURRENT_RASTER_POSITION\fP -.br -\%\f3glGet\fP with argument \%\f3GL_CURRENT_RASTER_COLOR\fP -.br -\%\f3glGet\fP with argument \%\f3GL_CURRENT_RASTER_DISTANCE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_CURRENT_RASTER_INDEX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_CURRENT_RASTER_TEXTURE_COORDS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_CURRENT_RASTER_POSITION_VALID\fP -.SH SEE ALSO -\%\f3glDrawPixels(3G)\fP, -\%\f3glPixelStore(3G)\fP, -\%\f3glPixelTransfer(3G)\fP, -\%\f3glRasterPos(3G)\fP - diff --git a/doc/gl-docs/GL/gl/blendcolor.3gl b/doc/gl-docs/GL/gl/blendcolor.3gl deleted file mode 100644 index 8591a816..00000000 --- a/doc/gl-docs/GL/gl/blendcolor.3gl +++ /dev/null @@ -1,52 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 blendcolo -.ds Xs 21257 4 blendcolor.gl -.TH GLBLENDCOLOR 3G -.SH NAME -.B "glBlendColor -\- set the blend color - -.SH C SPECIFICATION -void \f3glBlendColor\fP( -GLclampf \fIred\fP, -.nf -.ta \w'\f3void \fPglBlendColor( 'u - GLclampf \fIgreen\fP, - GLclampf \fIblue\fP, - GLclampf \fIalpha\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2red\fP\ \f2green\fP\ \f2blue\fP\ \f2alpha\fP\ \ 'u -\f2red\fP, \f2green\fP, \f2blue\fP, \f2alpha\fP -specify the components of \%\f3GL_BLEND_COLOR\fP -.SH DESCRIPTION -The \%\f3GL_BLEND_COLOR\fP may be used to calculate the source and destination -blending factors. The color components are clamped to the range [0,\ 1] -before being stored. See \%\f3glBlendFunc\fP for a complete description of the -blending operations. -Initially the \%\f3GL_BLEND_COLOR\fP is set to (0, 0, 0, 0). -.SH NOTES -\%\f3glBlendColor\fP is part of the \%\f3GL_ARB_imaging\fP subset. \%\f3glBlendColor\fP is present only -if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP is called with -\%\f3GL_EXTENSIONS\fP as its argument. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glBlendColor\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.P -.SH ASSOCIATED GETS -\%\f3glGet\fP with an argument of \%\f3GL_BLEND_COLOR\fP -.SH SEE ALSO -\%\f3glBlendEquation(3G)\fP, -\%\f3glBlendFunc(3G)\fP, -\%\f3glGetString(3G)\fP diff --git a/doc/gl-docs/GL/gl/blendequation.3gl b/doc/gl-docs/GL/gl/blendequation.3gl deleted file mode 100644 index 63f4c72a..00000000 --- a/doc/gl-docs/GL/gl/blendequation.3gl +++ /dev/null @@ -1,146 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 blendequa -.ds Xs 36751 7 blendequation.gl -.TH GLBLENDEQUATION 3G -.SH NAME -.B "glBlendEquation -\- set the blend equation - -.SH C SPECIFICATION -void \f3glBlendEquation\fP( -GLenum \fImode\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2mode\fP\ \ 'u -\f2mode\fP -specifies how source and destination colors are combined. -It must be \%\f3GL_FUNC_ADD\fP, \%\f3GL_FUNC_SUBTRACT\fP, -\%\f3GL_FUNC_REVERSE_SUBTRACT\fP, \%\f3GL_MIN\fP, \%\f3GL_MAX\fP. - -.SH DESCRIPTION -The blend equation determines how a new pixel (the ``source'' color) -is combined with a pixel already in the framebuffer (the ``destination'' -color). -.TP -\%\f3GL_MIN\fP -sets the blend equation so that each component of the result color -is the minimum of the corresponding components of the source and destination -colors. -.TP -\%\f3GL_MAX\fP -sets the blend equation so that each component of the result color -is the maximum of the corresponding components of the source and destination -colors. -.P -The remaining blend equations use the source and destination blend factors -specified by \%\f3glBlendFunc\fP. -See \%\f3glBlendFunc\fP for a description of the various blend factors. -.P -In the equations that follow, source and destination -color components are referred to as -$(R sub s, G sub s, B sub s, A sub s )$ -and -$(R sub d, G sub d, B sub d, A sub d )$, -respectively. -The result color is referred to as -$(R sub r, G sub r, B sub r, A sub r )$. -The source and destination blend factors are denoted -$(s sub R, s sub G, s sub B, s sub A )$ and -$(d sub R, d sub G, d sub B, d sub A )$, respectively. -For these equations all color components are understood to have values -in the range [0,\ 1]. -.TP -\%\f3GL_FUNC_ADD\fP -sets the blend equation so that the source and destination -data are added. -Each component of the source color is -multiplied by the corresponding source factor, then -each component of the destination color is multiplied -by the corresponding destination factor. -The result is the componentwise sum of the two products, clamped to the -range [0,\ 1]. -.P -.RS -.nf -.IP -$Rr ~=~ mark min (1, ~R sub s~s sub R ~+~ R sub d~d sub R )$ -$Gr ~=~ lineup min (1, ~G sub s~s sub G ~+~ G sub d~d sub G )$ -$Br ~=~ lineup min (1, ~B sub s~s sub B ~+~ B sub d~d sub B )$ -$Ar ~=~ lineup min (1, ~A sub s~s sub A ~+~ A sub d~d sub A )$ -.fi -.RE -.TP -\%\f3GL_FUNC_SUBTRACT\fP -Is like \%\f3GL_FUNC_ADD\fP except the product of the destination factor and -the destination color is componentwise subtracted from the product of the -source factor and the source color. -The result is clamped to the range [0,\ 1]. -.RS -.nf -.IP -$Rr ~=~ mark max (0 , ~R sub s~s sub R ~-~ R sub d~d sub R )$ -$Gr ~=~ lineup max (0 , ~G sub s~s sub G ~-~ G sub d~d sub G )$ -$Br ~=~ lineup max (0 , ~B sub s~s sub B ~-~ B sub d~d sub B )$ -$Ar ~=~ lineup max (0 , ~A sub s~s sub A ~-~ A sub d~d sub A )$ -.fi -.RE -.TP -\%\f3GL_FUNC_REVERSE_SUBTRACT\fP -Is like \%\f3GL_FUNC_ADD\fP except the product of the source factor and the -source color is componentwise subtracted from the product of the destination -factor and the destination color. -The result is clamped to the range [0,\ 1]. -.RS -.nf -.IP -$Rr ~=~ mark max (0 , ~R sub d~d sub R ~-~ R sub s~s sub R )$ -$Gr ~=~ lineup max (0 , ~G sub d~d sub G ~-~ G sub s~s sub G )$ -$Br ~=~ lineup max (0 , ~B sub d~d sub B ~-~ B sub s~s sub B )$ -$Ar ~=~ lineup max (0 , ~A sub d~d sub A ~-~ A sub s~s sub A )$ -.fi -.RE -.P -The \%\f3GL_MIN\fP and \%\f3GL_MAX\fP equations are useful for applications -that analyze -.br -image data (image thresholding against a constant color, -for example). -The \%\f3GL_FUNC_ADD\fP equation is useful -for antialiasing and transparency, among other things. -.P -Initially, the blend equation is set to \%\f3GL_FUNC_ADD\fP. -.P -.SH NOTES -\%\f3glBlendEquation\fP is part of the \%\f3GL_ARB_imaging\fP subset. \%\f3glBlendEquation\fP is present only -if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP is called with -\%\f3GL_EXTENSIONS\fP as its argument. -.P -The \%\f3GL_MIN\fP, and \%\f3GL_MAX\fP equations do not use -the source or destination factors, only the source and destination colors. -.P -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2mode\fP is not one of -\%\f3GL_FUNC_ADD\fP, \%\f3GL_FUNC_SUBTRACT\fP, \%\f3GL_FUNC_REVERSE_SUBTRACT\fP, -\%\f3GL_MAX\fP, or \%\f3GL_MIN\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glBlendEquation\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -.TP -\%\f3glGet\fP with an argument of \%\f3GL_BLEND_EQUATION\fP -.SH SEE ALSO -\%\f3glGetString(3G)\fP, -\%\f3glBlendColor(3G)\fP, -\%\f3glBlendFunc(3G)\fP diff --git a/doc/gl-docs/GL/gl/blendfunc.3gl b/doc/gl-docs/GL/gl/blendfunc.3gl deleted file mode 100644 index 66b8b8cb..00000000 --- a/doc/gl-docs/GL/gl/blendfunc.3gl +++ /dev/null @@ -1,250 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 blendfunc -.ds Xs 18970 10 blendfunc.gl -.TH GLBLENDFUNC 3G -.SH NAME -.B "glBlendFunc -\- specify pixel arithmetic - -.SH C SPECIFICATION -void \f3glBlendFunc\fP( -GLenum \fIsfactor\fP, -.nf -.ta \w'\f3void \fPglBlendFunc( 'u - GLenum \fIdfactor\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2sfactor\fP\ \ 'u -\f2sfactor\fP -Specifies how the red, green, blue, -and alpha source blending factors are computed. -The following symbolic constants are accepted: -\%\f3GL_ZERO\fP, -\%\f3GL_ONE\fP, -\%\f3GL_DST_COLOR\fP, -\%\f3GL_ONE_MINUS_DST_COLOR\fP, -\%\f3GL_SRC_ALPHA\fP, -\%\f3GL_ONE_MINUS_SRC_ALPHA\fP, -\%\f3GL_DST_ALPHA\fP, -\%\f3GL_ONE_MINUS_DST_ALPHA\fP, and -\%\f3GL_SRC_ALPHA_SATURATE\fP. -The initial value is \%\f3GL_ONE\fP. -.TE - -Additionally, if the \%\f3GL_ARB_imaging\fP extension is supported, the -following constants are accepted: -\%\f3GL_CONSTANT_COLOR\fP, -\%\f3GL_ONE_MINUS_CONSTANT_COLOR\fP, -\%\f3GL_CONSTANT_ALPHA\fP, -\%\f3GL_ONE_MINUS_CONSTANT_ALPHA\fP. -.TP -\f2dfactor\fP -Specifies how the red, green, blue, -and alpha destination blending factors are computed. -Eight symbolic constants are accepted: -\%\f3GL_ZERO\fP, -\%\f3GL_ONE\fP, -\%\f3GL_SRC_COLOR\fP, -\%\f3GL_ONE_MINUS_SRC_COLOR\fP, -\%\f3GL_SRC_ALPHA\fP, -\%\f3GL_ONE_MINUS_SRC_ALPHA\fP, -\%\f3GL_DST_ALPHA\fP, and -\%\f3GL_ONE_MINUS_DST_ALPHA\fP. -The initial value is \%\f3GL_ZERO\fP. -.TE - -Additionally, if the \%\f3GL_ARB_imaging\fP extension is supported, the -following constants are accepted: -\%\f3GL_CONSTANT_COLOR\fP, -\%\f3GL_ONE_MINUS_CONSTANT_COLOR\fP, -\%\f3GL_CONSTANT_ALPHA\fP, -\%\f3GL_ONE_MINUS_CONSTANT_ALPHA\fP. -.SH DESCRIPTION -In RGBA mode, pixels can be drawn using a function that blends -the incoming (source) RGBA values with the RGBA values -that are already in the frame buffer (the destination values). -Blending is initially disabled. -Use \%\f3glEnable\fP and \%\f3glDisable\fP with argument \%\f3GL_BLEND\fP -to enable and disable blending. -.P -\%\f3glBlendFunc\fP defines the operation of blending when it is enabled. -\f2sfactor\fP specifies which of nine methods is used to scale the -source color components. -\f2dfactor\fP specifies which of eight methods is used to scale the -destination color components. -The eleven possible methods are described in the following table. -Each method defines four scale factors, -one each for red, green, blue, and alpha. -.P -In the table and in subsequent equations, source and destination -color components are referred to as -$(R sub s , G sub s , B sub s , A sub s )$ and -$(R sub d , G sub d , B sub d , A sub d )$. -The color specified by \%\f3glBlendColor\fP is referred to as -$(R sub c , G sub c , B sub c , A sub c )$. -They are understood to have integer values between 0 and -$(k sub R , k sub G , k sub B , k sub A )$, -where -.P -.RS -.ce -$k sub c ~=~ 2 sup m sub c - 1$ -.RE -.P -and -$(m sub R , m sub G , m sub B , m sub A )$ -is the number of red, -green, -blue, -and alpha bitplanes. -.P -Source and destination scale factors are referred to as -$(s sub R , s sub G , s sub B , s sub A )$ and -$(d sub R , d sub G , d sub B , d sub A )$. -The scale factors described in the table, -denoted $(f sub R , f sub G , f sub B , f sub A )$, -represent either source or destination factors. -All scale factors have range [0,\ 1]. -.P -.TS -center; -lb cb -l c . -_ -Parameter $(f sub R , ~~ f sub G , ~~ f sub B , ~~ f sub A )$ -_ -\%\f3GL_ZERO\fP $(0, ~0, ~0, ~0 )$ -\%\f3GL_ONE\fP $(1, ~1, ~1, ~1 )$ -\%\f3GL_SRC_COLOR\fP $(R sub s / k sub R , ~G sub s / k sub G , ~B sub s / k sub B , ~A sub s / k sub A )$ -\%\f3GL_ONE_MINUS_SRC_COLOR\fP $(1, ~1, ~1, ~1 ) ~-~ (R sub s / k sub R , ~G sub s / k sub G , ~B sub s / k sub B , ~A sub s / k sub A )$ -\%\f3GL_DST_COLOR\fP $(R sub d / k sub R , ~G sub d / k sub G , ~B sub d / k sub B , ~A sub d / k sub A )$ -\%\f3GL_ONE_MINUS_DST_COLOR\fP $(1, ~1, ~1, ~1 ) ~-~ (R sub d / k sub R , ~G sub d / k sub G , ~B sub d / k sub B , ~A sub d / k sub A )$ -\%\f3GL_SRC_ALPHA\fP $(A sub s / k sub A , ~A sub s / k sub A , ~A sub s / k sub A , ~A sub s / k sub A )$ -\%\f3GL_ONE_MINUS_SRC_ALPHA\fP $(1, ~1, ~1, ~1 ) ~-~ (A sub s / k sub A , ~A sub s / k sub A , ~A sub s / k sub A , ~A sub s / k sub A )$ -\%\f3GL_DST_ALPHA\fP $(A sub d / k sub A , ~A sub d / k sub A , ~A sub d / k sub A , ~A sub d / k sub A )$ -\%\f3GL_ONE_MINUS_DST_ALPHA\fP $(1, ~1, ~1, ~1 ) ~-~ (A sub d / k sub A , ~A sub d / k sub A , ~A sub d / k sub A , ~A sub d / k sub A )$ -\%\f3GL_SRC_ALPHA_SATURATE\fP $(i, ~i, ~i, ~1 )$ -\%\f3GL_CONSTANT_COLOR\fP $(R sub c, G sub c, B sub c, A sub c)$ -\%\f3GL_ONE_MINUS_CONSTANT_COLOR\fP $(1, ~1, ~1, ~1 ) ~-~ (R sub c, G sub c, B sub c, A sub c)$ -\%\f3GL_CONSTANT_ALPHA\fP $(A sub c, A sub c, A sub c, A sub c)$ -\%\f3GL_ONE_MINUS_CONSTANT_ALPHA\fP $(1, ~1, ~1, ~1 ) ~-~ (A sub c, A sub c, A sub c, A sub c)$ -_ -.TE -.sp -In the table, -.P -.RS -.nf -.IP -$i ~=~ min (A sub s , ~k sub A ~-~ A sub d ) ~/~ k sub A$ -.fi -.RE -.P -To determine the blended RGBA values of a pixel when drawing in RGBA mode, -the system uses the following equations: -.P -.RS -.nf -.IP -$R sub d ~=~ mark min ( k sub R, ~R sub s~s sub R~+~R sub d~d sub R )$ -$G sub d ~=~ lineup min ( k sub G, ~G sub s~s sub G~+~G sub d~d sub G )$ -$B sub d ~=~ lineup min ( k sub B, ~B sub s~s sub B~+~B sub d~d sub B )$ -$A sub d ~=~ lineup min ( k sub A, ~A sub s~s sub A~+~A sub d~d sub A )$ -.fi -.RE -.P -Despite the apparent precision of the above equations, -blending arithmetic is not exactly specified, -because blending operates with imprecise integer color values. -However, -a blend factor that should be equal to 1 -is guaranteed not to modify its multiplicand, -and a blend factor equal to 0 reduces its multiplicand to 0. -For example, -when \f2sfactor\fP is \%\f3GL_SRC_ALPHA\fP, -\f2dfactor\fP is \%\f3GL_ONE_MINUS_SRC_ALPHA\fP, -and $A sub s$ is equal to $k sub A$, -the equations reduce to simple replacement: -.P -.RS -.nf -.IP -$R sub d ~=~ mark R sub s$ -$G sub d ~=~ lineup G sub s$ -$B sub d ~=~ lineup B sub s$ -$A sub d ~=~ lineup A sub s$ -.fi -.RE -.P -.SH EXAMPLES -.P -Transparency is best implemented using blend function -(\%\f3GL_SRC_ALPHA\fP, \%\f3GL_ONE_MINUS_SRC_ALPHA\fP) -with primitives sorted from farthest to nearest. -Note that this transparency calculation does not require -the presence of alpha bitplanes in the frame buffer. -.P -Blend function -(\%\f3GL_SRC_ALPHA\fP, \%\f3GL_ONE_MINUS_SRC_ALPHA\fP) -is also useful for rendering antialiased points and lines -in arbitrary order. -.P -Polygon antialiasing is optimized using blend function -.br -(\%\f3GL_SRC_ALPHA_SATURATE\fP, \%\f3GL_ONE\fP) -with polygons sorted from nearest to farthest. -(See the \%\f3glEnable\fP, \%\f3glDisable\fP reference page and the -\%\f3GL_POLYGON_SMOOTH\fP argument for information on polygon antialiasing.) -Destination alpha bitplanes, -which must be present for this blend function to operate correctly, -store the accumulated coverage. -.SH NOTES -Incoming (source) alpha is correctly thought of as a material opacity, -ranging from 1.0 ($K sub A$), representing complete opacity, -to 0.0 (0), representing complete -transparency. -.P -When more than one color buffer is enabled for drawing, -the GL performs blending separately for each enabled buffer, -using the contents of that buffer for destination color. -(See \%\f3glDrawBuffer\fP.) -.P -Blending affects only RGBA rendering. -It is ignored by color index renderers. -.P -\%\f3GL_CONSTANT_COLOR\fP, \%\f3GL_ONE_MINUS_CONSTANT_COLOR\fP, -\%\f3GL_CONSTANT_ALPHA\fP, \%\f3GL_ONE_MINUS_CONSTANT_ALPHA\fP are only -available if the \%\f3GL_ARB_imaging\fP is supported by your implementation. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if either \f2sfactor\fP or \f2dfactor\fP is not an -accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glBlendFunc\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_BLEND_SRC\fP -.br -\%\f3glGet\fP with argument \%\f3GL_BLEND_DST\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_BLEND\fP -.br -.SH SEE ALSO -\%\f3glAlphaFunc(3G)\fP, -\%\f3glBlendColor(3G)\fP, -\%\f3glBlendEquation(3G)\fP, -\%\f3glClear(3G)\fP, -\%\f3glDrawBuffer(3G)\fP, -\%\f3glEnable(3G)\fP, -\%\f3glLogicOp(3G)\fP, -\%\f3glStencilFunc(3G)\fP diff --git a/doc/gl-docs/GL/gl/calllist.3gl b/doc/gl-docs/GL/gl/calllist.3gl deleted file mode 100644 index 09f50a53..00000000 --- a/doc/gl-docs/GL/gl/calllist.3gl +++ /dev/null @@ -1,60 +0,0 @@ -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 calllist. -.ds Xs 42225 4 calllist.gl -.TH GLCALLLIST 3G -.SH NAME -.B "glCallList -\- execute a display list - -.SH C SPECIFICATION -void \f3glCallList\fP( -GLuint \fIlist\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2list\fP\ \ 'u -\f2list\fP -Specifies the integer name of the display list to be executed. -.SH DESCRIPTION -\%\f3glCallList\fP causes the named display list to be executed. -The commands saved in the display list are executed in order, -just as if they were called without using a display list. -If \f2list\fP has not been defined as a display list, -\%\f3glCallList\fP is ignored. -.P -\%\f3glCallList\fP can appear inside a display list. -To avoid the possibility of infinite recursion resulting from display lists -calling one another, -a limit is placed on the nesting level of display -lists during display-list execution. -This limit is at least 64, and it depends on the implementation. -.P -GL state is not saved and restored across a call to \%\f3glCallList\fP. -Thus, -changes made to GL state during the execution of a display list -remain after execution of the display list is completed. -Use \%\f3glPushAttrib\fP, -\%\f3glPopAttrib\fP, -\%\f3glPushMatrix\fP, -and \%\f3glPopMatrix\fP to preserve GL state across \%\f3glCallList\fP calls. -.SH NOTES -Display lists can be executed between a call to \%\f3glBegin\fP -and the corresponding call to \%\f3glEnd\fP, -as long as the display list includes only commands that are allowed -in this interval. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_MAX_LIST_NESTING\fP -.br -\%\f3glIsList\fP -.SH SEE ALSO -\%\f3glCallLists(3G)\fP, -\%\f3glDeleteLists(3G)\fP, -\%\f3glGenLists(3G)\fP, -\%\f3glNewList(3G)\fP, -\%\f3glPushAttrib(3G)\fP, -\%\f3glPushMatrix(3G)\fP diff --git a/doc/gl-docs/GL/gl/calllists.3gl b/doc/gl-docs/GL/gl/calllists.3gl deleted file mode 100644 index 193679af..00000000 --- a/doc/gl-docs/GL/gl/calllists.3gl +++ /dev/null @@ -1,165 +0,0 @@ -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 calllists -.ds Xs 46352 7 calllists.gl -.TH GLCALLLISTS 3G -.SH NAME -.B "glCallLists -\- execute a list of display lists - -.SH C SPECIFICATION -void \f3glCallLists\fP( -GLsizei \fIn\fP, -.nf -.ta \w'\f3void \fPglCallLists( 'u - GLenum \fItype\fP, - const GLvoid \fI*lists\fP ) -.fi - -.SH PARAMETERS -.TP \w'\fIlists\fP\ \ 'u -\f2n\fP -Specifies the number of display lists to be executed. -.TP -\f2type\fP -Specifies the type of values in \f2lists\fP. -Symbolic constants -\%\f3GL_BYTE\fP, -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_INT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_2_BYTES\fP, -\%\f3GL_3_BYTES\fP, and -\%\f3GL_4_BYTES\fP are accepted. -.TP -\f2lists\fP -Specifies the address of an array of name offsets in the display list. -The pointer type is void because the offsets can be bytes, -shorts, -ints, -or floats, -depending on the value of \f2type\fP. -.SH DESCRIPTION -\%\f3glCallLists\fP causes each display list in the list of names passed as \f2lists\fP -to be executed. -As a result, -the commands saved in each display list are executed in order, -just as if they were called without using a display list. -Names of display lists that have not been defined are ignored. -.P -\%\f3glCallLists\fP provides an efficient means for executing more than one display list. -\f2type\fP allows lists with various name formats to be accepted. -The formats are as follows: -.TP 25 -\%\f3GL_BYTE\fP -\f2lists\fP is treated as an array of signed bytes, -each in the range \-128 through 127. -.TP -\%\f3GL_UNSIGNED_BYTE\fP -\f2lists\fP is treated as an array of unsigned bytes, -each in the range 0 through 255. -.TP -\%\f3GL_SHORT\fP -\f2lists\fP is treated as an array of signed two-byte integers, -each in the range \-32768 through 32767. -.TP -\%\f3GL_UNSIGNED_SHORT\fP -\f2lists\fP is treated as an array of unsigned two-byte integers, -each in the range 0 through 65535. -.TP -\%\f3GL_INT\fP -\f2lists\fP is treated as an array of signed four-byte integers. -.TP -\%\f3GL_UNSIGNED_INT\fP -\f2lists\fP is treated as an array of unsigned four-byte integers. -.TP -\%\f3GL_FLOAT\fP -\f2lists\fP is treated as an array of four-byte floating-point values. -.TP -\%\f3GL_2_BYTES\fP -\f2lists\fP is treated as an array of unsigned bytes. -Each pair of bytes specifies a single display-list name. -The value of the pair is computed as 256 times the unsigned value -of the first byte plus the unsigned value of the second byte. -.TP -\%\f3GL_3_BYTES\fP -\f2lists\fP is treated as an array of unsigned bytes. -Each triplet of bytes specifies a single display-list name. -The value of the triplet is computed as 65536 times the unsigned value -of the first byte, -plus 256 times the unsigned value of the second byte, -plus the unsigned value of the third byte. -.TP -\%\f3GL_4_BYTES\fP -\f2lists\fP is treated as an array of unsigned bytes. -Each quadruplet of bytes specifies a single display-list name. -The value of the quadruplet is computed as 16777216 times the unsigned value -of the first byte, -plus 65536 times the unsigned value of the second byte, -plus 256 times the unsigned value of the third byte, -plus the unsigned value of the fourth byte. -.P -The list of display-list names is not null-terminated. -Rather, -\f2n\fP specifies how many names are to be taken from \f2lists\fP. -.P -An additional level of indirection is made available with the -\%\f3glListBase\fP command, -which specifies an unsigned offset that is added to each display-list -name specified in \f2lists\fP before that display list is executed. -.P -\%\f3glCallLists\fP can appear inside a display list. -To avoid the possibility of infinite recursion resulting from display lists -calling one another, -a limit is placed on the nesting level of display -lists during display-list execution. -This limit must be at least 64, and it depends on the implementation. -.P -GL state is not saved and restored across a call to \%\f3glCallLists\fP. -Thus, -changes made to GL state during the execution of the display lists -remain after execution is completed. -Use \%\f3glPushAttrib\fP, -\%\f3glPopAttrib\fP, -\%\f3glPushMatrix\fP, -and \%\f3glPopMatrix\fP to preserve GL state across \%\f3glCallLists\fP calls. -.SH NOTES -Display lists can be executed between a call to \%\f3glBegin\fP -and the corresponding call to \%\f3glEnd\fP, -as long as the display list includes only commands that are allowed -in this interval. -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if \f2n\fP is negative. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not one of -\%\f3GL_BYTE\fP, -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_INT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_2_BYTES\fP, -\%\f3GL_3_BYTES\fP, -\%\f3GL_4_BYTES\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_LIST_BASE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAX_LIST_NESTING\fP -.br -\%\f3glIsList\fP -.SH SEE ALSO -\%\f3glCallList(3G)\fP, -\%\f3glDeleteLists(3G)\fP, -\%\f3glGenLists(3G)\fP, -\%\f3glListBase(3G)\fP, -\%\f3glNewList(3G)\fP, -\%\f3glPushAttrib(3G)\fP, -.br -\%\f3glPushMatrix(3G)\fP diff --git a/doc/gl-docs/GL/gl/clear.3gl b/doc/gl-docs/GL/gl/clear.3gl deleted file mode 100644 index fb7ccbe2..00000000 --- a/doc/gl-docs/GL/gl/clear.3gl +++ /dev/null @@ -1,98 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 clear.gl -.ds Xs 16977 5 clear.gl -.TH GLCLEAR 3G -.SH NAME -.B "glClear -\- clear buffers to preset values - -.SH C SPECIFICATION -void \f3glClear\fP( -GLbitfield \fImask\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2mask\fP\ \ 'u -\f2mask\fP -Bitwise OR of masks that indicate the buffers to be cleared. -The four masks are -\%\f3GL_COLOR_BUFFER_BIT\fP, -\%\f3GL_DEPTH_BUFFER_BIT\fP, -\%\f3GL_ACCUM_BUFFER_BIT\fP, and -\%\f3GL_STENCIL_BUFFER_BIT\fP. -.SH DESCRIPTION -\%\f3glClear\fP sets the bitplane area of the window to values previously selected -by \%\f3glClearColor\fP, \%\f3glClearIndex\fP, \%\f3glClearDepth\fP, -\%\f3glClearStencil\fP, and \%\f3glClearAccum\fP. -Multiple color buffers can be cleared simultaneously by selecting -more than one buffer at a time using \%\f3glDrawBuffer\fP. -.P -The pixel ownership test, -the scissor test, -dithering, and the buffer writemasks affect the operation of \%\f3glClear\fP. -The scissor box bounds the cleared region. -Alpha function, -blend function, -logical operation, -stenciling, -texture mapping, -and depth-buffering are ignored by \%\f3glClear\fP. -.P -\%\f3glClear\fP takes a single argument that is the bitwise OR of several -values indicating which buffer is to be cleared. -.P -The values are as follows: -.TP 28 -\%\f3GL_COLOR_BUFFER_BIT\fP -Indicates the buffers currently enabled for color -writing. -.TP -\%\f3GL_DEPTH_BUFFER_BIT\fP -Indicates the depth buffer. -.TP -\%\f3GL_ACCUM_BUFFER_BIT\fP -Indicates the accumulation buffer. -.TP -\%\f3GL_STENCIL_BUFFER_BIT\fP -Indicates the stencil buffer. -.P -The value to which each buffer is cleared depends on the setting of the -clear value for that buffer. -.SH NOTES -If a buffer is not present, -then a \%\f3glClear\fP directed at that buffer has no effect. -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if any bit other than the four defined -bits is set in \f2mask\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glClear\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_ACCUM_CLEAR_VALUE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_DEPTH_CLEAR_VALUE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_INDEX_CLEAR_VALUE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_COLOR_CLEAR_VALUE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_STENCIL_CLEAR_VALUE\fP -.SH SEE ALSO -\%\f3glClearAccum(3G)\fP, -\%\f3glClearColor(3G)\fP, -\%\f3glClearDepth(3G)\fP, -\%\f3glClearIndex(3G)\fP, -\%\f3glClearStencil(3G)\fP, -\%\f3glColorMask(3G)\fP, -\%\f3glDepthMask(3G)\fP, -\%\f3glDrawBuffer(3G)\fP, -\%\f3glScissor(3G)\fP, -\%\f3glStencilMask(3G)\fP diff --git a/doc/gl-docs/GL/gl/clearaccum.3gl b/doc/gl-docs/GL/gl/clearaccum.3gl deleted file mode 100644 index c19132ae..00000000 --- a/doc/gl-docs/GL/gl/clearaccum.3gl +++ /dev/null @@ -1,45 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 clearaccu -.ds Xs 2071 3 clearaccum.gl -.TH GLCLEARACCUM 3G -.SH NAME -.B "glClearAccum -\- specify clear values for the accumulation buffer - -.SH C SPECIFICATION -void \f3glClearAccum\fP( -GLfloat \fIred\fP, -.nf -.ta \w'\f3void \fPglClearAccum( 'u - GLfloat \fIgreen\fP, - GLfloat \fIblue\fP, - GLfloat \fIalpha\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2red\fP\ \f2green\fP\ \f2blue\fP\ \f2alpha\fP\ \ 'u -\f2red\fP, \f2green\fP, \f2blue\fP, \f2alpha\fP -Specify the red, green, blue, and alpha values used when the -accumulation buffer is cleared. -The initial values are all 0. -.SH DESCRIPTION -\%\f3glClearAccum\fP specifies the red, green, blue, and alpha values used by \%\f3glClear\fP -to clear the accumulation buffer. -.P -Values specified by \%\f3glClearAccum\fP are clamped to the -range [-1,\ 1]. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glClearAccum\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_ACCUM_CLEAR_VALUE\fP -.SH SEE ALSO -\%\f3glAccum(3G)\fP, -\%\f3glClear(3G)\fP diff --git a/doc/gl-docs/GL/gl/clearcolor.3gl b/doc/gl-docs/GL/gl/clearcolor.3gl deleted file mode 100644 index 9413a1f1..00000000 --- a/doc/gl-docs/GL/gl/clearcolor.3gl +++ /dev/null @@ -1,44 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 clearcolo -.ds Xs 36439 3 clearcolor.gl -.TH GLCLEARCOLOR 3G -.SH NAME -.B "glClearColor -\- specify clear values for the color buffers - -.SH C SPECIFICATION -void \f3glClearColor\fP( -GLclampf \fIred\fP, -.nf -.ta \w'\f3void \fPglClearColor( 'u - GLclampf \fIgreen\fP, - GLclampf \fIblue\fP, - GLclampf \fIalpha\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2red\fP\ \f2green\fP\ \f2blue\fP\ \f2alpha\fP\ \ 'u -\f2red\fP, \f2green\fP, \f2blue\fP, \f2alpha\fP -Specify the red, green, blue, and alpha values used when the -color buffers are cleared. -The initial values are all 0. -.SH DESCRIPTION -\%\f3glClearColor\fP specifies the red, -green, -blue, -and alpha values used by \%\f3glClear\fP to clear the color buffers. -Values specified by \%\f3glClearColor\fP are clamped to the range [0,\ 1]. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glClearColor\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_COLOR_CLEAR_VALUE\fP -.SH SEE ALSO -\%\f3glClear(3G)\fP diff --git a/doc/gl-docs/GL/gl/cleardepth.3gl b/doc/gl-docs/GL/gl/cleardepth.3gl deleted file mode 100644 index 3a26f02e..00000000 --- a/doc/gl-docs/GL/gl/cleardepth.3gl +++ /dev/null @@ -1,36 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 cleardept -.ds Xs 62352 3 cleardepth.gl -.TH GLCLEARDEPTH 3G -.SH NAME -.B "glClearDepth -\- specify the clear value for the depth buffer - -.SH C SPECIFICATION -void \f3glClearDepth\fP( -GLclampd \fIdepth\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2depth\fP\ \ 'u -\f2depth\fP -Specifies the depth value used when the depth buffer is cleared. The -initial value is 1. -.SH DESCRIPTION -\%\f3glClearDepth\fP specifies the depth value used by \%\f3glClear\fP to clear the depth buffer. -Values specified by \%\f3glClearDepth\fP are clamped to the range [0,\ 1]. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glClearDepth\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_DEPTH_CLEAR_VALUE\fP -.SH SEE ALSO -\%\f3glClear(3G)\fP diff --git a/doc/gl-docs/GL/gl/clearindex.3gl b/doc/gl-docs/GL/gl/clearindex.3gl deleted file mode 100644 index d950bcc3..00000000 --- a/doc/gl-docs/GL/gl/clearindex.3gl +++ /dev/null @@ -1,47 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 clearinde -.ds Xs 34830 3 clearindex.gl -.TH GLCLEARINDEX 3G -.SH NAME -.B "glClearIndex -\- specify the clear value for the color index buffers - -.SH C SPECIFICATION -void \f3glClearIndex\fP( -GLfloat \fIc\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2c\fP\ \ 'u -\f2c\fP -Specifies the index used when the color index buffers are cleared. -The initial value is 0. -.SH DESCRIPTION -\%\f3glClearIndex\fP specifies the index used by \%\f3glClear\fP -to clear the color index buffers. -\f2c\fP is not clamped. -Rather, -\f2c\fP is converted to a fixed-point value with unspecified precision -to the right of the binary point. -The integer part of this value is then masked with $2 sup m^-^1$, -where $m$ is the number of bits in a color index stored in the frame buffer. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glClearIndex\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_INDEX_CLEAR_VALUE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_INDEX_BITS\fP -.SH SEE ALSO -\%\f3glClear(3G)\fP diff --git a/doc/gl-docs/GL/gl/clearstencil.3gl b/doc/gl-docs/GL/gl/clearstencil.3gl deleted file mode 100644 index b3367b32..00000000 --- a/doc/gl-docs/GL/gl/clearstencil.3gl +++ /dev/null @@ -1,45 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 clearsten -.ds Xs 64794 3 clearstencil.gl -.TH GLCLEARSTENCIL 3G -.SH NAME -.B "glClearStencil -\- specify the clear value for the stencil buffer - -.SH C SPECIFICATION -void \f3glClearStencil\fP( -GLint \fIs\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2s\fP\ \ 'u -\f2s\fP -Specifies the index used when the stencil buffer is cleared. -The initial value is 0. -.SH DESCRIPTION -\%\f3glClearStencil\fP specifies the index used by \%\f3glClear\fP to clear the stencil buffer. -\f2s\fP is masked with $2 sup m^-^1$, -where $m$ is the number of bits in the stencil buffer. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glClearStencil\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_STENCIL_CLEAR_VALUE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_STENCIL_BITS\fP -.SH SEE ALSO -\%\f3glClear(3G)\fP, -\%\f3glStencilFunc(3G)\fP, -\%\f3glStencilOp(3G)\fP, -\%\f3glStencilMask(3G)\fP diff --git a/doc/gl-docs/GL/gl/clientactivetextureARB.3gl b/doc/gl-docs/GL/gl/clientactivetextureARB.3gl deleted file mode 100644 index d9e4d76e..00000000 --- a/doc/gl-docs/GL/gl/clientactivetextureARB.3gl +++ /dev/null @@ -1,54 +0,0 @@ -'\" et -'\"! eqn|tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 19:46 -.ds Dm 001 clientac -.ds Xs 18566 4 clientactivetextureARB.gl -.TH GLCLIENTACTIVETEXTUREARB 3G -.SH NAME -.B "glClientActiveTextureARB -\- select active texture unit - -.SH C SPECIFICATION -void \f3glClientActiveTextureARB\fP( -GLenum \fItexture\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2texture\fP\ \ 'u -\f2texture\fP -Specifies which texture unit to make active. The number -of texture units is implementation dependent, but must be at least -two. \f2texture\fP must be one of \%\f3GL_TEXTURE\fP$i$\f3_ARB\fP -where 0 \(<= $ i $ < \%\f3GL_MAX_TEXTURE_UNITS_ARB\fP, which is an -implementation-dependent value. The initial value is -\%\f3GL_TEXTURE0_ARB\fP. -.SH DESCRIPTION -\%\f3glClientActiveTextureARB\fP selects the vertex array client state parameters to be modified by -\%\f3glTexCoordPointer\fP, and enabled or disabled with -\%\f3glEnableClientState\fP or \%\f3glDisableClientState\fP, respectively, -when called with a parameter of \%\f3GL_TEXTURE_COORD_ARRAY\fP. -.SH NOTES -\%\f3glClientActiveTextureARB\fP is supported only if \%\f3GL_ARB_multitexture\fP is included in the -string returned by \%\f3glGetString\fP when called with the argument -\%\f3GL_EXTENSIONS\fP. -.P -\%\f3glClientActiveTextureARB\fP sets \%\f3GL_CLIENT_ACTIVE_TEXTURE_ARB\fP to the active texture unit. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2texture\fP is not one of -\%\f3GL_TEXTURE\fP$i$\f3_ARB\fP, where -0 \(<= $ i $ < \%\f3GL_MAX_TEXTURE_UNITS_ARB\fP. -.SH SEE ALSO -\%\f3glActiveTextureARB(3G)\fP, -\%\f3glDisableClientState(3G)\fP, -\%\f3glEnableClientState(3G)\fP, -\%\f3glMultiTexCoordARB(3G)\fP, -\%\f3glTexCoordPointer(3G)\fP - diff --git a/doc/gl-docs/GL/gl/clipplane.3gl b/doc/gl-docs/GL/gl/clipplane.3gl deleted file mode 100644 index 430e0b1e..00000000 --- a/doc/gl-docs/GL/gl/clipplane.3gl +++ /dev/null @@ -1,81 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 clipplane -.ds Xs 34226 5 clipplane.gl -.TH GLCLIPPLANE 3G -.SH NAME -.B "glClipPlane -\- specify a plane against which all geometry is clipped - -.SH C SPECIFICATION -void \f3glClipPlane\fP( -GLenum \fIplane\fP, -.nf -.ta \w'\f3void \fPglClipPlane( 'u - const GLdouble \fI*equation\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIequation\fP\ \ 'u -\f2plane\fP -Specifies which clipping plane is being positioned. -Symbolic names of the form \%\f3GL_CLIP_PLANE\fP\f2i\fP, -where \f2i\fP is an integer between 0 and \%\f3GL_MAX_CLIP_PLANES\fP$^-^1$, -are accepted. -.TP -\f2equation\fP -Specifies the address of an array of four double-precision floating-point values. -These values are interpreted as a plane equation. -.SH DESCRIPTION -Geometry is always clipped against the boundaries of a six-plane frustum -in \f2x\fP, \f2y\fP, and \f2z\fP. -\%\f3glClipPlane\fP allows the specification of additional planes, -not necessarily perpendicular to the \f2x\fP, \f2y\fP, or \f2z\fP axis, -against which all geometry is clipped. -To determine the maximum number of additional clipping planes, call -\%\f3glGetIntegerv\fP with argument \%\f3GL_MAX_CLIP_PLANES\fP. All -implementations support at least six such clipping planes. -Because the resulting clipping region is the intersection -of the defined half-spaces, -it is always convex. -.P -\%\f3glClipPlane\fP specifies a half-space using a four-component plane equation. -When \%\f3glClipPlane\fP is called, -\f2equation\fP is transformed by the inverse of the modelview matrix -and stored in the resulting eye coordinates. -Subsequent changes to the modelview matrix have no effect on the -stored plane-equation components. -If the dot product of the eye coordinates of a vertex with the -stored plane equation components is positive or zero, -the vertex is \f2in\f1 with respect to that clipping plane. -Otherwise, it is \f2out\fP. -.P -To enable and disable clipping planes, call -\%\f3glEnable\fP and \%\f3glDisable\fP with the argument -\%\f3GL_CLIP_PLANE\fP\f2i\fP, -where \f2i\fP is the plane number. -.P -All clipping planes are initially defined as (0, 0, 0, 0) in eye coordinates -and are disabled. -.SH NOTES -It is always the case that \%\f3GL_CLIP_PLANE\fP$i$ = \%\f3GL_CLIP_PLANE0\fP$~+~i$. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2plane\fP is not an accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glClipPlane\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetClipPlane\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_CLIP_PLANE\fP\f2i\fP -.SH SEE ALSO -\%\f3glEnable(3G)\fP diff --git a/doc/gl-docs/GL/gl/color.3gl b/doc/gl-docs/GL/gl/color.3gl deleted file mode 100644 index 9cc94ffa..00000000 --- a/doc/gl-docs/GL/gl/color.3gl +++ /dev/null @@ -1,269 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 color.gl -.ds Xs 48493 5 color.gl -.TH GLCOLOR 3G -.SH NAME -.B "glColor3b, glColor3d, glColor3f, glColor3i, glColor3s, glColor3ub, glColor3ui, glColor3us, glColor4b, glColor4d, glColor4f, glColor4i, glColor4s, glColor4ub, glColor4ui, glColor4us, glColor3bv, glColor3dv, glColor3fv, glColor3iv, glColor3sv, glColor3ubv, glColor3uiv, glColor3usv, glColor4bv, glColor4dv, glColor4fv, glColor4iv, glColor4sv, glColor4ubv, glColor4uiv, glColor4usv -\- set the current color - -.SH C SPECIFICATION -void \f3glColor3b\fP( -GLbyte \fIred\fP, -.nf -.ta \w'\f3void \fPglColor3b( 'u - GLbyte \fIgreen\fP, - GLbyte \fIblue\fP ) -.fi -void \f3glColor3d\fP( -GLdouble \fIred\fP, -.nf -.ta \w'\f3void \fPglColor3d( 'u - GLdouble \fIgreen\fP, - GLdouble \fIblue\fP ) -.fi -void \f3glColor3f\fP( -GLfloat \fIred\fP, -.nf -.ta \w'\f3void \fPglColor3f( 'u - GLfloat \fIgreen\fP, - GLfloat \fIblue\fP ) -.fi -void \f3glColor3i\fP( -GLint \fIred\fP, -.nf -.ta \w'\f3void \fPglColor3i( 'u - GLint \fIgreen\fP, - GLint \fIblue\fP ) -.fi -void \f3glColor3s\fP( -GLshort \fIred\fP, -.nf -.ta \w'\f3void \fPglColor3s( 'u - GLshort \fIgreen\fP, - GLshort \fIblue\fP ) -.fi -void \f3glColor3ub\fP( -GLubyte \fIred\fP, -.nf -.ta \w'\f3void \fPglColor3ub( 'u - GLubyte \fIgreen\fP, - GLubyte \fIblue\fP ) -.fi -void \f3glColor3ui\fP( -GLuint \fIred\fP, -.nf -.ta \w'\f3void \fPglColor3ui( 'u - GLuint \fIgreen\fP, - GLuint \fIblue\fP ) -.fi -void \f3glColor3us\fP( -GLushort \fIred\fP, -.nf -.ta \w'\f3void \fPglColor3us( 'u - GLushort \fIgreen\fP, - GLushort \fIblue\fP ) -.fi -void \f3glColor4b\fP( -GLbyte \fIred\fP, -.nf -.ta \w'\f3void \fPglColor4b( 'u - GLbyte \fIgreen\fP, - GLbyte \fIblue\fP, - GLbyte \fIalpha\fP ) -.fi -void \f3glColor4d\fP( -GLdouble \fIred\fP, -.nf -.ta \w'\f3void \fPglColor4d( 'u - GLdouble \fIgreen\fP, - GLdouble \fIblue\fP, - GLdouble \fIalpha\fP ) -.fi -void \f3glColor4f\fP( -GLfloat \fIred\fP, -.nf -.ta \w'\f3void \fPglColor4f( 'u - GLfloat \fIgreen\fP, - GLfloat \fIblue\fP, - GLfloat \fIalpha\fP ) -.fi -void \f3glColor4i\fP( -GLint \fIred\fP, -.nf -.ta \w'\f3void \fPglColor4i( 'u - GLint \fIgreen\fP, - GLint \fIblue\fP, - GLint \fIalpha\fP ) -.fi -void \f3glColor4s\fP( -GLshort \fIred\fP, -.nf -.ta \w'\f3void \fPglColor4s( 'u - GLshort \fIgreen\fP, - GLshort \fIblue\fP, - GLshort \fIalpha\fP ) -.fi -void \f3glColor4ub\fP( -GLubyte \fIred\fP, -.nf -.ta \w'\f3void \fPglColor4ub( 'u - GLubyte \fIgreen\fP, - GLubyte \fIblue\fP, - GLubyte \fIalpha\fP ) -.fi -void \f3glColor4ui\fP( -GLuint \fIred\fP, -.nf -.ta \w'\f3void \fPglColor4ui( 'u - GLuint \fIgreen\fP, - GLuint \fIblue\fP, - GLuint \fIalpha\fP ) -.fi -void \f3glColor4us\fP( -GLushort \fIred\fP, -.nf -.ta \w'\f3void \fPglColor4us( 'u - GLushort \fIgreen\fP, - GLushort \fIblue\fP, - GLushort \fIalpha\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2red\fP\ \f2green\fP\ \f2blue\fP\ \ 'u -\f2red\fP, \f2green\fP, \f2blue\fP -Specify new red, green, and blue values for the current color. -.TP -\f2alpha\fP -Specifies a new alpha value for the current color. -Included only in the four-argument \%\f3glColor4\fP commands. -.SH C SPECIFICATION -void \f3glColor3bv\fP( -const GLbyte \fI*v\fP ) -.nf -.fi -void \f3glColor3dv\fP( -const GLdouble \fI*v\fP ) -.nf -.fi -void \f3glColor3fv\fP( -const GLfloat \fI*v\fP ) -.nf -.fi -void \f3glColor3iv\fP( -const GLint \fI*v\fP ) -.nf -.fi -void \f3glColor3sv\fP( -const GLshort \fI*v\fP ) -.nf -.fi -void \f3glColor3ubv\fP( -const GLubyte \fI*v\fP ) -.nf -.fi -void \f3glColor3uiv\fP( -const GLuint \fI*v\fP ) -.nf -.fi -void \f3glColor3usv\fP( -const GLushort \fI*v\fP ) -.nf -.fi -void \f3glColor4bv\fP( -const GLbyte \fI*v\fP ) -.nf -.fi -void \f3glColor4dv\fP( -const GLdouble \fI*v\fP ) -.nf -.fi -void \f3glColor4fv\fP( -const GLfloat \fI*v\fP ) -.nf -.fi -void \f3glColor4iv\fP( -const GLint \fI*v\fP ) -.nf -.fi -void \f3glColor4sv\fP( -const GLshort \fI*v\fP ) -.nf -.fi -void \f3glColor4ubv\fP( -const GLubyte \fI*v\fP ) -.nf -.fi -void \f3glColor4uiv\fP( -const GLuint \fI*v\fP ) -.nf -.fi -void \f3glColor4usv\fP( -const GLushort \fI*v\fP ) -.nf -.fi - -.SH PARAMETERS -.TP -\f2v\fP -Specifies a pointer to an array that contains red, green, blue, -and (sometimes) alpha values. -.SH DESCRIPTION -The GL stores both a current single-valued color index -and a current four-valued RGBA color. -\%\f3glColor\fP sets a new four-valued RGBA color. -\%\f3glColor\fP has two major variants: -\%\f3glColor3\fP and \%\f3glColor4\fP. -\%\f3glColor3\fP variants specify new red, -green, -and blue values explicitly -and set the current alpha value to 1.0 (full intensity) implicitly. -\%\f3glColor4\fP variants specify all four color components explicitly. -.P -\%\f3glColor3b\fP, \%\f3glColor4b\fP, -\%\f3glColor3s\fP, \%\f3glColor4s\fP, \%\f3glColor3i\fP, and \%\f3glColor4i\fP take -three or four signed byte, short, or long integers as arguments. -When \f3v\fP is appended to the name, -the color commands can take a pointer to an array of such values. -.P -Current color values are stored in floating-point , -with unspecified mantissa and exponent sizes. -Unsigned integer color components, -when specified, -are linearly mapped to floating-point values such that the largest -representable value maps to 1.0 (full intensity), -and 0 maps to 0.0 (zero intensity). -Signed integer color components, -when specified, -are linearly mapped to floating-point values such that the most positive -representable value maps to 1.0, -and the most negative representable value maps to \-1.0. (Note that -this mapping does not convert 0 precisely to 0.0.) -Floating-point values are mapped directly. -.P -Neither floating-point nor signed integer values are clamped -to the range [0,1] before the current color is updated. -However, -color components are clamped to this range before they are interpolated -or written into a color buffer. -.SH NOTES -The initial value for the current color is (1, 1, 1, 1). -.P -The current color can be updated at any time. -In particular, -\%\f3glColor\fP can be called between a call to \%\f3glBegin\fP and the corresponding -call to \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_CURRENT_COLOR\fP -.br -\%\f3glGet\fP with argument \%\f3GL_RGBA_MODE\fP -.SH SEE ALSO -\%\f3glIndex(3G)\fP diff --git a/doc/gl-docs/GL/gl/colormask.3gl b/doc/gl-docs/GL/gl/colormask.3gl deleted file mode 100644 index 3dd9fbc1..00000000 --- a/doc/gl-docs/GL/gl/colormask.3gl +++ /dev/null @@ -1,58 +0,0 @@ -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 colormask -.ds Xs 41408 4 colormask.gl -.TH GLCOLORMASK 3G -.SH NAME -.B "glColorMask -\- enable and disable writing of frame buffer color components - -.SH C SPECIFICATION -void \f3glColorMask\fP( -GLboolean \fIred\fP, -.nf -.ta \w'\f3void \fPglColorMask( 'u - GLboolean \fIgreen\fP, - GLboolean \fIblue\fP, - GLboolean \fIalpha\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2red\fP\ \f2green\fP\ \f2blue\fP\ \f2alpha\fP\ \ 'u -\f2red\fP, \f2green\fP, \f2blue\fP, \f2alpha\fP -Specify whether red, green, blue, and alpha can or cannot be written -into the frame buffer. -The initial values are all \%\f3GL_TRUE\fP, -indicating that the color components can be written. -.SH DESCRIPTION -\%\f3glColorMask\fP specifies whether the individual color components in the frame buffer -can or cannot be written. -If \f2red\fP is \%\f3GL_FALSE\fP, -for example, -no change is made to the red component of any pixel in any of the -color buffers, -regardless of the drawing operation attempted. -.P -Changes to individual bits of components cannot be controlled. -Rather, -changes are either enabled or disabled for entire color components. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glColorMask\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_COLOR_WRITEMASK\fP -.br -\%\f3glGet\fP with argument \%\f3GL_RGBA_MODE\fP -.SH SEE ALSO -\%\f3glClear(3G)\fP, -\%\f3glColor(3G)\fP, -\%\f3glColorPointer(3G)\fP, -\%\f3glDepthMask(3G)\fP, -\%\f3glIndex(3G)\fP, -\%\f3glIndexPointer(3G)\fP, -\%\f3glIndexMask(3G)\fP, -\%\f3glStencilMask(3G)\fP diff --git a/doc/gl-docs/GL/gl/colormaterial.3gl b/doc/gl-docs/GL/gl/colormaterial.3gl deleted file mode 100644 index bb86ecc4..00000000 --- a/doc/gl-docs/GL/gl/colormaterial.3gl +++ /dev/null @@ -1,94 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 colormate -.ds Xs 35305 5 colormaterial.gl -.TH GLCOLORMATERIAL 3G -.SH NAME -.B "glColorMaterial -\- cause a material color to track the current color - -.SH C SPECIFICATION -void \f3glColorMaterial\fP( -GLenum \fIface\fP, -.nf -.ta \w'\f3void \fPglColorMaterial( 'u - GLenum \fImode\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2face\fP\ \ 'u -\f2face\fP -Specifies whether front, -back, -or both front and back material parameters should track the current color. -Accepted values are -\%\f3GL_FRONT\fP, -\%\f3GL_BACK\fP, -and \%\f3GL_FRONT_AND_BACK\fP. -The initial value is \%\f3GL_FRONT_AND_BACK\fP. -.TP -\f2mode\fP -Specifies which of several material parameters track the current color. -Accepted values are -\%\f3GL_EMISSION\fP, -\%\f3GL_AMBIENT\fP, -\%\f3GL_DIFFUSE\fP, -\%\f3GL_SPECULAR\fP, -and \%\f3GL_AMBIENT_AND_DIFFUSE\fP. -The initial value is \%\f3GL_AMBIENT_AND_DIFFUSE\fP. -.SH DESCRIPTION -\%\f3glColorMaterial\fP specifies which material parameters track the current color. -When \%\f3GL_COLOR_MATERIAL\fP is enabled, -the material parameter or parameters specified by \f2mode\fP, -of the material or materials specified by \f2face\fP, -track the current color at all times. -.P -To enable and disable \%\f3GL_COLOR_MATERIAL\fP, call -\%\f3glEnable\fP and \%\f3glDisable\fP with argument \%\f3GL_COLOR_MATERIAL\fP. -\%\f3GL_COLOR_MATERIAL\fP is initially disabled. -.SH NOTES -\%\f3glColorMaterial\fP makes it possible to change a subset of material parameters for each -vertex using only the \%\f3glColor\fP command, -without calling \%\f3glMaterial\fP. -If only such a subset of parameters is to be specified for each -vertex, calling \%\f3glColorMaterial\fP is preferable to calling \%\f3glMaterial\fP. -.P -Call \%\f3glColorMaterial\fP before enabling \%\f3GL_COLOR_MATERIAL\fP. -.P -Calling \%\f3glDrawElements\fP, \%\f3glDrawArrays\fP, or \%\f3glDrawRangeElements\fP -may leave the current color indeterminate, if the color array is enabled. -If -\%\f3glColorMaterial\fP is enabled while the current color is indeterminate, the -lighting material state specified by \f2face\fP and \f2mode\fP is also indeterminate. -.P -If the GL version is 1.1 or greater, and \%\f3GL_COLOR_MATERIAL\fP is -enabled, evaluated color values affect the results of the lighting -equation as if the current color were being modified, but no change is -made to the tracking lighting parameter of the current color. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2face\fP or \f2mode\fP is not an -accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glColorMaterial\fP is executed between -the execution of \%\f3glBegin\fP and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glIsEnabled\fP with argument \%\f3GL_COLOR_MATERIAL\fP -.br -\%\f3glGet\fP with argument \%\f3GL_COLOR_MATERIAL_PARAMETER\fP -.br -\%\f3glGet\fP with argument \%\f3GL_COLOR_MATERIAL_FACE\fP -.SH SEE ALSO -\%\f3glColor(3G)\fP, -\%\f3glColorPointer(3G)\fP, -\%\f3glDrawArrays(3G)\fP, -\%\f3glDrawElements(3G)\fP, -\%\f3glDrawRangeElements(3G)\fP, -\%\f3glEnable(3G)\fP, -\%\f3glLight(3G)\fP, -\%\f3glLightModel(3G)\fP, -\%\f3glMaterial(3G)\fP diff --git a/doc/gl-docs/GL/gl/colorpointer.3gl b/doc/gl-docs/GL/gl/colorpointer.3gl deleted file mode 100644 index 7ab365e1..00000000 --- a/doc/gl-docs/GL/gl/colorpointer.3gl +++ /dev/null @@ -1,123 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 colorpoin -.ds Xs 1769 6 colorpointer.gl -.TH GLCOLORPOINTER 3G -.SH NAME -.B "glColorPointer -\- define an array of colors - -.SH C SPECIFICATION -void \f3glColorPointer\fP( -GLint \fIsize\fP, -.nf -.ta \w'\f3void \fPglColorPointer( 'u - GLenum \fItype\fP, - GLsizei \fIstride\fP, - const GLvoid \fI*ptr\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIstride\fP\ \ 'u -\f2size\fP -Specifies the number of components per color. Must be 3 or 4. -The initial value is 4. -.TP -\f2type\fP -Specifies the data type of each color component in the array. -Symbolic constants -\%\f3GL_BYTE\fP, -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_INT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_FLOAT\fP, -and -\%\f3GL_DOUBLE\fP -are accepted. -The initial value is \%\f3GL_FLOAT\fP. -.TP -\f2stride\fP -Specifies the byte offset between consecutive colors. -If \f2stride\fP is 0 (the initial value), the colors are understood to be -tightly packed in the array. The initial value is 0. -.TP -\f2ptr\fP -Specifies a pointer to the first component of the first color element -in the array. -.SH DESCRIPTION -\%\f3glColorPointer\fP specifies the location and data of an array of color components -to use when rendering. -\f2size\fP specifies the number of components per color, and must be 3 or 4. -\f2type\fP specifies the data type of each color component, and \f2stride\fP -specifies the byte stride from one color to the next allowing vertices and -attributes to be packed into a single array or stored in separate arrays. -(Single-array storage may be more efficient on some implementations; -see \%\f3glInterleavedArrays\fP.) -.P -When a color array is specified, -\f2size\fP, \f2type\fP, \f2stride\fP, and \f2ptr\fP are saved as client-side -state. -.P -To enable and disable the color array, call \%\f3glEnableClientState\fP and -.br -\%\f3glDisableClientState\fP with the argument \%\f3GL_COLOR_ARRAY\fP. If -enabled, the color array is used when \%\f3glDrawArrays\fP, -\%\f3glDrawElements\fP, \%\f3glDrawRangeElements\fP, or \%\f3glArrayElement\fP is -called. -.SH NOTES -\%\f3glColorPointer\fP is available only if the GL version is 1.1 or greater. -.P -The color array is initially disabled and isn't accessed when -\%\f3glArrayElement\fP, \%\f3glDrawArrays\fP, \%\f3glDrawRangeElements\fP, -or \%\f3glDrawElements\fP is called. -.P -Execution of \%\f3glColorPointer\fP is not allowed between the execution of -\%\f3glBegin\fP and the corresponding execution of \%\f3glEnd\fP, -but an error may or may not be generated. If no error is generated, -the operation is undefined. -.P -\%\f3glColorPointer\fP is typically implemented on the client side. -.P -Color array parameters are client-side state and are therefore not saved -or restored by \%\f3glPushAttrib\fP and \%\f3glPopAttrib\fP. -Use \%\f3glPushClientAttrib\fP and \%\f3glPopClientAttrib\fP instead. -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if \f2size\fP is not 3 or 4. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not an accepted value. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2stride\fP is negative. -.SH ASSOCIATED GETS -\%\f3glIsEnabled\fP with argument \%\f3GL_COLOR_ARRAY\fP -.br -\%\f3glGet\fP with argument \%\f3GL_COLOR_ARRAY_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_COLOR_ARRAY_TYPE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_COLOR_ARRAY_STRIDE\fP -.br -\%\f3glGetPointerv\fP with argument \%\f3GL_COLOR_ARRAY_POINTER\fP -.SH SEE ALSO -\%\f3glArrayElement(3G)\fP, -\%\f3glDrawArrays(3G)\fP, -\%\f3glDrawElements(3G)\fP, -\%\f3glEdgeFlagPointer(3G)\fP, -\%\f3glEnable(3G)\fP, -\%\f3glGetPointerv(3G)\fP, -\%\f3glIndexPointer(3G)\fP, -\%\f3glInterleavedArrays(3G)\fP, -\%\f3glNormalPointer(3G)\fP, -\%\f3glPopClientAttrib(3G)\fP, -\%\f3glPushClientAttrib(3G)\fP, -\%\f3glTexCoordPointer(3G)\fP, -\%\f3glVertexPointer(3G)\fP diff --git a/doc/gl-docs/GL/gl/colorsubtable.3gl b/doc/gl-docs/GL/gl/colorsubtable.3gl deleted file mode 100644 index 6072db63..00000000 --- a/doc/gl-docs/GL/gl/colorsubtable.3gl +++ /dev/null @@ -1,116 +0,0 @@ -'\" t -'\"! tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 colorsubt -.ds Xs 37035 5 colorsubtable.gl -.TH GLCOLORSUBTABLE 3G -.SH NAME -.B "glColorSubTable -\- respecify a portion of a color table - -.SH C SPECIFICATION -void \f3glColorSubTable\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglColorSubTable( 'u - GLsizei \fIstart\fP, - GLsizei \fIcount\fP, - GLenum \fIformat\fP, - GLenum \fItype\fP, - const GLvoid \fI*data\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -Must be one of -\%\f3GL_COLOR_TABLE\fP, -\%\f3GL_POST_CONVOLUTION_COLOR_TABLE\fP, or -\%\f3GL_POST_COLOR_MATRIX_COLOR_TABLE\fP. -.TP -\f2start\fP -The starting index of the portion of the color table to be replaced. -.TP -\f2count\fP -The number of table entries to replace. -.TP -\f2format\fP -The of the pixel data in \f2data\fP. -The allowable values are -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_BGR\fP, -\%\f3GL_RGBA\fP, and -\%\f3GL_BGRA\fP. -.TP -\f2type\fP -The type of the pixel data in \f2data\fP. -The allowable values are -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP. -.TP -\f2data\fP -Pointer to a one-dimensional array of pixel data that is processed to -replace the specified region of the color table. -.SH DESCRIPTION -\%\f3glColorSubTable\fP is used to respecify a contiguous portion of a color table previously -defined using \%\f3glColorTable\fP. The pixels referenced by \f2data\fP replace the -portion of the existing table from indices \f2start\fP to -$"start"~+~"count"~-~1$, inclusive. This region may not include any -entries outside the range of the color table as it was originally specified. -It is not an error to specify a subtexture with width of 0, but such a -specification has no effect. -.SH NOTES -\%\f3glColorSubTable\fP is present only if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP -is called with an argument of \%\f3GL_EXTENSIONS\fP. -.P -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_VALUE\fP is generated if $"start"~+~"count"~>~width$. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2format\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glColorSubTable\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetColorTable\fP, -\%\f3glGetColorTableParameter\fP -.SH SEE ALSO -\%\f3glColorSubTable(3G)\fP, -\%\f3glColorTableParameter(3G)\fP, -\%\f3glCopyColorTable(3G)\fP, -\%\f3glCopyColorSubTable(3G)\fP, -\%\f3glGetColorTable(3G)\fP diff --git a/doc/gl-docs/GL/gl/colortable.3gl b/doc/gl-docs/GL/gl/colortable.3gl deleted file mode 100644 index 328900f2..00000000 --- a/doc/gl-docs/GL/gl/colortable.3gl +++ /dev/null @@ -1,306 +0,0 @@ -'\" t -'\"! tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 colortabl -.ds Xs 60942 11 colortable.gl -.TH GLCOLORTABLE 3G -.SH NAME -.B "glColorTable -\- define a color lookup table - -.SH C SPECIFICATION -void \f3glColorTable\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglColorTable( 'u - GLenum \fIinternalformat\fP, - GLsizei \fIwidth\fP, - GLenum \fIformat\fP, - GLenum \fItype\fP, - const GLvoid \fI*table\fP ) -.fi - -.SH PARAMETERS -.TP \w'\fIinternalformat\fP\ \ 'u -\f2target\fP -Must be one of -\%\f3GL_COLOR_TABLE\fP, -\%\f3GL_POST_CONVOLUTION_COLOR_TABLE\fP, -\%\f3GL_POST_COLOR_MATRIX_COLOR_TABLE\fP, -\%\f3GL_PROXY_COLOR_TABLE\fP, -\%\f3GL_PROXY_POST_CONVOLUTION_COLOR_TABLE\fP, -or -\%\f3GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE\fP. -.TP -\f2internalformat\fP -The internal of the color table. -The allowable values are -\%\f3GL_ALPHA\fP, -\%\f3GL_ALPHA4\fP, -\%\f3GL_ALPHA8\fP, -\%\f3GL_ALPHA12\fP, -\%\f3GL_ALPHA16\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE4\fP, -\%\f3GL_LUMINANCE8\fP, -\%\f3GL_LUMINANCE12\fP, -\%\f3GL_LUMINANCE16\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_LUMINANCE4_ALPHA4\fP, -\%\f3GL_LUMINANCE6_ALPHA2\fP, -\%\f3GL_LUMINANCE8_ALPHA8\fP, -\%\f3GL_LUMINANCE12_ALPHA4\fP, -\%\f3GL_LUMINANCE12_ALPHA12\fP, -\%\f3GL_LUMINANCE16_ALPHA16\fP, -\%\f3GL_INTENSITY\fP, -\%\f3GL_INTENSITY4\fP, -\%\f3GL_INTENSITY8\fP, -\%\f3GL_INTENSITY12\fP, -\%\f3GL_INTENSITY16\fP, -\%\f3GL_R3_G3_B2\fP, -\%\f3GL_RGB\fP, -\%\f3GL_RGB4\fP, -\%\f3GL_RGB5\fP, -\%\f3GL_RGB8\fP, -\%\f3GL_RGB10\fP, -\%\f3GL_RGB12\fP, -\%\f3GL_RGB16\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_RGBA2\fP, -\%\f3GL_RGBA4\fP, -\%\f3GL_RGB5_A1\fP, -\%\f3GL_RGBA8\fP, -\%\f3GL_RGB10_A2\fP, -\%\f3GL_RGBA12\fP, and -\%\f3GL_RGBA16\fP. -.TP -\f2width\fP -The number of entries in the color lookup table specified by \f2table\fP. -.TP -\f2format\fP -The of the pixel data in \f2table\fP. -The allowable values are -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_BGR\fP, -\%\f3GL_RGBA\fP, and -\%\f3GL_BGRA\fP. -.TP -\f2type\fP -The type of the pixel data in \f2table\fP. -The allowable values are -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP. -.TP -\f2table\fP -Pointer to a one-dimensional array of pixel data that is processed to -build the color table. -.SH DESCRIPTION -\%\f3glColorTable\fP may be used in two ways: -to test the actual size and color resolution of a lookup table -given a particular set of parameters, -or to load the contents of a color lookup -table. -Use the targets \%\f3GL_PROXY_*\fP for the first case -and the other targets for the second case. -.P -If \f2target\fP is \%\f3GL_COLOR_TABLE\fP, -\%\f3GL_POST_CONVOLUTION_COLOR_TABLE\fP, -or -\%\f3GL_POST_COLOR_MATRIX_COLOR_TABLE\fP, -\%\f3glColorTable\fP builds a color lookup table from an array of pixels. -The pixel array specified by \f2width\fP, \f2format\fP, \f2type\fP, and \f2table\fP -is extracted from memory and -processed just as if \%\f3glDrawPixels\fP were called, but processing -stops after the final expansion to RGBA is completed. -.P -The four scale parameters and the four bias parameters that are defined -for the table are then used to scale and bias the R, G, B, and A components -of each pixel. -(Use \%\f3glColorTableParameter\fP to set these scale and bias -parameters.) -.P -Next, the R, G, B, and A values are clamped to the range [0,\ 1]. -Each pixel is then converted to the internal specified by -\f2internalformat\fP. -This conversion simply maps the component values of the pixel (R, G, B, -and A) to the values included in the internal (red, green, blue, -alpha, luminance, and intensity). The mapping is as follows: -.P -.TS -center; -lb cb cb cb cb cb cb -l c c c c c c. -_ -Internal Format Red Green Blue Alpha Luminance Intensity -_ -\%\f3GL_ALPHA\fP A -\%\f3GL_LUMINANCE\fP R -\%\f3GL_LUMINANCE_ALPHA\fP A R -\%\f3GL_INTENSITY\fP R -\%\f3GL_RGB\fP R G B -\%\f3GL_RGBA\fP R G B A -_ -.TE -.P -Finally, the red, green, blue, alpha, luminance, and/or intensity components of -the resulting pixels are stored in the color table. -They form a one-dimensional table with indices in the range -[0,\ \f2width\fP\ \-\ 1]. -.P -If \f2target\fP is \%\f3GL_PROXY_*\fP, -\%\f3glColorTable\fP recomputes and stores the values of the proxy color table's state -variables -\%\f3GL_COLOR_TABLE_FORMAT\fP, -\%\f3GL_COLOR_TABLE_WIDTH\fP, -\%\f3GL_COLOR_TABLE_RED_SIZE\fP, -\%\f3GL_COLOR_TABLE_GREEN_SIZE\fP, -\%\f3GL_COLOR_TABLE_BLUE_SIZE\fP, -\%\f3GL_COLOR_TABLE_ALPHA_SIZE\fP, -\%\f3GL_COLOR_TABLE_LUMINANCE_SIZE\fP, and -\%\f3GL_COLOR_TABLE_INTENSITY_SIZE\fP. -There is no effect on the image or state of any actual color table. -If the specified color table is too large to be supported, then all the -proxy state variables listed above are set to zero. -Otherwise, the color table could be supported by \%\f3glColorTable\fP -using the corresponding non-proxy target, -and the proxy state variables are set as if that target were being defined. -.P -The proxy state variables can be retrieved by calling -\%\f3glGetColorTableParameter\fP with a target of -\%\f3GL_PROXY_*\fP. -This allows the application to decide if a particular \%\f3glColorTable\fP -command would succeed, and to determine what the resulting color table -attributes would be. -.P -If a color table is enabled, and its width is non-zero, then its -contents are used to replace a subset of the components of each RGBA -pixel group, based on the internal of the table. -.P -Each pixel group has color components (R, G, B, A) -that are in the range [0.0,\ 1.0]. -The color components are rescaled to -the size of the color lookup table to form an index. -Then a subset of the components based on the internal of the table are -replaced by the table entry selected by that index. -If the color components and contents of the table are represented as follows: -.P -.TS -center; -cb cb -c l. -_ -Representation Meaning -_ -\f7r\fP Table index computed from \f7R\fP -\f7g\fP Table index computed from \f7G\fP -\f7b\fP Table index computed from \f7B\fP -\f7a\fP Table index computed from \f7A\fP -\f7L[i]\fP Luminance value at table index \f7i\fP -\f7I[i]\fP Intensity value at table index \f7i\fP -\f7R[i]\fP Red value at table index \f7i\fP -\f7G[i]\fP Green value at table index \f7i\fP -\f7B[i]\fP Blue value at table index \f7i\fP -\f7A[i]\fP Alpha value at table index \f7i\fP -_ -.TE -.P -then the result of color table lookup is as follows: -.P -.ne 10 -.TS -center; -l l s s s -l l l l l -l l l l l. -_ - Resulting Texture Components -Table Internal Format R G B A -_ -\%\f3GL_ALPHA\fP R G B A[a] -\%\f3GL_LUMINANCE\fP L[r] L[g] L[b] At -\%\f3GL_LUMINANCE_ALPHA\fP L[r] L[g] L[b] A[a] -\%\f3GL_INTENSITY\fP I[r] I[g] I[b] I[a] -\%\f3GL_RGB\fP R[r] G[g] B[b] A -\%\f3GL_RGBA\fP R[r] G[g] B[b] A[a] -_ -.TE -.P -When \%\f3GL_COLOR_TABLE\fP is enabled, the colors resulting from -the pixel map operation (if it is enabled) are mapped -by the color lookup table before being passed to the convolution -operation. The colors resulting from the convolution operation -are modified by the post convolution color lookup table when -\%\f3GL_POST_CONVOLUTION_COLOR_TABLE\fP -is enabled. These modified colors are then sent to the color matrix operation. -Finally, if \%\f3GL_POST_COLOR_MATRIX_COLOR_TABLE\fP -is enabled, the colors resulting from the color matrix operation -are mapped by the post color matrix color lookup table before being -used by the histogram operation. -.P -.SH NOTES -\%\f3glColorTable\fP is present only if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP -is called with an argument of \%\f3GL_EXTENSIONS\fP. -.P -If \f2target\fP is set to \%\f3GL_COLOR_TABLE\fP, -\%\f3GL_POST_CONVOLUTION_COLOR_TABLE\fP, -or \%\f3GL_POST_COLOR_MATRIX_COLOR_TABLE\fP, -then \f2width\fP must be a power of two or a \%\f3GL_INVALID_VALUE\fP -error is generated. -.P -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2internalformat\fP is not one of the -allowable values. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2width\fP is less than zero. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2format\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not one of the allowable -values. -.P -\%\f3GL_TABLE_TOO_LARGE\fP is generated if the requested color table -is too large to be supported by the implementation, and \f2target\fP is -not a \%\f3GL_PROXY_*\fP target. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glColorTable\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetColorTableParameter\fP -.SH SEE ALSO -\%\f3glColorSubTable(3G)\fP, -\%\f3glColorTableParameter(3G)\fP, -\%\f3glCopyColorTable(3G)\fP, -\%\f3glCopyColorSubTable(3G)\fP, -\%\f3glGetColorTable(3G)\fP diff --git a/doc/gl-docs/GL/gl/colortableparameter.3gl b/doc/gl-docs/GL/gl/colortableparameter.3gl deleted file mode 100644 index fce17e2f..00000000 --- a/doc/gl-docs/GL/gl/colortableparameter.3gl +++ /dev/null @@ -1,86 +0,0 @@ -'\" te -'\"! tbl | eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 19:42 -.ds Dm 01 colortabl -.ds Xs 4422 4 colortableparameter.gl -.TH GLCOLORTABLEPARAMETER 3G -.SH NAME -.B "glColorTableParameteriv, glColorTableParameterfv -\- set color lookup table parameters - -.SH C SPECIFICATION -void \f3glColorTableParameteriv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglColorTableParameteriv( 'u - GLenum \fIpname\fP, - const GLint \fI*params\fP ) -.fi -void \f3glColorTableParameterfv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglColorTableParameterfv( 'u - GLenum \fIpname\fP, - const GLfloat \fI*params\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -The target color table. -Must be -\%\f3GL_COLOR_TABLE\fP, -\%\f3GL_POST_CONVOLUTION_COLOR_TABLE\fP, or -\%\f3GL_POST_COLOR_MATRIX_COLOR_TABLE\fP. -.TP -\f2pname\fP -The symbolic name of a texture color lookup table parameter. -Must be one of -\%\f3GL_COLOR_TABLE_SCALE\fP or -\%\f3GL_COLOR_TABLE_BIAS\fP. -.TP -\f2params\fP -A pointer to an array where the values of the parameters are stored. -.SH DESCRIPTION -\%\f3glColorTableParameter\fP is used to specify the scale factors and bias terms applied to -color components when they are loaded into a color table. \f2target\fP -indicates which color table the scale and bias terms apply to; it -must be set to -\%\f3GL_COLOR_TABLE\fP, -\%\f3GL_POST_CONVOLUTION_COLOR_TABLE\fP, or -\%\f3GL_POST_COLOR_MATRIX_COLOR_TABLE\fP. -.P -\f2pname\fP must be \%\f3GL_COLOR_TABLE_SCALE\fP to set the -scale factors. -In this case, \f2params\fP points to an array of four values, which are -the scale factors for red, green, blue, and alpha, in that order. -.P -\f2pname\fP must be \%\f3GL_COLOR_TABLE_BIAS\fP to set the -bias terms. In this case, -\f2params\fP points to an array of four values, which are the bias -terms for red, green, blue, and alpha, in that order. -.P -The color tables themselves are specified by -calling \%\f3glColorTable\fP. -.SH NOTES -\%\f3glColorTableParameter\fP is available only if \%\f3GL_ARB_imaging\fP is returned from calling -\%\f3glGetString\fP with an argument of \%\f3GL_EXTENSIONS\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP or \f2pname\fP is not -an acceptable value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glColorTableParameter\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetColorTableParameter\fP -.SH SEE ALSO -\%\f3glColorTable(3G)\fP, -\%\f3glPixelTransfer(3G)\fP diff --git a/doc/gl-docs/GL/gl/convolutionfilter1d.3gl b/doc/gl-docs/GL/gl/convolutionfilter1d.3gl deleted file mode 100644 index a76c3cb6..00000000 --- a/doc/gl-docs/GL/gl/convolutionfilter1d.3gl +++ /dev/null @@ -1,220 +0,0 @@ -'\" t -'\"! tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 convoluti -.ds Xs 19959 8 convolutionfilter1d.gl -.TH GLCONVOLUTIONFILTER1D 3G -.SH NAME -.B "glConvolutionFilter1D -\- define a one-dimensional convolution filter - -.SH C SPECIFICATION -void \f3glConvolutionFilter1D\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglConvolutionFilter1D( 'u - GLenum \fIinternalformat\fP, - GLsizei \fIwidth\fP, - GLenum \fIformat\fP, - GLenum \fItype\fP, - const GLvoid \fI*image\fP ) -.fi - -.SH PARAMETERS -.TP \w'\fIinternalformat\fP\ \ 'u -\f2target\fP -Must be \%\f3GL_CONVOLUTION_1D\fP. -.TP -\f2internalformat\fP -The internal of the convolution filter kernel. -The allowable values are -\%\f3GL_ALPHA\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_INTENSITY\fP, -\%\f3GL_RGB\fP, and -\%\f3GL_RGBA\fP. -.TP -\f2width\fP -The width of the pixel array referenced by \f2image\fP. -.TP -\f2format\fP -The of the pixel data in \f2image\fP. -The allowable values are -\%\f3GL_ALPHA\fP, -\%\f3GL_ALPHA4\fP, -\%\f3GL_ALPHA8\fP, -\%\f3GL_ALPHA12\fP, -\%\f3GL_ALPHA16\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE4\fP, -\%\f3GL_LUMINANCE8\fP, -\%\f3GL_LUMINANCE12\fP, -\%\f3GL_LUMINANCE16\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_LUMINANCE4_ALPHA4\fP, -\%\f3GL_LUMINANCE6_ALPHA2\fP, -\%\f3GL_LUMINANCE8_ALPHA8\fP, -\%\f3GL_LUMINANCE12_ALPHA4\fP, -\%\f3GL_LUMINANCE12_ALPHA12\fP, -\%\f3GL_LUMINANCE16_ALPHA16\fP, -\%\f3GL_INTENSITY\fP, -\%\f3GL_INTENSITY4\fP, -\%\f3GL_INTENSITY8\fP, -\%\f3GL_INTENSITY12\fP, -\%\f3GL_INTENSITY16\fP, -\%\f3GL_R3_G3_B2\fP, -\%\f3GL_RGB\fP, -\%\f3GL_RGB4\fP, -\%\f3GL_RGB5\fP, -\%\f3GL_RGB8\fP, -\%\f3GL_RGB10\fP, -\%\f3GL_RGB12\fP, -\%\f3GL_RGB16\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_RGBA2\fP, -\%\f3GL_RGBA4\fP, -\%\f3GL_RGB5_A1\fP, -\%\f3GL_RGBA8\fP, -\%\f3GL_RGB10_A2\fP, -\%\f3GL_RGBA12\fP, or -\%\f3GL_RGBA16\fP. -.TP -\f2type\fP -The type of the pixel data in \f2image\fP. -Symbolic constants -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -are accepted. -.TP -\f2image\fP -Pointer to a one-dimensional array of pixel data that is processed to -build the convolution filter kernel. -.SH DESCRIPTION -\%\f3glConvolutionFilter1D\fP builds a one-dimensional convolution filter kernel from an array of -pixels. -.sp -The pixel array specified by \f2width\fP, \f2format\fP, \f2type\fP, and \f2image\fP -is extracted from memory and -processed just as if \%\f3glDrawPixels\fP were called, but processing -stops after the final expansion to RGBA is completed. -.sp -The R, G, B, and A components of each pixel are next scaled by the four -1D \%\f3GL_CONVOLUTION_FILTER_SCALE\fP parameters and biased by the -four 1D \%\f3GL_CONVOLUTION_FILTER_BIAS\fP parameters. -(The scale and bias parameters are set by \%\f3glConvolutionParameter\fP -using the \%\f3GL_CONVOLUTION_1D\fP target and the names -\%\f3GL_CONVOLUTION_FILTER_SCALE\fP and \%\f3GL_CONVOLUTION_FILTER_BIAS\fP. -The parameters themselves are vectors of four values that are applied to red, -green, blue, and alpha, in that order.) -The R, G, B, and A values are not clamped to [0,1] at any time during this -process. -.sp -Each pixel is then converted to the internal specified by -\f2internalformat\fP. -This conversion simply maps the component values of the pixel (R, G, B, -and A) to the values included in the internal (red, green, blue, -alpha, luminance, and intensity). The mapping is as follows: -.sp -.TS -center; -lb cb cb cb cb cb cb -l c c c c c c. -_ -Internal Format Red Green Blue Alpha Luminance Intensity -_ -\%\f3GL_ALPHA\fP A -\%\f3GL_LUMINANCE\fP R -\%\f3GL_LUMINANCE_ALPHA\fP A R -\%\f3GL_INTENSITY\fP R -\%\f3GL_RGB\fP R G B -\%\f3GL_RGBA\fP R G B A -_ -.TE -.sp -The red, green, blue, alpha, luminance, and/or intensity components of -the resulting pixels are stored in floating-point rather than integer -. -They form a one-dimensional filter kernel image indexed with coordinate -\f2i\fP such that \f2i\fP starts at 0 and increases from left to right. -Kernel location \f2i\fP is derived from the \f2i\fPth pixel, counting from 0. -.PP -Note that after a convolution is performed, the resulting color -components are also scaled by their corresponding -\%\f3GL_POST_CONVOLUTION_c_SCALE\fP parameters and biased by their -corresponding \%\f3GL_POST_CONVOLUTION_c_BIAS\fP parameters (where -\f2c\fP takes on the values \f3RED\fP, \f3GREEN\fP, \f3BLUE\fP, and -\f3ALPHA\fP). -These parameters are set by \%\f3glPixelTransfer\fP. -.SH NOTES -\%\f3glConvolutionFilter1D\fP is present only if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP -is called with an argument of \%\f3GL_EXTENSIONS\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not -\%\f3GL_CONVOLUTION_1D\fP. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2internalformat\fP is not one of the -allowable values. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2width\fP is less than zero or greater -than the maximum supported value. -This value may be queried with \%\f3glGetConvolutionParameter\fP -using target \%\f3GL_CONVOLUTION_1D\fP and name -\%\f3GL_MAX_CONVOLUTION_WIDTH\fP. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2format\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glConvolutionFilter1D\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2format\fP is one of -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, or -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2type\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2format\fP is one of -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2type\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.SH ASSOCIATED GETS -\%\f3glGetConvolutionParameter\fP, \%\f3glGetConvolutionFilter\fP -.SH SEE ALSO -\%\f3glConvolutionFilter2D(3G)\fP, -\%\f3glSeparableFilter2D(3G)\fP, -\%\f3glConvolutionParameter(3G)\fP, -\%\f3glPixelTransfer(3G)\fP diff --git a/doc/gl-docs/GL/gl/convolutionfilter2d.3gl b/doc/gl-docs/GL/gl/convolutionfilter2d.3gl deleted file mode 100644 index cb4618c6..00000000 --- a/doc/gl-docs/GL/gl/convolutionfilter2d.3gl +++ /dev/null @@ -1,236 +0,0 @@ -'\" t -'\"! tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 convoluti -.ds Xs 37578 9 convolutionfilter2d.gl -.TH GLCONVOLUTIONFILTER2D 3G -.SH NAME -.B "glConvolutionFilter2D -\- define a two-dimensional convolution filter - -.SH C SPECIFICATION -void \f3glConvolutionFilter2D\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglConvolutionFilter2D( 'u - GLenum \fIinternalformat\fP, - GLsizei \fIwidth\fP, - GLsizei \fIheight\fP, - GLenum \fIformat\fP, - GLenum \fItype\fP, - const GLvoid \fI*image\fP ) -.fi - -.SH PARAMETERS -.TP \w'\fIinternalformat\fP\ \ 'u -\f2target\fP -Must be \%\f3GL_CONVOLUTION_2D\fP. -.TP -\f2internalformat\fP -The internal of the convolution filter kernel. -The allowable values are -\%\f3GL_ALPHA\fP, -\%\f3GL_ALPHA4\fP, -\%\f3GL_ALPHA8\fP, -\%\f3GL_ALPHA12\fP, -\%\f3GL_ALPHA16\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE4\fP, -\%\f3GL_LUMINANCE8\fP, -\%\f3GL_LUMINANCE12\fP, -\%\f3GL_LUMINANCE16\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_LUMINANCE4_ALPHA4\fP, -\%\f3GL_LUMINANCE6_ALPHA2\fP, -\%\f3GL_LUMINANCE8_ALPHA8\fP, -\%\f3GL_LUMINANCE12_ALPHA4\fP, -\%\f3GL_LUMINANCE12_ALPHA12\fP, -\%\f3GL_LUMINANCE16_ALPHA16\fP, -\%\f3GL_INTENSITY\fP, -\%\f3GL_INTENSITY4\fP, -\%\f3GL_INTENSITY8\fP, -\%\f3GL_INTENSITY12\fP, -\%\f3GL_INTENSITY16\fP, -\%\f3GL_R3_G3_B2\fP, -\%\f3GL_RGB\fP, -\%\f3GL_RGB4\fP, -\%\f3GL_RGB5\fP, -\%\f3GL_RGB8\fP, -\%\f3GL_RGB10\fP, -\%\f3GL_RGB12\fP, -\%\f3GL_RGB16\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_RGBA2\fP, -\%\f3GL_RGBA4\fP, -\%\f3GL_RGB5_A1\fP, -\%\f3GL_RGBA8\fP, -\%\f3GL_RGB10_A2\fP, -\%\f3GL_RGBA12\fP, or -\%\f3GL_RGBA16\fP. -.TP -\f2width\fP -The width of the pixel array referenced by \f2image\fP. -.TP -\f2height\fP -The height of the pixel array referenced by \f2image\fP. -.TP -\f2format\fP -The of the pixel data in \f2image\fP. -The allowable values are -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_BGR\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, and -\%\f3GL_LUMINANCE_ALPHA\fP. -.TP -\f2type\fP -The type of the pixel data in \f2image\fP. -Symbolic constants -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -are accepted. -.TP -\f2image\fP -Pointer to a two-dimensional array of pixel data that is processed to -build the convolution filter kernel. -.SH DESCRIPTION -\%\f3glConvolutionFilter2D\fP builds a two-dimensional convolution filter kernel from an array of -pixels. -.sp -The pixel array specified by \f2width\fP, \f2height\fP, \f2format\fP, \f2type\fP, and -\f2image\fP is extracted from memory and processed just as if -\%\f3glDrawPixels\fP were called, but processing stops after the final -expansion to RGBA is completed. -.sp -The R, G, B, and A components of each pixel are next scaled by the four -2D \%\f3GL_CONVOLUTION_FILTER_SCALE\fP parameters and biased by the -four 2D \%\f3GL_CONVOLUTION_FILTER_BIAS\fP parameters. -(The scale and bias parameters are set by \%\f3glConvolutionParameter\fP -using the \%\f3GL_CONVOLUTION_2D\fP target and the names -\%\f3GL_CONVOLUTION_FILTER_SCALE\fP and \%\f3GL_CONVOLUTION_FILTER_BIAS\fP. -The parameters themselves are vectors of four values that are applied to red, -green, blue, and alpha, in that order.) -The R, G, B, and A values are not clamped to [0,1] at any time during this -process. -.sp -Each pixel is then converted to the internal specified by -\f2internalformat\fP. -This conversion simply maps the component values of the pixel (R, G, B, -and A) to the values included in the internal (red, green, blue, -alpha, luminance, and intensity). The mapping is as follows: -.sp -.TS -center; -lb cb cb cb cb cb cb -l c c c c c c. -_ -Internal Format Red Green Blue Alpha Luminance Intensity -_ -\%\f3GL_ALPHA\fP A -\%\f3GL_LUMINANCE\fP R -\%\f3GL_LUMINANCE_ALPHA\fP A R -\%\f3GL_INTENSITY\fP R -\%\f3GL_RGB\fP R G B -\%\f3GL_RGBA\fP R G B A -_ -.TE -.sp -The red, green, blue, alpha, luminance, and/or intensity components of -the resulting pixels are stored in floating-point rather than integer -. -They form a two-dimensional filter kernel image indexed with coordinates -\f2i\fP and \f2j\fP such that \f2i\fP starts at zero and increases from left -to right, and \f2j\fP starts at zero and increases from bottom to top. -Kernel location \f2i,j\fP is derived from the \f2N\fPth pixel, -where \f2N\fP is \f2i\fP+\f2j\fP*\f2width\fP. -.PP -Note that after a convolution is performed, the resulting color -components are also scaled by their corresponding -\%\f3GL_POST_CONVOLUTION_c_SCALE\fP parameters and biased by their -corresponding \%\f3GL_POST_CONVOLUTION_c_BIAS\fP parameters (where -\f2c\fP takes on the values \f3RED\fP, \f3GREEN\fP, \f3BLUE\fP, and -\f3ALPHA\fP). -These parameters are set by \%\f3glPixelTransfer\fP. -.SH NOTES -\%\f3glConvolutionFilter2D\fP is present only if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP -is called with an argument of \%\f3GL_EXTENSIONS\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not -\%\f3GL_CONVOLUTION_2D\fP. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2internalformat\fP is not one of the -allowable values. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2width\fP is less than zero or greater -than the maximum supported value. -This value may be queried with \%\f3glGetConvolutionParameter\fP -using target \%\f3GL_CONVOLUTION_2D\fP and name -\%\f3GL_MAX_CONVOLUTION_WIDTH\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2height\fP is less than zero or greater -than the maximum supported value. -This value may be queried with \%\f3glGetConvolutionParameter\fP -using target \%\f3GL_CONVOLUTION_2D\fP and name -\%\f3GL_MAX_CONVOLUTION_HEIGHT\fP. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2format\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glConvolutionFilter2D\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2height\fP is one of -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, or -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2height\fP is one of -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.SH ASSOCIATED GETS -\%\f3glGetConvolutionParameter\fP, \%\f3glGetConvolutionFilter\fP -.SH SEE ALSO -\%\f3glConvolutionFilter1D(3G)\fP, -\%\f3glSeparableFilter2D(3G)\fP, -\%\f3glConvolutionParameter(3G)\fP, -\%\f3glPixelTransfer(3G)\fP diff --git a/doc/gl-docs/GL/gl/convolutionparameter.3gl b/doc/gl-docs/GL/gl/convolutionparameter.3gl deleted file mode 100644 index f55cbe09..00000000 --- a/doc/gl-docs/GL/gl/convolutionparameter.3gl +++ /dev/null @@ -1,173 +0,0 @@ -'\" et -'\"! eqn|tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 convoluti -.ds Xs 40911 7 convolutionparameter.gl -.TH GLCONVOLUTIONPARAMETER 3G -.SH NAME -.B "glConvolutionParameterf, glConvolutionParameteri, glConvolutionParameterfv, glConvolutionParameteriv -\- set convolution parameters - -.SH C SPECIFICATION -void \f3glConvolutionParameterf\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglConvolutionParameterf( 'u - GLenum \fIpname\fP, - GLfloat \fIparams\fP ) -.fi -void \f3glConvolutionParameteri\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglConvolutionParameteri( 'u - GLenum \fIpname\fP, - GLint \fIparams\fP ) -.fi - -.EQ -delim $$ -.EN -.sp -1 -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -The target for the convolution parameter. -Must be one of -\%\f3GL_CONVOLUTION_1D\fP, -\%\f3GL_CONVOLUTION_2D\fP, or -\%\f3GL_SEPARABLE_2D\fP. -.TP -\f2pname\fP -The parameter to be set. -Must be -\%\f3GL_CONVOLUTION_BORDER_MODE\fP. -.TP -\f2params\fP -The parameter value. -Must be one of -\%\f3GL_REDUCE\fP, \%\f3GL_CONSTANT_BORDER\fP, \%\f3GL_REPLICATE_BORDER\fP. -.sp 2 -.SH C SPECIFICATION -void \f3glConvolutionParameterfv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglConvolutionParameterfv( 'u - GLenum \fIpname\fP, - const GLfloat \fI*params\fP ) -.fi -void \f3glConvolutionParameteriv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglConvolutionParameteriv( 'u - GLenum \fIpname\fP, - const GLint \fI*params\fP ) -.fi - -.sp -1 -.SH PARAMETERS -.TP -\f2target\fP -The target for the convolution parameter. -Must be one of -\%\f3GL_CONVOLUTION_1D\fP, -\%\f3GL_CONVOLUTION_2D\fP, or -\%\f3GL_SEPARABLE_2D\fP. -.TP -\f2pname\fP -The parameter to be set. -Must be one of -\%\f3GL_CONVOLUTION_BORDER_MODE\fP, -\%\f3GL_CONVOLUTION_BORDER_COLOR\fP, -\%\f3GL_CONVOLUTION_FILTER_SCALE\fP, or -\%\f3GL_CONVOLUTION_FILTER_BIAS\fP. -.TP -\f2params\fP -The parameter value. -If \f2pname\fP is \%\f3GL_CONVOLUTION_BORDER_MODE\fP, \f2params\fP must be one of -\%\f3GL_REDUCE\fP, \%\f3GL_CONSTANT_BORDER\fP, or \%\f3GL_REPLICATE_BORDER\fP. -Otherwise, must be a vector of four values (for red, green, blue, and alpha, -respectively) to be used for -scaling (when \f2pname\fP is \%\f3GL_CONVOLUTION_FILTER_SCALE\fP), or -biasing (when \f2pname\fP is \%\f3GL_CONVOLUTION_FILTER_BIAS\fP) a convolution -filter kernel or setting the constant border color (when \f2pname\fP is -\%\f3GL_CONVOLUTION_BORDER_COLOR\fP. -.SH DESCRIPTION -\%\f3glConvolutionParameter\fP sets the value of a convolution parameter. -.sp -\f2target\fP selects the convolution filter to be affected: -\%\f3GL_CONVOLUTION_1D\fP, -\%\f3GL_CONVOLUTION_2D\fP, or -\%\f3GL_SEPARABLE_2D\fP -for the 1D, 2D, or separable 2D filter, respectively. -.sp -\f2pname\fP selects the parameter to be changed. -\%\f3GL_CONVOLUTION_FILTER_SCALE\fP and \%\f3GL_CONVOLUTION_FILTER_BIAS\fP -affect the definition of the convolution filter kernel; see -\%\f3glConvolutionFilter1D\fP, \%\f3glConvolutionFilter2D\fP, and -\%\f3glSeparableFilter2D\fP for details. -In these cases, \f2params\fP is an array of four values to be applied to -red, green, blue, and alpha values, respectively. The initial value for -\%\f3GL_CONVOLUTION_FILTER_SCALE\fP is (1, 1, 1, 1), and the initial value -for \%\f3GL_CONVOLUTION_FILTER_BIAS\fP is (0, 0, 0, 0). -.sp -A \f2pname\fP value of \%\f3GL_CONVOLUTION_BORDER_MODE\fP controls the -convolution border mode. The accepted modes are: -.TP -\%\f3GL_REDUCE\fP -The image resulting from convolution is -smaller than the source image. -If the filter width is $Wf$ and height is $Hf$, -and the source image width is $Ws$ and height is $Hs$, -then the convolved image width will be $Ws ~-~ Wf ~+~ 1$ and height -will be $Hs ~-~ Hf ~+~ 1$. -(If this reduction would generate an image with zero or negative width -and/or height, the output is simply null, with no error generated.) -The coordinates of the image resulting from convolution are zero -through $Ws ~-~ Wf$ in width and zero through $Hs ~-~ Hf$ in -height. -.TP -\%\f3GL_CONSTANT_BORDER\fP -The image resulting from convolution is the same size as the source image, and -processed as if the source image were surrounded by pixels with their color -specified by the \%\f3GL_CONVOLUTION_BORDER_COLOR\fP. -.TP -\%\f3GL_REPLICATE_BORDER\fP -The image resulting from convolution is the same size as the source image, and -processed as if the outermost pixel on the border of the source image were -replicated. -.SH NOTES -\%\f3glConvolutionParameter\fP is present only if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP -is called with an argument of \%\f3GL_EXTENSIONS\fP. -.P -In cases where errors can result from the specification of invalid -image dimensions, it is the dimensions after convolution that are -tested, not the dimensions of the source image. -For example, \%\f3glTexImage1D\fP requires power-of-two image size. -When \%\f3GL_REDUCE\fP border mode is in effect, -the source image must be larger than the final power-of-two size -by one less than the size of the 1D filter kernel. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2pname\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2pname\fP is -\%\f3GL_CONVOLUTION_BORDER_MODE\fP and \f2params\fP is not one of -\%\f3GL_REDUCE\fP, \%\f3GL_CONSTANT_BORDER\fP, or \%\f3GL_REPLICATE_BORDER\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glConvolutionParameter\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetConvolutionParameter\fP -.SH SEE ALSO -\%\f3glConvolutionFilter1D(3G)\fP, -\%\f3glConvolutionFilter2D(3G)\fP, -\%\f3glSeparableFilter2D(3G)\fP, -\%\f3glGetConvolutionParameter(3G)\fP diff --git a/doc/gl-docs/GL/gl/copycolorsubtable.3gl b/doc/gl-docs/GL/gl/copycolorsubtable.3gl deleted file mode 100644 index 54596969..00000000 --- a/doc/gl-docs/GL/gl/copycolorsubtable.3gl +++ /dev/null @@ -1,75 +0,0 @@ -'\" t -'\"! tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 copycolor -.ds Xs 44682 4 copycolorsubtable.gl -.TH GLCOPYCOLORSUBTABLE 3G -.SH NAME -.B "glCopyColorSubTable -\- respecify a portion of a color table - -.SH C SPECIFICATION -void \f3glCopyColorSubTable\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglCopyColorSubTable( 'u - GLsizei \fIstart\fP, - GLint \fIx\fP, - GLint \fIy\fP, - GLsizei \fIwidth\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -Must be one of -\%\f3GL_COLOR_TABLE\fP, -\%\f3GL_POST_CONVOLUTION_COLOR_TABLE\fP, or -\%\f3GL_POST_COLOR_MATRIX_COLOR_TABLE\fP. -.TP -\f2start\fP -The starting index of the portion of the color table to be replaced. -.TP -\f2x\fP, \f2y\fP -The window coordinates of the left corner of the row of pixels to be -copied. -.TP -\f2width\fP -The number of table entries to replace. -.SH DESCRIPTION -\%\f3glCopyColorSubTable\fP is used to respecify a contiguous portion of a color table previously -defined using \%\f3glColorTable\fP. The pixels copied from the framebuffer -replace the portion of the existing table from indices \f2start\fP to -$"start"~+~"x"~-~1$, inclusive. This region may not include any -entries outside the range of the color table, as was originally specified. -It is not an error to specify a subtexture with width of 0, but such a -specification has no effect. -.SH NOTES -\%\f3glCopyColorSubTable\fP is present only if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP -is called with an argument of \%\f3GL_EXTENSIONS\fP. -.P -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if \f2target\fP is not a previously defined -color table. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2target\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_VALUE\fP is generated if $"start"~+~"x"~>~width$. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glCopyColorSubTable\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetColorTable\fP, -\%\f3glGetColorTableParameter\fP -.SH SEE ALSO -\%\f3glColorSubTable(3G)\fP, -\%\f3glColorTableParameter(3G)\fP, -\%\f3glCopyColorTable(3G)\fP, -\%\f3glCopyColorSubTable(3G)\fP, -\%\f3glGetColorTable(3G)\fP diff --git a/doc/gl-docs/GL/gl/copycolortable.3gl b/doc/gl-docs/GL/gl/copycolortable.3gl deleted file mode 100644 index a29ab62d..00000000 --- a/doc/gl-docs/GL/gl/copycolortable.3gl +++ /dev/null @@ -1,160 +0,0 @@ -'\" te -'\"! tbl | eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 copycolor -.ds Xs 49586 7 copycolortable.gl -.TH GLCOPYCOLORTABLE 3G -.SH NAME -.B "glCopyColorTable -\- copy pixels into a color table - -.SH C SPECIFICATION -void \f3glCopyColorTable\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglCopyColorTable( 'u - GLenum \fIinternalformat\fP, - GLint \fIx\fP, - GLint \fIy\fP, - GLsizei \fIwidth\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIinternalformat\fP\ \ 'u -\f2target\fP -The color table target. Must be -\%\f3GL_COLOR_TABLE\fP, -\%\f3GL_POST_CONVOLUTION_COLOR_TABLE\fP, -or \%\f3GL_POST_COLOR_MATRIX_COLOR_TABLE\fP. -.TP -\f2internalformat\fP -The internal storage of the texture image. -Must be one of the following symbolic constants: -\%\f3GL_ALPHA\fP, -\%\f3GL_ALPHA4\fP, -\%\f3GL_ALPHA8\fP, -\%\f3GL_ALPHA12\fP, -\%\f3GL_ALPHA16\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE4\fP, -\%\f3GL_LUMINANCE8\fP, -\%\f3GL_LUMINANCE12\fP, -\%\f3GL_LUMINANCE16\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_LUMINANCE4_ALPHA4\fP, -\%\f3GL_LUMINANCE6_ALPHA2\fP, -\%\f3GL_LUMINANCE8_ALPHA8\fP, -\%\f3GL_LUMINANCE12_ALPHA4\fP, -\%\f3GL_LUMINANCE12_ALPHA12\fP, -\%\f3GL_LUMINANCE16_ALPHA16\fP, -\%\f3GL_INTENSITY\fP, -\%\f3GL_INTENSITY4\fP, -\%\f3GL_INTENSITY8\fP, -\%\f3GL_INTENSITY12\fP, -\%\f3GL_INTENSITY16\fP, -\%\f3GL_R3_G3_B2\fP, -\%\f3GL_RGB\fP, -\%\f3GL_RGB4\fP, -\%\f3GL_RGB5\fP, -\%\f3GL_RGB8\fP, -\%\f3GL_RGB10\fP, -\%\f3GL_RGB12\fP, -\%\f3GL_RGB16\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_RGBA2\fP, -\%\f3GL_RGBA4\fP, -\%\f3GL_RGB5_A1\fP, -\%\f3GL_RGBA8\fP, -\%\f3GL_RGB10_A2\fP, -\%\f3GL_RGBA12\fP, -\%\f3GL_RGBA16\fP. -.TP -\f2x\fP -The x coordinate of the lower-left corner of the pixel rectangle -to be transferred to the color table. -.TP -\f2y\fP -The y coordinate of the lower-left corner of the pixel rectangle -to be transferred to the color table. -.TP -\f2width\fP -The width of the pixel rectangle. -.SH DESCRIPTION -\%\f3glCopyColorTable\fP loads a color table with pixels from the current -\%\f3GL_READ_BUFFER\fP (rather than from main memory, as is the case for -\%\f3glColorTable\fP). -.P -The screen-aligned pixel rectangle with lower-left corner at (\f2x\fP,\ \f2y\fP) -having width \f2width\fP and height 1 -is loaded into the color table. If any pixels within -this region are outside the window that is associated with the GL -context, the values obtained for those pixels are undefined. -.P -The pixels in the rectangle are processed just as if -\%\f3glReadPixels\fP were called, with \f2internalformat\fP set to RGBA, -but processing stops after the final conversion to RGBA. -.P -The four scale parameters and the four bias parameters that are defined -for the table are then used to scale and bias the R, G, B, and A components -of each pixel. The scale and bias parameters are set by calling -\%\f3glColorTableParameter\fP. -.P -Next, the R, G, B, and A values are clamped to the range [0,1]. -Each pixel is then converted to the internal specified by -\f2internalformat\fP. This conversion simply maps the component values of the pixel (R, G, B, -and A) to the values included in the internal (red, green, blue, -alpha, luminance, and intensity). The mapping is as follows: -.P -.TS -center; -lb cb cb cb cb cb cb -l c c c c c c. -_ -Internal Format Red Green Blue Alpha Luminance Intensity -_ -\%\f3GL_ALPHA\fP A -\%\f3GL_LUMINANCE\fP R -\%\f3GL_LUMINANCE_ALPHA\fP A R -\%\f3GL_INTENSITY\fP R -\%\f3GL_RGB\fP R G B -\%\f3GL_RGBA\fP R G B A -_ -.TE -.P -Finally, the red, green, blue, alpha, luminance, and/or intensity components of -the resulting pixels are stored in the color table. -They form a one-dimensional table with indices in the range -[0,\ \f2width\fP\ \-\ 1]. -.P -.SH NOTES -\%\f3glCopyColorTable\fP is available only if \%\f3GL_ARB_imaging\fP is returned from calling -\%\f3glGetString\fP with an argument of \%\f3GL_EXTENSIONS\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated when \f2target\fP is not one of the -allowable values. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2width\fP is less than zero. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2internalformat\fP is not one of the -allowable values. -.P -\%\f3GL_TABLE_TOO_LARGE\fP is generated if the requested color table -is too large to be supported by the implementation. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glCopyColorTable\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetColorTable\fP, -\%\f3glGetColorTableParameter\fP -.SH SEE ALSO -\%\f3glColorTable(3G)\fP, -\%\f3glColorTableParameter(3G)\fP, -\%\f3glReadPixels(3G)\fP diff --git a/doc/gl-docs/GL/gl/copyconvolutionfilter1d.3gl b/doc/gl-docs/GL/gl/copyconvolutionfilter1d.3gl deleted file mode 100644 index 36ae3a77..00000000 --- a/doc/gl-docs/GL/gl/copyconvolutionfilter1d.3gl +++ /dev/null @@ -1,164 +0,0 @@ -'\" t -'\"! tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 001 copyconv -.ds Xs 33614 7 copyconvolutionfilter1d.gl -.TH GLCOPYCONVOLUTIONFILTER1D 3G -.SH NAME -.B "glCopyConvolutionFilter1D -\- copy pixels into a one-dimensional convolution filter - -.SH C SPECIFICATION -void \f3glCopyConvolutionFilter1D\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglCopyConvolutionFilter1D( 'u - GLenum \fIinternalformat\fP, - GLint \fIx\fP, - GLint \fIy\fP, - GLsizei \fIwidth\fP ) -.fi - -.SH PARAMETERS -.TP \w'\fIinternalformat\fP\ \ 'u -\f2target\fP -Must be \%\f3GL_CONVOLUTION_1D\fP. -.TP -\f2internalformat\fP -The internal of the convolution filter kernel. -The allowable values are -\%\f3GL_ALPHA\fP, -\%\f3GL_ALPHA4\fP, -\%\f3GL_ALPHA8\fP, -\%\f3GL_ALPHA12\fP, -\%\f3GL_ALPHA16\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE4\fP, -\%\f3GL_LUMINANCE8\fP, -\%\f3GL_LUMINANCE12\fP, -\%\f3GL_LUMINANCE16\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_LUMINANCE4_ALPHA4\fP, -\%\f3GL_LUMINANCE6_ALPHA2\fP, -\%\f3GL_LUMINANCE8_ALPHA8\fP, -\%\f3GL_LUMINANCE12_ALPHA4\fP, -\%\f3GL_LUMINANCE12_ALPHA12\fP, -\%\f3GL_LUMINANCE16_ALPHA16\fP, -\%\f3GL_INTENSITY\fP, -\%\f3GL_INTENSITY4\fP, -\%\f3GL_INTENSITY8\fP, -\%\f3GL_INTENSITY12\fP, -\%\f3GL_INTENSITY16\fP, -\%\f3GL_R3_G3_B2\fP, -\%\f3GL_RGB\fP, -\%\f3GL_RGB4\fP, -\%\f3GL_RGB5\fP, -\%\f3GL_RGB8\fP, -\%\f3GL_RGB10\fP, -\%\f3GL_RGB12\fP, -\%\f3GL_RGB16\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_RGBA2\fP, -\%\f3GL_RGBA4\fP, -\%\f3GL_RGB5_A1\fP, -\%\f3GL_RGBA8\fP, -\%\f3GL_RGB10_A2\fP, -\%\f3GL_RGBA12\fP, or -\%\f3GL_RGBA16\fP. -.TP -\f2x\fP, \f2y\fP -The window space coordinates of the lower-left coordinate of the -pixel array to copy. -.TP -\f2width\fP -The width of the pixel array to copy. -.SH DESCRIPTION -\%\f3glCopyConvolutionFilter1D\fP defines a one-dimensional convolution filter kernel with pixels -from the current \%\f3GL_READ_BUFFER\fP (rather than from main memory, -as is the case for \%\f3glConvolutionFilter1D\fP). -.sp -The screen-aligned pixel rectangle with lower-left corner at (\f2x\fP,\ \f2y\fP), -width \f2width\fP and height 1 is used to define -the convolution filter. If any pixels within this region are -outside the window that is associated with the GL context, the -values obtained for those pixels are undefined. -.sp -The pixels in the rectangle are processed exactly as if \%\f3glReadPixels\fP -had been called with \f2format\fP -set to RGBA, but the process stops just before final conversion. -The R, G, B, and A components of each pixel are next scaled by the four -1D \%\f3GL_CONVOLUTION_FILTER_SCALE\fP parameters and biased by the -four 1D \%\f3GL_CONVOLUTION_FILTER_BIAS\fP parameters. -(The scale and bias parameters are set by \%\f3glConvolutionParameter\fP -using the \%\f3GL_CONVOLUTION_1D\fP target and the names -\%\f3GL_CONVOLUTION_FILTER_SCALE\fP and \%\f3GL_CONVOLUTION_FILTER_BIAS\fP. -The parameters themselves are vectors of four values that are applied to red, -green, blue, and alpha, in that order.) -The R, G, B, and A values are not clamped to [0,1] at any time during this -process. -.sp -Each pixel is then converted to the internal specified by -\f2internalformat\fP. -This conversion simply maps the component values of the pixel (R, G, B, -and A) to the values included in the internal (red, green, blue, -alpha, luminance, and intensity). The mapping is as follows: -.sp -.TS -center; -lb cb cb cb cb cb cb -l c c c c c c. -_ -Internal Format Red Green Blue Alpha Luminance Intensity -_ -\%\f3GL_ALPHA\fP A -\%\f3GL_LUMINANCE\fP R -\%\f3GL_LUMINANCE_ALPHA\fP A R -\%\f3GL_INTENSITY\fP R -\%\f3GL_RGB\fP R G B -\%\f3GL_RGBA\fP R G B A -_ -.TE -.sp -The red, green, blue, alpha, luminance, and/or intensity components of -the resulting pixels are stored in floating-point rather than integer -. -.sp -Pixel ordering is such that lower x screen coordinates correspond to -lower \f2i\fP filter image coordinates. -.PP -Note that after a convolution is performed, the resulting color -components are also scaled by their corresponding -\%\f3GL_POST_CONVOLUTION_c_SCALE\fP parameters and biased by their -corresponding \%\f3GL_POST_CONVOLUTION_c_BIAS\fP parameters (where -\f2c\fP takes on the values \f3RED\fP, \f3GREEN\fP, \f3BLUE\fP, and -\f3ALPHA\fP). -These parameters are set by \%\f3glPixelTransfer\fP. -.SH NOTES -\%\f3glCopyConvolutionFilter1D\fP is present only if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP -is called with an argument of \%\f3GL_EXTENSIONS\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not -\%\f3GL_CONVOLUTION_1D\fP. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2internalformat\fP is not one of the -allowable values. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2width\fP is less than zero or greater -than the maximum supported value. -This value may be queried with \%\f3glGetConvolutionParameter\fP -using target \%\f3GL_CONVOLUTION_1D\fP and name -\%\f3GL_MAX_CONVOLUTION_WIDTH\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glCopyConvolutionFilter1D\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetConvolutionParameter\fP, \%\f3glGetConvolutionFilter\fP -.SH SEE ALSO -\%\f3glConvolutionFilter1D(3G)\fP, -\%\f3glConvolutionParameter(3G)\fP, -\%\f3glPixelTransfer(3G)\fP diff --git a/doc/gl-docs/GL/gl/copyconvolutionfilter2d.3gl b/doc/gl-docs/GL/gl/copyconvolutionfilter2d.3gl deleted file mode 100644 index 49962450..00000000 --- a/doc/gl-docs/GL/gl/copyconvolutionfilter2d.3gl +++ /dev/null @@ -1,176 +0,0 @@ -'\" t -'\"! tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 001 copyconv -.ds Xs 51319 8 copyconvolutionfilter2d.gl -.TH GLCOPYCONVOLUTIONFILTER2D 3G -.SH NAME -.B "glCopyConvolutionFilter2D -\- copy pixels into a two-dimensional convolution filter - -.SH C SPECIFICATION -void \f3glCopyConvolutionFilter2D\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglCopyConvolutionFilter2D( 'u - GLenum \fIinternalformat\fP, - GLint \fIx\fP, - GLint \fIy\fP, - GLsizei \fIwidth\fP, - GLsizei \fIheight\fP ) -.fi - -.SH PARAMETERS -.TP \w'\fIinternalformat\fP\ \ 'u -\f2target\fP -Must be \%\f3GL_CONVOLUTION_2D\fP. -.TP -\f2internalformat\fP -The internal of the convolution filter kernel. -The allowable values are -\%\f3GL_ALPHA\fP, -\%\f3GL_ALPHA4\fP, -\%\f3GL_ALPHA8\fP, -\%\f3GL_ALPHA12\fP, -\%\f3GL_ALPHA16\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE4\fP, -\%\f3GL_LUMINANCE8\fP, -\%\f3GL_LUMINANCE12\fP, -\%\f3GL_LUMINANCE16\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_LUMINANCE4_ALPHA4\fP, -\%\f3GL_LUMINANCE6_ALPHA2\fP, -\%\f3GL_LUMINANCE8_ALPHA8\fP, -\%\f3GL_LUMINANCE12_ALPHA4\fP, -\%\f3GL_LUMINANCE12_ALPHA12\fP, -\%\f3GL_LUMINANCE16_ALPHA16\fP, -\%\f3GL_INTENSITY\fP, -\%\f3GL_INTENSITY4\fP, -\%\f3GL_INTENSITY8\fP, -\%\f3GL_INTENSITY12\fP, -\%\f3GL_INTENSITY16\fP, -\%\f3GL_R3_G3_B2\fP, -\%\f3GL_RGB\fP, -\%\f3GL_RGB4\fP, -\%\f3GL_RGB5\fP, -\%\f3GL_RGB8\fP, -\%\f3GL_RGB10\fP, -\%\f3GL_RGB12\fP, -\%\f3GL_RGB16\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_RGBA2\fP, -\%\f3GL_RGBA4\fP, -\%\f3GL_RGB5_A1\fP, -\%\f3GL_RGBA8\fP, -\%\f3GL_RGB10_A2\fP, -\%\f3GL_RGBA12\fP, or -\%\f3GL_RGBA16\fP. -.TP -\f2x\fP, \f2y\fP -The window space coordinates of the lower-left coordinate of the -pixel array to copy. -.TP -\f2width\fP -The width of the pixel array to copy. -.TP -\f2height\fP -The height of the pixel array to copy. -.SH DESCRIPTION -\%\f3glCopyConvolutionFilter2D\fP defines a two-dimensional convolution filter kernel with pixels -from the current \%\f3GL_READ_BUFFER\fP (rather than from main memory, -as is the case for \%\f3glConvolutionFilter2D\fP). -.sp -The screen-aligned pixel rectangle with lower-left corner at (\f2x\fP,\ \f2y\fP), -width \f2width\fP and height \f2height\fP -is used to define the convolution filter. If any pixels within this -region are -outside the window that is associated with the GL context, the -values obtained for those pixels are undefined. -.sp -The pixels in the rectangle are processed -exactly as if \%\f3glReadPixels\fP had been called with \f2format\fP -set to RGBA, but the process stops just before final conversion. -The R, G, B, and A components of each pixel are next scaled by the four -2D \%\f3GL_CONVOLUTION_FILTER_SCALE\fP parameters and biased by the -four 2D \%\f3GL_CONVOLUTION_FILTER_BIAS\fP parameters. -(The scale and bias parameters are set by \%\f3glConvolutionParameter\fP -using the \%\f3GL_CONVOLUTION_2D\fP target and the names -\%\f3GL_CONVOLUTION_FILTER_SCALE\fP and \%\f3GL_CONVOLUTION_FILTER_BIAS\fP. -The parameters themselves are vectors of four values that are applied to red, -green, blue, and alpha, in that order.) -The R, G, B, and A values are not clamped to [0,1] at any time during this -process. -.sp -Each pixel is then converted to the internal specified by -\f2internalformat\fP. -This conversion simply maps the component values of the pixel (R, G, B, -and A) to the values included in the internal (red, green, blue, -alpha, luminance, and intensity). The mapping is as follows: -.sp -.TS -center; -lb cb cb cb cb cb cb -l c c c c c c. -_ -Internal Format Red Green Blue Alpha Luminance Intensity -_ -\%\f3GL_ALPHA\fP A -\%\f3GL_LUMINANCE\fP R -\%\f3GL_LUMINANCE_ALPHA\fP A R -\%\f3GL_INTENSITY\fP R -\%\f3GL_RGB\fP R G B -\%\f3GL_RGBA\fP R G B A -_ -.TE -.sp -The red, green, blue, alpha, luminance, and/or intensity components of -the resulting pixels are stored in floating-point rather than integer -. -.sp -Pixel ordering is such that lower x screen coordinates correspond to -lower \f2i\fP filter image coordinates, and lower y screen coordinates -correspond to lower \f2j\fP filter image coordinates. -.PP -Note that after a convolution is performed, the resulting color -components are also scaled by their corresponding -\%\f3GL_POST_CONVOLUTION_c_SCALE\fP parameters and biased by their -corresponding \%\f3GL_POST_CONVOLUTION_c_BIAS\fP parameters (where -\f2c\fP takes on the values \f3RED\fP, \f3GREEN\fP, \f3BLUE\fP, and -\f3ALPHA\fP). -These parameters are set by \%\f3glPixelTransfer\fP. -.SH NOTES -\%\f3glCopyConvolutionFilter2D\fP is present only if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP -is called with an argument of \%\f3GL_EXTENSIONS\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not -\%\f3GL_CONVOLUTION_2D\fP. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2internalformat\fP is not one of the -allowable values. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2width\fP is less than zero or greater -than the maximum supported value. -This value may be queried with \%\f3glGetConvolutionParameter\fP -using target \%\f3GL_CONVOLUTION_2D\fP and name -\%\f3GL_MAX_CONVOLUTION_WIDTH\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2height\fP is less than zero or greater -than the maximum supported value. -This value may be queried with \%\f3glGetConvolutionParameter\fP -using target \%\f3GL_CONVOLUTION_2D\fP and name -\%\f3GL_MAX_CONVOLUTION_HEIGHT\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glCopyConvolutionFilter2D\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetConvolutionParameter\fP, \%\f3glGetConvolutionFilter\fP -.SH SEE ALSO -\%\f3glConvolutionFilter2D(3G)\fP, -\%\f3glConvolutionParameter(3G)\fP, -\%\f3glPixelTransfer(3G)\fP diff --git a/doc/gl-docs/GL/gl/copypixels.3gl b/doc/gl-docs/GL/gl/copypixels.3gl deleted file mode 100644 index 25402492..00000000 --- a/doc/gl-docs/GL/gl/copypixels.3gl +++ /dev/null @@ -1,249 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 copypixel -.ds Xs 10756 11 copypixels.gl -.TH GLCOPYPIXELS 3G -.SH NAME -.B "glCopyPixels -\- copy pixels in the frame buffer - -.SH C SPECIFICATION -void \f3glCopyPixels\fP( -GLint \fIx\fP, -.nf -.ta \w'\f3void \fPglCopyPixels( 'u - GLint \fIy\fP, - GLsizei \fIwidth\fP, - GLsizei \fIheight\fP, - GLenum \fItype\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2x\fP\ \f2y\fP\ \ 'u -\f2x\fP, \f2y\fP -Specify the window coordinates of the lower left corner -of the rectangular region of pixels to be copied. -.TP -\f2width\fP, \f2height\fP -Specify the dimensions of the rectangular region of pixels to be copied. -Both must be nonnegative. -.TP -\f2type\fP -Specifies whether color values, -depth values, -or stencil values are to be copied. -Symbolic constants -\%\f3GL_COLOR\fP, -\%\f3GL_DEPTH\fP, -and \%\f3GL_STENCIL\fP are accepted. -.SH DESCRIPTION -\%\f3glCopyPixels\fP copies a screen-aligned rectangle of pixels -from the specified frame buffer location to a region relative to the -current raster position. -Its operation is well defined only if the entire pixel source region -is within the exposed portion of the window. -Results of copies from outside the window, -or from regions of the window that are not exposed, -are hardware dependent and undefined. -.P -\f2x\fP and \f2y\fP specify the window coordinates of -the lower left corner of the rectangular region to be copied. -\f2width\fP and \f2height\fP specify the dimensions of the -rectangular region to be copied. -Both \f2width\fP and \f2height\fP must not be negative. -.P -Several parameters control the processing of the pixel data -while it is being copied. -These parameters are set with three commands: -\%\f3glPixelTransfer\fP, -\%\f3glPixelMap\fP, and -\%\f3glPixelZoom\fP. -This reference page describes the effects on \%\f3glCopyPixels\fP of most, -but not all, of the parameters specified by these three commands. -.P -\%\f3glCopyPixels\fP copies values from each pixel with the lower left-hand corner at -(\f2x\fP + $i$, \f2y\fP + $j$) for 0 \(<= $i$ < \f2width\fP -and 0 \(<= $j$ < \f2height\fP. -This pixel is said to be the $i$th pixel in the $j$th row. -Pixels are copied in row order from the lowest to the highest row, -left to right in each row. -.P -\f2type\fP specifies whether color, depth, or stencil data is to be copied. -The details of the transfer for each data type are as follows: -.TP 15 -\%\f3GL_COLOR\fP -Indices or RGBA colors are read from the buffer currently specified as the -read source buffer (see \%\f3glReadBuffer\fP). -If the GL is in color index mode, -each index that is read from this buffer is converted -to a fixed-point with an unspecified -number of bits to the right of the binary point. -Each index is then shifted left by \%\f3GL_INDEX_SHIFT\fP bits, -and added to \%\f3GL_INDEX_OFFSET\fP. -If \%\f3GL_INDEX_SHIFT\fP is negative, -the shift is to the right. -In either case, zero bits fill otherwise unspecified bit locations in the -result. -If \%\f3GL_MAP_COLOR\fP is true, -the index is replaced with the value that it references in lookup table -\%\f3GL_PIXEL_MAP_I_TO_I\fP. -Whether the lookup replacement of the index is done or not, -the integer part of the index is then ANDed with $2 sup b -1$, -where $b$ is the number of bits in a color index buffer. -.IP -If the GL is in RGBA mode, -the red, green, blue, and alpha components of each pixel that is read -are converted to an internal floating-point with unspecified -precision. -The conversion maps the largest representable component value to 1.0, -and component value 0 to 0.0. -The resulting floating-point color values are then multiplied -by \%\f3GL_c_SCALE\fP and added to \%\f3GL_c_BIAS\fP, -where \f2c\fP is RED, GREEN, BLUE, and ALPHA -for the respective color components. -The results are clamped to the range [0,1]. -If \%\f3GL_MAP_COLOR\fP is true, -each color component is scaled by the size of lookup table -\%\f3GL_PIXEL_MAP_c_TO_c\fP, -then replaced by the value that it references in that table. -\f2c\fP is R, G, B, or A. -.IP -If the \%\f3GL_ARB_imaging\fP extension is supported, the color values may -be -additionally processed by color-table lookups, color-matrix -transformations, and convolution filters. -.IP -The GL then converts the resulting indices or RGBA colors to fragments -by attaching the current raster position \f2z\fP coordinate and -texture coordinates to each pixel, -then assigning window coordinates -($x sub r ~+~ i , y sub r ~+~ j$), -where ($x sub r , y sub r$) is the current raster position, -and the pixel was the $i$th pixel in the $j$th row. -These pixel fragments are then treated just like the fragments generated by -rasterizing points, lines, or polygons. -Texture mapping, -fog, -and all the fragment operations are applied before the fragments are written -to the frame buffer. -.TP -\%\f3GL_DEPTH\fP -Depth values are read from the depth buffer and -converted directly to an internal floating-point -with unspecified precision. -The resulting floating-point depth value is then multiplied -by \%\f3GL_DEPTH_SCALE\fP and added to \%\f3GL_DEPTH_BIAS\fP. -The result is clamped to the range [0,1]. -.IP -The GL then converts the resulting depth components to fragments -by attaching the current raster position color or color index and -texture coordinates to each pixel, -then assigning window coordinates -($x sub r ~+~ i , y sub r ~+~ j$), -where ($x sub r , y sub r$) is the current raster position, -and the pixel was the $i$th pixel in the $j$th row. -These pixel fragments are then treated just like the fragments generated by -rasterizing points, lines, or polygons. -Texture mapping, -fog, -and all the fragment operations are applied before the fragments are written -to the frame buffer. -.TP -\%\f3GL_STENCIL\fP -Stencil indices are read from the stencil buffer and -converted to an internal fixed-point -with an unspecified number of bits to the right of the binary point. -Each fixed-point index is then shifted left by \%\f3GL_INDEX_SHIFT\fP bits, -and added to \%\f3GL_INDEX_OFFSET\fP. -If \%\f3GL_INDEX_SHIFT\fP is negative, -the shift is to the right. -In either case, zero bits fill otherwise unspecified bit locations in the -result. -If \%\f3GL_MAP_STENCIL\fP is true, -the index is replaced with the value that it references in lookup table -\%\f3GL_PIXEL_MAP_S_TO_S\fP. -Whether the lookup replacement of the index is done or not, -the integer part of the index is then ANDed with $2 sup b -1$, -where $b$ is the number of bits in the stencil buffer. -The resulting stencil indices are then written to the stencil buffer -such that the index read from the $i$th location of the $j$th row -is written to location -($x sub r ~+~ i , y sub r ~+~ j$), -where ($x sub r , y sub r$) is the current raster position. -Only the pixel ownership test, -the scissor test, -and the stencil writemask affect these write operations. -.P -The rasterization described thus far assumes pixel zoom factors of 1.0. -If -.br -\%\f3glPixelZoom\fP is used to change the $x$ and $y$ pixel zoom factors, -pixels are converted to fragments as follows. -If ($x sub r$, $y sub r$) is the current raster position, -and a given pixel is in the $i$th location in the $j$th row of the source -pixel rectangle, -then fragments are generated for pixels whose centers are in the rectangle -with corners at -.P -.ce -($x sub r ~+~ zoom sub x^ i$, $y sub r ~+~ zoom sub y^j$) -.sp .5 -.ce - and -.sp .5 -.ce -($x sub r ~+~ zoom sub x^ (i ~+~ 1)$, $y sub r ~+~ zoom sub y^ ( j ~+~ 1 )$) -.P -where $zoom sub x$ is the value of \%\f3GL_ZOOM_X\fP and -$zoom sub y$ is the value of \%\f3GL_ZOOM_Y\fP. -.SH EXAMPLES -To copy the color pixel in the lower left corner of the window to the current raster position, -use -.Ex -glCopyPixels(0, 0, 1, 1, \%\f3GL_COLOR\fP); -.En -.SH NOTES -Modes specified by \%\f3glPixelStore\fP have no effect on the operation -of \%\f3glCopyPixels\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not an accepted value. -.P -\%\f3GL_INVALID_VALUE\fP is generated if either \f2width\fP or \f2height\fP is negative. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is \%\f3GL_DEPTH\fP -and there is no depth buffer. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is \%\f3GL_STENCIL\fP -and there is no stencil buffer. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glCopyPixels\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_CURRENT_RASTER_POSITION\fP -.br -\%\f3glGet\fP with argument \%\f3GL_CURRENT_RASTER_POSITION_VALID\fP -.SH SEE ALSO -\%\f3glColorTable(3G)\fP, -\%\f3glConvolutionFilter1D(3G)\fP, -\%\f3glConvolutionFilter2D(3G)\fP, -\%\f3glDepthFunc(3G)\fP, -\%\f3glDrawBuffer(3G)\fP, -\%\f3glDrawPixels(3G)\fP, -\%\f3glMatrixMode(3G)\fP, -\%\f3glPixelMap(3G)\fP, -\%\f3glPixelTransfer(3G)\fP, -\%\f3glPixelZoom(3G)\fP, -\%\f3glRasterPos(3G)\fP, -\%\f3glReadBuffer(3G)\fP, -\%\f3glReadPixels(3G)\fP, -\%\f3glSeparableFilter2D(3G)\fP, -\%\f3glStencilFunc(3G)\fP diff --git a/doc/gl-docs/GL/gl/copyteximage1d.3gl b/doc/gl-docs/GL/gl/copyteximage1d.3gl deleted file mode 100644 index 09fe726d..00000000 --- a/doc/gl-docs/GL/gl/copyteximage1d.3gl +++ /dev/null @@ -1,173 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 copytexim -.ds Xs 48778 7 copyteximage1d.gl -.TH GLCOPYTEXIMAGE1D 3G -.SH NAME -.B "glCopyTexImage1D -\- copy pixels into a 1D texture image - -.SH C SPECIFICATION -void \f3glCopyTexImage1D\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglCopyTexImage1D( 'u - GLint \fIlevel\fP, - GLenum \fIinternalformat\fP, - GLint \fIx\fP, - GLint \fIy\fP, - GLsizei \fIwidth\fP, - GLint \fIborder\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIinternalformat\fP\ \ 'u -\f2target\fP -Specifies the target texture. -Must be \%\f3GL_TEXTURE_1D\fP. -.TP -\f2level\fP -Specifies the level-of-detail number. -Level 0 is the base image level. -Level \f2n\fP is the \f2n\fPth mipmap reduction image. -.TP -\f2internalformat\fP -Specifies the internal of the texture. -Must be one of the following symbolic constants: -\%\f3GL_ALPHA\fP, -\%\f3GL_ALPHA4\fP, -\%\f3GL_ALPHA8\fP, -\%\f3GL_ALPHA12\fP, -\%\f3GL_ALPHA16\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE4\fP, -\%\f3GL_LUMINANCE8\fP, -\%\f3GL_LUMINANCE12\fP, -\%\f3GL_LUMINANCE16\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_LUMINANCE4_ALPHA4\fP, -\%\f3GL_LUMINANCE6_ALPHA2\fP, -\%\f3GL_LUMINANCE8_ALPHA8\fP, -\%\f3GL_LUMINANCE12_ALPHA4\fP, -\%\f3GL_LUMINANCE12_ALPHA12\fP, -\%\f3GL_LUMINANCE16_ALPHA16\fP, -\%\f3GL_INTENSITY\fP, -\%\f3GL_INTENSITY4\fP, -\%\f3GL_INTENSITY8\fP, -\%\f3GL_INTENSITY12\fP, -\%\f3GL_INTENSITY16\fP, -\%\f3GL_RGB\fP, -\%\f3GL_R3_G3_B2\fP, -\%\f3GL_RGB4\fP, -\%\f3GL_RGB5\fP, -\%\f3GL_RGB8\fP, -\%\f3GL_RGB10\fP, -\%\f3GL_RGB12\fP, -\%\f3GL_RGB16\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_RGBA2\fP, -\%\f3GL_RGBA4\fP, -\%\f3GL_RGB5_A1\fP, -\%\f3GL_RGBA8\fP, -\%\f3GL_RGB10_A2\fP, -\%\f3GL_RGBA12\fP, or -\%\f3GL_RGBA16\fP. -.TP -\f2x\fP, \f2y\fP -Specify the window coordinates of the left corner -of the row of pixels to be copied. -.TP -\f2width\fP -Specifies the width of the texture image. -Must be 0 or $2 sup n ~+~ 2*$\f2border\fP for some integer $n$. -The height of the texture image is 1. -.TP -\f2border\fP -Specifies the width of the border. -Must be either 0 or 1. -.SH DESCRIPTION -\%\f3glCopyTexImage1D\fP defines a one-dimensional texture image with pixels from the current -\%\f3GL_READ_BUFFER\fP. -.P -The screen-aligned pixel row with left corner at $("x", "y")$ -and with a length of $"width"~+~2~*~"border"$ -defines the texture array -at the mipmap level specified by \f2level\fP. -\f2internalformat\fP specifies the internal of the texture array. -.P -The pixels in the row are processed exactly as if -\%\f3glCopyPixels\fP had been called, but the process stops just before -final conversion. -At this point all pixel component values are clamped to the range [0,\ 1] -and then converted to the texture's internal for storage in the texel -array. -.P -Pixel ordering is such that lower $x$ screen coordinates correspond to -lower texture coordinates. -.P -If any of the pixels within the specified row of the current -\%\f3GL_READ_BUFFER\fP are outside the window associated with the current -rendering context, then the values obtained for those pixels are undefined. -.SH NOTES -\%\f3glCopyTexImage1D\fP is available only if the GL version is 1.1 or greater. -.P -Texturing has no effect in color index mode. -.P -1, 2, 3, and 4 are not accepted values for \f2internalformat\fP. -.P -An image with 0 width indicates a NULL texture. -.P -When the \%\f3GL_ARB_imaging\fP extension is supported, the RGBA components -copied from the framebuffer may be processed by the imaging pipeline. See -\%\f3glTexImage1D\fP for specific details. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not one of the -allowable values. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2level\fP is less than 0. -.P -\%\f3GL_INVALID_VALUE\fP may be generated if \f2level\fP is greater -than $log sub 2 max$, -where $max$ is the returned value of \%\f3GL_MAX_TEXTURE_SIZE\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2internalformat\fP is not an -allowable value. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2width\fP is less than 0 -or greater than -2 + \%\f3GL_MAX_TEXTURE_SIZE\fP, -or if it cannot be represented as $2 sup n ~+~ 2~*~("border")$ -for some integer value of \f2n\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2border\fP is not 0 or 1. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glCopyTexImage1D\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetTexImage\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_TEXTURE_1D\fP -.SH SEE ALSO -\%\f3glCopyPixels(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glCopyTexSubImage1D(3G)\fP, -\%\f3glCopyTexSubImage2D(3G)\fP, -\%\f3glPixelStore(3G)\fP, -\%\f3glPixelTransfer(3G)\fP, -\%\f3glTexEnv(3G)\fP, -\%\f3glTexGen(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexSubImage1D(3G)\fP, -\%\f3glTexSubImage2D(3G)\fP, -.br -\%\f3glTexParameter(3G)\fP diff --git a/doc/gl-docs/GL/gl/copyteximage2d.3gl b/doc/gl-docs/GL/gl/copyteximage2d.3gl deleted file mode 100644 index 2f4407f8..00000000 --- a/doc/gl-docs/GL/gl/copyteximage2d.3gl +++ /dev/null @@ -1,179 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 copytexim -.ds Xs 15515 7 copyteximage2d.gl -.TH GLCOPYTEXIMAGE2D 3G -.SH NAME -.B "glCopyTexImage2D -\- copy pixels into a 2D texture image - -.SH C SPECIFICATION -void \f3glCopyTexImage2D\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglCopyTexImage2D( 'u - GLint \fIlevel\fP, - GLenum \fIinternalformat\fP, - GLint \fIx\fP, - GLint \fIy\fP, - GLsizei \fIwidth\fP, - GLsizei \fIheight\fP, - GLint \fIborder\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIinternalformat\fP\ \ 'u -\f2target\fP -Specifies the target texture. -Must be \%\f3GL_TEXTURE_2D\fP. -.TP -\f2level\fP -Specifies the level-of-detail number. -Level 0 is the base image level. -Level \f2n\fP is the \f2n\fPth mipmap reduction image. -.TP -\f2internalformat\fP -Specifies the internal of the texture. -Must be one of the following symbolic constants: -\%\f3GL_ALPHA\fP, -\%\f3GL_ALPHA4\fP, -\%\f3GL_ALPHA8\fP, -\%\f3GL_ALPHA12\fP, -\%\f3GL_ALPHA16\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE4\fP, -\%\f3GL_LUMINANCE8\fP, -\%\f3GL_LUMINANCE12\fP, -\%\f3GL_LUMINANCE16\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_LUMINANCE4_ALPHA4\fP, -\%\f3GL_LUMINANCE6_ALPHA2\fP, -\%\f3GL_LUMINANCE8_ALPHA8\fP, -\%\f3GL_LUMINANCE12_ALPHA4\fP, -\%\f3GL_LUMINANCE12_ALPHA12\fP, -\%\f3GL_LUMINANCE16_ALPHA16\fP, -\%\f3GL_INTENSITY\fP, -\%\f3GL_INTENSITY4\fP, -\%\f3GL_INTENSITY8\fP, -\%\f3GL_INTENSITY12\fP, -\%\f3GL_INTENSITY16\fP, -\%\f3GL_RGB\fP, -\%\f3GL_R3_G3_B2\fP, -\%\f3GL_RGB4\fP, -\%\f3GL_RGB5\fP, -\%\f3GL_RGB8\fP, -\%\f3GL_RGB10\fP, -\%\f3GL_RGB12\fP, -\%\f3GL_RGB16\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_RGBA2\fP, -\%\f3GL_RGBA4\fP, -\%\f3GL_RGB5_A1\fP, -\%\f3GL_RGBA8\fP, -\%\f3GL_RGB10_A2\fP, -\%\f3GL_RGBA12\fP, or -\%\f3GL_RGBA16\fP. -.TP -\f2x\fP, \f2y\fP -Specify the window coordinates of the lower left corner -of the rectangular region of pixels to be copied. -.TP -\f2width\fP -Specifies the width of the texture image. -Must be 0 or $2 sup n ~+~ 2*$\f2border\fP for some integer $n$. -.TP -\f2height\fP -Specifies the height of the texture image. -Must be 0 or $2 sup m ~+~ 2*$\f2border\fP for some integer $m$. -.TP -\f2border\fP -Specifies the width of the border. -Must be either 0 or 1. -.SH DESCRIPTION -\%\f3glCopyTexImage2D\fP defines a two-dimensional texture image with pixels from the current -\%\f3GL_READ_BUFFER\fP. -.P -The screen-aligned pixel rectangle with lower left corner at (\f2x\fP, -\f2y\fP) and with a width of \f2width\fP$~+~2~*~$\f2border\fP and a height of -\f2height\fP$~+~2~*~$\f2border\fP -defines the texture array -at the mipmap level specified by \f2level\fP. -\f2internalformat\fP specifies the internal of the texture array. -.P -The pixels in the rectangle are processed exactly as if -\%\f3glCopyPixels\fP had been called, but the process stops just before -final conversion. -At this point all pixel component values are clamped to the range $[0,1]$ -and then converted to the texture's internal for storage in the texel -array. -.P -Pixel ordering is such that lower $x$ and $y$ screen coordinates correspond to -lower $s$ and $t$ texture coordinates. -.P -If any of the pixels within the specified rectangle of the current -\%\f3GL_READ_BUFFER\fP are outside the window associated with the current -rendering context, then the values obtained for those pixels are undefined. -.P -.SH NOTES -\%\f3glCopyTexImage2D\fP is available only if the GL version is 1.1 or greater. -.P -Texturing has no effect in color index mode. -.P -1, 2, 3, and 4 are not accepted values for \f2internalformat\fP. -.P -An image with height or width of 0 indicates a NULL texture. -.P -When the \%\f3GL_ARB_imaging\fP extension is supported, the RGBA components -read from the framebuffer may be processed by the imaging pipeline. See -\%\f3glTexImage1D\fP for specific details. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not \%\f3GL_TEXTURE_2D\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2level\fP is less than 0. -.P -\%\f3GL_INVALID_VALUE\fP may be generated if \f2level\fP is greater -than $log sub 2 max$, -where $max$ is the returned value of \%\f3GL_MAX_TEXTURE_SIZE\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2width\fP or \f2height\fP is less than 0, -greater than $2~+~$\%\f3GL_MAX_TEXTURE_SIZE\fP, or if \f2width\fP or \f2height\fP cannot be -represented as $2 sup k ~+~ 2~*~$\f2border\fP for some integer -$k$. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2border\fP is not 0 or 1. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2internalformat\fP is not one of the -allowable values. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glCopyTexImage2D\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetTexImage\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_TEXTURE_2D\fP -.SH SEE ALSO -\%\f3glCopyPixels(3G)\fP, -\%\f3glCopyTexImage1D(3G)\fP, -\%\f3glCopyTexSubImage1D(3G)\fP, -\%\f3glCopyTexSubImage2D(3G)\fP, -\%\f3glPixelStore(3G)\fP, -\%\f3glPixelTransfer(3G)\fP, -\%\f3glTexEnv(3G)\fP, -\%\f3glTexGen(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexSubImage1D(3G)\fP, -\%\f3glTexSubImage2D(3G)\fP, -.br -\%\f3glTexParameter(3G)\fP - - diff --git a/doc/gl-docs/GL/gl/copytexsubimage1d.3gl b/doc/gl-docs/GL/gl/copytexsubimage1d.3gl deleted file mode 100644 index fd2be966..00000000 --- a/doc/gl-docs/GL/gl/copytexsubimage1d.3gl +++ /dev/null @@ -1,131 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 copytexsu -.ds Xs 28384 6 copytexsubimage1d.gl -.TH GLCOPYTEXSUBIMAGE1D 3G -.SH NAME -.B "glCopyTexSubImage1D -\- copy a one-dimensional texture subimage - -.SH C SPECIFICATION -void \f3glCopyTexSubImage1D\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglCopyTexSubImage1D( 'u - GLint \fIlevel\fP, - GLint \fIxoffset\fP, - GLint \fIx\fP, - GLint \fIy\fP, - GLsizei \fIwidth\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIxoffset\fP\ \ 'u -\f2target\fP -Specifies the target texture. -Must be \%\f3GL_TEXTURE_1D\fP. -.TP -\f2level\fP -Specifies the level-of-detail number. -Level 0 is the base image level. -Level \f2n\fP is the \f2n\fPth mipmap reduction image. -.TP -\f2xoffset\fP -Specifies the texel offset within the texture array. -.TP -\f2x\fP, \f2y\fP -Specify the window coordinates of the left corner -of the row of pixels to be copied. -.TP -\f2width\fP -Specifies the width of the texture subimage. -.SH DESCRIPTION -\%\f3glCopyTexSubImage1D\fP replaces a portion of a one-dimensional -texture image with pixels from the current \%\f3GL_READ_BUFFER\fP (rather -than from main memory, as is the case for \%\f3glTexSubImage1D\fP). -.P -The screen-aligned pixel row with left corner at (\f2x\fP,\ \f2y\fP), and with -length \f2width\fP replaces the portion of the -texture array with x indices \f2xoffset\fP through $"xoffset" ~+~ "width" ~-~ 1$, -inclusive. The destination in the texture array may not -include any texels outside the texture array as it was -originally specified. -.P -The pixels in the row are processed exactly as if -\%\f3glCopyPixels\fP had been called, but the process stops just before -final conversion. -At this point all pixel component values are clamped to the range [0,\ 1] -and then converted to the texture's internal for storage in the texel -array. -.P -It is not an error to specify a subtexture with zero width, but -such a specification has no effect. -If any of the pixels within the specified row of the current -\%\f3GL_READ_BUFFER\fP are outside the read window associated with the current -rendering context, then the values obtained for those pixels are undefined. -.P -No change is made to the \f2internalformat\fP, \f2width\fP, -or \f2border\fP parameters of the specified texture -array or to texel values outside the specified subregion. -.SH NOTES -\%\f3glCopyTexSubImage1D\fP is available only if the GL version is 1.1 or greater. -.P -Texturing has no effect in color index mode. -.P -\%\f3glPixelStore\fP and \%\f3glPixelTransfer\fP modes affect texture images -in exactly the way they affect \%\f3glDrawPixels\fP. -.P -When the \%\f3GL_ARB_imaging\fP extension is supported, the RGBA components -copied from the framebuffer may be processed by the imaging pipeline. See -\%\f3glTexImage1D\fP for specific details. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not \%\f3GL_TEXTURE_1D\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if the texture array has not -been defined by a previous \%\f3glTexImage1D\fP or \%\f3glCopyTexImage1D\fP operation. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2level\fP is less than 0. -.P -\%\f3GL_INVALID_VALUE\fP may be generated if \f2level\fP$>log sub 2$\f2 max\fP, -where \f2max\fP is the returned value of \%\f3GL_MAX_TEXTURE_SIZE\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2y\fP$ ~<~ ~-b$ -or if \f2width\fP$ ~<~ ~-b$, where $b$ -is the border width of the texture array. -.P -\%\f3GL_INVALID_VALUE\fP is generated if $"xoffset" ~<~ ~-b$, or -$("xoffset"~+~"width") ~>~ (w-b)$, -where $w$ is the \%\f3GL_TEXTURE_WIDTH\fP, and $b$ is the \%\f3GL_TEXTURE_BORDER\fP -of the texture image being modified. -Note that $w$ includes twice the border width. -.P -.SH ASSOCIATED GETS -\%\f3glGetTexImage\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_TEXTURE_1D\fP -.SH SEE ALSO -\%\f3glCopyPixels(3G)\fP, -\%\f3glCopyTexImage1D(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glCopyTexSubImage2D(3G)\fP, -\%\f3glCopyTexSubImage3D(3G)\fP, -\%\f3glPixelStore(3G)\fP, -\%\f3glPixelTransfer(3G)\fP, -\%\f3glReadBuffer(3G)\fP, -\%\f3glTexEnv(3G)\fP, -\%\f3glTexGen(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexImage3D(3G)\fP, -\%\f3glTexParameter(3G)\fP, -\%\f3glTexSubImage1D(3G)\fP, -\%\f3glTexSubImage2D(3G)\fP, -\%\f3glTexSubImage3D(3G)\fP diff --git a/doc/gl-docs/GL/gl/copytexsubimage2d.3gl b/doc/gl-docs/GL/gl/copytexsubimage2d.3gl deleted file mode 100644 index fc5b7094..00000000 --- a/doc/gl-docs/GL/gl/copytexsubimage2d.3gl +++ /dev/null @@ -1,151 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 copytexsu -.ds Xs 21640 7 copytexsubimage2d.gl -.TH GLCOPYTEXSUBIMAGE2D 3G -.SH NAME -.B "glCopyTexSubImage2D -\- copy a two-dimensional texture subimage - -.SH C SPECIFICATION -void \f3glCopyTexSubImage2D\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglCopyTexSubImage2D( 'u - GLint \fIlevel\fP, - GLint \fIxoffset\fP, - GLint \fIyoffset\fP, - GLint \fIx\fP, - GLint \fIy\fP, - GLsizei \fIwidth\fP, - GLsizei \fIheight\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIxoffset\fP\ \ 'u -\f2target\fP -Specifies the target texture. -Must be \%\f3GL_TEXTURE_2D\fP. -.TP -\f2level\fP -Specifies the level-of-detail number. -Level 0 is the base image level. -Level \f2n\fP is the \f2n\fPth mipmap reduction image. -.TP -\f2xoffset\fP -Specifies a texel offset in the x direction within the texture array. -.TP -\f2yoffset\fP -Specifies a texel offset in the y direction within the texture array. -.TP -\f2x\fP, \f2y\fP -Specify the window coordinates of the lower left corner -of the rectangular region of pixels to be copied. -.TP -\f2width\fP -Specifies the width of the texture subimage. -.TP -\f2height\fP -Specifies the height of the texture subimage. -.SH DESCRIPTION -\%\f3glCopyTexSubImage2D\fP replaces a rectangular portion of a two-dimensional -texture image with pixels from the current \%\f3GL_READ_BUFFER\fP (rather -than from main memory, as is the case for \%\f3glTexSubImage2D\fP). -.P -The screen-aligned pixel rectangle with lower left corner at -(\f2x\fP,\ \f2y\fP) and with -width \f2width\fP and height \f2height\fP replaces the portion of the -texture array with x indices \f2xoffset\fP through \f2xoffset\fP$~+~$\f2width\fP$~-~$1, -inclusive, and y indices \f2yoffset\fP through \f2yoffset\fP$~+~$\f2height\fP$~-~$1, -inclusive, at the mipmap level specified by \f2level\fP. -.P -The pixels in the rectangle are processed exactly as if -\%\f3glCopyPixels\fP had been called, but the process stops just before -final conversion. -At this point, all pixel component values are clamped to the range [0,\ 1] -and then converted to the texture's internal for storage in the texel -array. -.P -The destination rectangle in the texture array may not include any texels -outside the texture array as it was originally specified. -It is not an error to specify a subtexture with zero width or height, but -such a specification has no effect. -.P -If any of the pixels within the specified rectangle of the current -\%\f3GL_READ_BUFFER\fP are outside the read window associated with the current -rendering context, then the values obtained for those pixels are undefined. -.P -No change is made to the \f2internalformat\fP, \f2width\fP, -\f2height\fP, or \f2border\fP parameters of the specified texture -array or to texel values outside the specified subregion. -.SH NOTES -\%\f3glCopyTexSubImage2D\fP is available only if the GL version is 1.1 or greater. -.P -Texturing has no effect in color index mode. -.P -\%\f3glPixelStore\fP and \%\f3glPixelTransfer\fP modes affect texture images -in exactly the way they affect \%\f3glDrawPixels\fP. -.P -When the \%\f3GL_ARB_imaging\fP extension is supported, the RGBA components -read from the framebuffer may be processed by the imaging pipeline. See -\%\f3glTexImage1D\fP for specific details. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not \%\f3GL_TEXTURE_2D\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if the texture array has not -been defined by a previous \%\f3glTexImage2D\fP or \%\f3glCopyTexImage2D\fP operation. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2level\fP is less than 0. -.P -\%\f3GL_INVALID_VALUE\fP may be generated if \f2level\fP is greater -than $log sub 2 max$, -where $max$ is the returned value of \%\f3GL_MAX_TEXTURE_SIZE\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2x\fP$ ~<~ ~-b$ or if -\f2y\fP$ ~<~ ~-b$, -where $b$ is the border width of the texture array. -.P -\%\f3GL_INVALID_VALUE\fP is generated if $"xoffset" ~<~ -b$, -(\f2xoffset\fP$~+~$\f2width\fP)$~>~(w ~-~b)$, -\f2yoffset\fP$~<~ ~-b$, or -(\f2yoffset\fP$~+~$\f2height\fP)$~>~(h ~-~b)$, -where $w$ is the \%\f3GL_TEXTURE_WIDTH\fP, -$h$ is the \%\f3GL_TEXTURE_HEIGHT\fP, -and $b$ is the \%\f3GL_TEXTURE_BORDER\fP -of the texture image being modified. -Note that $w$ and $h$ -include twice the border width. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glCopyTexSubImage2D\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetTexImage\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_TEXTURE_2D\fP -.SH SEE ALSO -\%\f3glCopyPixels(3G)\fP, -\%\f3glCopyTexImage1D(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glCopyTexSubImage1D(3G)\fP, -\%\f3glCopyTexSubImage3D(3G)\fP, -\%\f3glPixelStore(3G)\fP, -\%\f3glPixelTransfer(3G)\fP, -\%\f3glReadBuffer(3G)\fP, -\%\f3glTexEnv(3G)\fP, -\%\f3glTexGen(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexImage3D(3G)\fP, -\%\f3glTexParameter(3G)\fP, -\%\f3glTexSubImage1D(3G)\fP, -\%\f3glTexSubImage2D(3G)\fP, -\%\f3glTexSubImage3D(3G)\fP diff --git a/doc/gl-docs/GL/gl/copytexsubimage3d.3gl b/doc/gl-docs/GL/gl/copytexsubimage3d.3gl deleted file mode 100644 index ffb57074..00000000 --- a/doc/gl-docs/GL/gl/copytexsubimage3d.3gl +++ /dev/null @@ -1,158 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 copytexsu -.ds Xs 39423 7 copytexsubimage3d.gl -.TH GLCOPYTEXSUBIMAGE3D 3G -.SH NAME -.B "glCopyTexSubImage3D -\- copy a three-dimensional texture subimage - -.SH C SPECIFICATION -void \f3glCopyTexSubImage3D\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglCopyTexSubImage3D( 'u - GLint \fIlevel\fP, - GLint \fIxoffset\fP, - GLint \fIyoffset\fP, - GLint \fIzoffset\fP, - GLint \fIx\fP, - GLint \fIy\fP, - GLsizei \fIwidth\fP, - GLsizei \fIheight\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIxoffset\fP\ \ 'u -\f2target\fP -Specifies the target texture. -Must be \%\f3GL_TEXTURE_3D\fP -.TP -\f2level\fP -Specifies the level-of-detail number. -Level 0 is the base image level. -Level \f2n\fP is the \f2n\fPth mipmap reduction image. -.TP -\f2xoffset\fP -Specifies a texel offset in the x direction within the texture array. -.TP -\f2yoffset\fP -Specifies a texel offset in the y direction within the texture array. -.TP -\f2zoffset\fP -Specifies a texel offset in the z direction within the texture array. -.TP -\f2x\fP, \f2y\fP -Specify the window coordinates of the lower left corner -of the rectangular region of pixels to be copied. -.TP -\f2width\fP -Specifies the width of the texture subimage. -.TP -\f2height\fP -Specifies the height of the texture subimage. -.SH DESCRIPTION -\%\f3glCopyTexSubImage3D\fP replaces a rectangular portion of a three-dimensional -texture image with pixels from the current \%\f3GL_READ_BUFFER\fP (rather -than from main memory, as is the case for \%\f3glTexSubImage3D\fP). -.P -The screen-aligned pixel rectangle with lower left corner at -(\f2x\fP,\ \f2y\fP) and with -width \f2width\fP and height \f2height\fP replaces the portion of the -texture array with x indices \f2xoffset\fP through \f2xoffset\fP$~+~$\f2width\fP$~-~$1, -inclusive, and y indices \f2yoffset\fP through \f2yoffset\fP$~+~$\f2height\fP$~-~$1, -inclusive, at z index \f2zoffset\fP and at the mipmap level specified by \f2level\fP. -.P -The pixels in the rectangle are processed exactly as if -\%\f3glCopyPixels\fP had been called, but the process stops just before -final conversion. -At this point, all pixel component values are clamped to the range [0,\ 1] -and then converted to the texture's internal for storage in the texel -array. -.P -The destination rectangle in the texture array may not include any texels -outside the texture array as it was originally specified. -It is not an error to specify a subtexture with zero width or height, but -such a specification has no effect. -.P -If any of the pixels within the specified rectangle of the current -\%\f3GL_READ_BUFFER\fP are outside the read window associated with the current -rendering context, then the values obtained for those pixels are undefined. -.P -No change is made to the \f2internalformat\fP, \f2width\fP, -\f2height\fP, \f2depth\fP, or \f2border\fP parameters of the specified texture -array or to texel values outside the specified subregion. -.SH NOTES -\%\f3glCopyTexSubImage3D\fP is available only if the GL version is 1.2 or greater. -.P -Texturing has no effect in color index mode. -.P -\%\f3glPixelStore\fP and \%\f3glPixelTransfer\fP modes affect texture images -in exactly the way they affect \%\f3glDrawPixels\fP. -.P -When the \%\f3GL_ARB_imaging\fP extension is supported, the RGBA components -copied from the framebuffer may be processed by the imaging pipeline, as -if they were a two-dimensional texture. See \%\f3glTexImage2D\fP for -specific details. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not \%\f3GL_TEXTURE_3D\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if the texture array has not -been defined by a previous \%\f3glTexImage3D\fP or \%\f3glCopyTexImage3D\fP operation. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2level\fP is less than 0. -.P -\%\f3GL_INVALID_VALUE\fP may be generated if \f2level\fP is greater -than $log sub 2^max$, -where $max$ is the returned value of \%\f3GL_MAX_3D_TEXTURE_SIZE\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2x\fP$ ~<~ ~-b$ or if -\f2y\fP$ ~<~ ~-b$, -where $b$ is the border width of the texture array. -.P -\%\f3GL_INVALID_VALUE\fP is generated if $"xoffset" ~<~ -b$, -(\f2xoffset\fP$~+~$\f2width\fP)$~>~(w ~-~b)$, -\f2yoffset\fP$~<~ ~-b$, -(\f2yoffset\fP$~+~$\f2height\fP)$~>~(h ~-~b)$, -\f2zoffset\fP$~<~ ~-b$, or \f2zoffset\fP$~>~(d ~-~b)$, -where $w$ is the \%\f3GL_TEXTURE_WIDTH\fP, -$h$ is the \%\f3GL_TEXTURE_HEIGHT\fP, -$d$ is the \%\f3GL_TEXTURE_DEPTH\fP, -and $b$ is the \%\f3GL_TEXTURE_BORDER\fP -of the texture image being modified. -Note that $w$, $h$, and $d$ -include twice the border width. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glCopyTexSubImage3D\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetTexImage\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_TEXTURE_3D\fP -.SH SEE ALSO -\%\f3glCopyPixels(3G)\fP, -\%\f3glCopyTexImage1D(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glCopyTexSubImage1D(3G)\fP, -\%\f3glCopyTexSubImage2D(3G)\fP, -\%\f3glPixelStore(3G)\fP, -\%\f3glPixelTransfer(3G)\fP, -\%\f3glReadBuffer(3G)\fP, -\%\f3glTexEnv(3G)\fP, -\%\f3glTexGen(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexImage3D(3G)\fP, -\%\f3glTexParameter(3G)\fP, -\%\f3glTexSubImage1D(3G)\fP, -\%\f3glTexSubImage2D(3G)\fP, -\%\f3glTexSubImage3D(3G)\fP diff --git a/doc/gl-docs/GL/gl/cullface.3gl b/doc/gl-docs/GL/gl/cullface.3gl deleted file mode 100644 index 10b26c93..00000000 --- a/doc/gl-docs/GL/gl/cullface.3gl +++ /dev/null @@ -1,58 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 cullface. -.ds Xs 63441 4 cullface.gl -.TH GLCULLFACE 3G -.SH NAME -.B "glCullFace -\- specify whether front- or back-facing facets can be culled - -.SH C SPECIFICATION -void \f3glCullFace\fP( -GLenum \fImode\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2mode\fP\ \ 'u -\f2mode\fP -Specifies whether front- or back-facing facets are candidates for culling. -Symbolic constants -\%\f3GL_FRONT\fP, \%\f3GL_BACK\fP, and \%\f3GL_FRONT_AND_BACK\fP are accepted. -The initial value is \%\f3GL_BACK\fP. -.SH DESCRIPTION -\%\f3glCullFace\fP specifies whether front- or back-facing facets are culled -(as specified by \f2mode\fP) when facet culling is enabled. Facet -culling is initially disabled. -To enable and disable facet culling, call the -\%\f3glEnable\fP and \%\f3glDisable\fP commands -with the argument \%\f3GL_CULL_FACE\fP. -Facets include triangles, -quadrilaterals, -polygons, -and rectangles. -.P -\%\f3glFrontFace\fP specifies which of the clockwise and counterclockwise facets -are front-facing and back-facing. -See \%\f3glFrontFace\fP. -.SH NOTES -If \f2mode\fP is \%\f3GL_FRONT_AND_BACK\fP, no facets are drawn, but other -primitives such as points and lines are drawn. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2mode\fP is not an accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glCullFace\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glIsEnabled\fP with argument \%\f3GL_CULL_FACE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_CULL_FACE_MODE\fP -.SH SEE ALSO -\%\f3glEnable(3G)\fP, -\%\f3glFrontFace(3G)\fP diff --git a/doc/gl-docs/GL/gl/deletelists.3gl b/doc/gl-docs/GL/gl/deletelists.3gl deleted file mode 100644 index 4e43ebe5..00000000 --- a/doc/gl-docs/GL/gl/deletelists.3gl +++ /dev/null @@ -1,50 +0,0 @@ -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 deletelis -.ds Xs 9368 4 deletelists.gl -.TH GLDELETELISTS 3G -.SH NAME -.B "glDeleteLists -\- delete a contiguous group of display lists - -.SH C SPECIFICATION -void \f3glDeleteLists\fP( -GLuint \fIlist\fP, -.nf -.ta \w'\f3void \fPglDeleteLists( 'u - GLsizei \fIrange\fP ) -.fi - -.SH PARAMETERS -.TP \w'\fIrange\fP\ \ 'u -\f2list\fP -Specifies the integer name of the first display list to delete. -.TP -\f2range\fP -Specifies the number of display lists to delete. -.SH DESCRIPTION -\%\f3glDeleteLists\fP causes a contiguous group of display lists to be deleted. -\f2list\fP is the name of the first display list to be deleted, -and \f2range\fP is the number of display lists to delete. -All display lists \fId\fP with \f2list\fP \(<= \fId\fP \(<= \f2list\fP + \f2range\fP \- 1 -are deleted. -.P -All storage locations allocated to the specified display lists are freed, -and the names are available for reuse at a later time. -Names within the range that do not have an associated display list are ignored. -If \f2range\fP is 0, nothing happens. -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if \f2range\fP is negative. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glDeleteLists\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glCallList(3G)\fP, -\%\f3glCallLists(3G)\fP, -\%\f3glGenLists(3G)\fP, -\%\f3glIsList(3G)\fP, -\%\f3glNewList(3G)\fP diff --git a/doc/gl-docs/GL/gl/deletetextures.3gl b/doc/gl-docs/GL/gl/deletetextures.3gl deleted file mode 100644 index 2d13db32..00000000 --- a/doc/gl-docs/GL/gl/deletetextures.3gl +++ /dev/null @@ -1,60 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 deletetex -.ds Xs 39225 4 deletetextures.gl -.TH GLDELETETEXTURES 3G -.SH NAME -.B "glDeleteTextures -\- delete named textures - -.SH C SPECIFICATION -void \f3glDeleteTextures\fP( -GLsizei \fIn\fP, -.nf -.ta \w'\f3void \fPglDeleteTextures( 'u - const GLuint \fI*textures\fP ) -.fi - -.SH PARAMETERS -.TP \w'\fItextures\fP\ \ 'u -\f2n\fP -Specifies the number of textures to be deleted. -.TP -\f2textures\fP -Specifies an array of textures to be deleted. -.SH DESCRIPTION -\%\f3glDeleteTextures\fP deletes \f2n\fP textures named by the elements of the array \f2textures\fP. -After a texture is deleted, it has no contents or dimensionality, -and its name is free for reuse (for example by \%\f3glGenTextures\fP). -If a texture that is currently bound is deleted, the binding reverts -to 0 (the default texture). -.P -\%\f3glDeleteTextures\fP silently ignores 0's and names that do not correspond to -existing textures. -.SH NOTES -\%\f3glDeleteTextures\fP is available only if the GL version is 1.1 or greater. -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if \f2n\fP is negative. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glDeleteTextures\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glIsTexture\fP -.SH SEE ALSO -\%\f3glAreTexturesResident(3G)\fP, -\%\f3glBindTexture(3G)\fP, -\%\f3glCopyTexImage1D(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glGenTextures(3G)\fP, -\%\f3glGet(3G)\fP, -\%\f3glGetTexParameter(3G)\fP, -\%\f3glPrioritizeTextures(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexParameter(3G)\fP diff --git a/doc/gl-docs/GL/gl/depthfunc.3gl b/doc/gl-docs/GL/gl/depthfunc.3gl deleted file mode 100644 index e055c3cf..00000000 --- a/doc/gl-docs/GL/gl/depthfunc.3gl +++ /dev/null @@ -1,88 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 depthfunc -.ds Xs 34310 5 depthfunc.gl -.TH GLDEPTHFUNC 3G -.SH NAME -.B "glDepthFunc -\- specify the value used for depth buffer comparisons - -.SH C SPECIFICATION -void \f3glDepthFunc\fP( -GLenum \fIfunc\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2func\fP\ \ 'u -\f2func\fP -Specifies the depth comparison function. -Symbolic constants -\%\f3GL_NEVER\fP, -\%\f3GL_LESS\fP, -\%\f3GL_EQUAL\fP, -\%\f3GL_LEQUAL\fP, -\%\f3GL_GREATER\fP, -\%\f3GL_NOTEQUAL\fP, -\%\f3GL_GEQUAL\fP, and -\%\f3GL_ALWAYS\fP are accepted. -The initial value is \%\f3GL_LESS\fP. -.SH DESCRIPTION -\%\f3glDepthFunc\fP specifies the function used to compare each incoming pixel depth value -with the depth value present in the depth buffer. -The comparison is performed only if depth testing is enabled. -(See \%\f3glEnable\fP and \%\f3glDisable\fP of \%\f3GL_DEPTH_TEST\fP.) -.P -\f2func\fP specifies the conditions under which the pixel will be drawn. -The comparison functions are as follows: -.TP 16 -\%\f3GL_NEVER\fP -Never passes. -.TP -\%\f3GL_LESS\fP -Passes if the incoming depth value is less than the stored depth value. -.TP -\%\f3GL_EQUAL\fP -Passes if the incoming depth value is equal to the stored depth value. -.TP -\%\f3GL_LEQUAL\fP -Passes if the incoming depth value is less than or equal to -the stored depth value. -.TP -\%\f3GL_GREATER\fP -Passes if the incoming depth value is greater than the stored depth value. -.TP -\%\f3GL_NOTEQUAL\fP -Passes if the incoming depth value is not equal to the stored depth value. -.TP -\%\f3GL_GEQUAL\fP -Passes if the incoming depth value is greater than or equal to -the stored depth value. -.TP -\%\f3GL_ALWAYS\fP -Always passes. -.P -The initial value of \f2func\fP is \%\f3GL_LESS\fP. -Initially, depth testing is disabled. -.NOTES -Even if the depth buffer exists and the depth mask is non-zero, the -depth buffer is not updated if the depth test is disabled. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2func\fP is not an accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glDepthFunc\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_DEPTH_FUNC\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_DEPTH_TEST\fP -.SH SEE ALSO -\%\f3glDepthRange(3G)\fP, -\%\f3glEnable(3G)\fP, -\%\f3glPolygonOffset(3G)\fP diff --git a/doc/gl-docs/GL/gl/depthmask.3gl b/doc/gl-docs/GL/gl/depthmask.3gl deleted file mode 100644 index 130a28a0..00000000 --- a/doc/gl-docs/GL/gl/depthmask.3gl +++ /dev/null @@ -1,46 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 depthmask -.ds Xs 13631 3 depthmask.gl -.TH GLDEPTHMASK 3G -.SH NAME -.B "glDepthMask -\- enable or disable writing into the depth buffer - -.SH C SPECIFICATION -void \f3glDepthMask\fP( -GLboolean \fIflag\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2flag\fP\ \ 'u -\f2flag\fP -Specifies whether the depth buffer is enabled for writing. -If \f2flag\fP is \%\f3GL_FALSE\fP, -depth buffer writing is disabled. -Otherwise, it is enabled. -Initially, depth buffer writing is enabled. -.SH DESCRIPTION -\%\f3glDepthMask\fP specifies whether the depth buffer is enabled for writing. -If \f2flag\fP is \%\f3GL_FALSE\fP, -depth buffer writing is disabled. -Otherwise, it is enabled. -Initially, depth buffer writing is enabled. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glDepthMask\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_DEPTH_WRITEMASK\fP -.SH SEE ALSO -\%\f3glColorMask(3G)\fP, -\%\f3glDepthFunc(3G)\fP, -\%\f3glDepthRange(3G)\fP, -\%\f3glIndexMask(3G)\fP, -\%\f3glStencilMask(3G)\fP diff --git a/doc/gl-docs/GL/gl/depthrange.3gl b/doc/gl-docs/GL/gl/depthrange.3gl deleted file mode 100644 index 3dcaa0cb..00000000 --- a/doc/gl-docs/GL/gl/depthrange.3gl +++ /dev/null @@ -1,65 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 depthrang -.ds Xs 41369 4 depthrange.gl -.TH GLDEPTHRANGE 3G -.SH NAME -.B "glDepthRange -\- specify mapping of depth values from normalized device coordinates to window coordinates - -.SH C SPECIFICATION -void \f3glDepthRange\fP( -GLclampd \fInear_val\fP, -.nf -.ta \w'\f3void \fPglDepthRange( 'u - GLclampd \fIfar_val\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2near_val\fP\ \ 'u -\f2near_val\fP -Specifies the mapping of the near clipping plane to window coordinates. -The initial value is 0. -.TP -\f2far_val\fP -Specifies the mapping of the far clipping plane to window coordinates. -The initial value is 1. -.SH DESCRIPTION -After clipping and division by \f2w\fP, -depth coordinates range from \-1 to 1, -corresponding to the near and far clipping planes. -\%\f3glDepthRange\fP specifies a linear mapping of the normalized depth coordinates -in this range to window depth coordinates. -Regardless of the actual depth buffer implementation, -window coordinate depth values are treated as though they range -from 0 through 1 (like color components). -Thus, -the values accepted by \%\f3glDepthRange\fP are both clamped to this range -before they are accepted. -.P -The setting of (0,1) maps the near plane to 0 and -the far plane to 1. -With this mapping, -the depth buffer range is fully utilized. -.SH NOTES -It is not necessary that \f2near_val\fP be less than \f2far_val\fP. -Reverse mappings such as $"near_val" ~=~ 1$, and $"far_val" ~=~ 0$ -are acceptable. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glDepthRange\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_DEPTH_RANGE\fP -.SH SEE ALSO -\%\f3glDepthFunc(3G)\fP, -\%\f3glPolygonOffset(3G)\fP, -\%\f3glViewport(3G)\fP diff --git a/doc/gl-docs/GL/gl/drawarrays.3gl b/doc/gl-docs/GL/gl/drawarrays.3gl deleted file mode 100644 index 27f4cc05..00000000 --- a/doc/gl-docs/GL/gl/drawarrays.3gl +++ /dev/null @@ -1,97 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 drawarray -.ds Xs 55233 5 drawarrays.gl -.TH GLDRAWARRAYS 3G -.SH NAME -.B "glDrawArrays -\- render primitives from array data - -.SH C SPECIFICATION -void \f3glDrawArrays\fP( -GLenum \fImode\fP, -.nf -.ta \w'\f3void \fPglDrawArrays( 'u - GLint \fIfirst\fP, - GLsizei \fIcount\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIfirst\fP\ \ 'u -\f2mode\fP -Specifies what kind of primitives to render. -Symbolic constants -\%\f3GL_POINTS\fP, -\%\f3GL_LINE_STRIP\fP, -\%\f3GL_LINE_LOOP\fP, -\%\f3GL_LINES\fP, -\%\f3GL_TRIANGLE_STRIP\fP, -\%\f3GL_TRIANGLE_FAN\fP, -\%\f3GL_TRIANGLES\fP, -\%\f3GL_QUAD_STRIP\fP, -\%\f3GL_QUADS\fP, -and \%\f3GL_POLYGON\fP are accepted. -.TP -\f2first\fP -Specifies the starting index in the enabled arrays. -.TP -\f2count\fP -Specifies the number of indices to be rendered. -.SH DESCRIPTION -\%\f3glDrawArrays\fP specifies multiple geometric primitives -with very few subroutine calls. Instead of calling a GL procedure -to pass each individual vertex, normal, texture coordinate, edge -flag, or color, you can prespecify -separate arrays of vertices, normals, and colors and use them to -construct a sequence of primitives with a single -call to \%\f3glDrawArrays\fP. -.P -When \%\f3glDrawArrays\fP is called, it uses \f2count\fP sequential elements from each -enabled array to construct a sequence of geometric primitives, -beginning with element \f2first\fP. \f2mode\fP specifies what kind of -primitives are constructed, and how the array elements -construct those primitives. If \%\f3GL_VERTEX_ARRAY\fP is not enabled, no -geometric primitives are generated. -.P -Vertex attributes that are modified by \%\f3glDrawArrays\fP have an -unspecified value after \%\f3glDrawArrays\fP returns. For example, if -\%\f3GL_COLOR_ARRAY\fP is enabled, the value of the current color is -undefined after \%\f3glDrawArrays\fP executes. Attributes that aren't -modified remain well defined. -.SH NOTES -\%\f3glDrawArrays\fP is available only if the GL version is 1.1 or greater. -.P -\%\f3glDrawArrays\fP is included in display lists. If \%\f3glDrawArrays\fP is entered into a -display list, -the necessary array data (determined by the array pointers and -enables) is also -entered into the display list. Because the array pointers and -enables are client-side state, their values affect display lists -when the lists are created, not when the lists are executed. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2mode\fP is not an accepted value. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2count\fP is negative. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glDrawArrays\fP is executed between -the execution of \%\f3glBegin\fP and the corresponding \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glArrayElement(3G)\fP, -\%\f3glColorPointer(3G)\fP, -\%\f3glDrawElements(3G)\fP, -\%\f3glDrawRangeElements(3G)\fP, -\%\f3glEdgeFlagPointer(3G)\fP, -\%\f3glGetPointerv(3G)\fP, -\%\f3glIndexPointer(3G)\fP, -\%\f3glInterleavedArrays(3G)\fP, -\%\f3glNormalPointer(3G)\fP, -\%\f3glTexCoordPointer(3G)\fP, -\%\f3glVertexPointer(3G)\fP diff --git a/doc/gl-docs/GL/gl/drawbuffer.3gl b/doc/gl-docs/GL/gl/drawbuffer.3gl deleted file mode 100644 index 778f965c..00000000 --- a/doc/gl-docs/GL/gl/drawbuffer.3gl +++ /dev/null @@ -1,141 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 drawbuffe -.ds Xs 38775 6 drawbuffer.gl -.TH GLDRAWBUFFER 3G -.SH NAME -.B "glDrawBuffer -\- specify which color buffers are to be drawn into - -.SH C SPECIFICATION -void \f3glDrawBuffer\fP( -GLenum \fImode\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2mode\fP\ \ 'u -\f2mode\fP -Specifies up to four color buffers to be drawn into. -Symbolic constants -\%\f3GL_NONE\fP, -\%\f3GL_FRONT_LEFT\fP, -\%\f3GL_FRONT_RIGHT\fP, -\%\f3GL_BACK_LEFT\fP, -\%\f3GL_BACK_RIGHT\fP, -\%\f3GL_FRONT\fP, -\%\f3GL_BACK\fP, -\%\f3GL_LEFT\fP, -\%\f3GL_RIGHT\fP, -\%\f3GL_FRONT_AND_BACK\fP, and -\%\f3GL_AUX\fP\f2i\fP, -where \f2i\fP is between 0 and -.br -``\%\f3GL_AUX_BUFFERS\fP'' \-1, -are accepted (\%\f3GL_AUX_BUFFERS\fP is not the upper limit; use \%\f3glGet\fP -to query the number of available aux buffers.) -The initial value is \%\f3GL_FRONT\fP for single-buffered contexts, -and \%\f3GL_BACK\fP for double-buffered contexts. -.SH DESCRIPTION -When colors are written to the frame buffer, -they are written into the color buffers specified by \%\f3glDrawBuffer\fP. -The specifications are as follows: -.TP 25 -\%\f3GL_NONE\fP -No color buffers are written. -.TP -\%\f3GL_FRONT_LEFT\fP -Only the front left color buffer is written. -.TP -\%\f3GL_FRONT_RIGHT\fP -Only the front right color buffer is written. -.TP -\%\f3GL_BACK_LEFT\fP -Only the back left color buffer is written. -.TP -\%\f3GL_BACK_RIGHT\fP -Only the back right color buffer is written. -.TP -\%\f3GL_FRONT\fP -Only the front left and front right color buffers are written. -If there is no front right color buffer, -only the front left color buffer is written. -.TP -\%\f3GL_BACK\fP -Only the back left and back right color buffers are written. -If there is no back right color buffer, -only the back left color buffer is written. -.TP -\%\f3GL_LEFT\fP -Only the front left and back left color buffers are written. -If there is no back left color buffer, -only the front left color buffer is written. -.TP -\%\f3GL_RIGHT\fP -Only the front right and back right color buffers are written. -If there is no back right color buffer, -only the front right color buffer is written. -.BP -.TP -\%\f3GL_FRONT_AND_BACK\fP -All the front and back color buffers -(front left, front right, back left, back right) -are written. -If there are no back color buffers, -only the front left and front right color buffers are written. -If there are no right color buffers, -only the front left and back left color buffers are written. -If there are no right or back color buffers, -only the front left color buffer is written. -.TP -\%\f3GL_AUX\fP\f2i\fP -Only auxiliary color buffer \f2i\fP is written. -.P -If more than one color buffer is selected for drawing, -then blending or logical operations are computed and applied independently -for each color buffer and can produce different results in each buffer. -.P -Monoscopic contexts include only -.I left -buffers, and stereoscopic contexts include both -.I left -and -.I right -buffers. -Likewise, single-buffered contexts include only -.I front -buffers, and double-buffered contexts include both -.I front -and -.I back -buffers. -The context is selected at GL initialization. -.SH NOTES -It is always the case that \%\f3GL_AUX\fP$i$ = \%\f3GL_AUX0\fP + $i$. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2mode\fP is not an accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if none of the buffers indicated -by \f2mode\fP exists. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glDrawBuffer\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_DRAW_BUFFER\fP -.br -\%\f3glGet\fP with argument \%\f3GL_AUX_BUFFERS\fP -.SH SEE ALSO -\%\f3glBlendFunc(3G)\fP, -\%\f3glColorMask(3G)\fP, -\%\f3glIndexMask(3G)\fP, -\%\f3glLogicOp(3G)\fP, -\%\f3glReadBuffer(3G)\fP diff --git a/doc/gl-docs/GL/gl/drawelements.3gl b/doc/gl-docs/GL/gl/drawelements.3gl deleted file mode 100644 index c5f5d2cd..00000000 --- a/doc/gl-docs/GL/gl/drawelements.3gl +++ /dev/null @@ -1,105 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 draweleme -.ds Xs 17577 5 drawelements.gl -.TH GLDRAWELEMENTS 3G -.SH NAME -.B "glDrawElements -\- render primitives from array data - -.SH C SPECIFICATION -void \f3glDrawElements\fP( -GLenum \fImode\fP, -.nf -.ta \w'\f3void \fPglDrawElements( 'u - GLsizei \fIcount\fP, - GLenum \fItype\fP, - const GLvoid \fI*indices\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIindices\fP\ \ 'u -\f2mode\fP -Specifies what kind of primitives to render. -Symbolic constants -\%\f3GL_POINTS\fP, -\%\f3GL_LINE_STRIP\fP, -\%\f3GL_LINE_LOOP\fP, -\%\f3GL_LINES\fP, -\%\f3GL_TRIANGLE_STRIP\fP, -\%\f3GL_TRIANGLE_FAN\fP, -\%\f3GL_TRIANGLES\fP, -\%\f3GL_QUAD_STRIP\fP, -\%\f3GL_QUADS\fP, -and \%\f3GL_POLYGON\fP are accepted. -.TP -\f2count\fP -Specifies the number of elements to be rendered. -.TP -\f2type\fP -Specifies the type of the values in \f2indices\fP. Must be one of -\%\f3GL_UNSIGNED_BYTE\fP, \%\f3GL_UNSIGNED_SHORT\fP, or -\%\f3GL_UNSIGNED_INT\fP. -.TP -\f2indices\fP -Specifies a pointer to the location where the indices are stored. -.SH DESCRIPTION -\%\f3glDrawElements\fP specifies multiple geometric primitives -with very few subroutine calls. Instead of calling a GL function -to pass each individual vertex, normal, texture coordinate, edge -flag, or color, you can prespecify -separate arrays of vertices, normals, and so on and use them to -construct a sequence of primitives with a single -call to \%\f3glDrawElements\fP. -.P -When \%\f3glDrawElements\fP is called, it uses \f2count\fP sequential elements from an -enabled array, starting at \f2indices\fP to construct a sequence of -geometric primitives. \f2mode\fP specifies what kind of primitives are -constructed, and how the array elements construct these primitives. If -more than one array is enabled, each is used. If -\%\f3GL_VERTEX_ARRAY\fP is not enabled, no geometric primitives are -constructed. -.P -Vertex attributes that are modified by \%\f3glDrawElements\fP have an -unspecified value after \%\f3glDrawElements\fP returns. For example, if -\%\f3GL_COLOR_ARRAY\fP is enabled, the value of the current color is -undefined after \%\f3glDrawElements\fP executes. Attributes that aren't -modified maintain their previous values. -.SH NOTES -\%\f3glDrawElements\fP is available only if the GL version is 1.1 or greater. -.P -\%\f3glDrawElements\fP is included in display lists. If \%\f3glDrawElements\fP is entered into a -display list, -the necessary array data (determined by the array pointers and -enables) is also -entered into the display list. Because the array pointers and -enables are client-side state, their values affect display lists -when the lists are created, not when the lists are executed. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2mode\fP is not an accepted value. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2count\fP is negative. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glDrawElements\fP is executed between -the execution of \%\f3glBegin\fP and the corresponding \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glArrayElement(3G)\fP, -\%\f3glColorPointer(3G)\fP, -\%\f3glDrawArrays(3G)\fP, -\%\f3glDrawRangeElements(3G)\fP, -\%\f3glEdgeFlagPointer(3G)\fP, -\%\f3glGetPointerv(3G)\fP, -\%\f3glIndexPointer(3G)\fP, -\%\f3glInterleavedArrays(3G)\fP, -\%\f3glNormalPointer(3G)\fP, -\%\f3glTexCoordPointer(3G)\fP, -\%\f3glVertexPointer(3G)\fP - diff --git a/doc/gl-docs/GL/gl/drawpixels.3gl b/doc/gl-docs/GL/gl/drawpixels.3gl deleted file mode 100644 index b55bed1e..00000000 --- a/doc/gl-docs/GL/gl/drawpixels.3gl +++ /dev/null @@ -1,545 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 drawpixel -.ds Xs 51793 21 drawpixels.gl -.TH GLDRAWPIXELS 3G -.SH NAME -.B "glDrawPixels -\- write a block of pixels to the frame buffer - -.SH C SPECIFICATION -void \f3glDrawPixels\fP( -GLsizei \fIwidth\fP, -.nf -.ta \w'\f3void \fPglDrawPixels( 'u - GLsizei \fIheight\fP, - GLenum \fIformat\fP, - GLenum \fItype\fP, - const GLvoid \fI*pixels\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2width\fP\ \f2height\fP\ \ 'u -\f2width\fP, \f2height\fP -Specify the dimensions of the pixel rectangle to be written -into the frame buffer. -.TP -\f2format\fP -Specifies the of the pixel data. -Symbolic constants -\%\f3GL_COLOR_INDEX\fP, -\%\f3GL_STENCIL_INDEX\fP, -\%\f3GL_DEPTH_COMPONENT\fP, -\%\f3GL_RGB\fP, -\%\f3GL_BGR\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_LUMINANCE\fP, and -\%\f3GL_LUMINANCE_ALPHA\fP are accepted. -.TP -\f2type\fP -Specifies the data type for \f2pixels\fP. -Symbolic constants -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -are accepted. -.TP -\f2pixels\fP -Specifies a pointer to the pixel data. -.SH DESCRIPTION -\%\f3glDrawPixels\fP reads pixel data from memory and writes it into the frame buffer -.br -relative to the current raster position, provided that the raster -position is valid. Use -.br -\%\f3glRasterPos\fP to set the current raster position; use -\%\f3glGet\fP with argument \%\f3GL_CURRENT_RASTER_POSITION_VALID\fP -to determine if the specified raster position is valid, and -\%\f3glGet\fP with argument \%\f3GL_CURRENT_RASTER_POSITION\fP -to query the raster position. -.P -Several parameters define the encoding of pixel data in memory -and control the processing of the pixel data -before it is placed in the frame buffer. -These parameters are set with four commands: -\%\f3glPixelStore\fP, -\%\f3glPixelTransfer\fP, -\%\f3glPixelMap\fP, and \%\f3glPixelZoom\fP. -This reference page describes the effects on \%\f3glDrawPixels\fP of many, -but not all, of the parameters specified by these four commands. -.P -Data is read from \f2pixels\fP as a sequence of signed or unsigned bytes, -signed or unsigned shorts, signed or unsigned integers, or -single-precision floating-point values, depending on \f2type\fP. -When \f2type\fP is one of \%\f3GL_UNSIGNED_BYTE\fP, \%\f3GL_BYTE\fP, -\%\f3GL_UNSIGNED_SHORT\fP, \%\f3GL_SHORT\fP, \%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, or \%\f3GL_FLOAT\fP each of these bytes, shorts, integers, or -floating-point values is interpreted as one color or depth component, or -one index, depending on \f2format\fP. -When \f2type\fP is one of \%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, \%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, \%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, each unsigned value is interpreted as -containing all the components for a single pixel, with the color -components arranged according to \f2format\fP. -When \f2type\fP is one of \%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, \%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, \%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP, each unsigned value is interpreted -as containing all color components, specified by \f2format\fP, for a single -pixel in a reversed order. Indices are always treated individually. -Color components are treated as groups of one, two, three, or four -values, again based on \f2format\fP. Both individual indices and groups of -components are referred to as pixels. -If \f2type\fP is \%\f3GL_BITMAP\fP, the data must be unsigned bytes, and -\f2format\fP must be either \%\f3GL_COLOR_INDEX\fP or \%\f3GL_STENCIL_INDEX\fP. -Each unsigned byte is treated as eight 1-bit pixels, with bit ordering -determined by \%\f3GL_UNPACK_LSB_FIRST\fP (see \%\f3glPixelStore\fP). -.P -\f2width\fP$~ times ~$\f2height\fP pixels are read from memory, -starting at location \f2pixels\fP. -By default, these pixels are taken from adjacent memory locations, -except that after all \f2width\fP pixels are read, -the read pointer is advanced to the next four-byte boundary. -The four-byte row alignment is specified by \%\f3glPixelStore\fP with -argument \%\f3GL_UNPACK_ALIGNMENT\fP, -and it can be set to one, two, four, or eight bytes. -Other pixel store parameters specify different read pointer advancements, -both before the first pixel is read -and after all \f2width\fP pixels are read. -See the \%\f3glPixelStore\fP reference page for details on these options. -.P -The \f2width\fP$~ times ~$\f2height\fP pixels that are read from memory are -each operated on in the same way, -based on the values of several parameters specified by \%\f3glPixelTransfer\fP -and \%\f3glPixelMap\fP. -The details of these operations, -as well as the target buffer into which the pixels are drawn, -are specific to the of the pixels, -as specified by \f2format\fP. -\f2format\fP can assume one of 13 symbolic values: -.TP 10 -\%\f3GL_COLOR_INDEX\fP -Each pixel is a single value, -a color index. -It is converted to fixed-point , -with an unspecified number of bits to the right of the binary point, -regardless of the memory data type. -Floating-point values convert to true fixed-point values. -Signed and unsigned integer data is converted with all fraction bits -set to 0. -Bitmap data convert to either 0 or 1. -.IP -Each fixed-point index is then shifted left by \%\f3GL_INDEX_SHIFT\fP bits -and added to \%\f3GL_INDEX_OFFSET\fP. -If \%\f3GL_INDEX_SHIFT\fP is negative, -the shift is to the right. -In either case, zero bits fill otherwise unspecified bit locations in the -result. -.IP -If the GL is in RGBA mode, -the resulting index is converted to an RGBA pixel -with the help of the \%\f3GL_PIXEL_MAP_I_TO_R\fP, -\%\f3GL_PIXEL_MAP_I_TO_G\fP, -\%\f3GL_PIXEL_MAP_I_TO_B\fP, -and \%\f3GL_PIXEL_MAP_I_TO_A\fP tables. -If the GL is in color index mode, -and if \%\f3GL_MAP_COLOR\fP is true, -the index is replaced with the value that it references in lookup table -\%\f3GL_PIXEL_MAP_I_TO_I\fP. -Whether the lookup replacement of the index is done or not, -the integer part of the index is then ANDed with $2 sup b -1$, -where $b$ is the number of bits in a color index buffer. -.BP -.IP -The GL then converts the resulting indices or RGBA colors to fragments -by attaching the current raster position \f2z\fP coordinate and -texture coordinates to each pixel, -then assigning $x$ and $y$ window coordinates to the $n$th fragment such that -.sp -.RS -.ce -$x sub n ~=~ x sub r ~+~ n ~ roman mod ~ "width"$ -.sp -.ce -$y sub n ~=~ y sub r ~+~ \(lf n ^/^ "width" ~ \(rf$ -.ce 0 -.sp -.RE -.IP -where ($x sub r , y sub r$) is the current raster position. -These pixel fragments are then treated just like the fragments generated by -rasterizing points, lines, or polygons. -Texture mapping, -fog, -and all the fragment operations are applied before the fragments are written -to the frame buffer. -.TP -\%\f3GL_STENCIL_INDEX\fP -Each pixel is a single value, -a stencil index. -It is converted to fixed-point , -with an unspecified number of bits to the right of the binary point, -regardless of the memory data type. -Floating-point values convert to true fixed-point values. -Signed and unsigned integer data is converted with all fraction bits -set to 0. -Bitmap data convert to either 0 or 1. -.IP -Each fixed-point index is then shifted left by \%\f3GL_INDEX_SHIFT\fP bits, -and added to \%\f3GL_INDEX_OFFSET\fP. -If \%\f3GL_INDEX_SHIFT\fP is negative, -the shift is to the right. -In either case, zero bits fill otherwise unspecified bit locations in the -result. -If \%\f3GL_MAP_STENCIL\fP is true, -the index is replaced with the value that it references in lookup table -\%\f3GL_PIXEL_MAP_S_TO_S\fP. -Whether the lookup replacement of the index is done or not, -the integer part of the index is then ANDed with $2 sup b -1$, -where $b$ is the number of bits in the stencil buffer. -The resulting stencil indices are then written to the stencil buffer -such that the $n$th index is written to location -.P -.RS -.ce -$x sub n ~=~ x sub r ~+~ n ~ roman mod ~ "width"$ -.sp -.ce -$y sub n ~=~ y sub r ~+~ \(lf ~ n / "width" ~ \(rf$ -.fi -.sp -.RE -.IP -where ($x sub r , y sub r$) is the current raster position. -Only the pixel ownership test, -the scissor test, -and the stencil writemask affect these write operations. -.TP -\%\f3GL_DEPTH_COMPONENT\fP -Each pixel is a single-depth component. -Floating-point data is converted directly to an internal floating-point - with unspecified precision. -Signed integer data is mapped linearly to the internal floating-point - such that the most positive representable integer value maps to 1.0, -and the most negative representable value maps to \-1.0. -Unsigned integer data is mapped similarly: -the largest integer value maps to 1.0, -and 0 maps to 0.0. -The resulting floating-point depth value is then multiplied -by \%\f3GL_DEPTH_SCALE\fP and added to \%\f3GL_DEPTH_BIAS\fP. -The result is clamped to the range [0,1]. -.IP -The GL then converts the resulting depth components to fragments -by attaching the current raster position color or color index and -texture coordinates to each pixel, -then assigning $x$ and $y$ window coordinates to the $n$th fragment such that -.P -.RS -.ce -$x sub n ~=~ x sub r ~+~ n ~ roman mod ~ "width"$ -.sp -.ce -$y sub n ~=~ y sub r ~+~ \(lf ~ n / "width" ~ \(rf$ -.ce 0 -.sp -.RE -.IP -where ($x sub r , y sub r$) is the current raster position. -These pixel fragments are then treated just like the fragments generated by -rasterizing points, lines, or polygons. -Texture mapping, -fog, -and all the fragment operations are applied before the fragments are written -to the frame buffer. -.TP -\%\f3GL_RGBA\fP -.TP -\%\f3GL_BGRA\fP -Each pixel is a four-component group: for \%\f3GL_RGBA\fP, the red -component is first, followed by green, followed by blue, followed by -alpha; for \%\f3GL_BGRA\fP the order is blue, green, red and then alpha. -Floating-point values are converted directly to an internal floating-point - with unspecified precision. -Signed integer values are mapped linearly to the internal floating-point - such that the most positive representable integer value maps to 1.0, -and the most negative representable value maps to \-1.0. (Note that -this mapping does not convert 0 precisely to 0.0.) -Unsigned integer data is mapped similarly: -the largest integer value maps to 1.0, -and 0 maps to 0.0. -The resulting floating-point color values are then multiplied -by \%\f3GL_c_SCALE\fP and added to \%\f3GL_c_BIAS\fP, -where \f2c\fP is RED, GREEN, BLUE, and ALPHA -for the respective color components. -The results are clamped to the range [0,1]. -.IP -If \%\f3GL_MAP_COLOR\fP is true, -each color component is scaled by the size of lookup table -\%\f3GL_PIXEL_MAP_c_TO_c\fP, -then replaced by the value that it references in that table. -\f2c\fP is R, G, B, or A respectively. -.BP -.IP -The GL then converts the resulting RGBA colors to fragments -by attaching the current raster position \f2z\fP coordinate and -texture coordinates to each pixel, -then assigning $x$ and $y$ window coordinates to the $n$th fragment such that -.P -.RS -.ce -$x sub n ~=~ x sub r ~+~ n ~ roman mod ~ "width"$ -.sp -.ce -$y sub n ~=~ y sub r ~+~ \(lf ~ n / "width" ~ \(rf$ -.ce 0 -.sp -.RE -.IP -where ($x sub r , y sub r$) is the current raster position. -These pixel fragments are then treated just like the fragments generated by -rasterizing points, lines, or polygons. -Texture mapping, -fog, -and all the fragment operations are applied before the fragments are written -to the frame buffer. -.TP -\%\f3GL_RED\fP -Each pixel is a single red component. -This component is converted to the internal floating-point in -the same way the red component of an RGBA pixel is. It is -then converted to an RGBA pixel with green and blue set to 0, -and alpha set to 1. -After this conversion, the pixel is treated as if it had been read -as an RGBA pixel. -.TP -\%\f3GL_GREEN\fP -Each pixel is a single green component. -This component is converted to the internal floating-point in -the same way the green component of an RGBA pixel is. -It is then converted to an RGBA pixel with red and blue set to 0, -and alpha set to 1. -After this conversion, the pixel is treated as if it had been read -as an RGBA pixel. -.TP -\%\f3GL_BLUE\fP -Each pixel is a single blue component. -This component is converted to the internal floating-point in -the same way the blue component of an RGBA pixel is. -It is then converted to an RGBA pixel with red and green set to 0, -and alpha set to 1. -After this conversion, the pixel is treated as if it had been read -as an RGBA pixel. -.TP -\%\f3GL_ALPHA\fP -Each pixel is a single alpha component. -This component is converted to the internal floating-point in -the same way the alpha component of an RGBA pixel is. -It is then converted to an RGBA pixel with red, green, and blue set to 0. -After this conversion, the pixel is treated as if it had been read -as an RGBA pixel. -.BP -.TP -\%\f3GL_RGB\fP -.TP -\%\f3GL_BGR\fP -Each pixel is a three-component group: -red first, followed by green, followed by blue; for \%\f3GL_BGR\fP, the -first component is blue, followed by green and then red. -Each component is converted to the internal floating-point in -the same way the red, green, and blue components of an RGBA pixel are. -The color triple is converted to an RGBA pixel with alpha set to 1. -After this conversion, the pixel is treated as if it had been read -as an RGBA pixel. -.TP -\%\f3GL_LUMINANCE\fP -Each pixel is a single luminance component. -This component is converted to the internal floating-point in -the same way the red component of an RGBA pixel is. -It is then converted to an RGBA pixel with red, green, and blue set to the -converted luminance value, -and alpha set to 1. -After this conversion, the pixel is treated as if it had been read -as an RGBA pixel. -.TP -\%\f3GL_LUMINANCE_ALPHA\fP -Each pixel is a two-component group: -luminance first, followed by alpha. -The two components are converted to the internal floating-point in -the same way the red component of an RGBA pixel is. -They are then converted to an RGBA pixel with red, green, and blue set to the -converted luminance value, -and alpha set to the converted alpha value. -After this conversion, the pixel is treated as if it had been read -as an RGBA pixel. -.P -The following table summarizes the meaning of the valid constants for the -\f2type\fP parameter: -.sp 2 -.TS -center; -lb lb -l l. -_ -Type Corresponding Type -_ -\%\f3GL_UNSIGNED_BYTE\fP unsigned 8-bit integer -\%\f3GL_BYTE\fP signed 8-bit integer -\%\f3GL_BITMAP\fP single bits in unsigned 8-bit integers -\%\f3GL_UNSIGNED_SHORT\fP unsigned 16-bit integer -\%\f3GL_SHORT\fP signed 16-bit integer -\%\f3GL_UNSIGNED_INT\fP unsigned 32-bit integer -\%\f3GL_INT\fP 32-bit integer -\%\f3GL_FLOAT\fP single-precision floating-point -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP unsigned 8-bit integer -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP unsigned 8-bit integer with reversed component ordering -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP unsigned 16-bit integer -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP unsigned 16-bit integer with reversed component ordering -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP unsigned 16-bit integer -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP unsigned 16-bit integer with reversed component ordering -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP unsigned 16-bit integer -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP unsigned 16-bit integer with reversed component ordering -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP unsigned 32-bit integer -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP unsigned 32-bit integer with reversed component ordering -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP unsigned 32-bit integer -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP unsigned 32-bit integer with reversed component ordering -_ -.TE -.sp -.BP -.P -The rasterization described so far assumes pixel zoom factors of 1. -If -.br -\%\f3glPixelZoom\fP is used to change the $x$ and $y$ pixel zoom factors, -pixels are converted to fragments as follows. -If ($x sub r$, $y sub r$) is the current raster position, -and a given pixel is in the $n$th column and $m$th row -of the pixel rectangle, -then fragments are generated for pixels whose centers are in the rectangle -with corners at -.sp -.RS -.ce -($x sub r ~+~ zoom sub x^ n$, $y sub r ~+~ zoom sub y^ m$) -.sp -.ce -($x sub r ~+~ zoom sub x^ (n ~+~ 1)$, $y sub r ~+~ zoom sub y^ ( m ~+~ 1 )$) -.ce 0 -.sp -.RE -.P -where $zoom sub x$ is the value of \%\f3GL_ZOOM_X\fP and -$zoom sub y$ is the value of \%\f3GL_ZOOM_Y\fP. -.SH NOTES -\%\f3GL_BGR\fP and \%\f3GL_BGRA\fP are only valid for \f2format\fP if the GL -version is 1.2 or greater. -.P -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP are only valid for \f2type\fP if the -GL version is 1.2 or greater. -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if either \f2width\fP or \f2height\fP is negative. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2format\fP or \f2type\fP is not one of -the accepted values. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2format\fP is -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGR\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, -or -\%\f3GL_LUMINANCE_ALPHA\fP, -and the GL is in color index mode. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is \%\f3GL_BITMAP\fP and -\f2format\fP is not either \%\f3GL_COLOR_INDEX\fP or \%\f3GL_STENCIL_INDEX\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2format\fP is \%\f3GL_STENCIL_INDEX\fP -and there is no stencil buffer. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glDrawPixels\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2format\fP is one -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, of -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2format\fP is one of -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_CURRENT_RASTER_POSITION\fP -.br -\%\f3glGet\fP with argument \%\f3GL_CURRENT_RASTER_POSITION_VALID\fP -.SH SEE ALSO -\%\f3glAlphaFunc(3G)\fP, -\%\f3glBlendFunc(3G)\fP, -\%\f3glCopyPixels(3G)\fP, -\%\f3glDepthFunc(3G)\fP, -\%\f3glLogicOp(3G)\fP, -\%\f3glPixelMap(3G)\fP, -\%\f3glPixelStore(3G)\fP, -\%\f3glPixelTransfer(3G)\fP, -\%\f3glPixelZoom(3G)\fP, -\%\f3glRasterPos(3G)\fP, -\%\f3glReadPixels(3G)\fP, -\%\f3glScissor(3G)\fP, -\%\f3glStencilFunc(3G)\fP diff --git a/doc/gl-docs/GL/gl/drawrangeelements.3gl b/doc/gl-docs/GL/gl/drawrangeelements.3gl deleted file mode 100644 index 05ee26a7..00000000 --- a/doc/gl-docs/GL/gl/drawrangeelements.3gl +++ /dev/null @@ -1,132 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 drawrange -.ds Xs 22158 7 drawrangeelements.gl -.TH GLDRAWRANGEELEMENTS 3G -.SH NAME -.B "glDrawRangeElements -\- render primitives from array data - -.SH C SPECIFICATION -void \f3glDrawRangeElements\fP( -GLenum \fImode\fP, -.nf -.ta \w'\f3void \fPglDrawRangeElements( 'u - GLuint \fIstart\fP, - GLuint \fIend\fP, - GLsizei \fIcount\fP, - GLenum \fItype\fP, - const GLvoid \fI*indices\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIindices\fP\ \ 'u -\f2mode\fP -Specifies what kind of primitives to render. -Symbolic constants -\%\f3GL_POINTS\fP, -\%\f3GL_LINE_STRIP\fP, -\%\f3GL_LINE_LOOP\fP, -\%\f3GL_LINES\fP, -\%\f3GL_TRIANGLE_STRIP\fP, -\%\f3GL_TRIANGLE_FAN\fP, -\%\f3GL_TRIANGLES\fP, -\%\f3GL_QUAD_STRIP\fP, -\%\f3GL_QUADS\fP, -and \%\f3GL_POLYGON\fP are accepted. -.TP -\f2start\fP -Specifies the minimum array index contained in \f2indices\fP. -.TP -\f2end\fP -Specifies the maximum array index contained in \f2indices\fP. -.TP -\f2count\fP -Specifies the number of elements to be rendered. -.TP -\f2type\fP -Specifies the type of the values in \f2count\fP. Must be one of -\%\f3GL_UNSIGNED_BYTE\fP, \%\f3GL_UNSIGNED_SHORT\fP, or -\%\f3GL_UNSIGNED_INT\fP. -.TP -\f2indices\fP -Specifies a pointer to the location where the indices are stored. -.SH DESCRIPTION -\%\f3glDrawRangeElements\fP is a restricted form of \%\f3glDrawElements\fP. \f2mode\fP, \f2start\fP, \f2end\fP, -and \f2count\fP match the corresponding arguments to \%\f3glDrawElements\fP, with -the additional constraint that all values in the arrays \f2count\fP must lie -between \f2start\fP and \f2end\fP, inclusive. -.P -Implementations denote recommended maximum amounts of vertex and -.br -index data, -which may be queried by calling \%\f3glGet\fP with argument -\%\f3GL_MAX_ELEMENTS_VERTICES\fP and \%\f3GL_MAX_ELEMENTS_INDICES\fP. -If $"end" ~-~ "start" ~+~ 1$ is greater than the value of -\%\f3GL_MAX_ELEMENTS_VERTICES\fP, or if \f2count\fP is greater than the value of -\%\f3GL_MAX_ELEMENTS_INDICES\fP, then the call may operate at reduced -performance. There is no requirement that all vertices in the range -[\f2start\fP,\ \f2end\fP] be referenced. However, the implementation may -partially process unused vertices, reducing performance from what could -be achieved with an optimal index set. -.P -When \%\f3glDrawRangeElements\fP is called, it uses \f2start\fP sequential elements from an -enabled array, starting at \f2count\fP to construct a sequence of -geometric primitives. \f2mode\fP specifies what kind of primitives are -constructed, and how the array elements construct these primitives. If -more than one array is enabled, each is used. If -\%\f3GL_VERTEX_ARRAY\fP is not enabled, no geometric primitives are -constructed. -.P -Vertex attributes that are modified by \%\f3glDrawRangeElements\fP have an -unspecified value after \%\f3glDrawRangeElements\fP returns. For example, if -\%\f3GL_COLOR_ARRAY\fP is enabled, the value of the current color is -undefined after \%\f3glDrawRangeElements\fP executes. Attributes that aren't -modified maintain their previous values. -.SH NOTES -\%\f3glDrawRangeElements\fP is available only if the GL version is 1.2 or greater. -.P -\%\f3glDrawRangeElements\fP is included in display lists. If \%\f3glDrawRangeElements\fP is entered into a -display list, -the necessary array data (determined by the array pointers and -enables) is also -entered into the display list. Because the array pointers and -enables are client-side state, their values affect display lists -when the lists are created, not when the lists are executed. -.SH ERRORS -It is an error for indices to lie outside the range [\f2start\fP,\ \f2end\fP], -but implementations may not check for this situation. Such indices -cause implementation-dependent behavior. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2mode\fP is not an accepted value. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2count\fP is negative. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2end\fP $<$ \f2start\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glDrawRangeElements\fP is executed between -the execution of \%\f3glBegin\fP and the corresponding \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_MAX_ELEMENTS_VERTICES\fP -.P -\%\f3glGet\fP with argument \%\f3GL_MAX_ELEMENTS_INDICES\fP -.SH SEE ALSO -\%\f3glArrayElement(3G)\fP, -\%\f3glColorPointer(3G)\fP, -\%\f3glDrawArrays(3G)\fP, -\%\f3glDrawElements(3G)\fP, -\%\f3glEdgeFlagPointer(3G)\fP, -\%\f3glGetPointerv(3G)\fP, -\%\f3glIndexPointer(3G)\fP, -\%\f3glInterleavedArrays(3G)\fP, -\%\f3glNormalPointer(3G)\fP, -\%\f3glTexCoordPointer(3G)\fP, -\%\f3glVertexPointer(3G)\fP diff --git a/doc/gl-docs/GL/gl/edgeflag.3gl b/doc/gl-docs/GL/gl/edgeflag.3gl deleted file mode 100644 index 6b5eebe1..00000000 --- a/doc/gl-docs/GL/gl/edgeflag.3gl +++ /dev/null @@ -1,65 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 edgeflag. -.ds Xs 46953 4 edgeflag.gl -.TH GLEDGEFLAG 3G -.SH NAME -.B "glEdgeFlag, glEdgeFlagv -\- flag edges as either boundary or nonboundary - -.SH C SPECIFICATION -void \f3glEdgeFlag\fP( -GLboolean \fIflag\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2flag\fP\ \ 'u -\f2flag\fP -Specifies the current edge flag value, -either \%\f3GL_TRUE\fP or \%\f3GL_FALSE\fP. The initial value is \%\f3GL_TRUE\fP. -.SH C SPECIFICATION -void \f3glEdgeFlagv\fP( -const GLboolean \fI*flag\fP ) -.nf -.fi - -.SH PARAMETERS -.TP -\f2flag\fP -Specifies a pointer to an array that contains a single boolean element, -which replaces the current edge flag value. -.SH DESCRIPTION -Each vertex of a polygon, -separate triangle, -or separate quadrilateral specified between a \%\f3glBegin\fP/\%\f3glEnd\fP pair -is marked as the start of either a boundary or nonboundary edge. -If the current edge flag is true when the vertex is specified, -the vertex is marked as the start of a boundary edge. -Otherwise, the vertex is marked as the start of a nonboundary edge. -\%\f3glEdgeFlag\fP sets the edge flag bit to \%\f3GL_TRUE\fP if \f2flag\fP is \%\f3GL_TRUE\fP, -and to \%\f3GL_FALSE\fP otherwise. -.P -The vertices of connected triangles and connected quadrilaterals are always -marked as boundary, -regardless of the value of the edge flag. -.P -Boundary and nonboundary edge flags on vertices are significant only if -\%\f3GL_POLYGON_MODE\fP is set to \%\f3GL_POINT\fP or \%\f3GL_LINE\fP. -See \%\f3glPolygonMode\fP. -.SH NOTES -The current edge flag can be updated at any time. -In particular, -\%\f3glEdgeFlag\fP can be called between a call to \%\f3glBegin\fP and the corresponding -call to \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_EDGE_FLAG\fP -.SH SEE ALSO -\%\f3glBegin(3G)\fP, -\%\f3glEdgeFlagPointer(3G)\fP, -\%\f3glPolygonMode(3G)\fP diff --git a/doc/gl-docs/GL/gl/edgeflagpointer.3gl b/doc/gl-docs/GL/gl/edgeflagpointer.3gl deleted file mode 100644 index d4029d2b..00000000 --- a/doc/gl-docs/GL/gl/edgeflagpointer.3gl +++ /dev/null @@ -1,100 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 edgeflagp -.ds Xs 49268 6 edgeflagpointer.gl -.TH GLEDGEFLAGPOINTER 3G -.SH NAME -.B "glEdgeFlagPointer -\- define an array of edge flags - -.SH C SPECIFICATION -void \f3glEdgeFlagPointer\fP( -GLsizei \fIstride\fP, -.nf -.ta \w'\f3void \fPglEdgeFlagPointer( 'u - const GLvoid \fI*ptr\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2stride\fP\ \ 'u -\f2stride\fP -Specifies the byte offset between consecutive edge flags. -If \f2stride\fP is 0 (the initial value), the edge flags are understood -to be tightly packed in the array. The initial value is 0. -.TP -\f2ptr\fP -Specifies a pointer to the first edge flag in the array. The initial -value is zero. -.SH DESCRIPTION -\%\f3glEdgeFlagPointer\fP specifies the location and data of an array of boolean edge -flags to use when rendering. \f2stride\fP specifies the byte stride from one -edge flag to the next allowing vertices and attributes -to be packed into a single array or stored in separate arrays. -(Single-array storage may be more efficient on some implementations; -see \%\f3glInterleavedArrays\fP.) -.P -When an edge flag array is -specified, \f2stride\fP and \f2ptr\fP are saved as client-side -state. -.P -To enable and disable the edge flag array, call \%\f3glEnableClientState\fP and -.br -\%\f3glDisableClientState\fP with -the argument \%\f3GL_EDGE_FLAG_ARRAY\fP. If enabled, the edge flag array is used -when \%\f3glDrawArrays\fP, \%\f3glDrawElements\fP, or \%\f3glArrayElement\fP is called. -.P -Use \%\f3glDrawArrays\fP to construct a sequence of primitives (all of -the same type) -from prespecified vertex and vertex attribute arrays. -Use \%\f3glArrayElement\fP to specify primitives -by indexing vertices and vertex attributes and \%\f3glDrawElements\fP to -construct a sequence of primitives by indexing vertices and vertex attributes. -.SH NOTES -\%\f3glEdgeFlagPointer\fP is available only if the GL version is 1.1 or greater. -.P -The edge flag array is initially disabled and it won't be accessed when -.br -\%\f3glArrayElement\fP, \%\f3glDrawElements\fP or \%\f3glDrawArrays\fP is called. -.P -Execution of \%\f3glEdgeFlagPointer\fP is not allowed between the execution of -\%\f3glBegin\fP and the corresponding execution of \%\f3glEnd\fP, -but an error may or may not be generated. If no error is generated, -the operation is undefined. -.P -\%\f3glEdgeFlagPointer\fP is typically implemented on the client side. -.P -Edge flag array parameters are client-side state and are therefore -not saved or restored by \%\f3glPushAttrib\fP and \%\f3glPopAttrib\fP. -Use \%\f3glPushClientAttrib\fP and -.br -\%\f3glPopClientAttrib\fP instead. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2stride\fP is negative. -.SH ASSOCIATED GETS -\%\f3glIsEnabled\fP with argument \%\f3GL_EDGE_FLAG_ARRAY\fP -.br -\%\f3glGet\fP with argument \%\f3GL_EDGE_FLAG_ARRAY_STRIDE\fP -.br -\%\f3glGetPointerv\fP with argument \%\f3GL_EDGE_FLAG_ARRAY_POINTER\fP -.SH SEE ALSO -\%\f3glArrayElement(3G)\fP, -\%\f3glColorPointer(3G)\fP, -\%\f3glDrawArrays(3G)\fP, -\%\f3glDrawElements(3G)\fP, -\%\f3glEnable(3G)\fP, -\%\f3glGetPointerv(3G)\fP, -\%\f3glIndexPointer(3G)\fP, -\%\f3glNormalPointer(3G)\fP, -\%\f3glPopClientAttrib(3G)\fP, -.br -\%\f3glPushClientAttrib(3G)\fP, -\%\f3glTexCoordPointer(3G)\fP, -\%\f3glVertexPointer(3G)\fP diff --git a/doc/gl-docs/GL/gl/enable.3gl b/doc/gl-docs/GL/gl/enable.3gl deleted file mode 100644 index 1ee75ec9..00000000 --- a/doc/gl-docs/GL/gl/enable.3gl +++ /dev/null @@ -1,505 +0,0 @@ -'\" et -'\"! eqn|tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 enable.gl -.ds Xs 48946 14 enable.gl -.TH GLENABLE 3G -.SH NAME -.B "glEnable, glDisable -\- enable or disable server-side GL capabilities - -.SH C SPECIFICATION -void \f3glEnable\fP( -GLenum \fIcap\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2cap\fP\ \ 'u -\f2cap\fP -Specifies a symbolic constant indicating a GL capability. -.SH C SPECIFICATION -void \f3glDisable\fP( -GLenum \fIcap\fP ) -.nf -.fi - -.SH PARAMETERS -.TP -\f2cap\fP -Specifies a symbolic constant indicating a GL capability. -.SH DESCRIPTION -\%\f3glEnable\fP and \%\f3glDisable\fP enable and disable various capabilities. -Use \%\f3glIsEnabled\fP or \%\f3glGet\fP to determine the current setting -of any capability. The initial value for each capability with the -exception of \%\f3GL_DITHER\fP is \%\f3GL_FALSE\fP. The initial value for -\%\f3GL_DITHER\fP is \%\f3GL_TRUE\fP. -.P -Both \%\f3glEnable\fP and \%\f3glDisable\fP take a single argument, \f2cap\fP, -which can assume one of the following values: -.TP 25 -\%\f3GL_ALPHA_TEST\fP -If enabled, -do alpha testing. See -\%\f3glAlphaFunc\fP. -.TP -\%\f3GL_AUTO_NORMAL\fP -If enabled, -generate normal vectors when either -\%\f3GL_MAP2_VERTEX_3\fP or -\%\f3GL_MAP2_VERTEX_4\fP is used to generate vertices. -See \%\f3glMap2\fP. -.TP -\%\f3GL_BLEND\fP -If enabled, -blend the incoming RGBA color values with the values in the color -buffers. See \%\f3glBlendFunc\fP. -.TP -\%\f3GL_CLIP_PLANE\fP\f2i\fP -If enabled, -clip geometry against user-defined clipping plane \f2i\fP. -See \%\f3glClipPlane\fP. -.TP -\%\f3GL_COLOR_LOGIC_OP\fP -If enabled, -apply the currently selected logical operation to the incoming RGBA -color and color buffer values. See \%\f3glLogicOp\fP. -.TP -\%\f3GL_COLOR_MATERIAL\fP -If enabled, -have one or more material parameters track the current color. -See \%\f3glColorMaterial\fP. -.TP -\%\f3GL_COLOR_TABLE\fP -If enabled, -preform a color table lookup on the incoming RGBA color values. -See \%\f3glColorTable\fP. -.TP -\%\f3GL_CONVOLUTION_1D\fP -If enabled, -perform a 1D convolution operation on incoming RGBA color values. -See \%\f3glConvolutionFilter1D\fP. -.TP -\%\f3GL_CONVOLUTION_2D\fP -If enabled, -perform a 2D convolution operation on incoming RGBA color values. -See \%\f3glConvolutionFilter2D\fP. -.TP -\%\f3GL_CULL_FACE\fP -If enabled, -cull polygons based on their winding in window coordinates. -See \%\f3glCullFace\fP. -.TP -\%\f3GL_DEPTH_TEST\fP -If enabled, -do depth comparisons and update the depth buffer. Note that even if -the depth buffer exists and the depth mask is non-zero, the -depth buffer is not updated if the depth test is disabled. See -\%\f3glDepthFunc\fP and -.br -\%\f3glDepthRange\fP. -.TP -\%\f3GL_DITHER\fP -If enabled, -dither color components or indices before they are written to the -color buffer. -.TP -\%\f3GL_FOG\fP -If enabled, -blend a fog color into the posttexturing color. -See \%\f3glFog\fP. -.TP -\%\f3GL_HISTOGRAM\fP -If enabled, -histogram incoming RGBA color values. -See \%\f3glHistogram\fP. -.TP -\%\f3GL_INDEX_LOGIC_OP\fP -If enabled, -apply the currently selected logical operation to the incoming index and color -buffer indices. See -.br -\%\f3glLogicOp\fP. -.TP -\%\f3GL_LIGHT\fP\f2i\fP -If enabled, -include light \f2i\fP in the evaluation of the lighting -equation. See \%\f3glLightModel\fP and \%\f3glLight\fP. -.TP -\%\f3GL_LIGHTING\fP -If enabled, -use the current lighting parameters to compute the vertex color or index. -Otherwise, simply associate the current color or index with each -vertex. See -.br -\%\f3glMaterial\fP, \%\f3glLightModel\fP, and \%\f3glLight\fP. -.TP -\%\f3GL_LINE_SMOOTH\fP -If enabled, -draw lines with correct filtering. -Otherwise, -draw aliased lines. -See \%\f3glLineWidth\fP. -.TP -\%\f3GL_LINE_STIPPLE\fP -If enabled, -use the current line stipple pattern when drawing lines. See -\%\f3glLineStipple\fP. -.TP -\%\f3GL_MAP1_COLOR_4\fP -If enabled, -calls to -\%\f3glEvalCoord1\fP, -\%\f3glEvalMesh1\fP, and -\%\f3glEvalPoint1\fP generate RGBA values. -See \%\f3glMap1\fP. -.TP -\%\f3GL_MAP1_INDEX\fP -If enabled, -calls to -\%\f3glEvalCoord1\fP, -\%\f3glEvalMesh1\fP, and -\%\f3glEvalPoint1\fP generate color indices. -See \%\f3glMap1\fP. -.TP -\%\f3GL_MAP1_NORMAL\fP -If enabled, -calls to -\%\f3glEvalCoord1\fP, -\%\f3glEvalMesh1\fP, and -\%\f3glEvalPoint1\fP generate normals. -See \%\f3glMap1\fP. -.TP -\%\f3GL_MAP1_TEXTURE_COORD_1\fP -If enabled, -calls to -\%\f3glEvalCoord1\fP, -\%\f3glEvalMesh1\fP, and -\%\f3glEvalPoint1\fP generate -\f2s\fP -texture coordinates. -See \%\f3glMap1\fP. -.TP -\%\f3GL_MAP1_TEXTURE_COORD_2\fP -If enabled, -calls to -\%\f3glEvalCoord1\fP, -\%\f3glEvalMesh1\fP, and -\%\f3glEvalPoint1\fP generate -\f2s\fP and -\f2t\fP texture coordinates. -See \%\f3glMap1\fP. -.TP -\%\f3GL_MAP1_TEXTURE_COORD_3\fP -If enabled, -calls to -\%\f3glEvalCoord1\fP, -\%\f3glEvalMesh1\fP, and -\%\f3glEvalPoint1\fP generate -\f2s\fP, -\f2t\fP, and -\f2r\fP texture coordinates. -See \%\f3glMap1\fP. -.TP -\%\f3GL_MAP1_TEXTURE_COORD_4\fP -If enabled, -calls to -\%\f3glEvalCoord1\fP, -\%\f3glEvalMesh1\fP, and -\%\f3glEvalPoint1\fP generate -\f2s\fP, -\f2t\fP, -\f2r\fP, and -\f2q\fP texture coordinates. -See \%\f3glMap1\fP. -.TP -\%\f3GL_MAP1_VERTEX_3\fP -If enabled, -calls to -\%\f3glEvalCoord1\fP, -\%\f3glEvalMesh1\fP, and -\%\f3glEvalPoint1\fP generate -\f2x\fP, \f2y\fP, and \f2z\fP vertex coordinates. -See \%\f3glMap1\fP. -.TP -\%\f3GL_MAP1_VERTEX_4\fP -If enabled, -calls to -\%\f3glEvalCoord1\fP, -\%\f3glEvalMesh1\fP, and -\%\f3glEvalPoint1\fP generate -homogeneous -\f2x\fP, -\f2y\fP, -\f2z\fP, and -\f2w\fP vertex coordinates. -See \%\f3glMap1\fP. -.TP -\%\f3GL_MAP2_COLOR_4\fP -If enabled, -calls to -\%\f3glEvalCoord2\fP, -\%\f3glEvalMesh2\fP, and -\%\f3glEvalPoint2\fP generate RGBA values. -See \%\f3glMap2\fP. -.TP -\%\f3GL_MAP2_INDEX\fP -If enabled, -calls to -\%\f3glEvalCoord2\fP, -\%\f3glEvalMesh2\fP, and -\%\f3glEvalPoint2\fP generate color indices. -See \%\f3glMap2\fP. -.TP -\%\f3GL_MAP2_NORMAL\fP -If enabled, -calls to -\%\f3glEvalCoord2\fP, -\%\f3glEvalMesh2\fP, and -\%\f3glEvalPoint2\fP generate normals. -See \%\f3glMap2\fP. -.TP -\%\f3GL_MAP2_TEXTURE_COORD_1\fP -If enabled, -calls to -\%\f3glEvalCoord2\fP, -\%\f3glEvalMesh2\fP, and -\%\f3glEvalPoint2\fP generate -\f2s\fP -texture coordinates. -See \%\f3glMap2\fP. -.TP -\%\f3GL_MAP2_TEXTURE_COORD_2\fP -If enabled, -calls to -\%\f3glEvalCoord2\fP, -\%\f3glEvalMesh2\fP, and -\%\f3glEvalPoint2\fP generate -\f2s\fP and -\f2t\fP texture coordinates. -See \%\f3glMap2\fP. -.TP -\%\f3GL_MAP2_TEXTURE_COORD_3\fP -If enabled, -calls to -\%\f3glEvalCoord2\fP, -\%\f3glEvalMesh2\fP, and -\%\f3glEvalPoint2\fP generate -\f2s\fP, -\f2t\fP, and -\f2r\fP texture coordinates. -See \%\f3glMap2\fP. -.TP -\%\f3GL_MAP2_TEXTURE_COORD_4\fP -If enabled, -calls to -\%\f3glEvalCoord2\fP, -\%\f3glEvalMesh2\fP, and -\%\f3glEvalPoint2\fP generate -\f2s\fP, -\f2t\fP, -\f2r\fP, and -\f2q\fP texture coordinates. -See \%\f3glMap2\fP. -.TP -\%\f3GL_MAP2_VERTEX_3\fP -If enabled, -calls to -\%\f3glEvalCoord2\fP, -\%\f3glEvalMesh2\fP, and -\%\f3glEvalPoint2\fP generate -\f2x\fP, \f2y\fP, and \f2z\fP vertex coordinates. -See \%\f3glMap2\fP. -.TP -\%\f3GL_MAP2_VERTEX_4\fP -If enabled, -calls to -\%\f3glEvalCoord2\fP, -\%\f3glEvalMesh2\fP, and -\%\f3glEvalPoint2\fP generate -homogeneous -\f2x\fP, -\f2y\fP, -\f2z\fP, and -\f2w\fP vertex coordinates. -See \%\f3glMap2\fP. -.TP -\%\f3GL_MINMAX\fP -If enabled, -compute the minimum and maximum values of incoming RGBA color values. -See \%\f3glMinmax\fP. -.TP -\%\f3GL_NORMALIZE\fP -If enabled, -normal vectors specified with \%\f3glNormal\fP are scaled to unit length -after transformation. See \%\f3glNormal\fP. -.TP -\%\f3GL_POINT_SMOOTH\fP -If enabled, -draw points with proper filtering. -Otherwise, -draw aliased points. -See \%\f3glPointSize\fP. -.TP -\%\f3GL_POLYGON_OFFSET_FILL\fP -If enabled, and if the polygon is rendered in -\%\f3GL_FILL\fP mode, an offset is added to depth values of a polygon's -fragments before the depth comparison is performed. -See \%\f3glPolygonOffset\fP. -.TP -\%\f3GL_POLYGON_OFFSET_LINE\fP -If enabled, and if the polygon is rendered in -\%\f3GL_LINE\fP mode, an offset is added to depth values of a polygon's -fragments before the depth comparison is performed. See \%\f3glPolygonOffset\fP. -.TP -\%\f3GL_POLYGON_OFFSET_POINT\fP -If enabled, an offset is added to depth values of a polygon's fragments -before the depth comparison is performed, if the polygon is rendered in -\%\f3GL_POINT\fP mode. See \%\f3glPolygonOffset\fP. -.TP -\%\f3GL_POLYGON_SMOOTH\fP -If enabled, draw polygons with proper filtering. -Otherwise, draw aliased polygons. For correct anti-aliased polygons, -an alpha buffer is needed and the polygons must be sorted front to -back. -.TP -\%\f3GL_POLYGON_STIPPLE\fP -If enabled, -use the current polygon stipple pattern when rendering -polygons. See \%\f3glPolygonStipple\fP. -.TP -\%\f3GL_POST_COLOR_MATRIX_COLOR_TABLE\fP -If enabled, -preform a color table lookup on RGBA color values after color matrix -transformation. -See \%\f3glColorTable\fP. -.TP -\%\f3GL_POST_CONVOLUTION_COLOR_TABLE\fP -If enabled, -preform a color table lookup on RGBA color values after convolution. -See \%\f3glColorTable\fP. -.TP -\%\f3GL_RESCALE_NORMAL\fP -If enabled, normal vectors specified with \%\f3glNormal\fP are scaled to -unit length after transformation. See \%\f3glNormal\fP. -.TP -\%\f3GL_SEPARABLE_2D\fP -If enabled, perform a two-dimensional convolution operation using a separable -convolution filter on incoming RGBA color values. -See \%\f3glSeparableFilter2D\fP. -.TP -\%\f3GL_SCISSOR_TEST\fP -If enabled, -discard fragments that are outside the scissor rectangle. -See \%\f3glScissor\fP. -.TP -\%\f3GL_STENCIL_TEST\fP -If enabled, -do stencil testing and update the stencil buffer. -See \%\f3glStencilFunc\fP and \%\f3glStencilOp\fP. -.TP -\%\f3GL_TEXTURE_1D\fP -If enabled, one-dimensional texturing is performed -(unless two- or three-dimensional texturing is also enabled). -See \%\f3glTexImage1D\fP. -.TP -\%\f3GL_TEXTURE_2D\fP -If enabled, two-dimensional texturing is performed -(unless three-dimensional texturing is also enabled). See \%\f3glTexImage2D\fP. -.TP -\%\f3GL_TEXTURE_3D\fP -If enabled, three-dimensional texturing is performed. See \%\f3glTexImage3D\fP. -.TP -\%\f3GL_TEXTURE_GEN_Q\fP -If enabled, -the \f2q\fP texture coordinate is computed using -the texture generation function defined with \%\f3glTexGen\fP. -Otherwise, the current \f2q\fP texture coordinate is used. -See \%\f3glTexGen\fP. -.TP -\%\f3GL_TEXTURE_GEN_R\fP -If enabled, -the \f2r\fP texture coordinate is computed using -the texture generation function defined with \%\f3glTexGen\fP. -Otherwise, the current \f2r\fP texture coordinate is used. -See \%\f3glTexGen\fP. -.TP -\%\f3GL_TEXTURE_GEN_S\fP -If enabled, -the \f2s\fP texture coordinate is computed using -the texture generation function defined with \%\f3glTexGen\fP. -Otherwise, the current \f2s\fP texture coordinate is used. -See \%\f3glTexGen\fP. -.TP -\%\f3GL_TEXTURE_GEN_T\fP -If enabled, -the \f2t\fP texture coordinate is computed using -the texture generation function defined with \%\f3glTexGen\fP. -Otherwise, the current \f2t\fP texture coordinate is used. -See \%\f3glTexGen\fP. -.SH NOTES -\%\f3GL_POLYGON_OFFSET_FILL\fP, \%\f3GL_POLYGON_OFFSET_LINE\fP, -\%\f3GL_POLYGON_OFFSET_POINT\fP, -\%\f3GL_COLOR_LOGIC_OP\fP, and \%\f3GL_INDEX_LOGIC_OP\fP are available -only if the GL version is 1.1 or greater. -.P -\%\f3GL_RESCALE_NORMAL\fP, and \%\f3GL_TEXTURE_3D\fP are available only if the -GL version is 1.2 or greater. -.P -\%\f3GL_COLOR_TABLE\fP, \%\f3GL_CONVOLUTION_1D\fP, \%\f3GL_CONVOLUTION_2D\fP, -\%\f3GL_HISTOGRAM\fP, \%\f3GL_MINMAX\fP, -\%\f3GL_POST_COLOR_MATRIX_COLOR_TABLE\fP, -\%\f3GL_POST_CONVOLUTION_COLOR_TABLE\fP, and -\%\f3GL_SEPARABLE_2D\fP are available only if \%\f3GL_ARB_imaging\fP is returned -from \%\f3glGet\fP with an argument of \%\f3GL_EXTENSIONS\fP. -.P -If \%\f3GL_ARB_multitexture\fP is supported, \%\f3GL_TEXTURE_1D\fP, -\%\f3GL_TEXTURE_2D\fP, \%\f3GL_TEXTURE_3D\fP, \%\f3GL_TEXTURE_GEN_S\fP, -\%\f3GL_TEXTURE_GEN_T\fP, \%\f3GL_TEXTURE_GEN_R\fP, and \%\f3GL_TEXTURE_GEN_Q\fP -enable or disable the respective state for the active texture unit -specified with \%\f3glActiveTextureARB\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2cap\fP is not one of the values -listed previously. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glEnable\fP or \%\f3glDisable\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glActiveTextureARB(3G)\fP, -\%\f3glAlphaFunc(3G)\fP, -\%\f3glBlendFunc(3G)\fP, -\%\f3glClipPlane(3G)\fP, -\%\f3glColorMaterial(3G)\fP, -\%\f3glCullFace(3G)\fP, -\%\f3glDepthFunc(3G)\fP, -\%\f3glDepthRange(3G)\fP, -\%\f3glEnableClientState(3G)\fP, -\%\f3glFog(3G)\fP, -\%\f3glGet(3G)\fP, -\%\f3glIsEnabled(3G)\fP, -\%\f3glLight(3G)\fP, -\%\f3glLightModel(3G)\fP, -\%\f3glLineWidth(3G)\fP, -\%\f3glLineStipple(3G)\fP, -\%\f3glLogicOp(3G)\fP, -\%\f3glMap1(3G)\fP, -\%\f3glMap2(3G)\fP, -\%\f3glMaterial(3G)\fP, -\%\f3glNormal(3G)\fP, -\%\f3glPointSize(3G)\fP, -\%\f3glPolygonMode(3G)\fP, -\%\f3glPolygonOffset(3G)\fP, -\%\f3glPolygonStipple(3G)\fP, -\%\f3glScissor(3G)\fP, -\%\f3glStencilFunc(3G)\fP, -\%\f3glStencilOp(3G)\fP, -\%\f3glTexGen(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexImage3D(3G)\fP - diff --git a/doc/gl-docs/GL/gl/enableclientstate.3gl b/doc/gl-docs/GL/gl/enableclientstate.3gl deleted file mode 100644 index 51f76798..00000000 --- a/doc/gl-docs/GL/gl/enableclientstate.3gl +++ /dev/null @@ -1,115 +0,0 @@ -.\" $XFree86$ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 enablecli -.ds Xs 64367 6 enableclientstate.gl -.TH GLENABLECLIENTSTATE 3G -.SH NAME -.B "glEnableClientState, glDisableClientState -\- enable or disable client-side capability - -.SH C SPECIFICATION -void \f3glEnableClientState\fP( -GLenum cap); \fI1.1\fP ) -.nf -.fi - -.EN -.SH PARAMETERS -.TP \w'\f21.1\fP\ \ 'u -\f21.1\fP -Specifies the capability to enable. -Symbolic constants -\%\f3GL_COLOR_ARRAY\fP, -\%\f3GL_EDGE_FLAG_ARRAY\fP, -\%\f3GL_INDEX_ARRAY\fP, -\%\f3GL_NORMAL_ARRAY\fP, -\%\f3GL_TEXTURE_COORD_ARRAY\fP, and -\%\f3GL_VERTEX_ARRAY\fP -are accepted. -.SH C SPECIFICATION -void \f3glDisableClientState\fP( -GLenum cap); \fI1.1\fP ) -.nf -.fi - -.SH PARAMETERS -.TP -\f21.1\fP -Specifies the capability to disable. -.SH DESCRIPTION -\%\f3glEnableClientState\fP and \%\f3glDisableClientState\fP -enable or disable individual client-side capabilities. By default, all -client-side capabilities are disabled. -Both -\%\f3glEnableClientState\fP and \%\f3glDisableClientState\fP take a -single argument, \f21.1\fP, which can assume one of the following -values: -.TP 25 -\%\f3GL_COLOR_ARRAY\fP -If enabled, the color array is enabled for writing and used during -rendering when \%\f3glArrayElement\fP, \%\f3glDrawArrays\fP, -\%\f3glDrawElement\fP, or \%\f3glDrawRangeElements\fP is called. See -\%\f3glColorPointer\fP. -.TP -\%\f3GL_EDGE_FLAG_ARRAY\fP -If enabled, the edge flag array is enabled for writing and used during -rendering when \%\f3glArrayElement\fP, \%\f3glDrawArrays\fP, -\%\f3glDrawElement\fP, or \%\f3glDrawRangeElements\fP is called. See -\%\f3glEdgeFlagPointer\fP. -.TP -\%\f3GL_INDEX_ARRAY\fP -If enabled, the index array is enabled for writing and used during -rendering when \%\f3glArrayElement\fP, \%\f3glDrawArrays\fP, -\%\f3glDrawElement\fP, or \%\f3glDrawRangeElements\fP is called. See -\%\f3glIndexPointer\fP. -.TP -\%\f3GL_NORMAL_ARRAY\fP -If enabled, the normal array is enabled for writing and used during -rendering when \%\f3glArrayElement\fP, \%\f3glDrawArrays\fP, -\%\f3glDrawElement\fP, or \%\f3glDrawRangeElements\fP is called. See -\%\f3glNormalPointer\fP. -.TP -\%\f3GL_TEXTURE_COORD_ARRAY\fP -If enabled, the texture coordinate array is enabled for writing and used during -rendering when \%\f3glArrayElement\fP, \%\f3glDrawArrays\fP, -\%\f3glDrawElement\fP, or \%\f3glDrawRangeElements\fP is called. See -\%\f3glTexCoordPointer\fP. -.TP -\%\f3GL_VERTEX_ARRAY\fP -If enabled, the vertex array is enabled for writing and used during -rendering when \%\f3glArrayElement\fP, \%\f3glDrawArrays\fP, -\%\f3glDrawElement\fP, or \%\f3glDrawRangeElements\fP is called. See -\%\f3glVertexPointer\fP. -.SH NOTES -\%\f3glEnableClientState\fP is available only if the GL version is 1.1 or greater. -.P -If \%\f3GL_ARB_multitexture\fP is supported, enabling and disabling -\%\f3GL_TEXTURE_COORD_ARRAY\fP affects the active client texture unit. -The active client texture unit is controlled with -\%\f3glClientActiveTextureARB\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f21.1\fP is not an accepted value. -.P -\%\f3glEnableClientState\fP is not allowed between the execution of \%\f3glBegin\fP and the -corresponding \%\f3glEnd\fP, but an error may or may not be generated. If -no error is generated, the behavior is undefined. -.SH SEE ALSO -\%\f3glArrayElement(3G)\fP, -\%\f3glClientActiveTextureARB(3G)\fP, -\%\f3glColorPointer(3G)\fP, -\%\f3glDrawArrays(3G)\fP, -\%\f3glDrawElements(3G)\fP, -\%\f3glEdgeFlagPointer(3G)\fP, -\%\f3glEnable(3G)\fP, -\%\f3glGetPointerv(3G)\fP, -\%\f3glIndexPointer(3G)\fP, -\%\f3glInterleavedArrays(3G)\fP, -\%\f3glNormalPointer(3G)\fP, -\%\f3glTexCoordPointer(3G)\fP, -\%\f3glVertexPointer(3G)\fP diff --git a/doc/gl-docs/GL/gl/evalcoord.3gl b/doc/gl-docs/GL/gl/evalcoord.3gl deleted file mode 100644 index 1c5a7d42..00000000 --- a/doc/gl-docs/GL/gl/evalcoord.3gl +++ /dev/null @@ -1,226 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 evalcoord -.ds Xs 42414 8 evalcoord.gl -.TH GLEVALCOORD 3G -.SH NAME -.B "glEvalCoord1d, glEvalCoord1f, glEvalCoord2d, glEvalCoord2f, glEvalCoord1dv, glEvalCoord1fv, glEvalCoord2dv, glEvalCoord2fv -\- evaluate enabled one- and two-dimensional maps - -.EQ -delim $$ -.EN -.SH C SPECIFICATION -void \f3glEvalCoord1d\fP( -GLdouble \fIu\fP ) -.nf -.fi -void \f3glEvalCoord1f\fP( -GLfloat \fIu\fP ) -.nf -.fi -void \f3glEvalCoord2d\fP( -GLdouble \fIu\fP, -.nf -.ta \w'\f3void \fPglEvalCoord2d( 'u - GLdouble \fIv\fP ) -.fi -void \f3glEvalCoord2f\fP( -GLfloat \fIu\fP, -.nf -.ta \w'\f3void \fPglEvalCoord2f( 'u - GLfloat \fIv\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2u\fP\ \ 'u -\f2u\fP -Specifies a value that is the domain coordinate $u$ to the basis function -defined in a previous \%\f3glMap1\fP or \%\f3glMap2\fP command. -.TP -\f2v\fP -Specifies a value that is the domain coordinate $v$ to the basis function -defined in a previous \%\f3glMap2\fP command. -This argument is not present in a \%\f3glEvalCoord1\fP command. -.SH C SPECIFICATION -void \f3glEvalCoord1dv\fP( -const GLdouble \fI*u\fP ) -.nf -.fi -void \f3glEvalCoord1fv\fP( -const GLfloat \fI*u\fP ) -.nf -.fi -void \f3glEvalCoord2dv\fP( -const GLdouble \fI*u\fP ) -.nf -.fi -void \f3glEvalCoord2fv\fP( -const GLfloat \fI*u\fP ) -.nf -.fi - -.SH PARAMETERS -.TP -\f2u\fP -Specifies a pointer to an array containing -either one or two domain coordinates. -The first coordinate is $u$. -The second coordinate is $v$, -which is present only in \%\f3glEvalCoord2\fP versions. -.SH DESCRIPTION -\%\f3glEvalCoord1\fP evaluates enabled one-dimensional maps at argument -\f2u\fP. -\%\f3glEvalCoord2\fP does the same for two-dimensional maps using -two domain values, -\f2u\fP and \f2v\fP. -To define a map, call \%\f3glMap1\fP and \%\f3glMap2\fP; to enable and -disable it, call \%\f3glEnable\fP and \%\f3glDisable\fP. -.P -When one of the \%\f3glEvalCoord\fP commands is issued, -all currently enabled maps of the indicated dimension are evaluated. -Then, -for each enabled map, -it is as if the corresponding GL command had been issued with the -computed value. -That is, -if \%\f3GL_MAP1_INDEX\fP or -\%\f3GL_MAP2_INDEX\fP is enabled, -a \%\f3glIndex\fP command is simulated. -If \%\f3GL_MAP1_COLOR_4\fP or -\%\f3GL_MAP2_COLOR_4\fP is enabled, -a \%\f3glColor\fP command is simulated. -If \%\f3GL_MAP1_NORMAL\fP or \%\f3GL_MAP2_NORMAL\fP is enabled, -a normal vector is produced, -and if any of -\%\f3GL_MAP1_TEXTURE_COORD_1\fP, -\%\f3GL_MAP1_TEXTURE_COORD_2\fP, -\%\f3GL_MAP1_TEXTURE_COORD_3\fP, -\%\f3GL_MAP1_TEXTURE_COORD_4\fP, -\%\f3GL_MAP2_TEXTURE_COORD_1\fP, -\%\f3GL_MAP2_TEXTURE_COORD_2\fP, -\%\f3GL_MAP2_TEXTURE_COORD_3\fP, or -\%\f3GL_MAP2_TEXTURE_COORD_4\fP is enabled, then an appropriate \%\f3glTexCoord\fP command is simulated. -.P -For color, -color index, -normal, -and texture coordinates the GL uses evaluated values instead of current values for those evaluations -that are enabled, -and current values otherwise, -However, -the evaluated values do not update the current values. -Thus, if \%\f3glVertex\fP commands are interspersed with \%\f3glEvalCoord\fP -commands, the color, -normal, -and texture coordinates associated with the \%\f3glVertex\fP commands are not -affected by the values generated by the \%\f3glEvalCoord\fP commands, -but only by the most recent -\%\f3glColor\fP, -\%\f3glIndex\fP, -\%\f3glNormal\fP, and -\%\f3glTexCoord\fP commands. -.P -No commands are issued for maps that are not enabled. -If more than one texture evaluation is enabled for a particular dimension -(for example, \%\f3GL_MAP2_TEXTURE_COORD_1\fP and -\%\f3GL_MAP2_TEXTURE_COORD_2\fP), -then only the evaluation of the map that produces the larger -number of coordinates -(in this case, \%\f3GL_MAP2_TEXTURE_COORD_2\fP) -is carried out. -\%\f3GL_MAP1_VERTEX_4\fP overrides \%\f3GL_MAP1_VERTEX_3\fP, -and -\%\f3GL_MAP2_VERTEX_4\fP overrides \%\f3GL_MAP2_VERTEX_3\fP, -in the same manner. -If neither a three- nor a four-component vertex map is enabled for the -specified dimension, -the \%\f3glEvalCoord\fP command is ignored. -.P -If you have enabled automatic normal generation, -by calling \%\f3glEnable\fP with argument \%\f3GL_AUTO_NORMAL\fP, -\%\f3glEvalCoord2\fP generates surface normals analytically, -regardless of the contents or enabling of the \%\f3GL_MAP2_NORMAL\fP map. -Let -.sp -.ce -.EQ -bold m ~=~ {partial bold p} over {partial u} ~times~ - {partial bold p} over {partial v} -.EN -.ce 0 -.sp -.br -Then the generated normal $ bold n $ is -.br -.ce -$bold n ~=~ bold m over { || bold m || }$ -.ce 0 -.sp -.br -If automatic normal generation is disabled, -the corresponding normal map \%\f3GL_MAP2_NORMAL\fP, -if enabled, -is used to produce a normal. -If neither automatic normal generation nor a normal map is enabled, -no normal is generated for -\%\f3glEvalCoord2\fP commands. -.SH ASSOCIATED GETS -.nf -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP1_VERTEX_3\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP1_VERTEX_4\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP1_INDEX\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP1_COLOR_4\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP1_NORMAL\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP1_TEXTURE_COORD_1\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP1_TEXTURE_COORD_2\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP1_TEXTURE_COORD_3\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP1_TEXTURE_COORD_4\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP2_VERTEX_3\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP2_VERTEX_4\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP2_INDEX\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP2_COLOR_4\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP2_NORMAL\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP2_TEXTURE_COORD_1\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP2_TEXTURE_COORD_2\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP2_TEXTURE_COORD_3\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP2_TEXTURE_COORD_4\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_AUTO_NORMAL\fP -.br -\%\f3glGetMap\fP -.SH SEE ALSO -\%\f3glBegin(3G)\fP, -\%\f3glColor(3G)\fP, -\%\f3glEnable(3G)\fP, -\%\f3glEvalMesh(3G)\fP, -\%\f3glEvalPoint(3G)\fP, -\%\f3glIndex(3G)\fP, -\%\f3glMap1(3G)\fP, -\%\f3glMap2(3G)\fP, -\%\f3glMapGrid(3G)\fP, -\%\f3glNormal(3G)\fP, -\%\f3glTexCoord(3G)\fP, -\%\f3glVertex(3G)\fP diff --git a/doc/gl-docs/GL/gl/evalmesh.3gl b/doc/gl-docs/GL/gl/evalmesh.3gl deleted file mode 100644 index bd3890ab..00000000 --- a/doc/gl-docs/GL/gl/evalmesh.3gl +++ /dev/null @@ -1,189 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 evalmesh. -.ds Xs 32277 7 evalmesh.gl -.TH GLEVALMESH 3G -.SH NAME -.B "glEvalMesh1, glEvalMesh2 -\- compute a one- or two-dimensional grid of points or lines - -.SH C SPECIFICATION -void \f3glEvalMesh1\fP( -GLenum \fImode\fP, -.nf -.ta \w'\f3void \fPglEvalMesh1( 'u - GLint \fIi1\fP, - GLint \fIi2\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2mode\fP\ \ 'u -\f2mode\fP -In \%\f3glEvalMesh1\fP, specifies whether to compute a one-dimensional mesh of points or lines. -Symbolic constants -\%\f3GL_POINT\fP and -\%\f3GL_LINE\fP are accepted. -.TP -\f2i1\fP, \f2i2\fP -Specify the first and last integer values for grid domain variable $i$. -.SH C SPECIFICATION -void \f3glEvalMesh2\fP( -GLenum \fImode\fP, -.nf -.ta \w'\f3void \fPglEvalMesh2( 'u - GLint \fIi1\fP, - GLint \fIi2\fP, - GLint \fIj1\fP, - GLint \fIj2\fP ) -.fi - -.SH PARAMETERS -.TP -\f2mode\fP -In \%\f3glEvalMesh2\fP, specifies whether to compute a two-dimensional mesh of points, lines, -or polygons. -Symbolic constants -\%\f3GL_POINT\fP, -\%\f3GL_LINE\fP, and -\%\f3GL_FILL\fP are accepted. -.TP -\f2i1\fP, \f2i2\fP -Specify the first and last integer values for grid domain variable $i$. -.TP -\f2j1\fP, \f2j2\fP -Specify the first and last integer values for grid domain variable $j$. -.SH DESCRIPTION -\%\f3glMapGrid\fP and \%\f3glEvalMesh\fP are used in tandem to efficiently -generate and evaluate a series of evenly-spaced map domain values. -\%\f3glEvalMesh\fP steps through the integer domain of a one- or two-dimensional grid, -whose range is the domain of the evaluation maps specified by -\%\f3glMap1\fP and \%\f3glMap2\fP. -\f2mode\fP determines whether the resulting vertices are connected as -points, -lines, -or filled polygons. -.P -In the one-dimensional case, -\%\f3glEvalMesh1\fP, -the mesh is generated as if the following code fragment were executed: -.nf -.IP -\f7 -glBegin( \f2type\f7 ); -for ( i = \f2i1\fP; i <= \f2i2\fP; i += 1 ) - glEvalCoord1( i$^cdot^DELTA u ~+~ u sub 1$ ); -glEnd(); -\fP -.RE -.fi -where -.sp -.in -$ DELTA u ~=~ (u sub 2 ~-~ u sub 1 ) ^/^ n$ -.sp -.in 0 -.P -and $n$, $u sub 1$, and $u sub 2$ are the arguments to the most recent -\%\f3glMapGrid1\fP command. -\f2type\fP is \%\f3GL_POINTS\fP if \f2mode\fP is \%\f3GL_POINT\fP, -or \%\f3GL_LINES\fP if \f2mode\fP is \%\f3GL_LINE\fP. -.P -The one absolute numeric requirement is that if $i ~=~ n$, then the -value computed from $ i^cdot^DELTA u ~+~ u sub 1$ is exactly $u sub 2$. -.P -In the two-dimensional case, \%\f3glEvalMesh2\fP, let -.nf -.IP -$ DELTA u ~=~ mark ( u sub 2 ~-~ u sub 1 ) ^/^ n$ -.sp -$ DELTA v ~=~ lineup ( v sub 2 ~-~ v sub 1 ) ^/^ m$, -.fi -.RE -.P -where $n$, $u sub 1$, $u sub 2$, $m$, $v sub 1$, and $v sub 2$ are the -arguments to the most recent \%\f3glMapGrid2\fP command. Then, if -\f2mode\fP is \%\f3GL_FILL\fP, the \%\f3glEvalMesh2\fP command is equivalent -to: -.nf -.IP -\f7 -for ( j = \f2j1\fP; j < \f2j2\fP; j += 1 ) { - glBegin( GL_QUAD_STRIP ); - for ( i = \f2i1\fP; i <= \f2i2\fP; i += 1 ) { - glEvalCoord2( i$^cdot^DELTA u ~+~ u sub 1$, j$^cdot^DELTA v ~+~ v sub 1$ ); - glEvalCoord2( i$^cdot^DELTA u ~+~ u sub 1$, (j+1)$^cdot^DELTA v ~+~ v sub 1$ ); - } - glEnd(); -} -\fP -.RE -.fi -.P -If \f2mode\fP is \%\f3GL_LINE\fP, then a call to \%\f3glEvalMesh2\fP is equivalent to: -.nf -.IP -\f7 -for ( j = \f2j1\fP; j <= \f2j2\fP; j += 1 ) { - glBegin( GL_LINE_STRIP ); - for ( i = \f2i1\fP; i <= \f2i2\fP; i += 1 ) - glEvalCoord2( i$^cdot^DELTA u ~+~ u sub 1$, j$^cdot^DELTA v ~+~ v sub 1$ ); - glEnd(); -} -.sp -for ( i = \f2i1\fP; i <= \f2i2\fP; i += 1 ) { - glBegin( GL_LINE_STRIP ); - for ( j = \f2j1\fP; j <= \f2j1\fP; j += 1 ) - glEvalCoord2( i$^cdot^DELTA u ~+~ u sub 1$, j$^cdot^DELTA v ~+~ v sub 1 $ ); - glEnd(); -} -\fP -.RE -.fi -.P -And finally, if \f2mode\fP is \%\f3GL_POINT\fP, then a call to -\%\f3glEvalMesh2\fP is equivalent to: -.nf -.IP -\f7 -glBegin( GL_POINTS ); -for ( j = \f2j1\fP; j <= \f2j2\fP; j += 1 ) - for ( i = \f2i1\fP; i <= \f2i2\fP; i += 1 ) - glEvalCoord2( i$^cdot^DELTA u ~+~ u sub 1$, j$^cdot^DELTA v ~+~ v sub 1$ ); -glEnd(); -\fP -.RE -.fi -.P -In all three cases, the only absolute numeric requirements are that if $i~=~n$, -then the value computed from $i^cdot^DELTA u ~+~ u sub 1$ is exactly $u -sub 2$, and if $j~=~m$, then the value computed from -$j ^cdot^ DELTA v ~+~ v sub 1$ is exactly $v sub 2$. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2mode\fP is not an accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glEvalMesh\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_MAP1_GRID_DOMAIN\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAP2_GRID_DOMAIN\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAP1_GRID_SEGMENTS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAP2_GRID_SEGMENTS\fP -.SH SEE ALSO -\%\f3glBegin(3G)\fP, -\%\f3glEvalCoord(3G)\fP, -\%\f3glEvalPoint(3G)\fP, -\%\f3glMap1(3G)\fP, -\%\f3glMap2(3G)\fP, -\%\f3glMapGrid(3G)\fP diff --git a/doc/gl-docs/GL/gl/evalpoint.3gl b/doc/gl-docs/GL/gl/evalpoint.3gl deleted file mode 100644 index a057baa1..00000000 --- a/doc/gl-docs/GL/gl/evalpoint.3gl +++ /dev/null @@ -1,101 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 evalpoint -.ds Xs 57169 5 evalpoint.gl -.TH GLEVALPOINT 3G -.SH NAME -.B "glEvalPoint1, glEvalPoint2 -\- generate and evaluate a single point in a mesh - -.SH C SPECIFICATION -void \f3glEvalPoint1\fP( -GLint \fIi\fP ) -.nf -.fi -void \f3glEvalPoint2\fP( -GLint \fIi\fP, -.nf -.ta \w'\f3void \fPglEvalPoint2( 'u - GLint \fIj\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2i\fP\ \ 'u -\f2i\fP -Specifies the integer value for grid domain variable $i$. -.TP -\f2j\fP -Specifies the integer value for grid domain variable $j$ -(\%\f3glEvalPoint2\fP only). -.SH DESCRIPTION -\%\f3glMapGrid\fP and \%\f3glEvalMesh\fP are used in tandem to efficiently -generate and evaluate a series of evenly spaced map domain values. -\%\f3glEvalPoint\fP can be used to evaluate a single grid point in the same gridspace -that is traversed by \%\f3glEvalMesh\fP. -Calling \%\f3glEvalPoint1\fP is equivalent to calling -.nf -.IP -\f7 -glEvalCoord1( i$^cdot^DELTA u ~+~ u sub 1$ ); -\fP -.RE -.fi -where -.sp -.in -$DELTA u ~=~ ( u sub 2 - u sub 1 ) ^/^ n$ -.in 0 -.sp -.P -and $n$, $u sub 1$, and $u sub 2$ -are the arguments to the most recent \%\f3glMapGrid1\fP command. -The one absolute numeric requirement is that if $i~=~n$, -then the value computed from -$i ^cdot^ DELTA u ~+~ u sub 1$ is exactly $u sub 2$. -.P -In the two-dimensional case, \%\f3glEvalPoint2\fP, let -.nf -.IP -$DELTA u ~=~ mark ( u sub 2 - u sub 1 ) ^/^ n$ -.sp -$DELTA v ~=~ mark ( v sub 2 - v sub 1 ) ^/^ m,$ -.RE -.fi -.P -where $n$, $u sub 1$, $u sub 2$, $m$, $v sub 1$, and $v sub 2$ -are the arguments to the most recent \%\f3glMapGrid2\fP command. -Then the \%\f3glEvalPoint2\fP command is equivalent to calling -.nf -.IP -\f7 -glEvalCoord2( i$^cdot^DELTA u ~+~ u sub 1$, j$^cdot^DELTA v ~+~ v sub 1$ ); -\fP -.RE -.fi -The only absolute numeric requirements are that if $i~=~n$, -then the value computed from -$i ^cdot^DELTA u ~+~ u sub 1$ is exactly $u sub 2$, -and if $j~=~m$, then the value computed from -$i ^cdot^DELTA v ~+~ v sub 1$ is exactly $v sub 2$. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_MAP1_GRID_DOMAIN\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAP2_GRID_DOMAIN\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAP1_GRID_SEGMENTS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAP2_GRID_SEGMENTS\fP -.SH SEE ALSO -\%\f3glEvalCoord(3G)\fP, -\%\f3glEvalMesh(3G)\fP, -\%\f3glMap1(3G)\fP, -\%\f3glMap2(3G)\fP, -\%\f3glMapGrid(3G)\fP diff --git a/doc/gl-docs/GL/gl/feedbackbuffer.3gl b/doc/gl-docs/GL/gl/feedbackbuffer.3gl deleted file mode 100644 index 9abac8df..00000000 --- a/doc/gl-docs/GL/gl/feedbackbuffer.3gl +++ /dev/null @@ -1,225 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 feedbackb -.ds Xs 26060 9 feedbackbuffer.gl -.TH GLFEEDBACKBUFFER 3G -.SH NAME -.B "glFeedbackBuffer -\- controls feedback mode - -.SH C SPECIFICATION -void \f3glFeedbackBuffer\fP( -GLsizei \fIsize\fP, -.nf -.ta \w'\f3void \fPglFeedbackBuffer( 'u - GLenum \fItype\fP, - GLfloat \fI*buffer\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIbuffer\fP\ \ 'u -\f2size\fP -Specifies the maximum number of values that can be written into \f2buffer\fP. -.TP -\f2type\fP -Specifies a symbolic constant that describes the information -that will be returned for each vertex. -\%\f3GL_2D\fP, -\%\f3GL_3D\fP, -\%\f3GL_3D_COLOR\fP, -\%\f3GL_3D_COLOR_TEXTURE\fP, and -\%\f3GL_4D_COLOR_TEXTURE\fP are accepted. -.TP -\f2buffer\fP -Returns the feedback data. -.SH DESCRIPTION -The \%\f3glFeedbackBuffer\fP function controls feedback. -Feedback, like selection, is a GL mode. -The mode is selected by calling -\%\f3glRenderMode\fP with \%\f3GL_FEEDBACK\fP. -When the GL is in feedback mode, -no pixels are produced by rasterization. -Instead, information about primitives that would have been -rasterized is fed back to the application using the GL. -.P -\%\f3glFeedbackBuffer\fP has three arguments: -\f2buffer\fP is a pointer to an array of floating-point values -into which feedback information is placed. -\f2size\fP indicates the size of the array. -\f2type\fP is a symbolic constant describing the information -that is fed back for each vertex. -\%\f3glFeedbackBuffer\fP must be issued before feedback mode is enabled -(by calling \%\f3glRenderMode\fP with argument \%\f3GL_FEEDBACK\fP). -Setting \%\f3GL_FEEDBACK\fP without establishing the feedback buffer, -or calling \%\f3glFeedbackBuffer\fP while the GL is in feedback mode, -is an error. -.P -When \%\f3glRenderMode\fP is called while in feedback mode, it returns the number of entries -placed in the feedback array, and resets the feedback array pointer to the base -of the feedback buffer. The returned value never exceeds \f2size\fP. If the feedback -data required more room than was available in \f2buffer\fP, -\%\f3glRenderMode\fP returns a negative value. -To take the GL out of feedback mode, call -\%\f3glRenderMode\fP with a parameter value other than \%\f3GL_FEEDBACK\fP. -.P -While in feedback mode, -each primitive, bitmap, or pixel rectangle that would be rasterized -generates a block of values that are copied into the feedback array. -If doing so would cause the number of entries to exceed the maximum, -the block is partially written so as to fill the array -(if there is any room left at all), -and an overflow flag is set. -Each block begins with a code indicating the primitive type, -followed by values that describe the primitive's vertices and -associated data. -Entries are also written for bitmaps and pixel rectangles. -Feedback occurs after polygon culling and \%\f3glPolygonMode\fP interpretation -of polygons has taken place, -so polygons that are culled are not returned in the feedback buffer. -It can also occur after polygons with more than three edges are broken up -into triangles, -if the GL implementation renders polygons by performing this decomposition. -.P -The \%\f3glPassThrough\fP command can be used to insert a marker -into the feedback buffer. -See \%\f3glPassThrough\fP. -.P -Following is the grammar for the blocks of values written -into the feedback buffer. -Each primitive is indicated with a unique identifying value -followed by some number of vertices. -Polygon entries include an integer value indicating how many vertices follow. -A vertex is fed back as some number of floating-point values, -as determined by \f2type\fP. -Colors are fed back as four values in RGBA mode and one value -in color index mode. -.RS -.na -.sp -feedbackList \(<- feedbackItem feedbackList | feedbackItem -.sp -feedbackItem \(<- point | lineSegment | polygon | bitmap | pixelRectangle | passThru -.sp -point \(<- \%\f3GL_POINT_TOKEN\fP vertex -.sp -lineSegment \(<- \%\f3GL_LINE_TOKEN\fP vertex vertex | \%\f3GL_LINE_RESET_TOKEN\fP vertex vertex -.sp -polygon \(<- \%\f3GL_POLYGON_TOKEN\fP n polySpec -.sp -polySpec \(<- polySpec vertex | vertex vertex vertex -.sp -bitmap \(<- \%\f3GL_BITMAP_TOKEN\fP vertex -.sp -pixelRectangle \(<- \%\f3GL_DRAW_PIXEL_TOKEN\fP vertex | \%\f3GL_COPY_PIXEL_TOKEN\fP vertex -.sp -passThru \(<- \%\f3GL_PASS_THROUGH_TOKEN\fP value -.sp -vertex \(<- 2d | 3d | 3dColor | 3dColorTexture | 4dColorTexture -.sp -2d \(<- value value -.sp -3d \(<- value value value -.sp -3dColor \(<- value value value color -.sp -3dColorTexture \(<- value value value color tex -.sp -4dColorTexture \(<- value value value value color tex -.sp -color \(<- rgba | index -.sp -rgba \(<- value value value value -.sp -index \(<- value -.sp -tex \(<- value value value value -.sp -.RE -.P -.I value -is a floating-point number, -and -.I n -is a floating-point integer giving the number of vertices in the polygon. -\%\f3GL_POINT_TOKEN\fP, -\%\f3GL_LINE_TOKEN\fP, -\%\f3GL_LINE_RESET_TOKEN\fP, -\%\f3GL_POLYGON_TOKEN\fP, -\%\f3GL_BITMAP_TOKEN\fP, -\%\f3GL_DRAW_PIXEL_TOKEN\fP, -\%\f3GL_COPY_PIXEL_TOKEN\fP and -\%\f3GL_PASS_THROUGH_TOKEN\fP are symbolic floating-point constants. -\%\f3GL_LINE_RESET_TOKEN\fP is returned whenever the line stipple pattern -is reset. -The data returned as a vertex depends on the feedback \f2type\fP. -.P -The following table gives the correspondence between \f2type\fP -and the number of values per vertex. -\f2k\fP is 1 in color index mode and 4 in RGBA mode. -.sp -.ne -.TS -center tab(:); -lb lb cb cb cb -l l c c c. -_ -Type:Coordinates:Color:Texture:Total Number of Values -_ -\%\f3GL_2D\fP:\f2x\fP, \f2y\fP:::2 -\%\f3GL_3D\fP:\f2x\fP, \f2y\fP, \f2z\fP:::3 -\%\f3GL_3D_COLOR\fP:\f2x\fP, \f2y\fP, \f2z\fP:$k$::$3 ~+~ k$ -\%\f3GL_3D_COLOR_TEXTURE\fP:\f2x\fP, \f2y\fP, \f2z\fP,:$k$:4:$7 ~+~ k$ -\%\f3GL_4D_COLOR_TEXTURE\fP:\f2x\fP, \f2y\fP, \f2z\fP, \f2w\fP:$k$:4:$8 ~+~ k$ -_ -.TE - -.P -Feedback vertex coordinates are in window coordinates, -except \f2w\fP, -which is in clip coordinates. -Feedback colors are lighted, if lighting is enabled. -Feedback texture coordinates are generated, -if texture coordinate generation is enabled. -They are always transformed by the texture matrix. -.SH NOTES -\%\f3glFeedbackBuffer\fP, when used in a display list, is not compiled into the display list -but is executed immediately. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, \%\f3glFeedbackBuffer\fP -returns only the texture coordinates of texture unit \%\f3GL_TEXTURE0_ARB\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not an accepted value. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2size\fP is negative. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glFeedbackBuffer\fP is called while the -render mode is \%\f3GL_FEEDBACK\fP, -or if \%\f3glRenderMode\fP is called with argument \%\f3GL_FEEDBACK\fP before -\%\f3glFeedbackBuffer\fP is called at least once. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glFeedbackBuffer\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_RENDER_MODE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_FEEDBACK_BUFFER_POINTER\fP -.br -\%\f3glGet\fP with argument \%\f3GL_FEEDBACK_BUFFER_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_FEEDBACK_BUFFER_TYPE\fP -.SH SEE ALSO -\%\f3glBegin(3G)\fP, -\%\f3glLineStipple(3G)\fP, -\%\f3glPassThrough(3G)\fP, -\%\f3glPolygonMode(3G)\fP, -\%\f3glRenderMode(3G)\fP, -\%\f3glSelectBuffer(3G)\fP diff --git a/doc/gl-docs/GL/gl/finish.3gl b/doc/gl-docs/GL/gl/finish.3gl deleted file mode 100644 index 06f969cb..00000000 --- a/doc/gl-docs/GL/gl/finish.3gl +++ /dev/null @@ -1,34 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 finish.gl -.ds Xs 36675 3 finish.gl -.TH GLFINISH 3G -.SH NAME -.B "glFinish -\- block until all GL execution is complete - -.SH C SPECIFICATION -void \f3glFinish\fP( void ) -.nf -.fi - -.SH DESCRIPTION -\%\f3glFinish\fP does not return until the effects of all previously -called GL commands are complete. -Such effects include all changes to GL state, -all changes to connection state, -and all changes to the frame buffer contents. -.SH NOTES -\%\f3glFinish\fP requires a round trip to the server. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glFinish\fP is executed between -the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glFlush(3G)\fP - diff --git a/doc/gl-docs/GL/gl/flush.3gl b/doc/gl-docs/GL/gl/flush.3gl deleted file mode 100644 index a338a86c..00000000 --- a/doc/gl-docs/GL/gl/flush.3gl +++ /dev/null @@ -1,46 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 flush.gl -.ds Xs 64601 4 flush.gl -.TH GLFLUSH 3G -.SH NAME -.B "glFlush -\- force execution of GL commands in finite time - -.SH C SPECIFICATION -void \f3glFlush\fP( void ) -.nf -.fi - -.SH DESCRIPTION -Different GL implementations buffer commands in several different locations, -including network buffers and the graphics accelerator itself. -\%\f3glFlush\fP empties all of these buffers, -causing all issued commands to be executed as quickly as -they are accepted by the actual rendering engine. -Though this execution may not be completed in any particular -time period, -it does complete in finite time. -.P -Because any GL program might be executed over a network, -or on an accelerator that buffers commands, -all programs should call \%\f3glFlush\fP whenever they count on having -all of their previously issued commands completed. -For example, -call \%\f3glFlush\fP before waiting for user input that depends on -the generated image. -.SH NOTES -\%\f3glFlush\fP can return at any time. -It does not wait until the execution of all previously -issued GL commands is complete. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glFlush\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glFinish(3G)\fP diff --git a/doc/gl-docs/GL/gl/fog.3gl b/doc/gl-docs/GL/gl/fog.3gl deleted file mode 100644 index d60a238c..00000000 --- a/doc/gl-docs/GL/gl/fog.3gl +++ /dev/null @@ -1,209 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 fog.gl -> -.ds Xs 7467 7 fog.gl -.TH GLFOG 3G -.SH NAME -.B "glFogf, glFogi, glFogfv, glFogiv -\- specify fog parameters - -.SH C SPECIFICATION -void \f3glFogf\fP( -GLenum \fIpname\fP, -.nf -.ta \w'\f3void \fPglFogf( 'u - GLfloat \fIparam\fP ) -.fi -void \f3glFogi\fP( -GLenum \fIpname\fP, -.nf -.ta \w'\f3void \fPglFogi( 'u - GLint \fIparam\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIparams\fP\ \ 'u -\f2pname\fP -Specifies a single-valued fog parameter. -\%\f3GL_FOG_MODE\fP, -\%\f3GL_FOG_DENSITY\fP, -\%\f3GL_FOG_START\fP, -\%\f3GL_FOG_END\fP, -and -\%\f3GL_FOG_INDEX\fP -are accepted. -.TP -\f2param\fP -Specifies the value that \f2pname\fP will be set to. -.SH C SPECIFICATION -void \f3glFogfv\fP( -GLenum \fIpname\fP, -.nf -.ta \w'\f3void \fPglFogfv( 'u - const GLfloat \fI*params\fP ) -.fi -void \f3glFogiv\fP( -GLenum \fIpname\fP, -.nf -.ta \w'\f3void \fPglFogiv( 'u - const GLint \fI*params\fP ) -.fi - -.SH PARAMETERS -.TP -\f2pname\fP -Specifies a fog parameter. -\%\f3GL_FOG_MODE\fP, -\%\f3GL_FOG_DENSITY\fP, -\%\f3GL_FOG_START\fP, -\%\f3GL_FOG_END\fP, -\%\f3GL_FOG_INDEX\fP, -and -\%\f3GL_FOG_COLOR\fP -are accepted. -.TP -\f2params\fP -Specifies the value or values to be assigned to \f2pname\fP. -\%\f3GL_FOG_COLOR\fP requires an array of four values. -All other parameters accept an array containing only a single value. -.SH DESCRIPTION -Fog is initially disabled. -While enabled, fog affects rasterized geometry, -bitmaps, and pixel blocks, but not buffer clear operations. To enable -and disable fog, call \%\f3glEnable\fP and \%\f3glDisable\fP with argument -\%\f3GL_FOG\fP. -.P -\%\f3glFog\fP assigns the value or values in \f2params\fP to the fog parameter -specified by \f2pname\fP. -The following values are accepted for \f2pname\fP: -.TP 20 -\%\f3GL_FOG_MODE\fP -\f2params\fP is a single integer or floating-point value that specifies -the equation to be used to compute the fog blend factor, $f$. -Three symbolic constants are accepted: -\%\f3GL_LINEAR\fP, -\%\f3GL_EXP\fP, -and \%\f3GL_EXP2\fP. -The equations corresponding to these symbolic constants are defined below. -The initial fog mode is \%\f3GL_EXP\fP. -.TP -\%\f3GL_FOG_DENSITY\fP -\f2params\fP is a single integer or floating-point value that specifies $density$, -the fog density used in both exponential fog equations. -Only nonnegative densities are accepted. -The initial fog density is 1. -.TP -\%\f3GL_FOG_START\fP -\f2params\fP is a single integer or floating-point value that specifies $start$, -the near distance used in the linear fog equation. -The initial near distance is 0. -.TP -\%\f3GL_FOG_END\fP -\f2params\fP is a single integer or floating-point value that specifies $end$, -the far distance used in the linear fog equation. -The initial far distance is 1. -.TP -\%\f3GL_FOG_INDEX\fP -\f2params\fP is a single integer or floating-point value that specifies -$i sub f$, -the fog color index. -The initial fog index is 0. -.TP -\%\f3GL_FOG_COLOR\fP -\f2params\fP contains four integer or floating-point values that specify -$C sub f$, the fog color. -Integer values are mapped linearly such that the most positive representable -value maps to 1.0, -and the most negative representable value maps to \-1.0. -Floating-point values are mapped directly. -After conversion, -all color components are clamped to the range [0,1]. -The initial fog color is (0, 0, 0, 0). -.P -Fog blends a fog color with each rasterized pixel fragment's posttexturing -color using a blending factor $f$. -Factor $f$ is computed in one of three ways, -depending on the fog mode. -Let $z$ be the distance in eye coordinates from the origin to the fragment -being fogged. -The equation for \%\f3GL_LINEAR\fP fog is -.ce - -.EQ -f ~=~ {end ~-~ z} over {end ~-~ start} -.EN - -.RE -.P -The equation for \%\f3GL_EXP\fP fog is -.ce - -.EQ -f ~=~ e sup {-^(density ~cdot~ z)} -.EN - -.P -The equation for \%\f3GL_EXP2\fP fog is -.ce - -.EQ -f ~=~ e sup {-^(density ~cdot~ z)} sup 2 -.EN - -.P -Regardless of the fog mode, -$f$ is clamped to the range [0,\ 1] after it is computed. -Then, -if the GL is in RGBA color mode, -the fragment's red, green, and blue colors, represented by $C sub r$, -are replaced by -.sp -.ce -.EQ -{C sub r} sup prime ~=~ f^C sub r ~+~ (1 - f)^C sub f -.EN - -.sp -Fog does not affect a fragment's alpha component. -.P -In color index mode, the fragment's color index $i sub r$ is replaced by -.sp -.ce -.EQ -{i sub r} sup prime ~=~ i sub r ~+~ (1 - f)^i sub f -.EN -.P -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2pname\fP is not an accepted value, -or if \f2pname\fP is \%\f3GL_FOG_MODE\fP and \f2params\fP is not an accepted value. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2pname\fP is \%\f3GL_FOG_DENSITY\fP, -and \f2params\fP is negative. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glFog\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glIsEnabled\fP with argument \%\f3GL_FOG\fP -.br -\%\f3glGet\fP with argument \%\f3GL_FOG_COLOR\fP -.br -\%\f3glGet\fP with argument \%\f3GL_FOG_INDEX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_FOG_DENSITY\fP -.br -\%\f3glGet\fP with argument \%\f3GL_FOG_START\fP -.br -\%\f3glGet\fP with argument \%\f3GL_FOG_END\fP -.br -\%\f3glGet\fP with argument \%\f3GL_FOG_MODE\fP -.SH SEE ALSO -\%\f3glEnable(3G)\fP diff --git a/doc/gl-docs/GL/gl/frontface.3gl b/doc/gl-docs/GL/gl/frontface.3gl deleted file mode 100644 index 5159c087..00000000 --- a/doc/gl-docs/GL/gl/frontface.3gl +++ /dev/null @@ -1,66 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 frontface -.ds Xs 58804 4 frontface.gl -.TH GLFRONTFACE 3G -.SH NAME -.B "glFrontFace -\- define front- and back-facing polygons - -.SH C SPECIFICATION -void \f3glFrontFace\fP( -GLenum \fImode\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2mode\fP\ \ 'u -\f2mode\fP -Specifies the orientation of front-facing polygons. -\%\f3GL_CW\fP and \%\f3GL_CCW\fP are accepted. -The initial value is \%\f3GL_CCW\fP. -.SH DESCRIPTION -In a scene composed entirely of opaque closed surfaces, -back-facing polygons are never visible. -Eliminating these invisible polygons has the obvious benefit -of speeding up the rendering of the image. -To enable and disable elimination of back-facing polygons, call \%\f3glEnable\fP -and \%\f3glDisable\fP with argument \%\f3GL_CULL_FACE\fP. -.P -The projection of a polygon to window coordinates is said to have -clockwise winding if an imaginary object following the path -from its first vertex, -its second vertex, -and so on, -to its last vertex, -and finally back to its first vertex, -moves in a clockwise direction about the interior of the polygon. -The polygon's winding is said to be counterclockwise if the imaginary -object following the same path moves in a counterclockwise direction -about the interior of the polygon. -\%\f3glFrontFace\fP specifies whether polygons with clockwise winding in window coordinates, -or counterclockwise winding in window coordinates, -are taken to be front-facing. -Passing \%\f3GL_CCW\fP to \f2mode\fP selects counterclockwise polygons as -front-facing; -\%\f3GL_CW\fP selects clockwise polygons as front-facing. -By default, counterclockwise polygons are taken to be front-facing. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2mode\fP is not an accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glFrontFace\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_FRONT_FACE\fP -.SH SEE ALSO -\%\f3glCullFace(3G)\fP, -\%\f3glLightModel(3G)\fP diff --git a/doc/gl-docs/GL/gl/frustum.3gl b/doc/gl-docs/GL/gl/frustum.3gl deleted file mode 100644 index 67f6d37f..00000000 --- a/doc/gl-docs/GL/gl/frustum.3gl +++ /dev/null @@ -1,133 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 frustum.g -.ds Xs 13962 6 frustum.gl -.TH GLFRUSTUM 3G -.SH NAME -.B "glFrustum -\- multiply the current matrix by a perspective matrix - -.SH C SPECIFICATION -void \f3glFrustum\fP( -GLdouble \fIleft\fP, -.nf -.ta \w'\f3void \fPglFrustum( 'u - GLdouble \fIright\fP, - GLdouble \fIbottom\fP, - GLdouble \fItop\fP, - GLdouble \fInear_val\fP, - GLdouble \fIfar_val\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2left\fP\ \f2right\fP\ \ 'u -\f2left\fP, \f2right\fP -Specify the coordinates for the left and right vertical clipping planes. -.TP -\f2bottom\fP, \f2top\fP -Specify the coordinates for the bottom and top horizontal clipping planes. -.TP -\f2near_val\fP, \f2far_val\fP -Specify the distances to the near and far depth clipping planes. -Both distances must be positive. -.SH DESCRIPTION -\%\f3glFrustum\fP describes a perspective matrix that produces a perspective projection. -The current matrix (see \%\f3glMatrixMode\fP) is multiplied by this matrix -and the result replaces the current matrix, as if -\%\f3glMultMatrix\fP were called with the following matrix -as its argument: -.P -.sp 5 -.ce -.EQ -down 150 -{left [ ~~~ { -down 165 matrix { - ccol { {{2 ~ "near_val"} over {"right" ~-~ "left"}} above 0 above 0 above 0 } - ccol { 0 above {{2 ~ "near_val"} over {"top" ~-~ "bottom"}} ~ above 0 above 0 } - ccol { A ~~~~ above B ~~~~ above C ~~~~ above -1 ~~~~} - ccol { 0 above 0 above D above 0} -}} -~~~ right ]} -.EN -.sp -.ce -.EQ -down 130 -{A ~=~ {"right" ~+~ "left"} over {"right" ~-~ "left"}} -.EN -.sp -.ce -.EQ -down 130 -{B ~=~ {"top" ~+~ "bottom"} over {"top" ~-~ "bottom"}} -.EN -.sp -.ce -.EQ -down 130 -{C ~=~ -{{"far_val" ~+~ "near_val"} over {"far_val" ~-~ "near_val"}}} -.EN -.sp -.ce -.EQ -down 130 -{D ~=~ -^{{2 ~ "far_val" ~ "near_val"} over {"far_val" ~-~ "near_val"}}} -.EN -.sp 2 -.P -Typically, the matrix mode is \%\f3GL_PROJECTION\fP, and -(\f2left\fP, \f2bottom\fP, \-\f2near_val\fP) and (\f2right\fP, \f2top\fP, \-\f2near_val\fP) -specify the points on the near clipping plane that are mapped -to the lower left and upper right corners of the window, -assuming that the eye is located at (0, 0, 0). -\-\f2far_val\fP specifies the location of the far clipping plane. -Both \f2near_val\fP and \f2far_val\fP must be positive. -.P -Use \%\f3glPushMatrix\fP and \%\f3glPopMatrix\fP to save and restore -the current matrix stack. -.SH NOTES -Depth buffer precision is affected by the values specified for -\f2near_val\fP and \f2far_val\fP. -The greater the ratio of \f2far_val\fP to \f2near_val\fP is, -the less effective the depth buffer will be at distinguishing between -surfaces that are near each other. -If -.sp -.ce -$r ~=~ "far_val" over "near_val"$ -.sp -roughly $log sub 2 (r)$ bits of depth buffer precision are lost. -Because $r$ approaches infinity as \f2near_val\fP approaches 0, -\f2near_val\fP must never be set to 0. -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if \f2near_val\fP or \f2far_val\fP is not -positive, or if \f2left\fP = \f2right\fP, or \f2bottom\fP = \f2top\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glFrustum\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_MATRIX_MODE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MODELVIEW_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PROJECTION_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_TEXTURE_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_COLOR_MATRIX\fP -.SH SEE ALSO -\%\f3glOrtho(3G)\fP, -\%\f3glMatrixMode(3G)\fP, -\%\f3glMultMatrix(3G)\fP, -\%\f3glPushMatrix(3G)\fP, -\%\f3glViewport(3G)\fP diff --git a/doc/gl-docs/GL/gl/genlists.3gl b/doc/gl-docs/GL/gl/genlists.3gl deleted file mode 100644 index 6a69c90f..00000000 --- a/doc/gl-docs/GL/gl/genlists.3gl +++ /dev/null @@ -1,49 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 genlists. -.ds Xs 2609 3 genlists.gl -.TH GLGENLISTS 3G -.SH NAME -.B "glGenLists -\- generate a contiguous set of empty display lists - -.SH C SPECIFICATION -GLuint \f3glGenLists\fP( -GLsizei \fIrange\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2range\fP\ \ 'u -\f2range\fP -Specifies the number of contiguous empty display lists -to be generated. -.SH DESCRIPTION -\%\f3glGenLists\fP has one argument, \f2range\fP. -It returns an integer \f2n\fP such that \f2range\fP contiguous -empty display lists, -named \f2n\fP, \f2n\fP+1, ..., \f2n\fP+\f2range\fP \-1, -are created. -If \f2range\fP is 0, -if there is no group of \f2range\fP contiguous names available, -or if any error is generated, -no display lists are generated, -and 0 is returned. -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if \f2range\fP is negative. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGenLists\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glIsList\fP -.SH SEE ALSO -\%\f3glCallList(3G)\fP, -\%\f3glCallLists(3G)\fP, -\%\f3glDeleteLists(3G)\fP, -\%\f3glNewList(3G)\fP diff --git a/doc/gl-docs/GL/gl/gentextures.3gl b/doc/gl-docs/GL/gl/gentextures.3gl deleted file mode 100644 index e975744b..00000000 --- a/doc/gl-docs/GL/gl/gentextures.3gl +++ /dev/null @@ -1,63 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 gentextur -.ds Xs 11752 4 gentextures.gl -.TH GLGENTEXTURES 3G -.SH NAME -.B "glGenTextures -\- generate texture names - -.SH C SPECIFICATION -void \f3glGenTextures\fP( -GLsizei \fIn\fP, -.nf -.ta \w'\f3void \fPglGenTextures( 'u - GLuint \fI*textures\fP ) -.fi - -.SH PARAMETERS -.TP \w'\fItextures\fP\ \ 'u -\f2n\fP -Specifies the number of texture names to be generated. -.TP -\f2textures\fP -Specifies an array in which the generated texture names are stored. -.SH DESCRIPTION -\%\f3glGenTextures\fP returns \f2n\fP texture names in \f2textures\fP. -There is no guarantee that the names form a contiguous set of integers; -however, it is guaranteed that none of the returned names was in use -immediately before the call to \%\f3glGenTextures\fP. -.P -The generated textures have no dimensionality; they assume the dimensionality -of the texture target to which they are first bound -(see \%\f3glBindTexture\fP). -.P -Texture names returned by a call to \%\f3glGenTextures\fP are not returned by -subsequent calls, unless they are first deleted with -\%\f3glDeleteTextures\fP. -.SH NOTES -\%\f3glGenTextures\fP is available only if the GL version is 1.1 or greater. -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if \f2n\fP is negative. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGenTextures\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glIsTexture\fP -.SH SEE ALSO -\%\f3glBindTexture(3G)\fP, -\%\f3glCopyTexImage1D(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glDeleteTextures(3G)\fP, -\%\f3glGet(3G)\fP, -\%\f3glGetTexParameter(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexImage3D(3G)\fP, -\%\f3glTexParameter(3G)\fP diff --git a/doc/gl-docs/GL/gl/get.3gl b/doc/gl-docs/GL/gl/get.3gl deleted file mode 100644 index c9a90d93..00000000 --- a/doc/gl-docs/GL/gl/get.3gl +++ /dev/null @@ -1,1798 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 get.gl -> -.ds Xs 65323 59 get.gl -.TH GLGET 3G -.SH NAME -.B "glGetBooleanv, glGetDoublev, glGetFloatv, glGetIntegerv -\- return the value or values of a selected parameter - -.SH C SPECIFICATION -void \f3glGetBooleanv\fP( -GLenum \fIpname\fP, -.nf -.ta \w'\f3void \fPglGetBooleanv( 'u - GLboolean \fI*params\fP ) -.fi - -.SH C SPECIFICATION -void \f3glGetDoublev\fP( -GLenum \fIpname\fP, -.nf -.ta \w'\f3void \fPglGetDoublev( 'u - GLdouble \fI*params\fP ) -.fi - -.SH C SPECIFICATION -void \f3glGetFloatv\fP( -GLenum \fIpname\fP, -.nf -.ta \w'\f3void \fPglGetFloatv( 'u - GLfloat \fI*params\fP ) -.fi - -.SH C SPECIFICATION -void \f3glGetIntegerv\fP( -GLenum \fIpname\fP, -.nf -.ta \w'\f3void \fPglGetIntegerv( 'u - GLint \fI*params\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIparams\fP\ \ 'u -\f2pname\fP -Specifies the parameter value to be returned. -The symbolic constants in the list below are accepted. -.TP -\f2params\fP -Returns the value or values of the specified parameter. -.SH DESCRIPTION -These four commands return values for simple state variables in GL. -\f2pname\fP is a symbolic constant indicating the state variable to be returned, -and \f2params\fP is a pointer to an array of the indicated type in -which to place the returned data. -.P -Type conversion is performed if \f2params\fP has a different type than -the state variable value being requested. -If \%\f3glGetBooleanv\fP is called, -a floating-point (or integer) value is converted to \%\f3GL_FALSE\fP if -and only if it is 0.0 (or 0). -Otherwise, -it is converted to \%\f3GL_TRUE\fP. -If \%\f3glGetIntegerv\fP is called, boolean values are returned as -\%\f3GL_TRUE\fP or \%\f3GL_FALSE\fP, and most floating-point values are -rounded to the nearest integer value. Floating-point colors and -normals, however, are returned with a linear mapping that maps 1.0 to -the most positive representable integer value, -and \-1.0 to the most negative representable integer value. -If \%\f3glGetFloatv\fP or \%\f3glGetDoublev\fP is called, -boolean values are returned as \%\f3GL_TRUE\fP or \%\f3GL_FALSE\fP, -and integer values are converted to floating-point values. -.P -The following symbolic constants are accepted by \f2pname\fP: -.TP 25 -\%\f3GL_ACCUM_ALPHA_BITS\fP -\f2params\fP returns one value, -the number of alpha bitplanes in the accumulation buffer. -.TP -\%\f3GL_ACCUM_BLUE_BITS\fP -\f2params\fP returns one value, -the number of blue bitplanes in the accumulation buffer. -.TP -\%\f3GL_ACCUM_CLEAR_VALUE\fP -\f2params\fP returns four values: -the red, green, blue, and alpha values used to clear the accumulation buffer. -Integer values, -if requested, -are linearly mapped from the internal floating-point representation such -that 1.0 returns the most positive representable integer value, -and \-1.0 returns the most negative representable integer -value. The initial value is (0, 0, 0, 0). -See \%\f3glClearAccum\fP. -.TP -\%\f3GL_ACCUM_GREEN_BITS\fP -\f2params\fP returns one value, -the number of green bitplanes in the accumulation buffer. -.TP -\%\f3GL_ACCUM_RED_BITS\fP -\f2params\fP returns one value, -the number of red bitplanes in the accumulation buffer. -.TP -\%\f3GL_ACTIVE_TEXTURE_ARB\fP -\f2params\fP returns a single value indicating the active multitexture unit. -The initial value is \%\f3GL_TEXTURE0_ARB\fP. -See \%\f3glActiveTextureARB\fP. -.TP -\%\f3GL_ALIASED_POINT_SIZE_RANGE\fP -\f2params\fP returns two values, -the smallest and largest supported sizes for aliased points. -.TP -\%\f3GL_ALIASED_LINE_WIDTH_RANGE\fP -\f2params\fP returns two values, -the smallest and largest supported widths for aliased lines. -.TP -\%\f3GL_ALPHA_BIAS\fP -\f2params\fP returns one value, -the alpha bias factor used during pixel transfers. The initial value is 0. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_ALPHA_BITS\fP -\f2params\fP returns one value, -the number of alpha bitplanes in each color buffer. -.TP -\%\f3GL_ALPHA_SCALE\fP -\f2params\fP returns one value, -the alpha scale factor used during pixel transfers. The initial value is 1. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_ALPHA_TEST\fP -\f2params\fP returns a single boolean value indicating whether alpha testing -of fragments is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glAlphaFunc\fP. -.TP -\%\f3GL_ALPHA_TEST_FUNC\fP -\f2params\fP returns one value, -the symbolic name of the alpha test function. The initial value is -\%\f3GL_ALWAYS\fP. -See \%\f3glAlphaFunc\fP. -.TP -\%\f3GL_ALPHA_TEST_REF\fP -\f2params\fP returns one value, -the reference value for the alpha test. The initial value is 0. -See \%\f3glAlphaFunc\fP. -An integer value, -if requested, -is linearly mapped from the internal floating-point representation such -that 1.0 returns the most positive representable integer value, -and \-1.0 returns the most negative representable integer value. -.TP -\%\f3GL_ATTRIB_STACK_DEPTH\fP -\f2params\fP returns one value, -the depth of the attribute stack. -If the stack is empty, -0 is returned. The initial value is 0. -See \%\f3glPushAttrib\fP. -.TP -\%\f3GL_AUTO_NORMAL\fP -\f2params\fP returns a single boolean value indicating whether 2D map evaluation -automatically generates surface normals. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glMap2\fP. -.TP -\%\f3GL_AUX_BUFFERS\fP -\f2params\fP returns one value, -the number of auxiliary color buffers. The initial value is 0. -.TP -\%\f3GL_BLEND\fP -\f2params\fP returns a single boolean value indicating whether blending is -enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glBlendFunc\fP. -.TP -\%\f3GL_BLEND_COLOR\fP -\f2params\fP returns four values, -the red, green, blue, and alpha values which are the components of -the blend color. -See \%\f3glBlendColor\fP. -.TP -\%\f3GL_BLEND_DST\fP -\f2params\fP returns one value, -the symbolic constant identifying the destination blend -function. The initial value is \%\f3GL_ZERO\fP. -See \%\f3glBlendFunc\fP. -.TP -\%\f3GL_BLEND_EQUATION\fP -\f2params\fP returns one value, a symbolic constant indicating whether -the blend equation is \%\f3GL_FUNC_ADD\fP, \%\f3GL_MIN\fP or -\%\f3GL_MAX\fP. See \%\f3glBlendEquation\fP. -.TP -\%\f3GL_BLEND_SRC\fP -\f2params\fP returns one value, -the symbolic constant identifying the source blend function. The initial -value is \%\f3GL_ONE\fP. -See \%\f3glBlendFunc\fP. -.TP -\%\f3GL_BLUE_BIAS\fP -\f2params\fP returns one value, -the blue bias factor used during pixel transfers. The initial value is 0. -See -\%\f3glPixelTransfer\fP. -.TP -\%\f3GL_BLUE_BITS\fP -\f2params\fP returns one value, -the number of blue bitplanes in each color buffer. -.TP -\%\f3GL_BLUE_SCALE\fP -\f2params\fP returns one value, -the blue scale factor used during pixel transfers. The initial value is 1. -See -\%\f3glPixelTransfer\fP. -.TP -\%\f3GL_CLIENT_ACTIVE_TEXTURE_ARB\fP -\f2params\fP returns a single integer value indicating the current client active -multitexture unit. The initial value is \%\f3GL_TEXTURE0_ARB\fP. -See \%\f3glClientActiveTextureARB\fP. -.TP -\%\f3GL_CLIENT_ATTRIB_STACK_DEPTH\fP -\f2params\fP returns one value indicating the depth of the -attribute stack. The initial value is 0. -See \%\f3glPushClientAttrib\fP. -.TP -\%\f3GL_CLIP_PLANE\fP\f2i\fP -\f2params\fP returns a single boolean value indicating whether the specified -clipping plane is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glClipPlane\fP. -.TP -\%\f3GL_COLOR_ARRAY\fP -\f2params\fP returns a single boolean value indicating whether the color array is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glColorPointer\fP. -.TP -\%\f3GL_COLOR_ARRAY_SIZE\fP -\f2params\fP returns one value, -the number of components per color in the color array. The initial value -is 4. See \%\f3glColorPointer\fP. -.TP -\%\f3GL_COLOR_ARRAY_STRIDE\fP -\f2params\fP returns one value, -the byte offset between consecutive colors in the color array. The initial -value is 0. -See \%\f3glColorPointer\fP. -.TP -\%\f3GL_COLOR_ARRAY_TYPE\fP -\f2params\fP returns one value, -the data type of each component in the color array. The initial value -is \%\f3GL_FLOAT\fP. See \%\f3glColorPointer\fP. -.TP -\%\f3GL_COLOR_CLEAR_VALUE\fP -\f2params\fP returns four values: -the red, green, blue, and alpha values used to clear the color buffers. -Integer values, -if requested, -are linearly mapped from the internal floating-point representation such -that 1.0 returns the most positive representable integer value, -and \-1.0 returns the most negative representable integer -value. The initial value is (0, 0, 0, 0). -See \%\f3glClearColor\fP. -.TP -\%\f3GL_COLOR_LOGIC_OP\fP -\f2params\fP returns a single boolean value indicating whether a fragment's -RGBA color values are merged into the framebuffer using a logical -operation. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glLogicOp\fP. -.TP -\%\f3GL_COLOR_MATERIAL\fP -\f2params\fP returns a single boolean value indicating whether one or more -material parameters are tracking the current color. The initial value -is \%\f3GL_FALSE\fP. -See \%\f3glColorMaterial\fP. -.TP -\%\f3GL_COLOR_MATERIAL_FACE\fP -\f2params\fP returns one value, -a symbolic constant indicating which materials have a parameter that is -tracking the current color. The initial value is \%\f3GL_FRONT_AND_BACK\fP. -See \%\f3glColorMaterial\fP. -.TP -\%\f3GL_COLOR_MATERIAL_PARAMETER\fP -\f2params\fP returns one value, -a symbolic constant indicating which material parameters are -tracking the current color. The initial value is -\%\f3GL_AMBIENT_AND_DIFFUSE\fP. -See \%\f3glColorMaterial\fP. -.TP -\%\f3GL_COLOR_MATRIX\fP -\f2params\fP returns sixteen values: -the color matrix on the top of the color matrix stack. Initially -this matrix is the identity matrix. See \%\f3glPushMatrix\fP. -.TP -\%\f3GL_COLOR_MATRIX_STACK_DEPTH\fP -\f2params\fP returns one value, -the maximum supported depth of the projection matrix stack. The value must -be at least 2. -See \%\f3glPushMatrix\fP. -.TP -\%\f3GL_COLOR_TABLE\fP -\f2params\fP returns a single boolean value indicating whether the color table -lookup is enabled. -See \%\f3glColorTable\fP. -.TP -\%\f3GL_COLOR_WRITEMASK\fP -\f2params\fP returns four boolean values: -the red, green, blue, and alpha write enables for the color -buffers. The initial value is (\%\f3GL_TRUE\fP, \%\f3GL_TRUE\fP, -\%\f3GL_TRUE\fP, \%\f3GL_TRUE\fP). -See \%\f3glColorMask\fP. -.TP -\%\f3GL_CONVOLUTION_1D\fP -\f2params\fP returns a single boolean value indicating whether 1D convolution -is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glConvolutionFilter1D\fP. -.TP -\%\f3GL_CONVOLUTION_2D\fP -\f2params\fP returns a single boolean value indicating whether 2D convolution -is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glConvolutionFilter2D\fP. -.TP -\%\f3GL_CULL_FACE\fP -\f2params\fP returns a single boolean value indicating whether polygon culling -is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glCullFace\fP. -.TP -\%\f3GL_CULL_FACE_MODE\fP -\f2params\fP returns one value, -a symbolic constant indicating which polygon faces are to be -culled. The initial value is \%\f3GL_BACK\fP. -See \%\f3glCullFace\fP. -.TP -\%\f3GL_CURRENT_COLOR\fP -\f2params\fP returns four values: -the red, green, blue, and alpha values of the current color. -Integer values, -if requested, -are linearly mapped from the internal floating-point representation such -that 1.0 returns the most positive representable integer value, -and \-1.0 returns the most negative representable integer value. -See \%\f3glColor\fP. The initial value is (1, 1, 1, 1). -.TP -\%\f3GL_CURRENT_INDEX\fP -\f2params\fP returns one value, -the current color index. The initial value is 1. -See \%\f3glIndex\fP. -.TP -\%\f3GL_CURRENT_NORMAL\fP -\f2params\fP returns three values: -the \f2x\fP, \f2y\fP, and \f2z\fP values of the current normal. -Integer values, -if requested, -are linearly mapped from the internal floating-point representation such -that 1.0 returns the most positive representable integer value, -and \-1.0 returns the most negative representable integer value. -The initial value is (0, 0, 1). See \%\f3glNormal\fP. -.TP -\%\f3GL_CURRENT_RASTER_COLOR\fP -\f2params\fP returns four values: -the red, green, blue, and alpha values of the current raster position. -Integer values, -if requested, -are linearly mapped from the internal floating-point representation such -that 1.0 returns the most positive representable integer value, -and \-1.0 returns the most negative representable integer -value. The initial value is (1, 1, 1, 1). -See \%\f3glRasterPos\fP. -.TP -\%\f3GL_CURRENT_RASTER_DISTANCE\fP -\f2params\fP returns one value, -the distance from the eye to the current raster position. The initial -value is 0. -See \%\f3glRasterPos\fP. -.TP -\%\f3GL_CURRENT_RASTER_INDEX\fP -\f2params\fP returns one value, -the color index of the current raster position. The initial value is 1. -See \%\f3glRasterPos\fP. -.TP -\%\f3GL_CURRENT_RASTER_POSITION\fP -\f2params\fP returns four values: -the \f2x\fP, \f2y\fP, \f2z\fP, and \f2w\fP components of the current -raster position. -\f2x\fP, \f2y\fP, and \f2z\fP are in window coordinates, -and \f2w\fP is in clip coordinates. The initial value is (0, 0, 0, 1). -See \%\f3glRasterPos\fP. -.TP -\%\f3GL_CURRENT_RASTER_POSITION_VALID\fP -\f2params\fP returns a single boolean value indicating whether the current -raster position is valid. The initial value is \%\f3GL_TRUE\fP. -See \%\f3glRasterPos\fP. -.TP -\%\f3GL_CURRENT_RASTER_TEXTURE_COORDS\fP -\f2params\fP returns four values: -the \f2s\fP, \f2t\fP, \f2r\fP, and \f2q\fP -current raster texture coordinates. The initial value is (0, 0, 0, 1). -See \%\f3glRasterPos\fP and \%\f3glTexCoord\fP. -.TP -\%\f3GL_CURRENT_TEXTURE_COORDS\fP -\f2params\fP returns four values: -the \f2s\fP, \f2t\fP, \f2r\fP, and \f2q\fP current texture -coordinates. The initial value is (0, 0, 0, 1). -See -\%\f3glTexCoord\fP. -.TP -\%\f3GL_DEPTH_BIAS\fP -\f2params\fP returns one value, -the depth bias factor used during pixel transfers. The initial value is 0. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_DEPTH_BITS\fP -\f2params\fP returns one value, -the number of bitplanes in the depth buffer. -.TP -\%\f3GL_DEPTH_CLEAR_VALUE\fP -\f2params\fP returns one value, -the value that is used to clear the depth buffer. -Integer values, -if requested, -are linearly mapped from the internal floating-point representation such -that 1.0 returns the most positive representable integer value, -and \-1.0 returns the most negative representable integer -value. The initial value is 1. -See \%\f3glClearDepth\fP. -.TP -\%\f3GL_DEPTH_FUNC\fP -\f2params\fP returns one value, -the symbolic constant that indicates the depth comparison -function. The initial value is \%\f3GL_LESS\fP. -See \%\f3glDepthFunc\fP. -.TP -\%\f3GL_DEPTH_RANGE\fP -\f2params\fP returns two values: -the near and far mapping limits for the depth buffer. -Integer values, -if requested, -are linearly mapped from the internal floating-point representation such -that 1.0 returns the most positive representable integer value, -and \-1.0 returns the most negative representable integer -value. The initial value is (0, 1). -See \%\f3glDepthRange\fP. -.TP -\%\f3GL_DEPTH_SCALE\fP -\f2params\fP returns one value, -the depth scale factor used during pixel transfers. The initial value is 1. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_DEPTH_TEST\fP -\f2params\fP returns a single boolean value indicating whether depth testing -of fragments is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glDepthFunc\fP and \%\f3glDepthRange\fP. -.TP -\%\f3GL_DEPTH_WRITEMASK\fP -\f2params\fP returns a single boolean value indicating if the depth buffer -is enabled for writing. The initial value is \%\f3GL_TRUE\fP. -See \%\f3glDepthMask\fP. -.TP -\%\f3GL_DITHER\fP -\f2params\fP returns a single boolean value indicating whether dithering of -fragment colors and indices is enabled. The initial value is \%\f3GL_TRUE\fP. -.TP -\%\f3GL_DOUBLEBUFFER\fP -\f2params\fP returns a single boolean value indicating whether double buffering -is supported. -.TP -\%\f3GL_DRAW_BUFFER\fP -\f2params\fP returns one value, -a symbolic constant indicating which buffers are being drawn to. -See \%\f3glDrawBuffer\fP. The initial value is \%\f3GL_BACK\fP if there -are back buffers, otherwise it is \%\f3GL_FRONT\fP. -.TP -\%\f3GL_EDGE_FLAG\fP -\f2params\fP returns a single boolean value indicating whether the current -edge flag is \%\f3GL_TRUE\fP or \%\f3GL_FALSE\fP. The initial value is \%\f3GL_TRUE\fP. -See \%\f3glEdgeFlag\fP. -.TP -\%\f3GL_EDGE_FLAG_ARRAY\fP -\f2params\fP returns a single boolean value indicating whether the edge -flag array is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glEdgeFlagPointer\fP. -.TP -\%\f3GL_EDGE_FLAG_ARRAY_STRIDE\fP -\f2params\fP returns one value, -the byte offset between consecutive edge flags in the edge flag -array. The initial value is 0. -See \%\f3glEdgeFlagPointer\fP. -.TP -\%\f3GL_FEEDBACK_BUFFER_SIZE\fP -\f2params\fP returns one value, the size of the feedback buffer. See -\%\f3glFeedbackBuffer\fP. -.TP -\%\f3GL_FEEDBACK_BUFFER_TYPE\fP -\f2params\fP returns one value, the type of the feedback buffer. See -\%\f3glFeedbackBuffer\fP. -.TP -\%\f3GL_FOG\fP -\f2params\fP returns a single boolean value indicating whether fogging is -enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glFog\fP. -.TP -\%\f3GL_FOG_COLOR\fP -\f2params\fP returns four values: -the red, green, blue, and alpha components of the fog color. -Integer values, -if requested, -are linearly mapped from the internal floating-point representation such -that 1.0 returns the most positive representable integer value, -and \-1.0 returns the most negative representable integer -value. The initial value is (0, 0, 0, 0). -See \%\f3glFog\fP. -.TP -\%\f3GL_FOG_DENSITY\fP -\f2params\fP returns one value, -the fog density parameter. The initial value is 1. -See \%\f3glFog\fP. -.TP -\%\f3GL_FOG_END\fP -\f2params\fP returns one value, -the end factor for the linear fog equation. The initial value is 1. -See \%\f3glFog\fP. -.TP -\%\f3GL_FOG_HINT\fP -\f2params\fP returns one value, -a symbolic constant indicating the mode of the fog hint. The initial value -is \%\f3GL_DONT_CARE\fP. -See \%\f3glHint\fP. -.TP -\%\f3GL_FOG_INDEX\fP -\f2params\fP returns one value, -the fog color index. The initial value is 0. -See \%\f3glFog\fP. -.TP -\%\f3GL_FOG_MODE\fP -\f2params\fP returns one value, -a symbolic constant indicating which fog equation is selected. The initial -value is \%\f3GL_EXP\fP. -See \%\f3glFog\fP. -.TP -\%\f3GL_FOG_START\fP -\f2params\fP returns one value, -the start factor for the linear fog equation. The initial value is 0. -See \%\f3glFog\fP. -.TP -\%\f3GL_FRONT_FACE\fP -\f2params\fP returns one value, -a symbolic constant indicating whether clockwise or counterclockwise -polygon winding is treated as front-facing. The initial value is -\%\f3GL_CCW\fP. -See \%\f3glFrontFace\fP. -.TP -\%\f3GL_GREEN_BIAS\fP -\f2params\fP returns one value, -the green bias factor used during pixel transfers. The initial value is 0. -.TP -\%\f3GL_GREEN_BITS\fP -\f2params\fP returns one value, -the number of green bitplanes in each color buffer. -.TP -\%\f3GL_GREEN_SCALE\fP -\f2params\fP returns one value, -the green scale factor used during pixel transfers. The initial value is 1. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_HISTOGRAM\fP -\f2params\fP returns a single boolean value indicating whether histogram is -enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glHistogram\fP. -.TP -\%\f3GL_INDEX_ARRAY\fP -\f2params\fP returns a single boolean value indicating whether the color -index array is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glIndexPointer\fP. -.TP -\%\f3GL_INDEX_ARRAY_STRIDE\fP -\f2params\fP returns one value, -the byte offset between consecutive color indexes in the color index -array. The initial value is 0. -See \%\f3glIndexPointer\fP. -.TP -\%\f3GL_INDEX_ARRAY_TYPE\fP -\f2params\fP returns one value, -the data type of indexes in the color index array. The initial value is -\%\f3GL_FLOAT\fP. -See \%\f3glIndexPointer\fP. -.TP -\%\f3GL_INDEX_BITS\fP -\f2params\fP returns one value, -the number of bitplanes in each color index buffer. -.TP -\%\f3GL_INDEX_CLEAR_VALUE\fP -\f2params\fP returns one value, -the color index used to clear the color index buffers. The initial value -is 0. -See \%\f3glClearIndex\fP. -.TP -\%\f3GL_INDEX_LOGIC_OP\fP -\f2params\fP returns a single boolean value indicating whether a fragment's index -values are merged into the framebuffer using a logical -operation. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glLogicOp\fP. -.TP -\%\f3GL_INDEX_MODE\fP -\f2params\fP returns a single boolean value indicating whether the GL is in -color index mode (\%\f3GL_TRUE\fP) or RGBA mode (\%\f3GL_FALSE\fP). -.TP -\%\f3GL_INDEX_OFFSET\fP -\f2params\fP returns one value, -the offset added to color and stencil indices during pixel -transfers. The initial value is 0. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_INDEX_SHIFT\fP -\f2params\fP returns one value, -the amount that color and stencil indices are shifted during pixel -transfers. The initial value is 0. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_INDEX_WRITEMASK\fP -\f2params\fP returns one value, -a mask indicating which bitplanes of each color index buffer can be -written. The initial value is all 1's. -See \%\f3glIndexMask\fP. -.TP -\%\f3GL_LIGHT\fP\f2i\fP -\f2params\fP returns a single boolean value indicating whether the specified -light is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glLight\fP and \%\f3glLightModel\fP. -.TP -\%\f3GL_LIGHTING\fP -\f2params\fP returns a single boolean value indicating whether lighting is -enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glLightModel\fP. -.TP -\%\f3GL_LIGHT_MODEL_AMBIENT\fP -\f2params\fP returns four values: -the red, green, blue, and alpha components of the ambient intensity of -the entire scene. -Integer values, -if requested, -are linearly mapped from the internal floating-point representation such -that 1.0 returns the most positive representable integer value, -and \-1.0 returns the most negative representable integer -value. The initial value is (0.2, 0.2, 0.2, 1.0). -See \%\f3glLightModel\fP. -.TP -\%\f3GL_LIGHT_MODEL_COLOR_CONTROL\fP -\f2params\fP returns single enumerated value indicating whether specular -reflection calculations are separated from normal lighting computations. -The initial value is \%\f3GL_SINGLE_COLOR\fP. -.TP -\%\f3GL_LIGHT_MODEL_LOCAL_VIEWER\fP -\f2params\fP returns a single boolean value indicating whether specular reflection -calculations treat the viewer as being local to the scene. The initial -value is \%\f3GL_FALSE\fP. -See \%\f3glLightModel\fP. -.TP -\%\f3GL_LIGHT_MODEL_TWO_SIDE\fP -\f2params\fP returns a single boolean value indicating whether separate materials -are used to compute lighting for front- and back-facing -polygons. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glLightModel\fP. -.TP -\%\f3GL_LINE_SMOOTH\fP -\f2params\fP returns a single boolean value indicating whether antialiasing of -lines is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glLineWidth\fP. -.TP -\%\f3GL_LINE_SMOOTH_HINT\fP -\f2params\fP returns one value, -a symbolic constant indicating the mode of the line antialiasing -hint. The initial value is \%\f3GL_DONT_CARE\fP. -See \%\f3glHint\fP. -.TP -\%\f3GL_LINE_STIPPLE\fP -\f2params\fP returns a single boolean value indicating whether stippling of lines -is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glLineStipple\fP. -.TP -\%\f3GL_LINE_STIPPLE_PATTERN\fP -\f2params\fP returns one value, -the 16-bit line stipple pattern. The initial value is all 1's. -See \%\f3glLineStipple\fP. -.TP -\%\f3GL_LINE_STIPPLE_REPEAT\fP -\f2params\fP returns one value, -the line stipple repeat factor. The initial value is 1. -See \%\f3glLineStipple\fP. -.TP -\%\f3GL_LINE_WIDTH\fP -\f2params\fP returns one value, -the line width as specified with \%\f3glLineWidth\fP. The initial value is -1. -.TP -\%\f3GL_LINE_WIDTH_GRANULARITY\fP -\f2params\fP returns one value, -the width difference between adjacent supported widths for antialiased lines. -See \%\f3glLineWidth\fP. -.TP -\%\f3GL_LINE_WIDTH_RANGE\fP -\f2params\fP returns two values: -the smallest and largest supported widths for antialiased -lines. -See \%\f3glLineWidth\fP. -.TP -\%\f3GL_LIST_BASE\fP -\f2params\fP returns one value, -the base offset added to all names in arrays presented to -\%\f3glCallLists\fP. The initial value is 0. -See \%\f3glListBase\fP. -.TP -\%\f3GL_LIST_INDEX\fP -\f2params\fP returns one value, -the name of the display list currently under construction. -0 is returned if no display list is currently under -construction. The initial value is 0. -See \%\f3glNewList\fP. -.TP -\%\f3GL_LIST_MODE\fP -\f2params\fP returns one value, -a symbolic constant indicating the construction mode of the display list -currently under construction. The initial value is 0. -See \%\f3glNewList\fP. -.TP -\%\f3GL_LOGIC_OP_MODE\fP -\f2params\fP returns one value, -a symbolic constant indicating the selected logic operation -mode. The initial value is \%\f3GL_COPY\fP. -See \%\f3glLogicOp\fP. -.TP -\%\f3GL_MAP1_COLOR_4\fP -\f2params\fP returns a single boolean value indicating whether -1D evaluation generates colors. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glMap1\fP. -.TP -\%\f3GL_MAP1_GRID_DOMAIN\fP -\f2params\fP returns two values: -the endpoints of the 1D map's grid domain. The initial value is (0, 1). -See \%\f3glMapGrid\fP. -.TP -\%\f3GL_MAP1_GRID_SEGMENTS\fP -\f2params\fP returns one value, -the number of partitions in the 1D map's grid domain. The initial value -is 1. -See \%\f3glMapGrid\fP. -.TP -\%\f3GL_MAP1_INDEX\fP -\f2params\fP returns a single boolean value indicating whether -1D evaluation generates color indices. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glMap1\fP. -.TP -\%\f3GL_MAP1_NORMAL\fP -\f2params\fP returns a single boolean value indicating whether -1D evaluation generates normals. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glMap1\fP. -.TP -\%\f3GL_MAP1_TEXTURE_COORD_1\fP -\f2params\fP returns a single boolean value indicating whether -1D evaluation generates 1D texture coordinates. The initial value is -\%\f3GL_FALSE\fP. -See \%\f3glMap1\fP. -.TP -\%\f3GL_MAP1_TEXTURE_COORD_2\fP -\f2params\fP returns a single boolean value indicating whether -1D evaluation generates 2D texture coordinates. The initial value is -\%\f3GL_FALSE\fP. -See \%\f3glMap1\fP. -.TP -\%\f3GL_MAP1_TEXTURE_COORD_3\fP -\f2params\fP returns a single boolean value indicating whether -1D evaluation generates 3D texture coordinates. The initial value is -\%\f3GL_FALSE\fP. -See \%\f3glMap1\fP. -.TP -\%\f3GL_MAP1_TEXTURE_COORD_4\fP -\f2params\fP returns a single boolean value indicating whether -1D evaluation generates 4D texture coordinates. The initial value is -\%\f3GL_FALSE\fP. -See \%\f3glMap1\fP. -.TP -\%\f3GL_MAP1_VERTEX_3\fP -\f2params\fP returns a single boolean value indicating whether -1D evaluation generates 3D vertex coordinates. The initial value is -\%\f3GL_FALSE\fP. -See \%\f3glMap1\fP. -.TP -\%\f3GL_MAP1_VERTEX_4\fP -\f2params\fP returns a single boolean value indicating whether -1D evaluation generates 4D vertex coordinates. The initial value is -\%\f3GL_FALSE\fP. -See \%\f3glMap1\fP. -.TP -\%\f3GL_MAP2_COLOR_4\fP -\f2params\fP returns a single boolean value indicating whether -2D evaluation generates colors. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glMap2\fP. -.TP -\%\f3GL_MAP2_GRID_DOMAIN\fP -\f2params\fP returns four values: -the endpoints of the 2D map's $i$ and $j$ grid domains. The initial value -is (0,1; 0,1). -See \%\f3glMapGrid\fP. -.TP -\%\f3GL_MAP2_GRID_SEGMENTS\fP -\f2params\fP returns two values: -the number of partitions in the 2D map's $i$ and $j$ grid -domains. The initial value is (1,1). -See \%\f3glMapGrid\fP. -.TP -\%\f3GL_MAP2_INDEX\fP -\f2params\fP returns a single boolean value indicating whether -2D evaluation generates color indices. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glMap2\fP. -.TP -\%\f3GL_MAP2_NORMAL\fP -\f2params\fP returns a single boolean value indicating whether -2D evaluation generates normals. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glMap2\fP. -.TP -\%\f3GL_MAP2_TEXTURE_COORD_1\fP -\f2params\fP returns a single boolean value indicating whether -2D evaluation generates 1D texture coordinates. The initial value is -\%\f3GL_FALSE\fP. -See \%\f3glMap2\fP. -.TP -\%\f3GL_MAP2_TEXTURE_COORD_2\fP -\f2params\fP returns a single boolean value indicating whether -2D evaluation generates 2D texture coordinates. The initial value is -\%\f3GL_FALSE\fP. -See \%\f3glMap2\fP. -.TP -\%\f3GL_MAP2_TEXTURE_COORD_3\fP -\f2params\fP returns a single boolean value indicating whether -2D evaluation generates 3D texture coordinates. The initial value is -\%\f3GL_FALSE\fP. -See \%\f3glMap2\fP. -.TP -\%\f3GL_MAP2_TEXTURE_COORD_4\fP -\f2params\fP returns a single boolean value indicating whether -2D evaluation generates 4D texture coordinates. The initial value is -\%\f3GL_FALSE\fP. -See \%\f3glMap2\fP. -.TP -\%\f3GL_MAP2_VERTEX_3\fP -\f2params\fP returns a single boolean value indicating whether -2D evaluation generates 3D vertex coordinates. The initial value is -\%\f3GL_FALSE\fP. -See \%\f3glMap2\fP. -.TP -\%\f3GL_MAP2_VERTEX_4\fP -\f2params\fP returns a single boolean value indicating whether -2D evaluation generates 4D vertex coordinates. The initial value is -\%\f3GL_FALSE\fP. -See \%\f3glMap2\fP. -.TP -\%\f3GL_MAP_COLOR\fP -\f2params\fP returns a single boolean value indicating if colors and -color indices are to be replaced by table lookup during pixel -transfers. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_MAP_STENCIL\fP -\f2params\fP returns a single boolean value indicating if stencil indices -are to be replaced by table lookup during pixel transfers. The initial -value is \%\f3GL_FALSE\fP. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_MATRIX_MODE\fP -\f2params\fP returns one value, -a symbolic constant indicating which matrix stack is currently the -target of all matrix operations. The initial value is \%\f3GL_MODELVIEW\fP. -See \%\f3glMatrixMode\fP. -.TP -\%\f3GL_MAX_3D_TEXTURE_SIZE\fP -\f2params\fP returns one value, -a rough estimate of the largest 3D texture that the GL can handle. -If the GL version is 1.2 or greater, use -\%\f3GL_PROXY_TEXTURE_3D\fP to determine if a texture is too large. -See \%\f3glTexImage3D\fP. -.TP -\%\f3GL_MAX_CLIENT_ATTRIB_STACK_DEPTH\fP -\f2params\fP returns one value indicating the maximum supported depth -of the client attribute stack. -See \%\f3glPushClientAttrib\fP. -.TP -\%\f3GL_MAX_ATTRIB_STACK_DEPTH\fP -\f2params\fP returns one value, -the maximum supported depth of the attribute stack. The value must be at least 16. -See \%\f3glPushAttrib\fP. -.TP -\%\f3GL_MAX_CLIP_PLANES\fP -\f2params\fP returns one value, -the maximum number of application-defined clipping planes. The value must be at least 6. -See \%\f3glClipPlane\fP. -.TP -\%\f3GL_MAX_COLOR_MATRIX_STACK_DEPTH\fP -\f2params\fP returns one value, the maximum supported depth of the color matrix -stack. The value must be at least 2. -See \%\f3glPushMatrix\fP. -.TP -\%\f3GL_MAX_ELEMENTS_INDICES\fP -\f2params\fP returns one value, -the recommended maximum number of vertex array indices. See \%\f3glDrawRangeElements\fP. -.TP -\%\f3GL_MAX_ELEMENTS_VERTICES\fP -\f2params\fP returns one value, -the recommended maximum number of vertex array vertices. See \%\f3glDrawRangeElements\fP. -.TP -\%\f3GL_MAX_EVAL_ORDER\fP -\f2params\fP returns one value, -the maximum equation order supported by 1D and 2D -evaluators. The value must be at least 8. -See \%\f3glMap1\fP and \%\f3glMap2\fP. -.TP -\%\f3GL_MAX_LIGHTS\fP -\f2params\fP returns one value, -the maximum number of lights. The value must be at least 8. -See \%\f3glLight\fP. -.TP -\%\f3GL_MAX_LIST_NESTING\fP -\f2params\fP returns one value, -the maximum recursion depth allowed during display-list -traversal. The value must be at least 64. -See \%\f3glCallList\fP. -.TP -\%\f3GL_MAX_MODELVIEW_STACK_DEPTH\fP -\f2params\fP returns one value, -the maximum supported depth of the modelview matrix stack. The value must -be at least 32. -See \%\f3glPushMatrix\fP. -.TP -\%\f3GL_MAX_NAME_STACK_DEPTH\fP -\f2params\fP returns one value, -the maximum supported depth of the selection name stack. The value must be at least 64. -See \%\f3glPushName\fP. -.TP -\%\f3GL_MAX_PIXEL_MAP_TABLE\fP -\f2params\fP returns one value, -the maximum supported size of a \%\f3glPixelMap\fP lookup table. -The value must be at least 32. -See \%\f3glPixelMap\fP. -.TP -\%\f3GL_MAX_PROJECTION_STACK_DEPTH\fP -\f2params\fP returns one value, -the maximum supported depth of the projection matrix stack. The value must be at least 2. -See \%\f3glPushMatrix\fP. -.TP -\%\f3GL_MAX_TEXTURE_SIZE\fP -\f2params\fP returns one value. -The value gives a rough estimate of the largest texture that -the GL can handle. -If the GL version is 1.1 or greater, use -\%\f3GL_PROXY_TEXTURE_1D\fP or \%\f3GL_PROXY_TEXTURE_2D\fP -to determine if a texture is too large. -See \%\f3glTexImage1D\fP and \%\f3glTexImage2D\fP. -.TP -\%\f3GL_MAX_TEXTURE_STACK_DEPTH\fP -\f2params\fP returns one value, -the maximum supported depth of the texture matrix stack. The value must be at least 2. -See \%\f3glPushMatrix\fP. -.TP -\%\f3GL_MAX_TEXTURE_UNITS_ARB\fP -\f2params\fP returns a single value indicating the number of texture units -supported. The value must be at least 1. -See \%\f3glActiveTextureARB\fP. -.TP -\%\f3GL_MAX_VIEWPORT_DIMS\fP -\f2params\fP returns two values: -the maximum supported width and height of the viewport. -These must be at least as large as the visible dimensions of the display -being rendered to. -See \%\f3glViewport\fP. -.TP -\%\f3GL_MINMAX\fP -\f2params\fP returns a single boolean value indicating whether pixel minmax -values are computed. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glMinmax\fP. -.TP -\%\f3GL_MODELVIEW_MATRIX\fP -\f2params\fP returns sixteen values: -the modelview matrix on the top of the modelview matrix stack. Initially -this matrix is the identity matrix. See \%\f3glPushMatrix\fP. -.TP -\%\f3GL_MODELVIEW_STACK_DEPTH\fP -\f2params\fP returns one value, -the number of matrices on the modelview matrix stack. -The initial value is 1. -See \%\f3glPushMatrix\fP. -.TP -\%\f3GL_NAME_STACK_DEPTH\fP -\f2params\fP returns one value, -the number of names on the selection name stack. The initial value is 0. -See \%\f3glPushName\fP. -.TP -\%\f3GL_NORMAL_ARRAY\fP -\f2params\fP returns a single boolean value, indicating whether the normal -array is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glNormalPointer\fP. -.TP -\%\f3GL_NORMAL_ARRAY_STRIDE\fP -\f2params\fP returns one value, -the byte offset between consecutive normals in the normal -array. The initial value is 0. -See \%\f3glNormalPointer\fP. -.TP -\%\f3GL_NORMAL_ARRAY_TYPE\fP -\f2params\fP returns one value, -the data type of each coordinate in the normal array. The initial value is -\%\f3GL_FLOAT\fP. -See \%\f3glNormalPointer\fP. -.TP -\%\f3GL_NORMALIZE\fP -\f2params\fP returns a single boolean value indicating whether normals are -automatically scaled to unit length after they have been transformed to -eye coordinates. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glNormal\fP. -.TP -\%\f3GL_PACK_ALIGNMENT\fP -\f2params\fP returns one value, -the byte alignment used for writing pixel data to memory. The initial -value is 4. -See \%\f3glPixelStore\fP. -.TP -\%\f3GL_PACK_IMAGE_HEIGHT\fP -\f2params\fP returns one value, -the image height used for writing pixel data to memory. The initial -value is 0. -See \%\f3glPixelStore\fP. -.TP -\%\f3GL_PACK_LSB_FIRST\fP -\f2params\fP returns a single boolean value indicating whether single-bit -pixels being written to memory are written first to the least significant -bit of each unsigned byte. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glPixelStore\fP. -.TP -\%\f3GL_PACK_ROW_LENGTH\fP -\f2params\fP returns one value, -the row length used for writing pixel data to memory. The initial value is -0. -See \%\f3glPixelStore\fP. -.TP -\%\f3GL_PACK_SKIP_IMAGES\fP -\f2params\fP returns one value, -the number of pixel images skipped before the first pixel is written -into memory. The initial value is 0. -See \%\f3glPixelStore\fP. -.TP -\%\f3GL_PACK_SKIP_PIXELS\fP -\f2params\fP returns one value, -the number of pixel locations skipped before the first pixel is written -into memory. The initial value is 0. -See \%\f3glPixelStore\fP. -.TP -\%\f3GL_PACK_SKIP_ROWS\fP -\f2params\fP returns one value, -the number of rows of pixel locations skipped before the first pixel is written -into memory. The initial value is 0. -See \%\f3glPixelStore\fP. -.TP -\%\f3GL_PACK_SWAP_BYTES\fP -\f2params\fP returns a single boolean value indicating whether the bytes of -two-byte and four-byte pixel indices and components are swapped before being -written to memory. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glPixelStore\fP. -.TP -\%\f3GL_PERSPECTIVE_CORRECTION_HINT\fP -\f2params\fP returns one value, -a symbolic constant indicating the mode of the perspective correction -hint. The initial value is \%\f3GL_DONT_CARE\fP. -See \%\f3glHint\fP. -.TP -\%\f3GL_PIXEL_MAP_A_TO_A_SIZE\fP -\f2params\fP returns one value, -the size of the alpha-to-alpha pixel translation table. -The initial value is 1. -See \%\f3glPixelMap\fP. -.TP -\%\f3GL_PIXEL_MAP_B_TO_B_SIZE\fP -\f2params\fP returns one value, -the size of the blue-to-blue pixel translation table. -The initial value is 1. -See \%\f3glPixelMap\fP. -.TP -\%\f3GL_PIXEL_MAP_G_TO_G_SIZE\fP -\f2params\fP returns one value, -the size of the green-to-green pixel translation table. -The initial value is 1. -See \%\f3glPixelMap\fP. -.TP -\%\f3GL_PIXEL_MAP_I_TO_A_SIZE\fP -\f2params\fP returns one value, -the size of the index-to-alpha pixel translation table. -The initial value is 1. -See \%\f3glPixelMap\fP. -.TP -\%\f3GL_PIXEL_MAP_I_TO_B_SIZE\fP -\f2params\fP returns one value, -the size of the index-to-blue pixel translation table. -The initial value is 1. -See \%\f3glPixelMap\fP. -.TP -\%\f3GL_PIXEL_MAP_I_TO_G_SIZE\fP -\f2params\fP returns one value, -the size of the index-to-green pixel translation table. -The initial value is 1. -See \%\f3glPixelMap\fP. -.TP -\%\f3GL_PIXEL_MAP_I_TO_I_SIZE\fP -\f2params\fP returns one value, -the size of the index-to-index pixel translation table. -The initial value is 1. -See \%\f3glPixelMap\fP. -.TP -\%\f3GL_PIXEL_MAP_I_TO_R_SIZE\fP -\f2params\fP returns one value, -the size of the index-to-red pixel translation table. -The initial value is 1. -See \%\f3glPixelMap\fP. -.TP -\%\f3GL_PIXEL_MAP_R_TO_R_SIZE\fP -\f2params\fP returns one value, -the size of the red-to-red pixel translation table. -The initial value is 1. -See \%\f3glPixelMap\fP. -.TP -\%\f3GL_PIXEL_MAP_S_TO_S_SIZE\fP -\f2params\fP returns one value, -the size of the stencil-to-stencil pixel translation table. -The initial value is 1. -See \%\f3glPixelMap\fP. -.TP -\%\f3GL_POINT_SIZE\fP -\f2params\fP returns one value, -the point size as specified by \%\f3glPointSize\fP. The initial value is 1. -.TP -\%\f3GL_POINT_SIZE_GRANULARITY\fP -\f2params\fP returns one value, -the size difference between adjacent supported sizes for antialiased points. -See \%\f3glPointSize\fP. -.TP -\%\f3GL_POINT_SIZE_RANGE\fP -\f2params\fP returns two values: -the smallest and largest supported sizes for antialiased -points. The smallest size must be at most 1, and the largest size must -be at least 1. -See \%\f3glPointSize\fP. -.TP -\%\f3GL_POINT_SMOOTH\fP -\f2params\fP returns a single boolean value indicating whether antialiasing of -points is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glPointSize\fP. -.TP -\%\f3GL_POINT_SMOOTH_HINT\fP -\f2params\fP returns one value, -a symbolic constant indicating the mode of the point antialiasing -hint. The initial value is \%\f3GL_DONT_CARE\fP. -See \%\f3glHint\fP. -.TP -\%\f3GL_POLYGON_MODE\fP -\f2params\fP returns two values: -symbolic constants indicating whether front-facing and back-facing polygons -are rasterized as points, lines, or filled polygons. The initial value is -\%\f3GL_FILL\fP. -See \%\f3glPolygonMode\fP. -.TP -\%\f3GL_POLYGON_OFFSET_FACTOR\fP -\f2params\fP returns one value, -the scaling factor used to determine the variable offset that is added -to the depth value of each fragment generated when a polygon is -rasterized. The initial value is 0. -See \%\f3glPolygonOffset\fP. -.TP -\%\f3GL_POLYGON_OFFSET_UNITS\fP -\f2params\fP returns one value. -This value is multiplied by an implementation-specific value and then -added to the depth value of each fragment -generated when a polygon is rasterized. The initial value is 0. -See \%\f3glPolygonOffset\fP. -.TP -\%\f3GL_POLYGON_OFFSET_FILL\fP -\f2params\fP returns a single boolean value indicating whether polygon offset -is enabled for polygons in fill mode. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glPolygonOffset\fP. -.TP -\%\f3GL_POLYGON_OFFSET_LINE\fP -\f2params\fP returns a single boolean value indicating whether polygon offset -is enabled for polygons in line mode. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glPolygonOffset\fP. -.TP -\%\f3GL_POLYGON_OFFSET_POINT\fP -\f2params\fP returns a single boolean value indicating whether polygon offset -is enabled for polygons in point mode. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glPolygonOffset\fP. -.TP -\%\f3GL_POLYGON_SMOOTH\fP -\f2params\fP returns a single boolean value indicating whether antialiasing of -polygons is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glPolygonMode\fP. -.TP -\%\f3GL_POLYGON_SMOOTH_HINT\fP -\f2params\fP returns one value, -a symbolic constant indicating the mode of the polygon antialiasing -hint. The initial value is \%\f3GL_DONT_CARE\fP. -See \%\f3glHint\fP. -.TP -\%\f3GL_POLYGON_STIPPLE\fP -\f2params\fP returns a single boolean value indicating whether polygon -stippling is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glPolygonStipple\fP. -.TP -\%\f3GL_POST_COLOR_MATRIX_COLOR_TABLE\fP -\f2params\fP returns a single boolean value indicating whether post color -matrix transformation lookup is enabled. The initial value is -\%\f3GL_FALSE\fP. -See \%\f3glColorTable\fP. -.TP -\%\f3GL_POST_COLOR_MATRIX_RED_BIAS\fP -\f2params\fP returns one value, the red bias factor applied to RGBA fragments -after color matrix transformations. The initial value is 0. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_POST_COLOR_MATRIX_GREEN_BIAS\fP -\f2params\fP returns one value, the green bias factor applied to RGBA fragments -after color matrix transformations. The initial value is 0. -See \%\f3glPixelTransfer\fP -.TP -\%\f3GL_POST_COLOR_MATRIX_BLUE_BIAS\fP -\f2params\fP returns one value, the blue bias factor applied to RGBA fragments -after color matrix transformations. The initial value is 0. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_POST_COLOR_MATRIX_ALPHA_BIAS\fP -\f2params\fP returns one value, the alpha bias factor applied to RGBA fragments -after color matrix transformations. The initial value is 0. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_POST_COLOR_MATRIX_RED_SCALE\fP -\f2params\fP returns one value, the red scale factor applied to RGBA fragments -after color matrix transformations. The initial value is 1. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_POST_COLOR_MATRIX_GREEN_SCALE\fP -\f2params\fP returns one value, the green scale factor applied to RGBA fragments -after color matrix transformations. The initial value is 1. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_POST_COLOR_MATRIX_BLUE_SCALE\fP -\f2params\fP returns one value, the blue scale factor applied to RGBA fragments -after color matrix transformations. The initial value is 1. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_POST_COLOR_MATRIX_ALPHA_SCALE\fP -\f2params\fP returns one value, the alpha scale factor applied to RGBA fragments -after color matrix transformations. The initial value is 1. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_POST_CONVOLUTION_COLOR_TABLE\fP -\f2params\fP returns a single boolean value indicating whether post convolution -lookup is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glColorTable\fP. -.TP -\%\f3GL_POST_CONVOLUTION_RED_BIAS\fP -\f2params\fP returns one value, the red bias factor applied to RGBA fragments -after convolution. The initial value is 0. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_POST_CONVOLUTION_GREEN_BIAS\fP -\f2params\fP returns one value, the green bias factor applied to RGBA fragments -after convolution. The initial value is 0. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_POST_CONVOLUTION_BLUE_BIAS\fP -\f2params\fP returns one value, the blue bias factor applied to RGBA fragments -after convolution. The initial value is 0. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_POST_CONVOLUTION_ALPHA_BIAS\fP -\f2params\fP returns one value, the alpha bias factor applied to RGBA fragments -after convolution. The initial value is 0. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_POST_CONVOLUTION_RED_SCALE\fP -\f2params\fP returns one value, the red scale factor applied to RGBA fragments -after convolution. The initial value is 1. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_POST_CONVOLUTION_GREEN_SCALE\fP -\f2params\fP returns one value, the green scale factor applied to RGBA fragments -after convolution. The initial value is 1. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_POST_CONVOLUTION_BLUE_SCALE\fP -\f2params\fP returns one value, the blue scale factor applied to RGBA fragments -after convolution. The initial value is 1. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_POST_CONVOLUTION_ALPHA_SCALE\fP -\f2params\fP returns one value, the alpha scale factor applied to RGBA fragments -after convolution. The initial value is 1. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_PROJECTION_MATRIX\fP -\f2params\fP returns sixteen values: -the projection matrix on the top of the projection matrix -stack. Initially this matrix is the identity matrix. -See \%\f3glPushMatrix\fP. -.TP -\%\f3GL_PROJECTION_STACK_DEPTH\fP -\f2params\fP returns one value, -the number of matrices on the projection matrix stack. -The initial value is 1. -See \%\f3glPushMatrix\fP. -.TP -\%\f3GL_READ_BUFFER\fP -\f2params\fP returns one value, -a symbolic constant indicating which color buffer is selected for -reading. The initial value is \%\f3GL_BACK\fP if there is a back buffer, -otherwise it is \%\f3GL_FRONT\fP. -See -\%\f3glReadPixels\fP and \%\f3glAccum\fP. -.TP -\%\f3GL_RED_BIAS\fP -\f2params\fP returns one value, -the red bias factor used during pixel transfers. The initial value is 0. -.TP -\%\f3GL_RED_BITS\fP -\f2params\fP returns one value, -the number of red bitplanes in each color buffer. -.TP -\%\f3GL_RED_SCALE\fP -\f2params\fP returns one value, -the red scale factor used during pixel transfers. The initial value is 1. -See \%\f3glPixelTransfer\fP. -.TP -\%\f3GL_RENDER_MODE\fP -\f2params\fP returns one value, -a symbolic constant indicating whether the GL is in render, -select, -or feedback mode. The initial value is \%\f3GL_RENDER\fP. -See \%\f3glRenderMode\fP. -.TP -\%\f3GL_RESCALE_NORMAL\fP -\f2params\fP returns single boolean value -indicating whether normal rescaling is enabled. -See \%\f3glEnable\fP. -.TP -\%\f3GL_RGBA_MODE\fP -\f2params\fP returns a single boolean value indicating whether the GL is in RGBA -mode (true) or color index mode (false). -See \%\f3glColor\fP. -.TP -\%\f3GL_SCISSOR_BOX\fP -\f2params\fP returns four values: -the $x$ and $y$ window coordinates of the scissor box, -followed by its width and height. -Initially the $x$ and $y$ window coordinates are both 0 and the -width and height are set to the size of the window. -See \%\f3glScissor\fP. -.TP -\%\f3GL_SCISSOR_TEST\fP -\f2params\fP returns a single boolean value indicating whether scissoring is -enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glScissor\fP. -.TP -\%\f3GL_SELECTION_BUFFER_SIZE\fP -\f2params\fP return one value, -the size of the selection buffer. -See \%\f3glSelectBuffer\fP. -.TP -\%\f3GL_SEPARABLE_2D\fP -\f2params\fP returns a single boolean value indicating whether 2D separable -convolution is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glSeparableFilter2D\fP. -.TP -\%\f3GL_SHADE_MODEL\fP -\f2params\fP returns one value, -a symbolic constant indicating whether the shading mode is flat or -smooth. The initial value is \%\f3GL_SMOOTH\fP. -See \%\f3glShadeModel\fP. -.TP -\%\f3GL_SMOOTH_LINE_WIDTH_RANGE\fP -\f2params\fP returns two values, -the smallest and largest supported widths for antialiased lines. -See \%\f3glLineWidth\fP. -.TP -\%\f3GL_SMOOTH_LINE_WIDTH_GRANULARITY\fP -\f2params\fP returns one value, -the granularity of widths for antialiased lines. -See \%\f3glLineWidth\fP. -.TP -\%\f3GL_SMOOTH_POINT_SIZE_RANGE\fP -\f2params\fP returns two values, -the smallest and largest supported widths for antialiased points. -See \%\f3glPointSize\fP. -.TP -\%\f3GL_SMOOTH_POINT_SIZE_GRANULARITY\fP -\f2params\fP returns one value, -the granularity of sizes for antialiased points. -See \%\f3glPointSize\fP. -.TP -\%\f3GL_STENCIL_BITS\fP -\f2params\fP returns one value, -the number of bitplanes in the stencil buffer. -.TP -\%\f3GL_STENCIL_CLEAR_VALUE\fP -\f2params\fP returns one value, -the index to which the stencil bitplanes are cleared. The initial value is -0. -See \%\f3glClearStencil\fP. -.TP -\%\f3GL_STENCIL_FAIL\fP -\f2params\fP returns one value, -a symbolic constant indicating what action is taken when the stencil -test fails. The initial value is \%\f3GL_KEEP\fP. -See \%\f3glStencilOp\fP. -.TP -\%\f3GL_STENCIL_FUNC\fP -\f2params\fP returns one value, -a symbolic constant indicating what function is used to compare the -stencil reference value with the stencil buffer value. The initial value -is \%\f3GL_ALWAYS\fP. -See \%\f3glStencilFunc\fP. -.TP -\%\f3GL_STENCIL_PASS_DEPTH_FAIL\fP -\f2params\fP returns one value, -a symbolic constant indicating what action is taken when the stencil -test passes, -but the depth test fails. The initial value is \%\f3GL_KEEP\fP. -See \%\f3glStencilOp\fP. -.TP -\%\f3GL_STENCIL_PASS_DEPTH_PASS\fP -\f2params\fP returns one value, -a symbolic constant indicating what action is taken when the stencil -test passes and the depth test passes. The initial value is \%\f3GL_KEEP\fP. -See \%\f3glStencilOp\fP. -.TP -\%\f3GL_STENCIL_REF\fP -\f2params\fP returns one value, -the reference value that is compared with the contents of the stencil -buffer. The initial value is 0. -See \%\f3glStencilFunc\fP. -.TP -\%\f3GL_STENCIL_TEST\fP -\f2params\fP returns a single boolean value indicating whether stencil testing -of fragments is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glStencilFunc\fP and \%\f3glStencilOp\fP. -.TP -\%\f3GL_STENCIL_VALUE_MASK\fP -\f2params\fP returns one value, -the mask that is used to mask both the stencil reference value and the -stencil buffer value before they are compared. The initial value is all 1's. -See \%\f3glStencilFunc\fP. -.TP -\%\f3GL_STENCIL_WRITEMASK\fP -\f2params\fP returns one value, -the mask that controls writing of the stencil bitplanes. The initial value -is all 1's. See \%\f3glStencilMask\fP. -.TP -\%\f3GL_STEREO\fP -\f2params\fP returns a single boolean value indicating whether stereo buffers -(left and right) are supported. -.TP -\%\f3GL_SUBPIXEL_BITS\fP -\f2params\fP returns one value, -an estimate of the number of bits of subpixel resolution that are used to -position rasterized geometry in window coordinates. The initial value -.br -is 4. -.TP -\%\f3GL_TEXTURE_1D\fP -\f2params\fP returns a single boolean value indicating whether 1D texture -mapping is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glTexImage1D\fP. -.TP -\%\f3GL_TEXTURE_BINDING_1D\fP -\f2params\fP returns a single value, the name of the texture -currently bound to the target \%\f3GL_TEXTURE_1D\fP. The initial value is 0. -See \%\f3glBindTexture\fP. -.TP -\%\f3GL_TEXTURE_2D\fP -\f2params\fP returns a single boolean value indicating whether 2D texture -mapping is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glTexImage2D\fP. -.TP -\%\f3GL_TEXTURE_BINDING_2D\fP -\f2params\fP returns a single value, the name of the texture -currently bound to the target \%\f3GL_TEXTURE_2D\fP. The initial value is 0. -See \%\f3glBindTexture\fP. -.TP -\%\f3GL_TEXTURE_3D\fP -\f2params\fP returns a single boolean value indicating whether 3D texture -mapping is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glTexImage3D\fP. -.TP -\%\f3GL_TEXTURE_BINDING_3D\fP -\f2params\fP returns a single value, the name of the texture -currently bound to the target \%\f3GL_TEXTURE_3D\fP. The initial value is 0. -See \%\f3glBindTexture\fP. -.TP -\%\f3GL_TEXTURE_COORD_ARRAY\fP -\f2params\fP returns a single boolean value indicating whether the texture -coordinate array is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glTexCoordPointer\fP. -.TP -\%\f3GL_TEXTURE_COORD_ARRAY_SIZE\fP -\f2params\fP returns one value, -the number of coordinates per element in the texture coordinate -array. The initial value is 4. -See \%\f3glTexCoordPointer\fP. -.TP -\%\f3GL_TEXTURE_COORD_ARRAY_STRIDE\fP -\f2params\fP returns one value, -the byte offset between consecutive elements in the texture coordinate -array. The initial value is 0. -See \%\f3glTexCoordPointer\fP. -.TP -\%\f3GL_TEXTURE_COORD_ARRAY_TYPE\fP -\f2params\fP returns one value, -the data type of the coordinates in the texture coordinate -array. The initial value is \%\f3GL_FLOAT\fP. -See \%\f3glTexCoordPointer\fP. -.TP -\%\f3GL_TEXTURE_GEN_Q\fP -\f2params\fP returns a single boolean value indicating whether automatic generation -of the \f2q\fP texture coordinate is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glTexGen\fP. -.TP -\%\f3GL_TEXTURE_GEN_R\fP -\f2params\fP returns a single boolean value indicating whether automatic generation -of the \f2r\fP texture coordinate is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glTexGen\fP. -.TP -\%\f3GL_TEXTURE_GEN_S\fP -\f2params\fP returns a single boolean value indicating whether automatic generation -of the \f2S\fP texture coordinate is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glTexGen\fP. -.TP -\%\f3GL_TEXTURE_GEN_T\fP -\f2params\fP returns a single boolean value indicating whether automatic generation -of the T texture coordinate is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glTexGen\fP. -.TP -\%\f3GL_TEXTURE_MATRIX\fP -\f2params\fP returns sixteen values: -the texture matrix on the top of the texture matrix stack. Initially this -matrix is the identity matrix. -See \%\f3glPushMatrix\fP. -.TP -\%\f3GL_TEXTURE_STACK_DEPTH\fP -\f2params\fP returns one value, -the number of matrices on the texture matrix stack. -The initial value is 1. -See \%\f3glPushMatrix\fP. -.TP -\%\f3GL_UNPACK_ALIGNMENT\fP -\f2params\fP returns one value, -the byte alignment used for reading pixel data from memory. The initial -value is 4. -See \%\f3glPixelStore\fP. -.TP -\%\f3GL_UNPACK_IMAGE_HEIGHT\fP -\f2params\fP returns one value, -the image height used for reading pixel data from memory. The initial -is 0. -See \%\f3glPixelStore\fP. -.TP -\%\f3GL_UNPACK_LSB_FIRST\fP -\f2params\fP returns a single boolean value indicating whether single-bit -pixels being read from memory are read first from the least significant -bit of each unsigned byte. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glPixelStore\fP. -.TP -\%\f3GL_UNPACK_ROW_LENGTH\fP -\f2params\fP returns one value, -the row length used for reading pixel data from memory. The initial value -is 0. -See \%\f3glPixelStore\fP. -.TP -\%\f3GL_UNPACK_SKIP_IMAGES\fP -\f2params\fP returns one value, -the number of pixel images skipped before the first pixel is read -from memory. The initial value is 0. -See \%\f3glPixelStore\fP. -.TP -\%\f3GL_UNPACK_SKIP_PIXELS\fP -\f2params\fP returns one value, -the number of pixel locations skipped before the first pixel is read -from memory. The initial value is 0. -See \%\f3glPixelStore\fP. -.TP -\%\f3GL_UNPACK_SKIP_ROWS\fP -\f2params\fP returns one value, -the number of rows of pixel locations skipped before the first pixel is read -from memory. The initial value is 0. -See \%\f3glPixelStore\fP. -.TP -\%\f3GL_UNPACK_SWAP_BYTES\fP -\f2params\fP returns a single boolean value indicating whether the bytes of -two-byte and four-byte pixel indices and components are swapped after being -read from memory. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glPixelStore\fP. -.TP -\%\f3GL_VERTEX_ARRAY\fP -\f2params\fP returns a single boolean value indicating whether the vertex -array is enabled. The initial value is \%\f3GL_FALSE\fP. -See \%\f3glVertexPointer\fP. -.TP -\%\f3GL_VERTEX_ARRAY_SIZE\fP -\f2params\fP returns one value, -the number of coordinates per vertex in the vertex array. The initial -value is 4. -See \%\f3glVertexPointer\fP. -.TP -\%\f3GL_VERTEX_ARRAY_STRIDE\fP -\f2params\fP returns one value, -the byte offset between consecutive vertices in the vertex -array. The initial value is 0. -See \%\f3glVertexPointer\fP. -.TP -\%\f3GL_VERTEX_ARRAY_TYPE\fP -\f2params\fP returns one value, -the data type of each coordinate in the vertex array. The initial value is -\%\f3GL_FLOAT\fP. -See \%\f3glVertexPointer\fP. -.TP -\%\f3GL_VIEWPORT\fP -\f2params\fP returns four values: -the $x$ and $y$ window coordinates of the viewport, -followed by its width and height. -Initially the $x$ and $y$ window coordinates are both set to 0, -and the width and height are set to the width and height of the window into -which the GL will do its rendering. -See \%\f3glViewport\fP. -.TP -\%\f3GL_ZOOM_X\fP -\f2params\fP returns one value, -the $x$ pixel zoom factor. The initial value is 1. -See \%\f3glPixelZoom\fP. -.TP -\%\f3GL_ZOOM_Y\fP -\f2params\fP returns one value, -the $y$ pixel zoom factor. The initial value is 1. -See \%\f3glPixelZoom\fP. -.P -Many of the boolean parameters can also be queried more easily using -\%\f3glIsEnabled\fP. -.SH NOTES -\%\f3GL_COLOR_LOGIC_OP\fP, -\%\f3GL_COLOR_ARRAY\fP, -\%\f3GL_COLOR_ARRAY_SIZE\fP, -\%\f3GL_COLOR_ARRAY_STRIDE\fP, -\%\f3GL_COLOR_ARRAY_TYPE\fP, -\%\f3GL_EDGE_FLAG_ARRAY\fP, -\%\f3GL_EDGE_FLAG_ARRAY_STRIDE\fP, -\%\f3GL_INDEX_ARRAY\fP, -\%\f3GL_INDEX_ARRAY_STRIDE\fP, -\%\f3GL_INDEX_ARRAY_TYPE\fP, -\%\f3GL_INDEX_LOGIC_OP\fP, -\%\f3GL_NORMAL_ARRAY\fP, -\%\f3GL_NORMAL_ARRAY_STRIDE\fP, -\%\f3GL_NORMAL_ARRAY_TYPE\fP, -\%\f3GL_POLYGON_OFFSET_UNITS\fP, -\%\f3GL_POLYGON_OFFSET_FACTOR\fP, -\%\f3GL_POLYGON_OFFSET_FILL\fP, -\%\f3GL_POLYGON_OFFSET_LINE\fP, -\%\f3GL_POLYGON_OFFSET_POINT\fP, -\%\f3GL_TEXTURE_COORD_ARRAY\fP, -\%\f3GL_TEXTURE_COORD_ARRAY_SIZE\fP, -\%\f3GL_TEXTURE_COORD_ARRAY_STRIDE\fP, -\%\f3GL_TEXTURE_COORD_ARRAY_TYPE\fP, -\%\f3GL_VERTEX_ARRAY\fP, -\%\f3GL_VERTEX_ARRAY_SIZE\fP, -\%\f3GL_VERTEX_ARRAY_STRIDE\fP, and -\%\f3GL_VERTEX_ARRAY_TYPE\fP -are available only if the GL version is 1.1 or greater. -.P -\%\f3GL_ALIASED_POINT_SIZE_RANGE\fP, -\%\f3GL_ALIASED_POINT_SIZE_GRANULARITY\fP, -\%\f3GL_FEEDBACK_BUFFER_SIZE\fP, -\%\f3GL_FEEDBACK_BUFFER_TYPE\fP, -\%\f3GL_LIGHT_MODEL_AMBIENT\fP, -\%\f3GL_LIGHT_MODEL_COLOR_CONTROL\fP, -\%\f3GL_MAX_3D_TEXTURE_SIZE\fP, -\%\f3GL_MAX_ELEMENTS_INDICES\fP, -\%\f3GL_MAX_ELEMENTS_VERTICES\fP, -\%\f3GL_PACK_IMAGE_HEIGHT\fP, -\%\f3GL_PACK_SKIP_IMAGES\fP, -\%\f3GL_RESCALE_NORMAL\fP, -\%\f3GL_SELECTION_BUFFER_SIZE\fP, -\%\f3GL_SMOOTH_LINE_WIDTH_GRANULARITY\fP, -\%\f3GL_SMOOTH_LINE_WIDTH_RANGE\fP, -\%\f3GL_SMOOTH_POINT_SIZE_GRANULARITY\fP, -\%\f3GL_SMOOTH_POINT_SIZE_RANGE\fP, -\%\f3GL_TEXTURE_3D\fP, -\%\f3GL_TEXTURE_BINDING_3D\fP, -\%\f3GL_UNPACK_IMAGE_HEIGHT\fP, and -\%\f3GL_UNPACK_SKIP_IMAGES\fP -are available only if the GL version is 1.2 or greater. -.P -\%\f3GL_LINE_WIDTH_GRANULARITY\fP was deprecated in GL version 1.2. Its -functionality was replaced by \%\f3GL_SMOOTH_LINE_WIDTH_GRANULARITY\fP. -.P -\%\f3GL_LINE_WIDTH_RANGE\fP was deprecated in GL version 1.2. Its -functionality was replaced by \%\f3GL_SMOOTH_LINE_WIDTH_RANGE\fP. -.P -\%\f3GL_POINT_SIZE_GRANULARITY\fP was deprecated in GL version 1.2. Its -functionality was replaced by \%\f3GL_SMOOTH_POINT_SIZE_GRANULARITY\fP. -.P -\%\f3GL_POINT_SIZE_RANGE\fP was deprecated in GL version 1.2. Its -functionality was replaced by \%\f3GL_SMOOTH_POINT_SIZE_RANGE\fP. -.P -\%\f3GL_BLEND_COLOR\fP, -\%\f3GL_BLEND_EQUATION\fP, -\%\f3GL_COLOR_MATRIX\fP, -\%\f3GL_COLOR_MATRIX_STACK_DEPTH\fP, -\%\f3GL_COLOR_TABLE\fP, -\%\f3GL_CONVOLUTION_1D\fP, -\%\f3GL_CONVOLUTION_2D\fP, -\%\f3GL_HISTOGRAM\fP, -\%\f3GL_MAX_COLOR_MATRIX_STACK_DEPTH\fP, -\%\f3GL_MINMAX\fP, -\%\f3GL_POST_COLOR_MATRIX_COLOR_TABLE\fP, -\%\f3GL_POST_COLOR_MATRIX_RED_BIAS\fP, -\%\f3GL_POST_COLOR_MATRIX_GREEN_BIAS\fP, -\%\f3GL_POST_COLOR_MATRIX_BLUE_BIAS\fP, -\%\f3GL_POST_COLOR_MATRIX_ALPHA_BIAS\fP, -\%\f3GL_POST_COLOR_MATRIX_RED_SCALE\fP, -\%\f3GL_POST_COLOR_MATRIX_GREEN_SCALE\fP, -\%\f3GL_POST_COLOR_MATRIX_BLUE_SCALE\fP, -\%\f3GL_POST_COLOR_MATRIX_ALPHA_SCALE\fP, -\%\f3GL_POST_CONVOLUTION_COLOR_TABLE\fP, -\%\f3GL_POST_CONVOLUTION_RED_BIAS\fP, -\%\f3GL_POST_CONVOLUTION_GREEN_BIAS\fP, -\%\f3GL_POST_CONVOLUTION_BLUE_BIAS\fP, -\%\f3GL_POST_CONVOLUTION_ALPHA_BIAS\fP, -\%\f3GL_POST_CONVOLUTION_RED_SCALE\fP, -\%\f3GL_POST_CONVOLUTION_GREEN_SCALE\fP, -\%\f3GL_POST_CONVOLUTION_BLUE_SCALE\fP, -\%\f3GL_POST_CONVOLUTION_ALPHA_SCALE\fP, and -\%\f3GL_SEPARABLE_2D\fP -are available only if \%\f3GL_ARB_imaging\fP is returned from \%\f3glGet\fP -when called with the argument \%\f3GL_EXTENSIONS\fP. -.P -\%\f3GL_ACTIVE_TEXTURE_ARB\fP, -\%\f3GL_CLIENT_ACTIVE_TEXTURE_ARB\fP, and -\%\f3GL_MAX_TEXTURE_UNITS_ARB\fP are available only if -\%\f3GL_ARB_multitexture\fP is returned from \%\f3glGet\fP when called with the -argument \%\f3GL_EXTENSIONS\fP. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, the following -parameters return the associated value for the active texture unit: -\%\f3GL_CURRENT_RASTER_TEXTURE_COORDS\fP, -\%\f3GL_TEXTURE_1D\fP, \%\f3GL_TEXTURE_BINDING_1D\fP, -\%\f3GL_TEXTURE_2D\fP, \%\f3GL_TEXTURE_BINDING_2D\fP, -\%\f3GL_TEXTURE_3D\fP, \%\f3GL_TEXTURE_BINDING_3D\fP, -\%\f3GL_TEXTURE_GEN_S\fP, -\%\f3GL_TEXTURE_GEN_T\fP, -\%\f3GL_TEXTURE_GEN_R\fP, -\%\f3GL_TEXTURE_GEN_Q\fP, -\%\f3GL_TEXTURE_MATRIX\fP, and -\%\f3GL_TEXTURE_STACK_DEPTH\fP. -Likewise, the following parameters return the associated value for the -active client texture unit: -\%\f3GL_TEXTURE_COORD_ARRAY\fP, -\%\f3GL_TEXTURE_COORD_ARRAY_SIZE\fP, -\%\f3GL_TEXTURE_COORD_ARRAY_STRIDE\fP, -\%\f3GL_TEXTURE_COORD_ARRAY_TYPE\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2pname\fP is not an accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGet\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.P -.SH SEE ALSO -\%\f3glGetClipPlane(3G)\fP, -\%\f3glGetColorTable(3G)\fP, -\%\f3glGetColorTableParameter(3G)\fP, -\%\f3glGetConvolutionFilter(3G)\fP, -\%\f3glGetConvolutionParameter(3G)\fP, -\%\f3glGetError(3G)\fP, -\%\f3glGetHistogram(3G)\fP, -\%\f3glGetHistogramParameter(3G)\fP, -\%\f3glGetLight(3G)\fP, -\%\f3glGetMap(3G)\fP, -\%\f3glGetMaterial(3G)\fP, -\%\f3glGetMinmax(3G)\fP, -\%\f3glGetMinmaxParameter(3G)\fP, -\%\f3glGetPixelMap(3G)\fP, -\%\f3glGetPointerv(3G)\fP, -\%\f3glGetPolygonStipple(3G)\fP, -\%\f3glGetSeparableFilter(3G)\fP, -\%\f3glGetString(3G)\fP, -\%\f3glGetTexEnv(3G)\fP, -\%\f3glGetTexGen(3G)\fP, -\%\f3glGetTexImage(3G)\fP, -\%\f3glGetTexLevelParameter(3G)\fP, -\%\f3glGetTexParameter(3G)\fP, -\%\f3glIsEnabled(3G)\fP diff --git a/doc/gl-docs/GL/gl/getclipplane.3gl b/doc/gl-docs/GL/gl/getclipplane.3gl deleted file mode 100644 index 3bd14d32..00000000 --- a/doc/gl-docs/GL/gl/getclipplane.3gl +++ /dev/null @@ -1,53 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 getclippl -.ds Xs 48616 4 getclipplane.gl -.TH GLGETCLIPPLANE 3G -.SH NAME -.B "glGetClipPlane -\- return the coefficients of the specified clipping plane - -.SH C SPECIFICATION -void \f3glGetClipPlane\fP( -GLenum \fIplane\fP, -.nf -.ta \w'\f3void \fPglGetClipPlane( 'u - GLdouble \fI*equation\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIequation\fP\ \ 'u -\f2plane\fP -Specifies a clipping plane. -The number of clipping planes depends on the implementation, -but at least six clipping planes are supported. -They are identified by symbolic names of the form \%\f3GL_CLIP_PLANE\fP$i$ -where 0 \(<= $ i $ < \%\f3GL_MAX_CLIP_PLANES\fP. -.TP -\f2equation\fP -Returns four double-precision values that are the coefficients of the plane equation of \f2plane\fP in eye coordinates. -The initial value is (0, 0, 0, 0). -.SH DESCRIPTION -\%\f3glGetClipPlane\fP returns in \f2equation\fP the four coefficients of the plane equation -for \f2plane\fP. -.SH NOTES -It is always the case that \%\f3GL_CLIP_PLANE\fP$i$ = \%\f3GL_CLIP_PLANE0\fP + $i$. -.P -If an error is generated, -no change is made to the contents of \f2equation\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2plane\fP is not an accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetClipPlane\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glClipPlane(3G)\fP diff --git a/doc/gl-docs/GL/gl/getcolortable.3gl b/doc/gl-docs/GL/gl/getcolortable.3gl deleted file mode 100644 index 7a578860..00000000 --- a/doc/gl-docs/GL/gl/getcolortable.3gl +++ /dev/null @@ -1,142 +0,0 @@ -'\" t -'\"! tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 getcolort -.ds Xs 62474 6 getcolortable.gl -.TH GLGETCOLORTABLE 3G -.SH NAME -.B "glGetColorTable -\- retrieve contents of a color lookup table - -.SH C SPECIFICATION -void \f3glGetColorTable\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetColorTable( 'u - GLenum \fIformat\fP, - GLenum \fItype\fP, - GLvoid \fI*table\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -Must be \%\f3GL_COLOR_TABLE\fP, -\%\f3GL_POST_CONVOLUTION_COLOR_TABLE\fP, -or -\%\f3GL_POST_COLOR_MATRIX_COLOR_TABLE\fP. -.TP -\f2format\fP -The of the pixel data in \f2table\fP. -The possible values are -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_BGR\fP, -\%\f3GL_RGBA\fP, and -\%\f3GL_BGRA\fP. -.TP -\f2type\fP -The type of the pixel data in \f2table\fP. -Symbolic constants -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -are accepted. -.TP -\f2table\fP -Pointer to a one-dimensional array of pixel data containing the contents -of the color table. -.SH DESCRIPTION -\%\f3glGetColorTable\fP returns in \f2table\fP the contents of the color table specified -by \f2target\fP. No pixel transfer operations are performed, but pixel -storage modes that are applicable to -\%\f3glReadPixels\fP are performed. -.P -Color components that are requested in -the specified \f2format\fP, but which are not included in the internal - of the color lookup table, are returned as zero. The -assignments of internal color components to the components -requested by \f2format\fP are -.P -.TS -center; -lb lb -l l. -_ -Internal Component Resulting Component -_ -red red -green green -blue blue -alpha alpha -luminance red -intensity red -_ -.TE - -.P -.SH NOTES -\%\f3glGetColorTable\fP is present only if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP -is called with an argument of \%\f3GL_EXTENSIONS\fP. -.P -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2format\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, or -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetColorTable\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glColorTable(3G)\fP, -\%\f3glColorTableParameter(3G)\fP, -\%\f3glGetColorTableParameter(3G)\fP diff --git a/doc/gl-docs/GL/gl/getcolortableparameter.3gl b/doc/gl-docs/GL/gl/getcolortableparameter.3gl deleted file mode 100644 index e807e777..00000000 --- a/doc/gl-docs/GL/gl/getcolortableparameter.3gl +++ /dev/null @@ -1,116 +0,0 @@ -'\" te -'\"! tbl | eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 001 getcolor -.ds Xs 21434 5 getcolortableparameter.gl -.TH GLGETCOLORTABLEPARAMETER 3G -.SH NAME -.B "glGetColorTableParameterfv, glGetColorTableParameteriv -\- get color lookup table parameters - -.SH C SPECIFICATION -void \f3glGetColorTableParameterfv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetColorTableParameterfv( 'u - GLenum \fIpname\fP, - GLfloat \fI*params\fP ) -.fi -void \f3glGetColorTableParameteriv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetColorTableParameteriv( 'u - GLenum \fIpname\fP, - GLint \fI*params\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -The target color table. -Must be -\%\f3GL_COLOR_TABLE\fP, -\%\f3GL_POST_CONVOLUTION_COLOR_TABLE\fP, -\%\f3GL_POST_COLOR_MATRIX_COLOR_TABLE\fP, -\%\f3GL_PROXY_COLOR_TABLE\fP, -\%\f3GL_PROXY_POST_CONVOLUTION_COLOR_TABLE\fP, -\%\f3GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE\fP. -.TP -\f2pname\fP -The symbolic name of a color lookup table parameter. -Must be one of -\%\f3GL_COLOR_TABLE_BIAS\fP, -\%\f3GL_COLOR_TABLE_SCALE\fP, -\%\f3GL_COLOR_TABLE_FORMAT\fP, -\%\f3GL_COLOR_TABLE_WIDTH\fP, -\%\f3GL_COLOR_TABLE_RED_SIZE\fP, -\%\f3GL_COLOR_TABLE_GREEN_SIZE\fP, -\%\f3GL_COLOR_TABLE_BLUE_SIZE\fP, -\%\f3GL_COLOR_TABLE_ALPHA_SIZE\fP, -\%\f3GL_COLOR_TABLE_LUMINANCE_SIZE\fP, or -\%\f3GL_COLOR_TABLE_INTENSITY_SIZE\fP. -.TP -\f2params\fP -A pointer to an array where the values of the parameter will be stored. -.SH DESCRIPTION -Returns parameters specific to color table \f2target\fP. -.P -When \f2pname\fP is set to \%\f3GL_COLOR_TABLE_SCALE\fP or -\%\f3GL_COLOR_TABLE_BIAS\fP, \%\f3glGetColorTableParameter\fP returns the color -table scale or bias parameters for the table specified by \f2target\fP. -For these queries, \f2target\fP must be set to -\%\f3GL_COLOR_TABLE\fP, -\%\f3GL_POST_CONVOLUTION_COLOR_TABLE\fP, -or \%\f3GL_POST_COLOR_MATRIX_COLOR_TABLE\fP and -\f2params\fP points to an array of four elements, which receive -the scale or bias factors for red, green, blue, and alpha, in that order. -.P -\%\f3glGetColorTableParameter\fP can also be used to retrieve the and size parameters -for a color table. For these queries, set \f2target\fP to either the -color table target or the proxy color table target. -The and size parameters are set by \%\f3glColorTable\fP. -.P -The following table lists the and size parameters that may -be queried. -For each symbolic constant listed below for \f2pname\fP, -\f2params\fP must point to an array of the -given length, and receive the values indicated. -.P -.TS -center; -lb cb lb -l c l. -_ -Parameter N Meaning -_ -\%\f3GL_COLOR_TABLE_FORMAT\fP 1 Internal (e.g. \%\f3GL_RGBA\fP) -\%\f3GL_COLOR_TABLE_WIDTH\fP 1 Number of elements in table -\%\f3GL_COLOR_TABLE_RED_SIZE\fP 1 Size of red component, in bits -\%\f3GL_COLOR_TABLE_GREEN_SIZE\fP 1 Size of green component -\%\f3GL_COLOR_TABLE_BLUE_SIZE\fP 1 Size of blue component -\%\f3GL_COLOR_TABLE_ALPHA_SIZE\fP 1 Size of alpha component -\%\f3GL_COLOR_TABLE_LUMINANCE_SIZE\fP 1 Size of luminance component -\%\f3GL_COLOR_TABLE_INTENSITY_SIZE\fP 1 Size of intensity component -_ -.TE -.SH NOTES -\%\f3glGetColorTableParameter\fP is present only if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP -is called with an argument of \%\f3GL_EXTENSIONS\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP or \f2pname\fP is not -an acceptable value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetColorTableParameter\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glColorTable(3G)\fP, -\%\f3glTexParameter(3G)\fP, -\%\f3glColorTableParameter(3G)\fP diff --git a/doc/gl-docs/GL/gl/getconvolutionfilter.3gl b/doc/gl-docs/GL/gl/getconvolutionfilter.3gl deleted file mode 100644 index 3f1acab6..00000000 --- a/doc/gl-docs/GL/gl/getconvolutionfilter.3gl +++ /dev/null @@ -1,145 +0,0 @@ -'\" t -'\"! tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 getconvol -.ds Xs 38054 6 getconvolutionfilter.gl -.TH GLGETCONVOLUTIONFILTER 3G -.SH NAME -.B "glGetConvolutionFilter -\- get current 1D or 2D convolution filter kernel - -.SH C SPECIFICATION -void \f3glGetConvolutionFilter\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetConvolutionFilter( 'u - GLenum \fIformat\fP, - GLenum \fItype\fP, - GLvoid \fI*image\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -The filter to be retrieved. -Must be one of -\%\f3GL_CONVOLUTION_1D\fP or -\%\f3GL_CONVOLUTION_2D\fP. -.TP -\f2format\fP -Format of the output image. -Must be one of -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_BGR\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, or -\%\f3GL_LUMINANCE_ALPHA\fP. -.TP -\f2type\fP -Data type of components in the output image. -Symbolic constants -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -are accepted. -.TP -\f2image\fP -Pointer to storage for the output image. -.SH DESCRIPTION -\%\f3glGetConvolutionFilter\fP returns the current 1D or 2D convolution filter kernel as an image. -The one- or two-dimensional image is placed in \f2image\fP according to the -specifications in \f2format\fP and \f2type\fP. -No pixel transfer operations are performed on this image, but the relevant -pixel storage modes are applied. -.sp -Color components that are present in \f2format\fP but not included in the -internal of the filter are returned as zero. -The assignments of internal color components to the components of \f2format\fP -are as follows. -.br -.bp -.TS -center; -lb lb -l l. -_ -Internal Component Resulting Component -_ -Red Red -Green Green -Blue Blue -Alpha Alpha -Luminance Red -Intensity Red -_ -.TE -.SH NOTES -\%\f3glGetConvolutionFilter\fP is present only if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP -is called with an argument of \%\f3GL_EXTENSIONS\fP. -.P -The current separable 2D filter must be retrieved with -\%\f3glGetSeparableFilter\fP rather than \%\f3glGetConvolutionFilter\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2format\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetConvolutionFilter\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, or -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.SH ASSOCIATED GETS -\%\f3glGetConvolutionParameter\fP -.SH SEE ALSO -\%\f3glGetSeparableFilter(3G)\fP, -\%\f3glConvolutionParameter(3G)\fP, -\%\f3glConvolutionFilter1D(3G)\fP, -\%\f3glConvolutionFilter2D(3G)\fP diff --git a/doc/gl-docs/GL/gl/getconvolutionparameter.3gl b/doc/gl-docs/GL/gl/getconvolutionparameter.3gl deleted file mode 100644 index b65e62b3..00000000 --- a/doc/gl-docs/GL/gl/getconvolutionparameter.3gl +++ /dev/null @@ -1,114 +0,0 @@ -'\" t -'\"! tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 001 getconvo -.ds Xs 10201 5 getconvolutionparameter.gl -.TH GLGETCONVOLUTIONPARAMETER 3G -.SH NAME -.B "glGetConvolutionParameterfv, glGetConvolutionParameteriv -\- get convolution parameters - -.SH C SPECIFICATION -void \f3glGetConvolutionParameterfv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetConvolutionParameterfv( 'u - GLenum \fIpname\fP, - GLfloat \fI*params\fP ) -.fi -void \f3glGetConvolutionParameteriv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetConvolutionParameteriv( 'u - GLenum \fIpname\fP, - GLint \fI*params\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -The filter whose parameters are to be retrieved. -Must be one of -\%\f3GL_CONVOLUTION_1D\fP, -\%\f3GL_CONVOLUTION_2D\fP, or -\%\f3GL_SEPARABLE_2D\fP. -.TP -\f2pname\fP -The parameter to be retrieved. -Must be one of -\%\f3GL_CONVOLUTION_BORDER_MODE\fP, -\%\f3GL_CONVOLUTION_BORDER_COLOR\fP, -\%\f3GL_CONVOLUTION_FILTER_SCALE\fP, -\%\f3GL_CONVOLUTION_FILTER_BIAS\fP, -\%\f3GL_CONVOLUTION_FORMAT\fP, -\%\f3GL_CONVOLUTION_WIDTH\fP, -\%\f3GL_CONVOLUTION_HEIGHT\fP, -\%\f3GL_MAX_CONVOLUTION_WIDTH\fP, or -\%\f3GL_MAX_CONVOLUTION_HEIGHT\fP. -.TP -\f2params\fP -Pointer to storage for the parameters to be retrieved. -.SH DESCRIPTION -\%\f3glGetConvolutionParameter\fP retrieves convolution parameters. -\f2target\fP determines which convolution filter is queried. -\f2pname\fP determines which parameter is returned: -.TP -\%\f3GL_CONVOLUTION_BORDER_MODE\fP -The convolution border mode. -See \%\f3glConvolutionParameter\fP for a list of border modes. -.TP -\%\f3GL_CONVOLUTION_BORDER_COLOR\fP -The current convolution border color. -\f2params\fP must be a pointer to an array of four elements, -which will receive the red, green, blue, and alpha border colors. -.TP -\%\f3GL_CONVOLUTION_FILTER_SCALE\fP -The current filter scale factors. -\f2params\fP must be a pointer to an array of four elements, -which will receive the red, green, blue, and alpha filter scale -factors in that order. -.TP -\%\f3GL_CONVOLUTION_FILTER_BIAS\fP -The current filter bias factors. -\f2params\fP must be a pointer to an array of four elements, -which will receive the red, green, blue, and alpha filter bias -terms in that order. -.TP -\%\f3GL_CONVOLUTION_FORMAT\fP -The current internal . -See \%\f3glConvolutionFilter1D\fP, \%\f3glConvolutionFilter2D\fP, -and \%\f3glSeparableFilter2D\fP for lists of allowable formats. -.TP -\%\f3GL_CONVOLUTION_WIDTH\fP -The current filter image width. -.TP -\%\f3GL_CONVOLUTION_HEIGHT\fP -The current filter image height. -.TP -\%\f3GL_MAX_CONVOLUTION_WIDTH\fP -The maximum acceptable filter image width. -.TP -\%\f3GL_MAX_CONVOLUTION_HEIGHT\fP -The maximum acceptable filter image height. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2pname\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is \%\f3GL_CONVOLUTION_1D\fP -and \f2pname\fP is \%\f3GL_CONVOLUTION_HEIGHT\fP or -\%\f3GL_MAX_CONVOLUTION_HEIGHT\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetConvolutionParameter\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glGetConvolutionFilter(3G)\fP, -\%\f3glGetSeparableFilter2D(3G)\fP, -\%\f3glConvolutionParameter(3G)\fP diff --git a/doc/gl-docs/GL/gl/geterror.3gl b/doc/gl-docs/GL/gl/geterror.3gl deleted file mode 100644 index d2dc137f..00000000 --- a/doc/gl-docs/GL/gl/geterror.3gl +++ /dev/null @@ -1,102 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 geterror. -.ds Xs 56466 6 geterror.gl -.TH GLGETERROR 3G -.SH NAME -.B "glGetError -\- return error information - -.SH C SPECIFICATION -GLenum \f3glGetError\fP( void ) -.nf -.fi - -.SH DESCRIPTION -\%\f3glGetError\fP returns the value of the error flag. -Each detectable error is assigned a numeric code and symbolic name. -When an error occurs, -the error flag is set to the appropriate error code value. -No other errors are recorded until \%\f3glGetError\fP is called, -the error code is returned, -and the flag is reset to \%\f3GL_NO_ERROR\fP. -If a call to \%\f3glGetError\fP returns \%\f3GL_NO_ERROR\fP, -there has been no detectable error since the last call to \%\f3glGetError\fP, -or since the GL was initialized. -.P -To allow for distributed implementations, -there may be several error flags. -If any single error flag has recorded an error, -the value of that flag is returned -and that flag is reset to \%\f3GL_NO_ERROR\fP -when \%\f3glGetError\fP is called. -If more than one flag has recorded an error, -\%\f3glGetError\fP returns and clears an arbitrary error flag value. -Thus, \%\f3glGetError\fP should always be called in a loop, -until it returns \%\f3GL_NO_ERROR\fP, -if all error flags are to be reset. -.P -Initially, all error flags are set to \%\f3GL_NO_ERROR\fP. -.P -The following errors are currently defined: -.TP 30 -\%\f3GL_NO_ERROR\fP -No error has been recorded. -The value of this symbolic constant is guaranteed to be 0. -.TP -\%\f3GL_INVALID_ENUM\fP -An unacceptable value is specified for an enumerated argument. -The offending command is ignored, -and has no other side effect than to set the error flag. -.TP -\%\f3GL_INVALID_VALUE\fP -A numeric argument is out of range. -The offending command is ignored, -and has no other side effect than to set the error flag. -.TP -\%\f3GL_INVALID_OPERATION\fP -The specified operation is not allowed in the current state. -The offending command is ignored, -and has no other side effect than to set the error flag. -.TP -\%\f3GL_STACK_OVERFLOW\fP -This command would cause a stack overflow. -The offending command is ignored, -and has no other side effect than to set the error flag. -.TP -\%\f3GL_STACK_UNDERFLOW\fP -This command would cause a stack underflow. -The offending command is ignored, -and has no other side effect than to set the error flag. -.TP -\%\f3GL_OUT_OF_MEMORY\fP -There is not enough memory left to execute the command. -The state of the GL is undefined, -except for the state of the error flags, -after this error is recorded. -.TP -\%\f3GL_TABLE_TOO_LARGE\fP -The specified table exceeds the implementation's maximum supported table -size. The offending command is ignored, and has no other side effect -than to set the error flag. -.P -When an error flag is set, -results of a GL operation are undefined only if \%\f3GL_OUT_OF_MEMORY\fP -has occurred. -In all other cases, -the command generating the error is ignored and has no effect on the GL state -or frame buffer contents. -If the generating command returns a value, it returns 0. -If \%\f3glGetError\fP itself generates an error, it returns 0. -.SH NOTES -\%\f3GL_TABLE_TOO_LARGE\fP was introduced in GL version 1.2. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetError\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -In this case \%\f3glGetError\fP returns 0. diff --git a/doc/gl-docs/GL/gl/gethistogram.3gl b/doc/gl-docs/GL/gl/gethistogram.3gl deleted file mode 100644 index 992c7b67..00000000 --- a/doc/gl-docs/GL/gl/gethistogram.3gl +++ /dev/null @@ -1,142 +0,0 @@ -'\" t -'\"! tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 gethistog -.ds Xs 52081 6 gethistogram.gl -.TH GLGETHISTOGRAM 3G -.SH NAME -.B "glGetHistogram -\- get histogram table - -.SH C SPECIFICATION -void \f3glGetHistogram\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetHistogram( 'u - GLboolean \fIreset\fP, - GLenum \fIformat\fP, - GLenum \fItype\fP, - GLvoid \fI*values\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -Must be -\%\f3GL_HISTOGRAM\fP. -.TP -\f2reset\fP -If \%\f3GL_TRUE\fP, each component counter that is actually returned -is reset to zero. (Other counters are unaffected.) -If \%\f3GL_FALSE\fP, none of the counters in the histogram table is modified. -.TP -\f2format\fP -The of values to be returned in \f2values\fP. -Must be one of -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_BGR\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, or -\%\f3GL_LUMINANCE_ALPHA\fP. -.TP -\f2type\fP -The type of values to be returned in \f2values\fP. -Symbolic constants -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -are accepted. -.TP -\f2values\fP -A pointer to storage for the returned histogram table. -.SH DESCRIPTION -\%\f3glGetHistogram\fP returns the current histogram table as a one-dimensional image -with the same width as the histogram. -No pixel transfer operations are performed on this image, but pixel storage -modes that are applicable to 1D images are honored. -.PP -Color components that are requested in the specified \f2format\fP, but which -are not included in the internal of the histogram, are returned as -zero. -.bp -The assignments of internal color components to the components -requested by \f2format\fP are: -.TS -center; -lb lb -l l. -_ -Internal Component Resulting Component -_ -Red Red -Green Green -Blue Blue -Alpha Alpha -Luminance Red -_ -.TE - -.SH NOTES -\%\f3glGetHistogram\fP is present only if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP -is called with an argument of \%\f3GL_EXTENSIONS\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not \%\f3GL_HISTOGRAM\fP. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2format\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetHistogram\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.P -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, or -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.SH SEE ALSO -\%\f3glHistogram(3G)\fP, -\%\f3glResetHistogram(3G)\fP, -\%\f3glGetHistogramParameter(3G)\fP diff --git a/doc/gl-docs/GL/gl/gethistogramparameter.3gl b/doc/gl-docs/GL/gl/gethistogramparameter.3gl deleted file mode 100644 index 4a8dd74e..00000000 --- a/doc/gl-docs/GL/gl/gethistogramparameter.3gl +++ /dev/null @@ -1,103 +0,0 @@ -'\" t -'\"! tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 001 gethisto -.ds Xs 33049 5 gethistogramparameter.gl -.TH GLGETHISTOGRAMPARAMETER 3G -.SH NAME -.B "glGetHistogramParameterfv, glGetHistogramParameteriv -\- get histogram parameters - -.SH C SPECIFICATION -void \f3glGetHistogramParameterfv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetHistogramParameterfv( 'u - GLenum \fIpname\fP, - GLfloat \fI*params\fP ) -.fi -void \f3glGetHistogramParameteriv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetHistogramParameteriv( 'u - GLenum \fIpname\fP, - GLint \fI*params\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -Must be one of -\%\f3GL_HISTOGRAM\fP or -\%\f3GL_PROXY_HISTOGRAM\fP. -.TP -\f2pname\fP -The name of the parameter to be retrieved. -Must be one of -\%\f3GL_HISTOGRAM_WIDTH\fP, -\%\f3GL_HISTOGRAM_FORMAT\fP, -\%\f3GL_HISTOGRAM_RED_SIZE\fP, -\%\f3GL_HISTOGRAM_GREEN_SIZE\fP, -\%\f3GL_HISTOGRAM_BLUE_SIZE\fP, -\%\f3GL_HISTOGRAM_ALPHA_SIZE\fP, -\%\f3GL_HISTOGRAM_LUMINANCE_SIZE\fP, or -\%\f3GL_HISTOGRAM_SINK\fP. -.TP -\f2params\fP -Pointer to storage for the returned values. -.SH DESCRIPTION -\%\f3glGetHistogramParameter\fP is used to query parameter values for the current histogram or for -a proxy. The histogram state information may be queried by calling -\%\f3glGetHistogramParameter\fP with a \f2target\fP of \%\f3GL_HISTOGRAM\fP (to -obtain information for the current histogram table) or -\%\f3GL_PROXY_HISTOGRAM\fP (to obtain information from the most recent -proxy request) and one of the following values for the \f2pname\fP argument: -.P -.ne -.TS -center; -lb lb -l l. -_ -Parameter Description -_ -\%\f3GL_HISTOGRAM_WIDTH\fP Histogram table width -\%\f3GL_HISTOGRAM_FORMAT\fP Internal -\%\f3GL_HISTOGRAM_RED_SIZE\fP Red component counter size, in bits -\%\f3GL_HISTOGRAM_GREEN_SIZE\fP Green component counter size, in bits -.TE -.bp -.TS -center; -lb lb -l l. -_ -Parameter Description -_ -\%\f3GL_HISTOGRAM_BLUE_SIZE\fP Blue component counter size, in bits -\%\f3GL_HISTOGRAM_ALPHA_SIZE\fP Alpha component counter size, in bits -\%\f3GL_HISTOGRAM_LUMINANCE_SIZE\fP Luminance component counter size, in bits -\%\f3GL_HISTOGRAM_SINK\fP Value of the \f2sink\fP parameter -_ -.TE - -.SH NOTES -\%\f3glGetHistogramParameter\fP is present only if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP -is called with an argument of \%\f3GL_EXTENSIONS\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2pname\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetHistogramParameter\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glGetHistogram(3G)\fP, -\%\f3glHistogram(3G)\fP diff --git a/doc/gl-docs/GL/gl/getlight.3gl b/doc/gl-docs/GL/gl/getlight.3gl deleted file mode 100644 index 77396262..00000000 --- a/doc/gl-docs/GL/gl/getlight.3gl +++ /dev/null @@ -1,187 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 getlight. -.ds Xs 45912 8 getlight.gl -.TH GLGETLIGHT 3G -.SH NAME -.B "glGetLightfv, glGetLightiv -\- return light source parameter values - -.SH C SPECIFICATION -void \f3glGetLightfv\fP( -GLenum \fIlight\fP, -.nf -.ta \w'\f3void \fPglGetLightfv( 'u - GLenum \fIpname\fP, - GLfloat \fI*params\fP ) -.fi -void \f3glGetLightiv\fP( -GLenum \fIlight\fP, -.nf -.ta \w'\f3void \fPglGetLightiv( 'u - GLenum \fIpname\fP, - GLint \fI*params\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIparams\fP\ \ 'u -\f2light\fP -Specifies a light source. -The number of possible lights depends on the implementation, -but at least eight lights are supported. -They are identified by symbolic names of the form \%\f3GL_LIGHT\fP$i$ -where 0 \(<= $ i $ < \%\f3GL_MAX_LIGHTS\fP. -.TP -\f2pname\fP -Specifies a light source parameter for \f2light\fP. -Accepted symbolic names are -\%\f3GL_AMBIENT\fP, -\%\f3GL_DIFFUSE\fP, -\%\f3GL_SPECULAR\fP, -\%\f3GL_POSITION\fP, -\%\f3GL_SPOT_DIRECTION\fP, -\%\f3GL_SPOT_EXPONENT\fP, -\%\f3GL_SPOT_CUTOFF\fP, -\%\f3GL_CONSTANT_ATTENUATION\fP, -\%\f3GL_LINEAR_ATTENUATION\fP, and -\%\f3GL_QUADRATIC_ATTENUATION\fP. -.TP -\f2params\fP -Returns the requested data. -.SH DESCRIPTION -\%\f3glGetLight\fP returns in \f2params\fP the value or values of a light source parameter. -\f2light\fP names the light and is a symbolic name of the form \%\f3GL_LIGHT\fP$i$ -for 0 \(<= $i$ < \%\f3GL_MAX_LIGHTS\fP, -where \%\f3GL_MAX_LIGHTS\fP is an implementation dependent constant that is -greater than or equal to eight. -\f2pname\fP specifies one of ten light source parameters, -again by symbolic name. -.P -The following parameters are defined: -.TP 20 -\%\f3GL_AMBIENT\fP -\f2params\fP returns four integer or floating-point values representing the -ambient intensity of the light source. -Integer values, -when requested, -are linearly mapped from the internal floating-point representation -such that 1.0 maps to the most positive representable integer value, -and \-1.0 maps to the most negative representable integer value. -If the internal value is outside the range [\-1, 1], -the corresponding integer return value is undefined. The initial value is -(0, 0, 0, 1). -.TP -\%\f3GL_DIFFUSE\fP -\f2params\fP returns four integer or floating-point values representing the -diffuse intensity of the light source. -Integer values, -when requested, -are linearly mapped from the internal floating-point representation -such that 1.0 maps to the most positive representable integer value, -and \-1.0 maps to the most negative representable integer value. -If the internal value is outside the range [\-1, 1], -the corresponding integer return value is undefined. The initial value -for \%\f3GL_LIGHT0\fP is (1, 1, 1, 1); for other lights, the -initial value is (0, 0, 0, 0). -.TP -\%\f3GL_SPECULAR\fP -\f2params\fP returns four integer or floating-point values representing the -specular intensity of the light source. -Integer values, -when requested, -are linearly mapped from the internal floating-point representation -such that 1.0 maps to the most positive representable integer value, -and \-1.0 maps to the most negative representable integer value. -If the internal value is outside the range [\-1, 1], -the corresponding integer return value is undefined. The initial value -for \%\f3GL_LIGHT0\fP is (1, 1, 1, 1); for other lights, the -initial value is (0, 0, 0, 0). -.TP -\%\f3GL_POSITION\fP -\f2params\fP returns four integer or floating-point values representing the -position of the light source. -Integer values, -when requested, -are computed by rounding the internal floating-point values to the -nearest integer value. -The returned values are those maintained in eye coordinates. -They will not be equal to the values specified using \%\f3glLight\fP, -unless the modelview matrix was identity at the time \%\f3glLight\fP was -called. The initial value is (0, 0, 1, 0). -.TP -\%\f3GL_SPOT_DIRECTION\fP -\f2params\fP returns three integer or floating-point values representing the -direction of the light source. -Integer values, -when requested, -are computed by rounding the internal floating-point values to the -nearest integer value. -The returned values are those maintained in eye coordinates. -They will not be equal to the values specified using \%\f3glLight\fP, -unless the modelview matrix was identity at the time \%\f3glLight\fP was called. -Although spot direction is normalized before being used in the lighting -equation, -the returned values are the transformed versions of the specified values -prior to normalization. The initial value is (0, 0, \-1). -.TP -\%\f3GL_SPOT_EXPONENT\fP -\f2params\fP returns a single integer or floating-point value representing the -spot exponent of the light. -An integer value, -when requested, -is computed by rounding the internal floating-point representation to -the nearest integer. The initial value is 0. -.TP -\%\f3GL_SPOT_CUTOFF\fP -\f2params\fP returns a single integer or floating-point value representing the -spot cutoff angle of the light. -An integer value, -when requested, -is computed by rounding the internal floating-point representation to -the nearest integer. The initial value is 180. -.TP -\%\f3GL_CONSTANT_ATTENUATION\fP -\f2params\fP returns a single integer or floating-point value representing the -constant (not distance-related) attenuation of the light. -An integer value, -when requested, -is computed by rounding the internal floating-point representation to -the nearest integer. The initial value is 1. -.TP -\%\f3GL_LINEAR_ATTENUATION \fP -\f2params\fP returns a single integer or floating-point value representing the -linear attenuation of the light. -An integer value, -when requested, -is computed by rounding the internal floating-point representation to -the nearest integer. The initial value is 0. -.TP -\%\f3GL_QUADRATIC_ATTENUATION\fP -\f2params\fP returns a single integer or floating-point value representing the -quadratic attenuation of the light. -An integer value, -when requested, -is computed by rounding the internal floating-point representation to -the nearest integer. The initial value is 0. -.SH NOTES -It is always the case that \%\f3GL_LIGHT\fP$i$ = \%\f3GL_LIGHT0\fP + $i$. -.P -If an error is generated, -no change is made to the contents of \f2params\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2light\fP or \f2pname\fP is not an -accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetLight\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glLight(3G)\fP diff --git a/doc/gl-docs/GL/gl/getmap.3gl b/doc/gl-docs/GL/gl/getmap.3gl deleted file mode 100644 index 20e73ab9..00000000 --- a/doc/gl-docs/GL/gl/getmap.3gl +++ /dev/null @@ -1,134 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 getmap.gl -.ds Xs 19970 5 getmap.gl -.TH GLGETMAP 3G -.SH NAME -.B "glGetMapdv, glGetMapfv, glGetMapiv -\- return evaluator parameters - -.SH C SPECIFICATION -void \f3glGetMapdv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetMapdv( 'u - GLenum \fIquery\fP, - GLdouble \fI*v\fP ) -.fi -void \f3glGetMapfv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetMapfv( 'u - GLenum \fIquery\fP, - GLfloat \fI*v\fP ) -.fi -void \f3glGetMapiv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetMapiv( 'u - GLenum \fIquery\fP, - GLint \fI*v\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -Specifies the symbolic name of a map. -Accepted values are -\%\f3GL_MAP1_COLOR_4\fP, -\%\f3GL_MAP1_INDEX\fP, -\%\f3GL_MAP1_NORMAL\fP, -\%\f3GL_MAP1_TEXTURE_COORD_1\fP, -\%\f3GL_MAP1_TEXTURE_COORD_2\fP, -\%\f3GL_MAP1_TEXTURE_COORD_3\fP, -\%\f3GL_MAP1_TEXTURE_COORD_4\fP, -\%\f3GL_MAP1_VERTEX_3\fP, -\%\f3GL_MAP1_VERTEX_4\fP, -\%\f3GL_MAP2_COLOR_4\fP, -\%\f3GL_MAP2_INDEX\fP, -\%\f3GL_MAP2_NORMAL\fP, -\%\f3GL_MAP2_TEXTURE_COORD_1\fP, -\%\f3GL_MAP2_TEXTURE_COORD_2\fP, -\%\f3GL_MAP2_TEXTURE_COORD_3\fP, -\%\f3GL_MAP2_TEXTURE_COORD_4\fP, -\%\f3GL_MAP2_VERTEX_3\fP, and -\%\f3GL_MAP2_VERTEX_4\fP. -.TP -\f2query\fP -Specifies which parameter to return. -Symbolic names -\%\f3GL_COEFF\fP, -\%\f3GL_ORDER\fP, and -\%\f3GL_DOMAIN\fP are accepted. -.TP -\f2v\fP -Returns the requested data. -.SH DESCRIPTION -\%\f3glMap1\fP and \%\f3glMap2\fP define evaluators. -\%\f3glGetMap\fP returns evaluator parameters. -\f2target\fP chooses a map, -\f2query\fP selects a specific parameter, -and \f2v\fP points to storage where the values will be returned. -.P -The acceptable values for the \f2target\fP parameter are described -in the \%\f3glMap1\fP and \%\f3glMap2\fP reference pages. -.P -\f2query\fP can assume the following values: -.TP 15 -\%\f3GL_COEFF\fP -\f2v\fP returns the control points for the evaluator function. -One-dimensional evaluators return $order$ control points, -and two-dimensional evaluators return $uorder ~times~ vorder$ control points. -Each control point consists of one, two, three, or four integer, -single-precision floating-point, -or double-precision floating-point values, -depending on the type of the evaluator. -The GL returns two-dimensional control points in row-major order, -incrementing the $uorder$ index quickly -and the $vorder$ index after each row. -Integer values, -when requested, -are computed by rounding the internal floating-point values to the -nearest integer values. -.TP -\%\f3GL_ORDER\fP -\f2v\fP returns the order of the evaluator function. -One-dimensional evaluators return a single value, -$order$. The initial value is 1. -Two-dimensional evaluators return two values, -$uorder$ and $vorder$. The initial value is 1,1. -.TP -\%\f3GL_DOMAIN\fP -\f2v\fP returns the linear $u$ and $v$ mapping parameters. -One-dimensional evaluators return two values, -$u1$ and $u2$, -as specified by \%\f3glMap1\fP. -Two-dimensional evaluators return four values -($u1$, $u2$, $v1$, and $v2$) -as specified by \%\f3glMap2\fP. -Integer values, -when requested, -are computed by rounding the internal floating-point values to the -nearest integer values. -.SH NOTES -If an error is generated, -no change is made to the contents of \f2v\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if either \f2target\fP or \f2query\fP is not -an accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetMap\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glEvalCoord(3G)\fP, -\%\f3glMap1(3G)\fP, -\%\f3glMap2(3G)\fP diff --git a/doc/gl-docs/GL/gl/getmaterial.3gl b/doc/gl-docs/GL/gl/getmaterial.3gl deleted file mode 100644 index 3172c4a9..00000000 --- a/doc/gl-docs/GL/gl/getmaterial.3gl +++ /dev/null @@ -1,133 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 getmateri -.ds Xs 34280 6 getmaterial.gl -.TH GLGETMATERIAL 3G -.SH NAME -.B "glGetMaterialfv, glGetMaterialiv -\- return material parameters - -.SH C SPECIFICATION -void \f3glGetMaterialfv\fP( -GLenum \fIface\fP, -.nf -.ta \w'\f3void \fPglGetMaterialfv( 'u - GLenum \fIpname\fP, - GLfloat \fI*params\fP ) -.fi -void \f3glGetMaterialiv\fP( -GLenum \fIface\fP, -.nf -.ta \w'\f3void \fPglGetMaterialiv( 'u - GLenum \fIpname\fP, - GLint \fI*params\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIparams\fP\ \ 'u -\f2face\fP -Specifies which of the two materials is being queried. -\%\f3GL_FRONT\fP or \%\f3GL_BACK\fP are accepted, -representing the front and back materials, respectively. -.TP -\f2pname\fP -Specifies the material parameter to return. -\%\f3GL_AMBIENT\fP, -\%\f3GL_DIFFUSE\fP, -\%\f3GL_SPECULAR\fP, -\%\f3GL_EMISSION\fP, -\%\f3GL_SHININESS\fP, and -\%\f3GL_COLOR_INDEXES\fP -are accepted. -.TP -\f2params\fP -Returns the requested data. -.SH DESCRIPTION -\%\f3glGetMaterial\fP returns in \f2params\fP the value or values of parameter \f2pname\fP -of material \f2face\fP. Six parameters are defined: -.TP 22 -\%\f3GL_AMBIENT\fP -\f2params\fP returns four integer or floating-point values representing the -ambient reflectance of the material. -Integer values, -when requested, -are linearly mapped from the internal floating-point representation -such that 1.0 maps to the most positive representable integer value, -and \-1.0 maps to the most negative representable integer value. -If the internal value is outside the range [\-1, 1], -the corresponding integer return value is undefined. The initial value is -(0.2, 0.2, 0.2, 1.0) -.TP -\%\f3GL_DIFFUSE\fP -\f2params\fP returns four integer or floating-point values representing the -diffuse reflectance of the material. -Integer values, -when requested, -are linearly mapped from the internal floating-point representation -such that 1.0 maps to the most positive representable integer value, -and \-1.0 maps to the most negative representable integer value. -If the internal value is outside the range [\-1, 1], -the corresponding integer return value is undefined. The initial value is -(0.8, 0.8, 0.8, 1.0). -.TP -\%\f3GL_SPECULAR\fP -\f2params\fP returns four integer or floating-point values representing the -specular reflectance of the material. -Integer values, -when requested, -are linearly mapped from the internal floating-point representation -such that 1.0 maps to the most positive representable integer value, -and \-1.0 maps to the most negative representable integer value. -If the internal value is outside the range [\-1, 1], -the corresponding integer return value is undefined. The initial value is -(0, 0, 0, 1). -.TP -\%\f3GL_EMISSION\fP -\f2params\fP returns four integer or floating-point values representing the -emitted light intensity of the material. -Integer values, -when requested, -are linearly mapped from the internal floating-point representation -such that 1.0 maps to the most positive representable integer value, -and \-1.0 maps to the most negative representable integer value. -If the internal value is outside the range [\-1, 1.0], -the corresponding integer return value is undefined. The initial value is -(0, 0, 0, 1). -.TP -\%\f3GL_SHININESS\fP -\f2params\fP returns one integer or floating-point value representing the -specular exponent of the material. -Integer values, -when requested, -are computed by rounding the internal floating-point value to the -nearest integer value. The initial value is 0. -.TP -\%\f3GL_COLOR_INDEXES\fP -\f2params\fP returns three integer or floating-point values representing the -ambient, diffuse, and specular indices of the material. -These indices are used only for color index lighting. -(All the other parameters are used only for RGBA lighting.) -Integer values, -when requested, -are computed by rounding the internal floating-point values to the -nearest integer values. -.SH NOTES -If an error is generated, -no change is made to the contents of \f2params\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2face\fP or \f2pname\fP is not an -accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetMaterial\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glMaterial(3G)\fP diff --git a/doc/gl-docs/GL/gl/getminmax.3gl b/doc/gl-docs/GL/gl/getminmax.3gl deleted file mode 100644 index 2f027f36..00000000 --- a/doc/gl-docs/GL/gl/getminmax.3gl +++ /dev/null @@ -1,149 +0,0 @@ -'\" t -'\"! tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 getminmax -.ds Xs 43140 6 getminmax.gl -.TH GLGETMINMAX 3G -.SH NAME -.B "glGetMinmax -\- get minimum and maximum pixel values - -.SH C SPECIFICATION -void \f3glGetMinmax\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetMinmax( 'u - GLboolean \fIreset\fP, - GLenum \fIformat\fP, - GLenum \fItypes\fP, - GLvoid \fI*values\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -Must be -\%\f3GL_MINMAX\fP. -.TP -\f2reset\fP -If \%\f3GL_TRUE\fP, all entries in the minmax table that are actually -returned are reset to their initial values. (Other entries are unaltered.) -If \%\f3GL_FALSE\fP, the minmax table is unaltered. -.TP -\f2format\fP -The of the data to be returned in \f2values\fP. -Must be one of -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_BGR\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, or -\%\f3GL_LUMINANCE_ALPHA\fP. -.TP -\f2types\fP -The type of the data to be returned in \f2values\fP. -Symbolic constants -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -are accepted. -.TP -\f2values\fP -A pointer to storage for the returned values. -.SH DESCRIPTION -\%\f3glGetMinmax\fP returns the accumulated minimum and maximum pixel values (computed on a -per-component basis) in a one-dimensional image of width 2. The first set -of return values are the minima, and the second set of return values -are the maxima. -The of the return values is determined by \f2format\fP, and their type is -determined by \f2types\fP. -.PP -No pixel transfer operations are performed on the return values, but pixel -storage modes that are applicable to 1-dimensional images are performed. -Color components that are requested in the specified \f2format\fP, but that -are not included in the internal of the minmax table, are -returned as zero. The assignment of internal color components to the -components requested by \f2format\fP are as follows: -.sp -.TS -center; -lb lb -l l. -_ -Internal Component Resulting Component -_ -Red Red -Green Green -Blue Blue -Alpha Alpha -Luminance Red -_ -.TE - -.PP -If \f2reset\fP is \%\f3GL_TRUE\fP, the minmax table entries corresponding -to the return values are reset to their initial -values. Minimum and maximum values that are not returned are not -modified, even if \f2reset\fP is \%\f3GL_TRUE\fP. -.SH NOTES -\%\f3glGetMinmax\fP is present only if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP -is called with an argument of \%\f3GL_EXTENSIONS\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not \%\f3GL_MINMAX\fP. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2format\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2types\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetMinmax\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2types\fP is one of -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, or -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2types\fP is one of -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.SH SEE ALSO -\%\f3glMinmax(3G)\fP, -\%\f3glResetMinmax(3G)\fP, -\%\f3glGetMinmaxParameter(3G)\fP diff --git a/doc/gl-docs/GL/gl/getminmaxparameter.3gl b/doc/gl-docs/GL/gl/getminmaxparameter.3gl deleted file mode 100644 index d2178d16..00000000 --- a/doc/gl-docs/GL/gl/getminmaxparameter.3gl +++ /dev/null @@ -1,76 +0,0 @@ -'\" t -'\"! tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 getminmax -.ds Xs 8418 4 getminmaxparameter.gl -.TH GLGETMINMAXPARAMETER 3G -.SH NAME -.B "glGetMinmaxParameterfv, glGetMinmaxParameteriv -\- get minmax parameters - -.SH C SPECIFICATION -void \f3glGetMinmaxParameterfv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetMinmaxParameterfv( 'u - GLenum \fIpname\fP, - GLfloat \fI*params\fP ) -.fi -void \f3glGetMinmaxParameteriv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetMinmaxParameteriv( 'u - GLenum \fIpname\fP, - GLint \fI*params\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -Must be -\%\f3GL_MINMAX\fP. -.TP -\f2pname\fP -The parameter to be retrieved. -Must be one of -\%\f3GL_MINMAX_FORMAT\fP or -\%\f3GL_MINMAX_SINK\fP. -.TP -\f2params\fP -A pointer to storage for the retrieved parameters. -.SH DESCRIPTION -\%\f3glGetMinmaxParameter\fP retrieves parameters for the current minmax table by setting -\f2pname\fP to one of the following values: -.sp - -.TS -center; -lb lb -l l. -_ -Parameter Description -_ -\%\f3GL_MINMAX_FORMAT\fP Internal of minmax table -\%\f3GL_MINMAX_SINK\fP Value of the \f2sink\fP parameter -_ -.TE - -.SH NOTES -\%\f3glGetMinmaxParameter\fP is present only if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP -is called with an argument of \%\f3GL_EXTENSIONS\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not \%\f3GL_MINMAX\fP. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2pname\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetMinmaxParameter\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glMinmax(3G)\fP, -\%\f3glGetMinmax(3G)\fP diff --git a/doc/gl-docs/GL/gl/getpixelmap.3gl b/doc/gl-docs/GL/gl/getpixelmap.3gl deleted file mode 100644 index ff5e8211..00000000 --- a/doc/gl-docs/GL/gl/getpixelmap.3gl +++ /dev/null @@ -1,156 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 getpixelm -.ds Xs 23505 6 getpixelmap.gl -.TH GLGETPIXELMAP 3G -.SH NAME -.B "glGetPixelMapfv, glGetPixelMapuiv, glGetPixelMapusv -\- return the specified pixel map - -.SH C SPECIFICATION -void \f3glGetPixelMapfv\fP( -GLenum \fImap\fP, -.nf -.ta \w'\f3void \fPglGetPixelMapfv( 'u - GLfloat \fI*values\fP ) -.fi -void \f3glGetPixelMapuiv\fP( -GLenum \fImap\fP, -.nf -.ta \w'\f3void \fPglGetPixelMapuiv( 'u - GLuint \fI*values\fP ) -.fi -void \f3glGetPixelMapusv\fP( -GLenum \fImap\fP, -.nf -.ta \w'\f3void \fPglGetPixelMapusv( 'u - GLushort \fI*values\fP ) -.fi - -.SH PARAMETERS -.TP \w'\fIvalues\fP\ \ 'u -\f2map\fP -Specifies the name of the pixel map to return. -Accepted values are -\%\f3GL_PIXEL_MAP_I_TO_I\fP, -\%\f3GL_PIXEL_MAP_S_TO_S\fP, -\%\f3GL_PIXEL_MAP_I_TO_R\fP, -\%\f3GL_PIXEL_MAP_I_TO_G\fP, -\%\f3GL_PIXEL_MAP_I_TO_B\fP, -\%\f3GL_PIXEL_MAP_I_TO_A\fP, -\%\f3GL_PIXEL_MAP_R_TO_R\fP, -\%\f3GL_PIXEL_MAP_G_TO_G\fP, -\%\f3GL_PIXEL_MAP_B_TO_B\fP, and -\%\f3GL_PIXEL_MAP_A_TO_A\fP. -.TP -\f2values\fP -Returns the pixel map contents. -.SH DESCRIPTION -See the \%\f3glPixelMap\fP reference page for a description of the acceptable -values for the \f2map\fP parameter. -\%\f3glGetPixelMap\fP returns in \f2values\fP the contents of the pixel map -specified in \f2map\fP. -Pixel maps are used during the execution of -\%\f3glReadPixels\fP, -\%\f3glDrawPixels\fP, -\%\f3glCopyPixels\fP, -\%\f3glTexImage1D\fP, -\%\f3glTexImage2D\fP, -\%\f3glTexImage3D\fP, -\%\f3glTexSubImage1D\fP, -\%\f3glTexSubImage2D\fP, -\%\f3glTexSubImage3D\fP, -\%\f3glCopyTexImage1D\fP, -\%\f3glCopyTexImage2D\fP, -\%\f3glCopyTexSubImage1D\fP, -\%\f3glCopyTexSubImage2D\fP, -\%\f3glCopyTexSubImage3D\fP, -\%\f3glColorTable\fP, -\%\f3glColorSubTable\fP, -\%\f3glCopyColorTable\fP, -\%\f3glCopyColorSubTable\fP, -\%\f3glConvolutionFilter1D\fP, -\%\f3glConvolutionFilter2D\fP, -\%\f3glSeparableFilter2D\fP, -\%\f3glGetHistogram\fP, -\%\f3glGetMinmax\fP, and -\%\f3glGetTexImage\fP -to map color indices, -stencil indices, -color components, -and depth components to other values. -.P -Unsigned integer values, -if requested, -are linearly mapped from the internal fixed or floating-point representation -such that 1.0 maps to the largest representable integer value, -and 0.0 maps to 0. -Return unsigned integer values are undefined if the map value was -not in the range [0,1]. -.P -To determine the required size of \f2map\fP, -call \%\f3glGet\fP with the appropriate symbolic constant. -.SH NOTES -If an error is generated, -no change is made to the contents of \f2values\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2map\fP is not an accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetPixelMap\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -.na -\%\f3glGet\fP with argument \%\f3GL_PIXEL_MAP_I_TO_I_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PIXEL_MAP_S_TO_S_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PIXEL_MAP_I_TO_R_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PIXEL_MAP_I_TO_G_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PIXEL_MAP_I_TO_B_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PIXEL_MAP_I_TO_A_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PIXEL_MAP_R_TO_R_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PIXEL_MAP_G_TO_G_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PIXEL_MAP_B_TO_B_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PIXEL_MAP_A_TO_A_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAX_PIXEL_MAP_TABLE\fP -.SH SEE ALSO -\%\f3glColorSubTable(3G)\fP, -\%\f3glColorTable(3G)\fP, -\%\f3glConvolutionFilter1D(3G)\fP, -\%\f3glConvolutionFilter2D(3G)\fP, -\%\f3glCopyColorSubTable(3G)\fP, -\%\f3glCopyColorTable(3G)\fP, -\%\f3glCopyPixels(3G)\fP, -\%\f3glCopyTexImage1D(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glCopyTexSubImage1D(3G)\fP, -\%\f3glCopyTexSubImage2D(3G)\fP, -\%\f3glCopyTexSubImage3D(3G)\fP, -\%\f3glDrawPixels(3G)\fP, -\%\f3glGetHistogram(3G)\fP, -\%\f3glGetMinmax(3G)\fP, -\%\f3glGetTexImage(3G)\fP, -\%\f3glPixelMap(3G)\fP, -\%\f3glPixelTransfer(3G)\fP, -\%\f3glReadPixels(3G)\fP, -\%\f3glSeparableFilter2D(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP -\%\f3glTexImage3D(3G)\fP, -\%\f3glTexSubImage1D(3G)\fP, -\%\f3glTexSubImage2D(3G)\fP, -\%\f3glTexSubImage3D(3G)\fP diff --git a/doc/gl-docs/GL/gl/getpointerv.3gl b/doc/gl-docs/GL/gl/getpointerv.3gl deleted file mode 100644 index 089a8ccd..00000000 --- a/doc/gl-docs/GL/gl/getpointerv.3gl +++ /dev/null @@ -1,72 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 getpointe -.ds Xs 38346 4 getpointerv.gl -.TH GLGETPOINTERV 3G -.SH NAME -.B "glGetPointerv -\- return the address of the specified pointer - -.SH C SPECIFICATION -void \f3glGetPointerv\fP( -GLenum \fIpname\fP, -.nf -.ta \w'\f3void \fPglGetPointerv( 'u - void \fI**params\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIparams\fP\ \ 'u -\f2pname\fP -Specifies the array or buffer pointer to be returned. -Symbolic constants -\%\f3GL_COLOR_ARRAY_POINTER\fP, -\%\f3GL_EDGE_FLAG_ARRAY_POINTER\fP, -\%\f3GL_FEEDBACK_BUFFER_POINTER\fP, -\%\f3GL_INDEX_ARRAY_POINTER\fP, -\%\f3GL_NORMAL_ARRAY_POINTER\fP, -\%\f3GL_TEXTURE_COORD_ARRAY_POINTER\fP, -\%\f3GL_SELECTION_BUFFER_POINTER\fP, -and -\%\f3GL_VERTEX_ARRAY_POINTER\fP -are accepted. -.TP -\f2params\fP -Returns the pointer value specified by \f2pname\fP. -.SH DESCRIPTION -\%\f3glGetPointerv\fP returns pointer information. \f2pname\fP -is a symbolic constant indicating the pointer to be returned, and -\f2params\fP is a pointer to a location in which to place the returned data. -.SH NOTES -\%\f3glGetPointerv\fP is available only if the GL version is 1.1 or greater. -.P -The pointers are all client-side state. -.P -The initial value for each pointer is 0. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, querying the -\%\f3GL_TEXTURE_COORD_ARRAY_POINTER\fP returns the value for the active -client texture unit. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2pname\fP is not an accepted value. -.SH SEE ALSO -\%\f3glArrayElement(3G)\fP, -\%\f3glClientActiveTextureARB(3G)\fP, -\%\f3glColorPointer(3G)\fP, -\%\f3glDrawArrays(3G)\fP, -\%\f3glEdgeFlagPointer(3G)\fP, -\%\f3glFeedbackBuffer(3G)\fP, -\%\f3glIndexPointer(3G)\fP, -\%\f3glInterleavedArrays(3G)\fP, -\%\f3glNormalPointer(3G)\fP, -\%\f3glSelectBuffer(3G)\fP, -\%\f3glTexCoordPointer(3G)\fP, -\%\f3glVertexPointer(3G)\fP diff --git a/doc/gl-docs/GL/gl/getpolygonstipple.3gl b/doc/gl-docs/GL/gl/getpolygonstipple.3gl deleted file mode 100644 index eed7dd1b..00000000 --- a/doc/gl-docs/GL/gl/getpolygonstipple.3gl +++ /dev/null @@ -1,52 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 getpolygo -.ds Xs 49553 4 getpolygonstipple.gl -.TH GLGETPOLYGONSTIPPLE 3G -.SH NAME -.B "glGetPolygonStipple -\- return the polygon stipple pattern - -.SH C SPECIFICATION -void \f3glGetPolygonStipple\fP( -GLubyte \fI*mask\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2mask\fP\ \ 'u -\f2mask\fP -Returns the stipple pattern. The initial value is all 1's. -.SH DESCRIPTION -\%\f3glGetPolygonStipple\fP returns to \f2mask\fP a $32 ~times~ 32$ polygon stipple pattern. -The pattern is packed into memory as if \%\f3glReadPixels\fP -with both \f2height\fP and \f2width\fP of 32, -\f2type\fP of \%\f3GL_BITMAP\fP, -and \f2format\fP of \%\f3GL_COLOR_INDEX\fP were called, -and the stipple pattern were stored in an internal $32 ~times~ 32$ color -index buffer. -Unlike \%\f3glReadPixels\fP, -however, -pixel transfer operations -(shift, offset, pixel map) -are not applied to the returned stipple image. -.SH NOTES -If an error is generated, -no change is made to the contents of \f2mask\fP. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetPolygonStipple\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glPixelStore(3G)\fP, -\%\f3glPixelTransfer(3G)\fP, -\%\f3glPolygonStipple(3G)\fP, -\%\f3glReadPixels(3G)\fP diff --git a/doc/gl-docs/GL/gl/getseparablefilter.3gl b/doc/gl-docs/GL/gl/getseparablefilter.3gl deleted file mode 100644 index 238b766a..00000000 --- a/doc/gl-docs/GL/gl/getseparablefilter.3gl +++ /dev/null @@ -1,152 +0,0 @@ -'\" t -'\"! tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 getsepara -.ds Xs 5701 6 getseparablefilter.gl -.TH GLGETSEPARABLEFILTER 3G -.SH NAME -.B "glGetSeparableFilter -\- get separable convolution filter kernel images - -.SH C SPECIFICATION -void \f3glGetSeparableFilter\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetSeparableFilter( 'u - GLenum \fIformat\fP, - GLenum \fItype\fP, - GLvoid \fI*row\fP, - GLvoid \fI*column\fP, - GLvoid \fI*span\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -The separable filter to be retrieved. -Must be -\%\f3GL_SEPARABLE_2D\fP. -.TP -\f2format\fP -Format of the output images. -Must be one of -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_BGR\fP -\%\f3GL_RGBA\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, or -\%\f3GL_LUMINANCE_ALPHA\fP. -.TP -\f2type\fP -Data type of components in the output images. -Symbolic constants -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -are accepted. -.TP -\f2row\fP -Pointer to storage for the row filter image. -.TP -\f2column\fP -Pointer to storage for the column filter image. -.TP -\f2span\fP -Pointer to storage for the span filter image (currently unused). -.SH DESCRIPTION -\%\f3glGetSeparableFilter\fP returns the two one-dimensional filter kernel images for the -current separable 2D convolution filter. -The row image is placed in \f2row\fP and the column image is placed in -\f2column\fP according to the specifications in \f2format\fP and \f2type\fP. -(In the current implementation, \f2span\fP is not affected in any way.) -No pixel transfer operations are performed on the images, but the relevant -pixel storage modes are applied. -.sp -Color components that are present in \f2format\fP but not included in the -internal of the filters are returned as zero. -The assignments of internal color components to the components of \f2format\fP -are as follows: -.sp - -.TS -center; -cb cb -l l. -_ -Internal Component Resulting Component -_ -Red Red -Green Green -Blue Blue -Alpha Alpha -Luminance Red -Intensity Red -_ -.TE - -.SH NOTES -\%\f3glGetSeparableFilter\fP is present only if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP -is called with an argument of \%\f3GL_EXTENSIONS\fP. -.P -Non-separable 2D filters must be retrieved with \%\f3glGetConvolutionFilter\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not \%\f3GL_SEPARABLE_2D\fP. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2format\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetSeparableFilter\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, or -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.SH ASSOCIATED GETS -\%\f3glGetConvolutionParameter\fP -.SH SEE ALSO -\%\f3glGetConvolutionFilter(3G)\fP, -\%\f3glConvolutionParameter(3G)\fP, -\%\f3glSeparableFilter2D(3G)\fP diff --git a/doc/gl-docs/GL/gl/getstring.3gl b/doc/gl-docs/GL/gl/getstring.3gl deleted file mode 100644 index 58957074..00000000 --- a/doc/gl-docs/GL/gl/getstring.3gl +++ /dev/null @@ -1,84 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 getstring -.ds Xs 56397 5 getstring.gl -.TH GLGETSTRING 3G -.SH NAME -.B "glGetString -\- return a string describing the current GL connection - -.SH C SPECIFICATION -const GLubyte* \f3glGetString\fP( -GLenum \fIname\fP ) -.SH PARAMETERS -.TP \w'\fIname\fP\ \ 'u -\f2name\fP -Specifies a symbolic constant, one of -\%\f3GL_VENDOR\fP, \%\f3GL_RENDERER\fP, \%\f3GL_VERSION\fP, or \%\f3GL_EXTENSIONS\fP. -.SH DESCRIPTION -\%\f3glGetString\fP returns a pointer to a static string -describing some aspect of the current GL connection. -\f2name\fP can be one of the following: -.TP 20 -\%\f3GL_VENDOR\fP -Returns the company responsible for this GL implementation. -This name does not change from release to release. -.TP -\%\f3GL_RENDERER\fP -Returns the name of the renderer. -This name is typically specific to a particular configuration of a hardware -platform. -It does not change from release to release. -.TP -\%\f3GL_VERSION\fP -Returns a version or release number. -.TP -\%\f3GL_EXTENSIONS\fP -Returns a space-separated list of supported extensions to GL. -.P -Because the GL does not include queries for the performance -characteristics of an implementation, some applications are written to -recognize known platforms and modify their GL usage based on known -performance characteristics of these platforms. -Strings \%\f3GL_VENDOR\fP and \%\f3GL_RENDERER\fP together uniquely specify -a platform. They do not change from release to release and should be used -by platform-recognition algorithms. -.P -Some applications want to make use of features that -are not part of the standard GL. These features -may be implemented as extensions to the standard GL. -The \%\f3GL_EXTENSIONS\fP string is a space-separated -list of supported GL extensions. -(Extension names never contain a space character.) -.P -The \%\f3GL_VERSION\fP string begins with a version number. -The version number uses one -of these forms: -.P -\f2major_number.minor_number\fP -.br -\f2major_number.minor_number.release_number\fP -.P -Vendor-specific information may follow the version -number. Its depends on the implementation, but -a space always separates the version number and -the vendor-specific information. -.P -All strings are null-terminated. -.SH NOTES -If an error is generated, \%\f3glGetString\fP returns 0. -.P -The client and server may support different versions or extensions. -\%\f3glGetString\fP always returns a compatible version number or list of extensions. -The release number always describes the server. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2name\fP is not an accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetString\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. diff --git a/doc/gl-docs/GL/gl/gettexenv.3gl b/doc/gl-docs/GL/gl/gettexenv.3gl deleted file mode 100644 index f1bf03b5..00000000 --- a/doc/gl-docs/GL/gl/gettexenv.3gl +++ /dev/null @@ -1,80 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 gettexenv -.ds Xs 32087 4 gettexenv.gl -.TH GLGETTEXENV 3G -.SH NAME -.B "glGetTexEnvfv, glGetTexEnviv -\- return texture environment parameters - -.SH C SPECIFICATION -void \f3glGetTexEnvfv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetTexEnvfv( 'u - GLenum \fIpname\fP, - GLfloat \fI*params\fP ) -.fi -void \f3glGetTexEnviv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetTexEnviv( 'u - GLenum \fIpname\fP, - GLint \fI*params\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -Specifies a texture environment. -Must be \%\f3GL_TEXTURE_ENV\fP. -.TP -\f2pname\fP -Specifies the symbolic name of a texture environment parameter. -Accepted values are \%\f3GL_TEXTURE_ENV_MODE\fP and \%\f3GL_TEXTURE_ENV_COLOR\fP. -.TP -\f2params\fP -Returns the requested data. -.SH DESCRIPTION -\%\f3glGetTexEnv\fP returns in \f2params\fP selected values of a texture environment that -was specified with \%\f3glTexEnv\fP. -\f2target\fP specifies a texture environment. -Currently, only one texture environment is defined and supported: -\%\f3GL_TEXTURE_ENV\fP. -.P -\f2pname\fP names a specific texture environment parameter, as follows: -.TP 10 -\%\f3GL_TEXTURE_ENV_MODE\fP -\f2params\fP returns the single-valued texture environment mode, -a symbolic constant. The initial value is \%\f3GL_MODULATE\fP. -.TP -\%\f3GL_TEXTURE_ENV_COLOR\fP -\f2params\fP returns four integer or floating-point values that are the -texture environment color. -Integer values, -when requested, -are linearly mapped from the internal floating-point representation -such that 1.0 maps to the most positive representable integer, -and \-1.0 maps to the most negative representable integer. The initial -value is (0, 0, 0, 0). -.SH NOTES -If an error is generated, -no change is made to the contents of \f2params\fP. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, \%\f3glGetTexEnv\fP returns -the texture environment parameters for the active texture unit. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP or \f2pname\fP is not an -accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetTexEnv\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glActiveTextureARB(3G)\fP, -\%\f3glTexEnv(3G)\fP diff --git a/doc/gl-docs/GL/gl/gettexgen.3gl b/doc/gl-docs/GL/gl/gettexgen.3gl deleted file mode 100644 index 5397d53d..00000000 --- a/doc/gl-docs/GL/gl/gettexgen.3gl +++ /dev/null @@ -1,107 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 gettexgen -.ds Xs 2655 5 gettexgen.gl -.TH GLGETTEXGEN 3G -.SH NAME -.B "glGetTexGendv, glGetTexGenfv, glGetTexGeniv -\- return texture coordinate generation parameters - -.SH C SPECIFICATION -void \f3glGetTexGendv\fP( -GLenum \fIcoord\fP, -.nf -.ta \w'\f3void \fPglGetTexGendv( 'u - GLenum \fIpname\fP, - GLdouble \fI*params\fP ) -.fi -void \f3glGetTexGenfv\fP( -GLenum \fIcoord\fP, -.nf -.ta \w'\f3void \fPglGetTexGenfv( 'u - GLenum \fIpname\fP, - GLfloat \fI*params\fP ) -.fi -void \f3glGetTexGeniv\fP( -GLenum \fIcoord\fP, -.nf -.ta \w'\f3void \fPglGetTexGeniv( 'u - GLenum \fIpname\fP, - GLint \fI*params\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIparams\fP\ \ 'u -\f2coord\fP -Specifies a texture coordinate. -Must be -\%\f3GL_S\fP, -\%\f3GL_T\fP, -\%\f3GL_R\fP, or -\%\f3GL_Q\fP. -.TP -\f2pname\fP -Specifies the symbolic name of the value(s) to be returned. -Must be either \%\f3GL_TEXTURE_GEN_MODE\fP -or the name of one of the texture generation plane equations: -\%\f3GL_OBJECT_PLANE\fP or \%\f3GL_EYE_PLANE\fP. -.TP -\f2params\fP -Returns the requested data. -.SH DESCRIPTION -\%\f3glGetTexGen\fP returns in \f2params\fP selected parameters of a texture coordinate -generation function that was specified using \%\f3glTexGen\fP. -\f2coord\fP names one of the (\f2s\fP, \f2t\fP, \f2r\fP, \f2q\fP) -texture coordinates, -using the symbolic constant -\%\f3GL_S\fP, -\%\f3GL_T\fP, -\%\f3GL_R\fP, or -\%\f3GL_Q\fP. -.P -\f2pname\fP specifies one of three symbolic names: -.TP 28 -\%\f3GL_TEXTURE_GEN_MODE\fP -\f2params\fP returns the single-valued texture generation function, -a symbolic constant. The initial value is \%\f3GL_EYE_LINEAR\fP. -.TP -\%\f3GL_OBJECT_PLANE\fP -\f2params\fP returns the four plane equation coefficients that specify -object linear-coordinate generation. -Integer values, when requested, -are mapped directly from the internal floating-point representation. -.BP -.TP -\%\f3GL_EYE_PLANE\fP -\f2params\fP returns the four plane equation coefficients that specify -eye linear-coordinate generation. -Integer values, -when requested, -are mapped directly from the internal floating-point representation. -The returned values are those maintained in eye coordinates. -They are not equal to the values specified using \%\f3glTexGen\fP, -unless the modelview matrix was identity when \%\f3glTexGen\fP was called. -.SH NOTES -If an error is generated, -no change is made to the contents of \f2params\fP. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, \%\f3glGetTexGen\fP returns -the texture coordinate generation parameters for the active texture unit. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2coord\fP or \f2pname\fP is not an -accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetTexGen\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glActiveTextureARB(3G)\fP, -\%\f3glTexGen(3G)\fP diff --git a/doc/gl-docs/GL/gl/getteximage.3gl b/doc/gl-docs/GL/gl/getteximage.3gl deleted file mode 100644 index 41583d73..00000000 --- a/doc/gl-docs/GL/gl/getteximage.3gl +++ /dev/null @@ -1,209 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 gettexima -.ds Xs 2939 8 getteximage.gl -.TH GLGETTEXIMAGE 3G -.SH NAME -.B "glGetTexImage -\- return a texture image - -.SH C SPECIFICATION -void \f3glGetTexImage\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetTexImage( 'u - GLint \fIlevel\fP, - GLenum \fIformat\fP, - GLenum \fItype\fP, - GLvoid \fI*pixels\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -Specifies which texture is to be obtained. -\%\f3GL_TEXTURE_1D\fP, \%\f3GL_TEXTURE_2D\fP, and \%\f3GL_TEXTURE_3D\fP are accepted. -.TP -\f2level\fP -Specifies the level-of-detail number of the desired image. -Level 0 is the base image level. -Level $n$ is the $n$th mipmap reduction image. -.TP -\f2format\fP -Specifies a pixel for the returned data. -The supported formats are -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_BGR\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, and -\%\f3GL_LUMINANCE_ALPHA\fP. -.TP -\f2type\fP -Specifies a pixel type for the returned data. -The supported types are -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP. -.TP -\f2pixels\fP -Returns the texture image. -Should be a pointer to an array of the type specified by \f2type\fP. -.SH DESCRIPTION -\%\f3glGetTexImage\fP returns a texture image into \f2pixels\fP. -\f2target\fP specifies whether the desired texture image is one specified by -\%\f3glTexImage1D\fP (\%\f3GL_TEXTURE_1D\fP), -\%\f3glTexImage2D\fP (\%\f3GL_TEXTURE_2D\fP), or -\%\f3glTexImage3D\fP (\%\f3GL_TEXTURE_3D\fP). -\f2level\fP specifies the level-of-detail number of the desired image. -\f2format\fP and \f2type\fP specify the and type of the desired image array. -See the reference pages \%\f3glTexImage1D\fP and \%\f3glDrawPixels\fP -for a description of the acceptable values for the \f2format\fP and \f2type\fP -parameters, respectively. -.P -To understand the operation of \%\f3glGetTexImage\fP, consider the selected internal -four-component texture image to be an RGBA color buffer the size of the image. -The semantics of \%\f3glGetTexImage\fP are then identical to those of \%\f3glReadPixels\fP, -with the exception that no pixel transfer operations are performed, -when called with the same \f2format\fP and \f2type\fP, -with \f2x\fP and \f2y\fP set to 0, -\f2width\fP set to the width of the texture image -(including border if one was specified), -and \f2height\fP set to 1 for 1D images, -or to the height of the texture image -(including border if one was specified) -for 2D images. -.BP -Because the internal texture image is an RGBA image, -pixel formats \%\f3GL_COLOR_INDEX\fP, -\%\f3GL_STENCIL_INDEX\fP, -and \%\f3GL_DEPTH_COMPONENT\fP are not accepted, -and pixel type \%\f3GL_BITMAP\fP is not accepted. -.P -If the selected texture image does not contain four components, -the following mappings are applied. -Single-component textures are treated as RGBA buffers with red set -to the single-component value, -green set to 0, blue set to 0, and alpha set to 1. -Two-component textures are treated as RGBA buffers with red set to -the value of component zero, -alpha set to the value of component one, -and green and blue set to 0. -Finally, -three-component textures are treated as RGBA buffers with red set to -component zero, -green set to component one, -blue set to component two, -and alpha set to 1. -.P -To determine the required size of \f2pixels\fP, -use \%\f3glGetTexLevelParameter\fP to determine the dimensions of the -internal texture image, -then scale the required number of pixels by the storage required for -each pixel, -based on \f2format\fP and \f2type\fP. -Be sure to take the pixel storage parameters into account, -especially \%\f3GL_PACK_ALIGNMENT\fP. -.SH NOTES -If an error is generated, -no change is made to the contents of \f2pixels\fP. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, \%\f3glGetTexImage\fP returns -the texture image for the active texture unit. -.P -The types \%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP, -and the formats -\%\f3GL_BGR\fP, and \%\f3GL_BGRA\fP are available only if the GL version is -1.2 or greater. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP, \f2format\fP, or \f2type\fP is not -an accepted value. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2level\fP is less than 0. -.P -\%\f3GL_INVALID_VALUE\fP may be generated if \f2level\fP is greater -than $log sub 2 max$, -where $max$ is the returned value of \%\f3GL_MAX_TEXTURE_SIZE\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetTexImage\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is returned if \f2type\fP is one of -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, or -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is returned if \f2type\fP is one of -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP, and \f2format\fP is neither \%\f3GL_RGBA\fP -or \%\f3GL_BGRA\fP. -.SH ASSOCIATED GETS -\%\f3glGetTexLevelParameter\fP with argument \%\f3GL_TEXTURE_WIDTH\fP -.br -\%\f3glGetTexLevelParameter\fP with argument \%\f3GL_TEXTURE_HEIGHT\fP -.br -\%\f3glGetTexLevelParameter\fP with argument \%\f3GL_TEXTURE_BORDER\fP -.br -\%\f3glGetTexLevelParameter\fP with argument \%\f3GL_TEXTURE_INTERNALFORMAT\fP -.br -\%\f3glGet\fP with arguments \%\f3GL_PACK_ALIGNMENT\fP and others -.SH SEE ALSO -\%\f3glActiveTextureARB(3G)\fP, -\%\f3glDrawPixels(3G)\fP, -\%\f3glReadPixels(3G)\fP, -\%\f3glTexEnv(3G)\fP, -\%\f3glTexGen(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexImage3D(3G)\fP, -\%\f3glTexSubImage1D(3G)\fP, -\%\f3glTexSubImage2D(3G)\fP, -\%\f3glTexSubImage3D(3G)\fP, -\%\f3glTexParameter(3G)\fP diff --git a/doc/gl-docs/GL/gl/gettexlevelparameter.3gl b/doc/gl-docs/GL/gl/gettexlevelparameter.3gl deleted file mode 100644 index 9ed20da2..00000000 --- a/doc/gl-docs/GL/gl/gettexlevelparameter.3gl +++ /dev/null @@ -1,182 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 gettexlev -.ds Xs 50913 7 gettexlevelparameter.gl -.TH GLGETTEXLEVELPARAMETER 3G -.SH NAME -.B "glGetTexLevelParameterfv, glGetTexLevelParameteriv -\- return texture parameter values for a specific level of detail - -.SH C SPECIFICATION -void \f3glGetTexLevelParameterfv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetTexLevelParameterfv( 'u - GLint \fIlevel\fP, - GLenum \fIpname\fP, - GLfloat \fI*params\fP ) -.fi -void \f3glGetTexLevelParameteriv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetTexLevelParameteriv( 'u - GLint \fIlevel\fP, - GLenum \fIpname\fP, - GLint \fI*params\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -Specifies the symbolic name of the target texture, -either \%\f3GL_TEXTURE_1D\fP, \%\f3GL_TEXTURE_2D\fP, \%\f3GL_TEXTURE_3D\fP, -\%\f3GL_PROXY_TEXTURE_1D\fP, \%\f3GL_PROXY_TEXTURE_2D\fP, or -\%\f3GL_PROXY_TEXTURE_3D\fP. -.TP -\f2level\fP -Specifies the level-of-detail number of the desired image. -Level 0 is the base image level. -Level $n$ is the $n$th mipmap reduction image. -.TP -\f2pname\fP -Specifies the symbolic name of a texture parameter. -\%\f3GL_TEXTURE_WIDTH\fP, -\%\f3GL_TEXTURE_HEIGHT\fP, -\%\f3GL_TEXTURE_DEPTH\fP, -\%\f3GL_TEXTURE_INTERNAL_FORMAT\fP, -\%\f3GL_TEXTURE_BORDER\fP, -\%\f3GL_TEXTURE_RED_SIZE\fP, -\%\f3GL_TEXTURE_GREEN_SIZE\fP, -\%\f3GL_TEXTURE_BLUE_SIZE\fP, -\%\f3GL_TEXTURE_ALPHA_SIZE\fP, -\%\f3GL_TEXTURE_LUMINANCE_SIZE\fP, and -\%\f3GL_TEXTURE_INTENSITY_SIZE\fP are accepted. -.TP -\f2params\fP -Returns the requested data. -.SH DESCRIPTION -\%\f3glGetTexLevelParameter\fP returns in \f2params\fP texture parameter values for a specific -level-of-detail value, -specified as \f2level\fP. -\f2target\fP defines the target texture, -either \%\f3GL_TEXTURE_1D\fP, \%\f3GL_TEXTURE_2D\fP, \%\f3GL_TEXTURE_3D\fP, -\%\f3GL_PROXY_TEXTURE_1D\fP, -\%\f3GL_PROXY_TEXTURE_2D\fP, or -\%\f3GL_PROXY_TEXTURE_3D\fP. -.BR -.P -\%\f3GL_MAX_TEXTURE_SIZE\fP, and \%\f3GL_MAX_3D_TEXTURE_SIZE\fP are not really -descriptive enough. -It has to report the largest square texture image that can be -accommodated with mipmaps and borders, -but a long skinny texture, or a texture without mipmaps and borders, may -easily fit in texture memory. -The proxy targets allow the user to more accurately query -whether the GL can accommodate a texture of a given configuration. -If the texture cannot be accommodated, the texture state variables, which -may be queried with \%\f3glGetTexLevelParameter\fP, are set to 0. If the texture can be accommodated, -the texture state values will be set as they would be set for a -non-proxy target. -.P -\f2pname\fP specifies the texture parameter whose value or values -will be returned. -.P -The accepted parameter names are as follows: -.TP 10 -\%\f3GL_TEXTURE_WIDTH\fP -\f2params\fP returns a single value, -the width of the texture image. -This value includes the border of the texture image. The initial value is -0. -.TP -\%\f3GL_TEXTURE_HEIGHT\fP -\f2params\fP returns a single value, -the height of the texture image. -This value includes the border of the texture image. The initial value is -0. -.TP -\%\f3GL_TEXTURE_DEPTH\fP -\f2params\fP returns a single value, -the depth of the texture image. -This value includes the border of the texture image. The initial value is -0. -.TP -\%\f3GL_TEXTURE_INTERNAL_FORMAT\fP -\f2params\fP returns a single value, -the internal of the texture image. -.TP -\%\f3GL_TEXTURE_BORDER\fP -\f2params\fP returns a single value, -the width in pixels of the border of the texture image. The initial value -is 0. -.TP -\%\f3GL_TEXTURE_RED_SIZE\fP, -.TP -\%\f3GL_TEXTURE_GREEN_SIZE\fP, -.TP -\%\f3GL_TEXTURE_BLUE_SIZE\fP, -.TP -\%\f3GL_TEXTURE_ALPHA_SIZE\fP, -.TP -\%\f3GL_TEXTURE_LUMINANCE_SIZE\fP, -.TP -\%\f3GL_TEXTURE_INTENSITY_SIZE\fP -The internal storage resolution of an individual component. -The resolution chosen by the GL will be a close match for the resolution -requested by the user with the component argument of \%\f3glTexImage1D\fP, -\%\f3glTexImage2D\fP, \%\f3glTexImage3D\fP, \%\f3glCopyTexImage1D\fP, and -\%\f3glCopyTexImage2D\fP. The initial value is 0. -.SH NOTES -If an error is generated, -no change is made to the contents of \f2params\fP. -.P -\%\f3GL_TEXTURE_INTERNAL_FORMAT\fP is available only if the GL version is -1.1 or greater. In version 1.0, use \%\f3GL_TEXTURE_COMPONENTS\fP -instead. -.P -\%\f3GL_PROXY_TEXTURE_1D\fP and \%\f3GL_PROXY_TEXTURE_2D\fP are -available only if the GL version is 1.1 or greater. -.P -\%\f3GL_TEXTURE_3D\fP, \%\f3GL_PROXY_TEXTURE_3D\fP, and \%\f3GL_TEXTURE_DEPTH\fP -are available only if the GL version is 1.2 or greater. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, \%\f3glGetTexLevelParameter\fP returns -the texture level parameters for the active texture unit. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP or \f2pname\fP is not an -accepted value. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2level\fP is less than 0. -.P -\%\f3GL_INVALID_VALUE\fP may be generated if \f2level\fP is greater -than $ log sub 2$ \f2max\fP, -where \f2max\fP is the returned value of \%\f3GL_MAX_TEXTURE_SIZE\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetTexLevelParameter\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glActiveTextureARB(3G)\fP, -\%\f3glGetTexParameter(3G)\fP, -\%\f3glCopyTexImage1D(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glCopyTexSubImage1D(3G)\fP, -\%\f3glCopyTexSubImage2D(3G)\fP, -\%\f3glCopyTexSubImage3D(3G)\fP, -\%\f3glTexEnv(3G)\fP, -\%\f3glTexGen(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexImage3D(3G)\fP, -\%\f3glTexSubImage1D(3G)\fP, -\%\f3glTexSubImage2D(3G)\fP, -\%\f3glTexSubImage3D(3G)\fP, -\%\f3glTexParameter(3G)\fP diff --git a/doc/gl-docs/GL/gl/gettexparameter.3gl b/doc/gl-docs/GL/gl/gettexparameter.3gl deleted file mode 100644 index 58283eba..00000000 --- a/doc/gl-docs/GL/gl/gettexparameter.3gl +++ /dev/null @@ -1,142 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 gettexpar -.ds Xs 10274 6 gettexparameter.gl -.TH GLGETTEXPARAMETER 3G -.SH NAME -.B "glGetTexParameterfv, glGetTexParameteriv -\- return texture parameter values - -.SH C SPECIFICATION -void \f3glGetTexParameterfv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetTexParameterfv( 'u - GLenum \fIpname\fP, - GLfloat \fI*params\fP ) -.fi -void \f3glGetTexParameteriv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglGetTexParameteriv( 'u - GLenum \fIpname\fP, - GLint \fI*params\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -Specifies the symbolic name of the target texture. -\%\f3GL_TEXTURE_1D\fP,\%\f3GL_TEXTURE_2D\fP, and \%\f3GL_TEXTURE_3D\fP are accepted. -.TP -\f2pname\fP -Specifies the symbolic name of a texture parameter. -\%\f3GL_TEXTURE_MAG_FILTER\fP, -\%\f3GL_TEXTURE_MIN_FILTER\fP, -\%\f3GL_TEXTURE_MIN_LOD\fP, -\%\f3GL_TEXTURE_MAX_LOD\fP, -\%\f3GL_TEXTURE_BASE_LEVEL\fP, -\%\f3GL_TEXTURE_MAX_LEVEL\fP, -\%\f3GL_TEXTURE_WRAP_S\fP, -\%\f3GL_TEXTURE_WRAP_T\fP, -\%\f3GL_TEXTURE_WRAP_R\fP, -\%\f3GL_TEXTURE_BORDER_COLOR\fP, -\%\f3GL_TEXTURE_PRIORITY\fP, and -\%\f3GL_TEXTURE_RESIDENT\fP are accepted. -.TP -\f2params\fP -Returns the texture parameters. -.SH DESCRIPTION -\%\f3glGetTexParameter\fP returns in \f2params\fP the value or values of the texture parameter -specified as \f2pname\fP. -\f2target\fP defines the target texture, -either \%\f3GL_TEXTURE_1D\fP, \%\f3GL_TEXTURE_2D\fP, or \%\f3GL_TEXTURE_3D\fP -to specify one-, two-, or three-dimensional texturing. -\f2pname\fP accepts the same symbols as \%\f3glTexParameter\fP, -with the same interpretations: -.TP 35 -\%\f3GL_TEXTURE_MAG_FILTER\fP -Returns the single-valued texture magnification filter, -a symbolic constant. The initial value is \%\f3GL_LINEAR\fP. -.TP -\%\f3GL_TEXTURE_MIN_FILTER\fP -Returns the single-valued texture minification filter, -a symbolic constant. The initial value is \%\f3GL_NEAREST_MIPMAP_LINEAR\fP. -.TP -\%\f3GL_TEXTURE_MIN_LOD\fP -Returns the single-valued texture minimum level-of-detail value. The -initial value is $-1000$. -.TP -\%\f3GL_TEXTURE_MAX_LOD\fP -Returns the single-valued texture maximum level-of-detail value. The -initial value is 1000. -.TP -\%\f3GL_TEXTURE_BASE_LEVEL\fP -Returns the single-valued base texture mipmap level. The initial value is 0. -.TP -\%\f3GL_TEXTURE_MAX_LEVEL\fP -Returns the single-valued maximum texture mipmap array level. The initial -value is 1000. -.TP -\%\f3GL_TEXTURE_WRAP_S\fP -Returns the single-valued wrapping function for texture coordinate $s$, -a symbolic constant. The initial value is \%\f3GL_REPEAT\fP. -.TP -\%\f3GL_TEXTURE_WRAP_T\fP -Returns the single-valued wrapping function for texture coordinate $t$, -a symbolic constant. The initial value is \%\f3GL_REPEAT\fP. -.TP -\%\f3GL_TEXTURE_WRAP_R\fP -Returns the single-valued wrapping function for texture coordinate $r$, -a symbolic constant. The initial value is \%\f3GL_REPEAT\fP. -.BP -.TP -\%\f3GL_TEXTURE_BORDER_COLOR\fP -Returns four integer or floating-point numbers that comprise the RGBA color -of the texture border. -Floating-point values are returned in the range [0, 1]. -Integer values are returned as a linear mapping of the internal floating-point -representation such that 1.0 maps to the most positive representable -integer and \-1.0 maps to the most negative representable -integer. The initial value is (0, 0, 0, 0). -.TP -\%\f3GL_TEXTURE_PRIORITY\fP -Returns the residence priority of the target texture (or the named -texture bound to it). The initial value is 1. -See \%\f3glPrioritizeTextures\fP. -.TP -\%\f3GL_TEXTURE_RESIDENT\fP -Returns the residence status of the target texture. -If the value returned in \f2params\fP is \%\f3GL_TRUE\fP, the texture is -resident in texture memory. -See \%\f3glAreTexturesResident\fP. -.SH NOTES -\%\f3GL_TEXTURE_PRIORITY\fP and \%\f3GL_TEXTURE_RESIDENT\fP are -available only if the GL version is 1.1 or greater. -.P -\%\f3GL_TEXTURE_3D\fP, -\%\f3GL_TEXTURE_MIN_LOD\fP, \%\f3GL_TEXTURE_MAX_LOD\fP, \%\f3GL_TEXTURE_BASE_LEVEL\fP, -\%\f3GL_TEXTURE_MAX_LEVEL\fP, and \%\f3GL_TEXTURE_WRAP_R\fP are available only -if the GL version is 1.2 or greater. -.P -If an error is generated, -no change is made to the contents of \f2params\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP or \f2pname\fP is not an -accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glGetTexParameter\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glAreTexturesResident(3G)\fP, -\%\f3glPrioritizeTextures(3G)\fP, -\%\f3glTexParameter(3G)\fP diff --git a/doc/gl-docs/GL/gl/hint.3gl b/doc/gl-docs/GL/gl/hint.3gl deleted file mode 100644 index 956e91f0..00000000 --- a/doc/gl-docs/GL/gl/hint.3gl +++ /dev/null @@ -1,104 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 hint.gl - -.ds Xs 8452 5 hint.gl -.TH GLHINT 3G -.SH NAME -.B "glHint -\- specify implementation-specific hints - -.SH C SPECIFICATION -void \f3glHint\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglHint( 'u - GLenum \fImode\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -Specifies a symbolic constant indicating the behavior to be controlled. -\%\f3GL_FOG_HINT\fP, -\%\f3GL_LINE_SMOOTH_HINT\fP, -\%\f3GL_PERSPECTIVE_CORRECTION_HINT\fP, -\%\f3GL_POINT_SMOOTH_HINT\fP, and -\%\f3GL_POLYGON_SMOOTH_HINT\fP are accepted. -.TP -\f2mode\fP -Specifies a symbolic constant indicating the desired behavior. -\%\f3GL_FASTEST\fP, -\%\f3GL_NICEST\fP, and -\%\f3GL_DONT_CARE\fP are accepted. -.SH DESCRIPTION -Certain aspects of GL behavior, -when there is room for interpretation, -can be controlled with hints. -A hint is specified with two arguments. -\f2target\fP is a symbolic -constant indicating the behavior to be controlled, -and \f2mode\fP is another symbolic constant indicating the desired -behavior. The initial value for each \f2target\fP is \%\f3GL_DONT_CARE\fP. -\f2mode\fP can be one of the following: -.TP 20 -\%\f3GL_FASTEST\fP -The most efficient option should be chosen. -.TP -\%\f3GL_NICEST\fP -The most correct, -or highest quality, -option should be chosen. -.TP -\%\f3GL_DONT_CARE\fP -No preference. -.P -Though the implementation aspects that can be hinted are well defined, -the interpretation of the hints depends on the implementation. -The hint aspects that can be specified with \f2target\fP, -along with suggested semantics, -are as follows: -.TP 20 -\%\f3GL_FOG_HINT\fP -Indicates the accuracy of fog calculation. -If per-pixel fog calculation is not efficiently supported -by the GL implementation, -hinting \%\f3GL_DONT_CARE\fP or \%\f3GL_FASTEST\fP can result in per-vertex -calculation of fog effects. -.TP -\%\f3GL_LINE_SMOOTH_HINT\fP -Indicates the sampling quality of antialiased lines. -If a larger filter function is applied, hinting \%\f3GL_NICEST\fP can -result in more pixel fragments being generated during rasterization, -.TP -\%\f3GL_PERSPECTIVE_CORRECTION_HINT\fP -Indicates the quality of color and texture coordinate interpolation. -If perspective-corrected parameter interpolation is not efficiently supported -by the GL implementation, -hinting \%\f3GL_DONT_CARE\fP or \%\f3GL_FASTEST\fP can result in simple linear -interpolation of colors and/or texture coordinates. -.TP -\%\f3GL_POINT_SMOOTH_HINT\fP -Indicates the sampling quality of antialiased points. -If a larger filter function is applied, hinting \%\f3GL_NICEST\fP can -result in more pixel fragments being generated during rasterization, -.TP -\%\f3GL_POLYGON_SMOOTH_HINT\fP -Indicates the sampling quality of antialiased polygons. -Hinting \%\f3GL_NICEST\fP can result in more pixel fragments being generated -during rasterization, -if a larger filter function is applied. -.SH NOTES -The interpretation of hints depends on the implementation. -Some implementations ignore \%\f3glHint\fP settings. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if either \f2target\fP or \f2mode\fP is not -an accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glHint\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. diff --git a/doc/gl-docs/GL/gl/histogram.3gl b/doc/gl-docs/GL/gl/histogram.3gl deleted file mode 100644 index a659a4a1..00000000 --- a/doc/gl-docs/GL/gl/histogram.3gl +++ /dev/null @@ -1,138 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 histogram -.ds Xs 13152 6 histogram.gl -.TH GLHISTOGRAM 3G -.SH NAME -.B "glHistogram -\- define histogram table - -.SH C SPECIFICATION -void \f3glHistogram\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglHistogram( 'u - GLsizei \fIwidth\fP, - GLenum \fIinternalformat\fP, - GLboolean \fIsink\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIinternalformat\fP\ \ 'u -\f2target\fP -The histogram whose parameters are to be set. -Must be one of -\%\f3GL_HISTOGRAM\fP or -\%\f3GL_PROXY_HISTOGRAM\fP. -.TP -\f2width\fP -The number of entries in the histogram table. Must be a power of 2. -.TP -\f2internalformat\fP -The of entries in the histogram table. -Must be one of -\%\f3GL_ALPHA\fP, -\%\f3GL_ALPHA4\fP, -\%\f3GL_ALPHA8\fP, -\%\f3GL_ALPHA12\fP, -\%\f3GL_ALPHA16\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE4\fP, -\%\f3GL_LUMINANCE8\fP, -\%\f3GL_LUMINANCE12\fP, -\%\f3GL_LUMINANCE16\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_LUMINANCE4_ALPHA4\fP, -\%\f3GL_LUMINANCE6_ALPHA2\fP, -\%\f3GL_LUMINANCE8_ALPHA8\fP, -\%\f3GL_LUMINANCE12_ALPHA4\fP, -\%\f3GL_LUMINANCE12_ALPHA12\fP, -\%\f3GL_LUMINANCE16_ALPHA16\fP, -\%\f3GL_R3_G3_B2\fP, -\%\f3GL_RGB\fP, -\%\f3GL_RGB4\fP, -\%\f3GL_RGB5\fP, -\%\f3GL_RGB8\fP, -\%\f3GL_RGB10\fP, -\%\f3GL_RGB12\fP, -\%\f3GL_RGB16\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_RGBA2\fP, -\%\f3GL_RGBA4\fP, -\%\f3GL_RGB5_A1\fP, -\%\f3GL_RGBA8\fP, -\%\f3GL_RGB10_A2\fP, -\%\f3GL_RGBA12\fP, or -\%\f3GL_RGBA16\fP. -.TP -\f2sink\fP -If \%\f3GL_TRUE\fP, pixels will be consumed by the histogramming -process and no drawing or texture loading will take place. -If \%\f3GL_FALSE\fP, pixels will proceed to the minmax process after -histogramming. -.SH DESCRIPTION -When \%\f3GL_HISTOGRAM\fP is enabled, RGBA color components are converted to -histogram table indices by clamping to the range [0,1], multiplying by -the width of the histogram table, and rounding to the nearest integer. -The table entries selected by the RGBA indices are then incremented. -(If the internal of the histogram table includes luminance, then -the index derived from the R color component determines the luminance -table entry to be incremented.) If a histogram table entry is incremented -beyond its maximum value, then its value becomes undefined. (This is -not an error.) -.PP -Histogramming is performed only for RGBA pixels (though these may -be specified originally as color indices and converted to RGBA by -index table lookup). -Histogramming is enabled with \%\f3glEnable\fP and disabled with \%\f3glDisable\fP. -.PP -When \f2target\fP is \%\f3GL_HISTOGRAM\fP, \%\f3glHistogram\fP redefines the current -histogram table to have \f2width\fP entries of the specified by -\f2internalformat\fP. -The entries are indexed 0 through $"width" ~-~ 1$, and -all entries are initialized to zero. -The values in the previous histogram table, if any, are lost. -If \f2sink\fP is \%\f3GL_TRUE\fP, then pixels are discarded after histogramming; -no further processing of the pixels takes place, and no drawing, -texture loading, or pixel readback will result. -.PP -When \f2target\fP is \%\f3GL_PROXY_HISTOGRAM\fP, \%\f3glHistogram\fP computes all -state information as if the histogram table were to be redefined, -but does not actually define the new table. -If the requested histogram table is too large to be supported, then the -state information will be set to zero. -This provides a way to determine if a histogram table with the given -parameters can be supported. -.PP -.SH NOTES -\%\f3glHistogram\fP is present only if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP -is called with an argument of \%\f3GL_EXTENSIONS\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2width\fP is less than zero or is -not a power of 2. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2internalformat\fP is not one of the -allowable values. -.P -\%\f3GL_TABLE_TOO_LARGE\fP is generated if \f2target\fP is \%\f3GL_HISTOGRAM\fP -and the histogram table specified is too large for the implementation. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glHistogram\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetHistogramParameter\fP -.SH SEE ALSO -\%\f3glGetHistogram(3G)\fP, -\%\f3glResetHistogram(3G)\fP diff --git a/doc/gl-docs/GL/gl/index.3gl b/doc/gl-docs/GL/gl/index.3gl deleted file mode 100644 index 040174d6..00000000 --- a/doc/gl-docs/GL/gl/index.3gl +++ /dev/null @@ -1,99 +0,0 @@ -.\" $XFree86$ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 index.gl -.ds Xs 37923 4 index.gl -.TH GLINDEX 3G -.SH NAME -.B "glIndexd, glIndexf, glIndexi, glIndexs, glIndexub, glIndexdv, glIndexfv, glIndexiv, glIndexsv, glIndexubv -\- set the current color index - -.P -.SH C SPECIFICATION -void \f3glIndexd\fP( -GLdouble \fIc\fP ) -.nf -.fi -void \f3glIndexf\fP( -GLfloat \fIc\fP ) -.nf -.fi -void \f3glIndexi\fP( -GLint \fIc\fP ) -.nf -.fi -void \f3glIndexs\fP( -GLshort \fIc\fP ) -.nf -.fi -void \f3glIndexub\fP( -GLubyte c); \fI1.1\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f21.1\fP\ \ 'u -\f21.1\fP -Specifies the new value for the current color index. -.P -.SH C SPECIFICATION -void \f3glIndexdv\fP( -const GLdouble \fI*c\fP ) -.nf -.fi -void \f3glIndexfv\fP( -const GLfloat \fI*c\fP ) -.nf -.fi -void \f3glIndexiv\fP( -const GLint \fI*c\fP ) -.nf -.fi -void \f3glIndexsv\fP( -const GLshort \fI*c\fP ) -.nf -.fi -void \f3glIndexubv\fP( -const GLubyte *c); \fI1.1\fP ) -.nf -.fi - -.SH PARAMETERS -.TP -\f21.1\fP -Specifies a pointer to a one-element array that contains -the new value for the current color index. -.SH DESCRIPTION -\%\f3glIndex\fP updates the current (single-valued) color index. -It takes one argument, the new value for the current color index. -.P -The current index is stored as a floating-point value. -Integer values are converted directly to floating-point values, -with no special mapping. -The initial value is 1. -.P -Index values outside the representable range of the color index buffer -are not clamped. -However, -before an index is dithered (if enabled) and written to the frame buffer, -it is converted to fixed-point . -Any bits in the integer portion of the resulting fixed-point value -that do not correspond to bits in the frame buffer are masked out. -.SH NOTES -\%\f3glIndexub\fP and \%\f3glIndexubv\fP are available only if the GL version is -1.1 or greater. -.P -The current index can be updated at any time. -In particular, -\%\f3glIndex\fP can be called between a call to \%\f3glBegin\fP and the corresponding -call to \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_CURRENT_INDEX\fP -.SH SEE ALSO -\%\f3glColor(3G)\fP, -\%\f3glIndexPointer(3G)\fP diff --git a/doc/gl-docs/GL/gl/indexmask.3gl b/doc/gl-docs/GL/gl/indexmask.3gl deleted file mode 100644 index 06ccaa18..00000000 --- a/doc/gl-docs/GL/gl/indexmask.3gl +++ /dev/null @@ -1,57 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 indexmask -.ds Xs 54319 4 indexmask.gl -.TH GLINDEXMASK 3G -.SH NAME -.B "glIndexMask -\- control the writing of individual bits in the color index buffers - -.SH C SPECIFICATION -void \f3glIndexMask\fP( -GLuint \fImask\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2mask\fP\ \ 'u -\f2mask\fP -Specifies a bit mask to enable and disable the writing of individual bits -in the color index buffers. -Initially, the mask is all 1's. -.SH DESCRIPTION -\%\f3glIndexMask\fP controls the writing of individual bits in the color index buffers. -The least significant $n$ bits of \f2mask\fP, -where $n$ is the number of bits in a color index buffer, -specify a mask. -Where a 1 (one) appears in the mask, -it's possible to write to the corresponding bit in the color index -buffer (or buffers). -Where a 0 (zero) appears, -the corresponding bit is write-protected. -.P -This mask is used only in color index mode, -and it affects only the buffers currently selected for writing -(see \%\f3glDrawBuffer\fP). -Initially, all bits are enabled for writing. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glIndexMask\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_INDEX_WRITEMASK\fP -.SH SEE ALSO -\%\f3glColorMask(3G)\fP, -\%\f3glDepthMask(3G)\fP, -\%\f3glDrawBuffer(3G)\fP, -\%\f3glIndex(3G)\fP, -\%\f3glIndexPointer(3G)\fP, -\%\f3glStencilMask(3G)\fP diff --git a/doc/gl-docs/GL/gl/indexpointer.3gl b/doc/gl-docs/GL/gl/indexpointer.3gl deleted file mode 100644 index a22f18c6..00000000 --- a/doc/gl-docs/GL/gl/indexpointer.3gl +++ /dev/null @@ -1,114 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 indexpoin -.ds Xs 54341 6 indexpointer.gl -.TH GLINDEXPOINTER 3G -.SH NAME -.B "glIndexPointer -\- define an array of color indexes - -.SH C SPECIFICATION -void \f3glIndexPointer\fP( -GLenum \fItype\fP, -.nf -.ta \w'\f3void \fPglIndexPointer( 'u - GLsizei \fIstride\fP, - const GLvoid \fI*ptr\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIstride\fP\ \ 'u -\f2type\fP -Specifies the data type of each color index in the array. -Symbolic constants -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -and \%\f3GL_DOUBLE\fP -are accepted. The initial value is \%\f3GL_FLOAT\fP. -.TP -\f2stride\fP -Specifies the byte offset between consecutive color indexes. -If \f2stride\fP is 0 (the initial value), the color indexes are understood to -be tightly packed in the array. -The initial value is 0. -.TP -\f2ptr\fP -Specifies a pointer to the first index in the array. -The initial value is 0. -.SH DESCRIPTION -\%\f3glIndexPointer\fP specifies the location and data of an array of color indexes -to use when rendering. -\f2type\fP specifies the data type of -each color index and \f2stride\fP gives the byte stride from one -color index to the next allowing vertices and attributes -to be packed into a single array or stored in separate arrays. -(Single-array storage may be more efficient on some implementations; -see \%\f3glInterleavedArrays\fP.) -.P -\f2type\fP, \f2stride\fP, and \f2ptr\fP are saved as client-side -state. -.P -The color index array is initially disabled. To enable and disable -the array, call \%\f3glEnableClientState\fP and -\%\f3glDisableClientState\fP with the argument \%\f3GL_INDEX_ARRAY\fP. If -enabled, the color index array is used when \%\f3glDrawArrays\fP, -\%\f3glDrawElements\fP or \%\f3glArrayElement\fP is called. -.P -Use \%\f3glDrawArrays\fP to construct a sequence of primitives (all of -the same type) from prespecified vertex and vertex attribute arrays. -Use \%\f3glArrayElement\fP to specify primitives -by indexing vertices and vertex attributes and \%\f3glDrawElements\fP to -construct a sequence of primitives by indexing vertices and vertex attributes. -.SH NOTES -\%\f3glIndexPointer\fP is available only if the GL version is 1.1 or greater. -.P -The color index array is initially disabled, and it isn't accessed when -\%\f3glArrayElement\fP, \%\f3glDrawElements\fP, or \%\f3glDrawArrays\fP is called. -.P -Execution of \%\f3glIndexPointer\fP is not allowed between -\%\f3glBegin\fP and the corresponding \%\f3glEnd\fP, -but an error may or may not be generated. If an error is not generated, -the operation is undefined. -.P -\%\f3glIndexPointer\fP is typically implemented on the client side. -.P -Since the color index array parameters are client-side state, they are -not saved or restored by \%\f3glPushAttrib\fP and \%\f3glPopAttrib\fP. -Use \%\f3glPushClientAttrib\fP and -\%\f3glPopClientAttrib\fP instead. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not an accepted value. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2stride\fP is negative. -.SH ASSOCIATED GETS -\%\f3glIsEnabled\fP with argument \%\f3GL_INDEX_ARRAY\fP -.br -\%\f3glGet\fP with argument \%\f3GL_INDEX_ARRAY_TYPE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_INDEX_ARRAY_STRIDE\fP -.br -\%\f3glGetPointerv\fP with argument \%\f3GL_INDEX_ARRAY_POINTER\fP -.SH SEE ALSO -\%\f3glArrayElement(3G)\fP, -\%\f3glColorPointer(3G)\fP, -\%\f3glDrawArrays(3G)\fP, -\%\f3glDrawElements(3G)\fP, -\%\f3glEdgeFlagPointer(3G)\fP, -\%\f3glEnable(3G)\fP, -\%\f3glGetPointerv(3G)\fP, -\%\f3glInterleavedArrays(3G)\fP, -\%\f3glNormalPointer(3G)\fP, -\%\f3glPopClientAttrib(3G)\fP, -\%\f3glPushClientAttrib(3G)\fP, -\%\f3glTexCoordPointer(3G)\fP, -\%\f3glVertexPointer(3G)\fP diff --git a/doc/gl-docs/GL/gl/initnames.3gl b/doc/gl-docs/GL/gl/initnames.3gl deleted file mode 100644 index bfcacfe0..00000000 --- a/doc/gl-docs/GL/gl/initnames.3gl +++ /dev/null @@ -1,38 +0,0 @@ -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 initnames -.ds Xs 2647 3 initnames.gl -.TH GLINITNAMES 3G -.SH NAME -.B "glInitNames -\- initialize the name stack - -.SH C SPECIFICATION -void \f3glInitNames\fP( void ) -.nf -.fi - -.SH DESCRIPTION -The name stack is used during selection mode to allow sets of rendering -commands to be uniquely identified. -It consists of an ordered set of unsigned integers. -\%\f3glInitNames\fP causes the name stack to be initialized to its default empty state. -.P -The name stack is always empty while the render mode is not \%\f3GL_SELECT\fP. -Calls to \%\f3glInitNames\fP while the render mode is not \%\f3GL_SELECT\fP are ignored. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glInitNames\fP -is executed between the execution of \%\f3glBegin\fP and the corresponding execution of -\%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_NAME_STACK_DEPTH\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAX_NAME_STACK_DEPTH\fP -.SH SEE ALSO -\%\f3glLoadName(3G)\fP, -\%\f3glPushName(3G)\fP, -\%\f3glRenderMode(3G)\fP, -\%\f3glSelectBuffer(3G)\fP diff --git a/doc/gl-docs/GL/gl/interleavedarrays.3gl b/doc/gl-docs/GL/gl/interleavedarrays.3gl deleted file mode 100644 index fb30d764..00000000 --- a/doc/gl-docs/GL/gl/interleavedarrays.3gl +++ /dev/null @@ -1,110 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 interleav -.ds Xs 31502 6 interleavedarrays.gl -.TH GLINTERLEAVEDARRAYS 3G -.SH NAME -.B "glInterleavedArrays -\- simultaneously specify and enable several interleaved arrays - -.SH C SPECIFICATION -void \f3glInterleavedArrays\fP( -GLenum \fIformat\fP, -.nf -.ta \w'\f3void \fPglInterleavedArrays( 'u - GLsizei \fIstride\fP, - const GLvoid \fI*pointer\fP ) -.fi - -.SH PARAMETERS -.TP \w'\fIpointer\fP\ \ 'u -\f2format\fP -Specifies the type of array to enable. Symbolic constants -\%\f3GL_V2F\fP, -\%\f3GL_V3F\fP, -\%\f3GL_C4UB_V2F\fP, -\%\f3GL_C4UB_V3F\fP, -\%\f3GL_C3F_V3F\fP, -\%\f3GL_N3F_V3F\fP, -\%\f3GL_C4F_N3F_V3F\fP, -\%\f3GL_T2F_V3F\fP, -\%\f3GL_T4F_V4F\fP, -\%\f3GL_T2F_C4UB_V3F\fP, -\%\f3GL_T2F_C3F_V3F\fP, -\%\f3GL_T2F_N3F_V3F\fP, -\%\f3GL_T2F_C4F_N3F_V3F\fP, -and -\%\f3GL_T4F_C4F_N3F_V4F\fP -are accepted. -.TP -\f2stride\fP -Specifies the offset in bytes between each aggregate array element. -.SH DESCRIPTION -\%\f3glInterleavedArrays\fP lets you specify and enable individual color, -normal, -texture and vertex -arrays whose elements are part of a larger aggregate array element. -For some implementations, this is more efficient than specifying the arrays -separately. -.P -If \f2stride\fP is 0, the aggregate elements are stored consecutively. -Otherwise, \f2stride\fP bytes occur between the beginning of one -aggregate array element and the beginning of the next aggregate array -element. -.P -\f2format\fP serves as a ``key'' -describing the extraction of individual arrays from the aggregate array. -If \f2format\fP contains a T, then texture coordinates are -extracted from the interleaved array. If C is present, color values -are extracted. If N is present, normal coordinates are extracted. -Vertex coordinates are always extracted. -.P -The digits 2, 3, and 4 denote how many values are extracted. -F indicates that values are extracted as floating-point values. -Colors may also be extracted as 4 unsigned bytes if 4UB follows the -C. If a color is extracted as 4 unsigned bytes, the vertex -array element which follows is located at the first possible -floating-point aligned address. -.SH NOTES -\%\f3glInterleavedArrays\fP is available only if the GL version is 1.1 or greater. -.P -If \%\f3glInterleavedArrays\fP is called while compiling a display list, it is not -compiled into the list, and it is executed immediately. -.P -Execution of \%\f3glInterleavedArrays\fP is not allowed between the execution of -\%\f3glBegin\fP and the corresponding execution of \%\f3glEnd\fP, -but an error may or may not be generated. If no error is generated, -the operation is undefined. -.P -\%\f3glInterleavedArrays\fP is typically implemented on the client side. -.P -Vertex array parameters are client-side state and are therefore not -saved or restored by \%\f3glPushAttrib\fP and \%\f3glPopAttrib\fP. -Use \%\f3glPushClientAttrib\fP and \%\f3glPopClientAttrib\fP instead. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, \%\f3glInterleavedArrays\fP -only updates the texture coordinate array for the active active texture -unit. The texture coordinate state for other client texture units is not -update, regardless if they are enabled or not. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2format\fP is not an accepted value. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2stride\fP is negative. -.SH SEE ALSO -\%\f3glArrayElement(3G)\fP, -\%\f3glClientActiveTextureARB(3G)\fP, -\%\f3glColorPointer(3G)\fP, -\%\f3glDrawArrays(3G)\fP, -\%\f3glDrawElements(3G)\fP, -\%\f3glEdgeFlagPointer(3G)\fP, -\%\f3glEnableClientState(3G)\fP, -\%\f3glGetPointer(3G)\fP, -\%\f3glIndexPointer(3G)\fP, -\%\f3glNormalPointer(3G)\fP, -\%\f3glTexCoordPointer(3G)\fP, -\%\f3glVertexPointer(3G)\fP diff --git a/doc/gl-docs/GL/gl/isenabled.3gl b/doc/gl-docs/GL/gl/isenabled.3gl deleted file mode 100644 index 4f73bc57..00000000 --- a/doc/gl-docs/GL/gl/isenabled.3gl +++ /dev/null @@ -1,160 +0,0 @@ -'\" et -'\"! eqn|tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 isenabled -.ds Xs 14538 7 isenabled.gl -.TH GLISENABLED 3G -.SH NAME -.B "glIsEnabled -\- test whether a capability is enabled - -.SH C SPECIFICATION -GLboolean \f3glIsEnabled\fP( -GLenum \fIcap\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2cap\fP\ \ 'u -\f2cap\fP -Specifies a symbolic constant indicating a GL capability. -.SH DESCRIPTION -\%\f3glIsEnabled\fP returns \%\f3GL_TRUE\fP if \f2cap\fP is an enabled capability -and returns \%\f3GL_FALSE\fP otherwise. -Initially all capabilities except \%\f3GL_DITHER\fP are disabled; -\%\f3GL_DITHER\fP is initially enabled. -.P -The following capabilities are accepted for \f2cap\fP: -.P - -.TS -lb lb -l l. -_ -Constant See -_ -\%\f3GL_ALPHA_TEST\fP \%\f3glAlphaFunc\fP -\%\f3GL_AUTO_NORMAL\fP \%\f3glEvalCoord\fP -\%\f3GL_BLEND\fP \%\f3glBlendFunc\fP, \%\f3glLogicOp\fP -\%\f3GL_CLIP_PLANE\fP\f2i\fP \%\f3glClipPlane\fP -\%\f3GL_COLOR_ARRAY\fP \%\f3glColorPointer\fP -\%\f3GL_COLOR_LOGIC_OP\fP \%\f3glLogicOp\fP -\%\f3GL_COLOR_MATERIAL\fP \%\f3glColorMaterial\fP -\%\f3GL_COLOR_TABLE\fP \%\f3glColorTable\fP -\%\f3GL_CONVOLUTION_1D\fP \%\f3glConvolutionFilter1D\fP -\%\f3GL_CONVOLUTION_2D\fP \%\f3glConvolutionFilter2D\fP -\%\f3GL_CULL_FACE\fP \%\f3glCullFace\fP -\%\f3GL_DEPTH_TEST\fP \%\f3glDepthFunc\fP, \%\f3glDepthRange\fP -\%\f3GL_DITHER\fP \%\f3glEnable\fP -\%\f3GL_EDGE_FLAG_ARRAY\fP \%\f3glEdgeFlagPointer\fP -\%\f3GL_FOG\fP \%\f3glFog\fP -\%\f3GL_HISTOGRAM\fP \%\f3glHistogram\fP -\%\f3GL_INDEX_ARRAY\fP \%\f3glIndexPointer\fP -\%\f3GL_INDEX_LOGIC_OP\fP \%\f3glLogicOp\fP -\%\f3GL_LIGHT\fP\f2i\fP \%\f3glLightModel\fP, \%\f3glLight\fP -\%\f3GL_LIGHTING\fP \%\f3glMaterial\fP, \%\f3glLightModel\fP, \%\f3glLight\fP -\%\f3GL_LINE_SMOOTH\fP \%\f3glLineWidth\fP -\%\f3GL_LINE_STIPPLE\fP \%\f3glLineStipple\fP -\%\f3GL_MAP1_COLOR_4\fP \%\f3glMap1\fP -\%\f3GL_MAP1_INDEX\fP \%\f3glMap1\fP -\%\f3GL_MAP1_NORMAL\fP \%\f3glMap1\fP -\%\f3GL_MAP1_TEXTURE_COORD_1\fP \%\f3glMap1\fP -\%\f3GL_MAP1_TEXTURE_COORD_2\fP \%\f3glMap1\fP -\%\f3GL_MAP1_TEXTURE_COORD_3\fP \%\f3glMap1\fP -\%\f3GL_MAP1_TEXTURE_COORD_4\fP \%\f3glMap1\fP -\%\f3GL_MAP2_COLOR_4\fP \%\f3glMap2\fP -\%\f3GL_MAP2_INDEX\fP \%\f3glMap2\fP -\%\f3GL_MAP2_NORMAL\fP \%\f3glMap2\fP -\%\f3GL_MAP2_TEXTURE_COORD_1\fP \%\f3glMap2\fP -\%\f3GL_MAP2_TEXTURE_COORD_2\fP \%\f3glMap2\fP -\%\f3GL_MAP2_TEXTURE_COORD_3\fP \%\f3glMap2\fP -\%\f3GL_MAP2_TEXTURE_COORD_4\fP \%\f3glMap2\fP -\%\f3GL_MAP2_VERTEX_3\fP \%\f3glMap2\fP -\%\f3GL_MAP2_VERTEX_4\fP \%\f3glMap2\fP -\%\f3GL_MINMAX\fP \%\f3glMinmax\fP -\%\f3GL_NORMAL_ARRAY\fP \%\f3glNormalPointer\fP -\%\f3GL_NORMALIZE\fP \%\f3glNormal\fP -\%\f3GL_POINT_SMOOTH\fP \%\f3glPointSize\fP -\%\f3GL_POLYGON_SMOOTH\fP \%\f3glPolygonMode\fP -\%\f3GL_POLYGON_OFFSET_FILL\fP \%\f3glPolygonOffset\fP -\%\f3GL_POLYGON_OFFSET_LINE\fP \%\f3glPolygonOffset\fP -\%\f3GL_POLYGON_OFFSET_POINT\fP \%\f3glPolygonOffset\fP -\%\f3GL_POLYGON_STIPPLE\fP \%\f3glPolygonStipple\fP -\%\f3GL_POST_COLOR_MATRIX_COLOR_TABLE\fP \%\f3glColorTable\fP -\%\f3GL_POST_CONVOLUTION_COLOR_TABLE\fP \%\f3glColorTable\fP -\%\f3GL_RESCALE_NORMAL\fP \%\f3glNormal\fP -\%\f3GL_SCISSOR_TEST\fP \%\f3glScissor\fP -\%\f3GL_SEPARABLE_2D\fP \%\f3glSeparableFilter2D\fP -\%\f3GL_STENCIL_TEST\fP \%\f3glStencilFunc\fP, \%\f3glStencilOp\fP -\%\f3GL_TEXTURE_1D\fP \%\f3glTexImage1D\fP -\%\f3GL_TEXTURE_2D\fP \%\f3glTexImage2D\fP -\%\f3GL_TEXTURE_3D\fP \%\f3glTexImage3D\fP -\%\f3GL_TEXTURE_COORD_ARRAY\fP \%\f3glTexCoordPointer\fP -\%\f3GL_TEXTURE_GEN_Q\fP \%\f3glTexGen\fP -\%\f3GL_TEXTURE_GEN_R\fP \%\f3glTexGen\fP -\%\f3GL_TEXTURE_GEN_S\fP \%\f3glTexGen\fP -\%\f3GL_TEXTURE_GEN_T\fP \%\f3glTexGen\fP -\%\f3GL_VERTEX_ARRAY\fP \%\f3glVertexPointer\fP -_ -.TE - -.SH NOTES -If an error is generated, -\%\f3glIsEnabled\fP returns 0. -.P -\%\f3GL_COLOR_LOGIC_OP\fP, -\%\f3GL_COLOR_ARRAY\fP, -\%\f3GL_EDGE_FLAG_ARRAY\fP, -\%\f3GL_INDEX_ARRAY\fP, -\%\f3GL_INDEX_LOGIC_OP\fP, -\%\f3GL_NORMAL_ARRAY\fP, -\%\f3GL_POLYGON_OFFSET_FILL\fP, -\%\f3GL_POLYGON_OFFSET_LINE\fP, -\%\f3GL_POLYGON_OFFSET_POINT\fP, -\%\f3GL_TEXTURE_COORD_ARRAY\fP, and -\%\f3GL_VERTEX_ARRAY\fP -are available only -if the GL version is 1.1 or greater -.P -\%\f3GL_RESCALE_NORMAL\fP, and \%\f3GL_TEXTURE_3D\fP are available only if the GL -version is 1.2 or greater. -.P -\%\f3GL_COLOR_TABLE\fP, \%\f3GL_CONVOLUTION_1D\fP, \%\f3GL_CONVOLUTION_2D\fP, -\%\f3GL_HISTOGRAM\fP, \%\f3GL_MINMAX\fP, -\%\f3GL_POST_COLOR_MATRIX_COLOR_TABLE\fP, -\%\f3GL_POST_CONVOLUTION_COLOR_TABLE\fP, and -\%\f3GL_SEPARABLE_2D\fP are available only if \%\f3GL_ARB_imaging\fP is -returned when \%\f3glGet\fP is called with \%\f3GL_EXTENSIONS\fP. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, the following -parameters return the associated value for the active texture unit. -\%\f3GL_TEXTURE_1D\fP, \%\f3GL_TEXTURE_BINDING_1D\fP, -\%\f3GL_TEXTURE_2D\fP, \%\f3GL_TEXTURE_BINDING_2D\fP, -\%\f3GL_TEXTURE_3D\fP, \%\f3GL_TEXTURE_BINDING_3D\fP, -\%\f3GL_TEXTURE_GEN_S\fP, -\%\f3GL_TEXTURE_GEN_T\fP, -\%\f3GL_TEXTURE_GEN_R\fP, -\%\f3GL_TEXTURE_GEN_Q\fP, -\%\f3GL_TEXTURE_MATRIX\fP, and -\%\f3GL_TEXTURE_STACK_DEPTH\fP. -Likewise, the following parameters return the associated value for the -active client texture unit: -\%\f3GL_TEXTURE_COORD_ARRAY\fP, -\%\f3GL_TEXTURE_COORD_ARRAY_SIZE\fP, -\%\f3GL_TEXTURE_COORD_ARRAY_STRIDE\fP, -\%\f3GL_TEXTURE_COORD_ARRAY_TYPE\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2cap\fP is not an accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glIsEnabled\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glEnable(3G)\fP, -\%\f3glEnableClientState(3G)\fP, -\%\f3glGet(3G)\fP - diff --git a/doc/gl-docs/GL/gl/islist.3gl b/doc/gl-docs/GL/gl/islist.3gl deleted file mode 100644 index 78a1471e..00000000 --- a/doc/gl-docs/GL/gl/islist.3gl +++ /dev/null @@ -1,38 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 islist.gl -.ds Xs 8931 3 islist.gl -.TH GLISLIST 3G -.SH NAME -.B "glIsList -\- determine if a name corresponds to a display-list - -.SH C SPECIFICATION -GLboolean \f3glIsList\fP( -GLuint \fIlist\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2list\fP\ \ 'u -\f2list\fP -Specifies a potential display-list name. -.SH DESCRIPTION -\%\f3glIsList\fP returns \%\f3GL_TRUE\fP if \f2list\fP is the name -of a display list and returns \%\f3GL_FALSE\fP otherwise. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glIsList\fP -is executed between the execution of -\%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glCallList(3G)\fP, -\%\f3glCallLists(3G)\fP, -\%\f3glDeleteLists(3G)\fP, -\%\f3glGenLists(3G)\fP, -\%\f3glNewList(3G)\fP diff --git a/doc/gl-docs/GL/gl/istexture.3gl b/doc/gl-docs/GL/gl/istexture.3gl deleted file mode 100644 index db4c4555..00000000 --- a/doc/gl-docs/GL/gl/istexture.3gl +++ /dev/null @@ -1,46 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 istexture -.ds Xs 34777 3 istexture.gl -.TH GLISTEXTURE 3G -.SH NAME -.B "glIsTexture -\- determine if a name corresponds to a texture - -.SH C SPECIFICATION -GLboolean \f3glIsTexture\fP( -GLuint \fItexture\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2texture\fP\ \ 'u -\f2texture\fP -Specifies a value that may be the name of a texture. -.SH DESCRIPTION -\%\f3glIsTexture\fP returns \%\f3GL_TRUE\fP if \f2texture\fP is currently the name of a texture. -If \f2texture\fP is zero, or is a non-zero value that is not currently the -name of a texture, or if an error occurs, \%\f3glIsTexture\fP returns \%\f3GL_FALSE\fP. -.SH NOTES -\%\f3glIsTexture\fP is available only if the GL version is 1.1 or greater. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glIsTexture\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glBindTexture(3G)\fP, -\%\f3glCopyTexImage1D(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glDeleteTextures(3G)\fP, -\%\f3glGenTextures(3G)\fP, -\%\f3glGet(3G)\fP, -\%\f3glGetTexParameter(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexImage3D(3G)\fP, -\%\f3glTexParameter(3G)\fP diff --git a/doc/gl-docs/GL/gl/light.3gl b/doc/gl-docs/GL/gl/light.3gl deleted file mode 100644 index 9d68261c..00000000 --- a/doc/gl-docs/GL/gl/light.3gl +++ /dev/null @@ -1,253 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 light.gl -.ds Xs 33725 10 light.gl -.TH GLLIGHT 3G -.SH NAME -.B "glLightf, glLighti, glLightfv, glLightiv -\- set light source parameters - -.SH C SPECIFICATION -void \f3glLightf\fP( -GLenum \fIlight\fP, -.nf -.ta \w'\f3void \fPglLightf( 'u - GLenum \fIpname\fP, - GLfloat \fIparam\fP ) -.fi -void \f3glLighti\fP( -GLenum \fIlight\fP, -.nf -.ta \w'\f3void \fPglLighti( 'u - GLenum \fIpname\fP, - GLint \fIparam\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIparams\fP\ \ 'u -\f2light\fP -Specifies a light. -The number of lights depends on the implementation, -but at least eight lights are supported. -They are identified by symbolic names of the form \%\f3GL_LIGHT\fP$i$ -where 0 \(<= $ i $ < \%\f3GL_MAX_LIGHTS\fP. -.TP -\f2pname\fP -Specifies a single-valued light source parameter for \f2light\fP. -\%\f3GL_SPOT_EXPONENT\fP, -\%\f3GL_SPOT_CUTOFF\fP, -\%\f3GL_CONSTANT_ATTENUATION\fP, -\%\f3GL_LINEAR_ATTENUATION\fP, and -\%\f3GL_QUADRATIC_ATTENUATION\fP are accepted. -.TP -\f2param\fP -Specifies the value that parameter \f2pname\fP of light source \f2light\fP -will be set to. -.SH C SPECIFICATION -void \f3glLightfv\fP( -GLenum \fIlight\fP, -.nf -.ta \w'\f3void \fPglLightfv( 'u - GLenum \fIpname\fP, - const GLfloat \fI*params\fP ) -.fi -void \f3glLightiv\fP( -GLenum \fIlight\fP, -.nf -.ta \w'\f3void \fPglLightiv( 'u - GLenum \fIpname\fP, - const GLint \fI*params\fP ) -.fi - -.SH PARAMETERS -.TP -\f2light\fP -Specifies a light. -The number of lights depends on the implementation, but -at least eight lights are supported. -They are identified by symbolic names of the form \%\f3GL_LIGHT\fP$i$ -where 0 \(<= $ i $ < \%\f3GL_MAX_LIGHTS\fP. -.TP -\f2pname\fP -Specifies a light source parameter for \f2light\fP. -\%\f3GL_AMBIENT\fP, -\%\f3GL_DIFFUSE\fP, -\%\f3GL_SPECULAR\fP, -\%\f3GL_POSITION\fP, -\%\f3GL_SPOT_CUTOFF\fP, -\%\f3GL_SPOT_DIRECTION\fP, -\%\f3GL_SPOT_EXPONENT\fP, -\%\f3GL_CONSTANT_ATTENUATION\fP, -\%\f3GL_LINEAR_ATTENUATION\fP, and -\%\f3GL_QUADRATIC_ATTENUATION\fP are accepted. -.TP -\f2params\fP -Specifies a pointer to the value or values that parameter \f2pname\fP -of light source \f2light\fP will be set to. -.SH DESCRIPTION -\%\f3glLight\fP sets the values of individual light source parameters. -\f2light\fP names the light and is a symbolic name of the form \%\f3GL_LIGHT\fP$i$, -where 0 \(<= i < \%\f3GL_MAX_LIGHTS\fP. -\f2pname\fP specifies one of ten light source parameters, -again by symbolic name. -\f2params\fP is either a single value or a pointer to an array that contains -the new values. -.P -To enable and disable lighting calculation, call \%\f3glEnable\fP -and \%\f3glDisable\fP with argument \%\f3GL_LIGHTING\fP. Lighting is -initially disabled. -When it is enabled, -light sources that are enabled contribute to the lighting calculation. -Light source $i$ is enabled and disabled using \%\f3glEnable\fP and -\%\f3glDisable\fP with argument \%\f3GL_LIGHT\fP$i$. -.P -The ten light parameters are as follows: -.TP 20 -\%\f3GL_AMBIENT\fP -\f2params\fP contains four integer or floating-point values that specify -the ambient RGBA intensity of the light. -Integer values are mapped linearly such that the most positive representable -value maps to 1.0, -and the most negative representable value maps to \-1.0. -Floating-point values are mapped directly. -Neither integer nor floating-point values are clamped. -The initial ambient light intensity is (0, 0, 0, 1). -.TP -\%\f3GL_DIFFUSE\fP -\f2params\fP contains four integer or floating-point values that specify -the diffuse RGBA intensity of the light. -Integer values are mapped linearly such that the most positive representable -value maps to 1.0, -and the most negative representable value maps to \-1.0. -Floating-point values are mapped directly. -Neither integer nor floating-point values are clamped. -The initial value -for \%\f3GL_LIGHT0\fP is (1, 1, 1, 1); for other lights, the -initial value is (0, 0, 0, 0). -.TP -\%\f3GL_SPECULAR\fP -\f2params\fP contains four integer or floating-point values that specify -the specular RGBA intensity of the light. -Integer values are mapped linearly such that the most positive representable -value maps to 1.0, -and the most negative representable value maps to \-1.0. -Floating-point values are mapped directly. -Neither integer nor floating-point values are clamped. -The initial value -for \%\f3GL_LIGHT0\fP is (1, 1, 1, 1); for other lights, the -initial value is (0, 0, 0, 0). -.TP -\%\f3GL_POSITION\fP -\f2params\fP contains four integer or floating-point values that specify -the position of the light in homogeneous object coordinates. -Both integer and floating-point values are mapped directly. -Neither integer nor floating-point values are clamped. -.IP -The position is transformed by the modelview matrix when -\%\f3glLight\fP is called (just as if it were a point), -and it is stored in eye coordinates. -If the $w$ component of the position is 0, -the light is treated as a directional source. -Diffuse and specular lighting calculations take the light's direction, -but not its actual position, -into account, -and attenuation is disabled. -Otherwise, -diffuse and specular lighting calculations are based on the actual location -of the light in eye coordinates, -and attenuation is enabled. -The initial position is (0, 0, 1, 0); -thus, the initial light source is directional, -parallel to, and in the direction of the $-z$ axis. -.TP -\%\f3GL_SPOT_DIRECTION\fP -\f2params\fP contains three integer or floating-point values that specify -the direction of the light in homogeneous object coordinates. -Both integer and floating-point values are mapped directly. -Neither integer nor floating-point values are clamped. -.IP -The spot direction is transformed by the inverse of the modelview matrix when -\%\f3glLight\fP is called (just as if it were a normal), -and it is stored in eye coordinates. -It is significant only when \%\f3GL_SPOT_CUTOFF\fP is not 180, -which it is initially. -The initial direction is (0, 0, \-1). -.TP -\%\f3GL_SPOT_EXPONENT\fP -\f2params\fP is a single integer or floating-point value that specifies -the intensity distribution of the light. -Integer and floating-point values are mapped directly. -Only values in the range [0,128] are accepted. -.IP -Effective light intensity is attenuated by the cosine of the angle between -the direction of the light and the direction from the light to the vertex -being lighted, -raised to the power of the spot exponent. -Thus, higher spot exponents result in a more focused light source, -regardless of the spot cutoff angle (see \%\f3GL_SPOT_CUTOFF\fP, next paragraph). -The initial spot exponent is 0, -resulting in uniform light distribution. -.TP -\%\f3GL_SPOT_CUTOFF\fP -\f2params\fP is a single integer or floating-point value that specifies -the maximum spread angle of a light source. -Integer and floating-point values are mapped directly. -Only values in the range [0,90] and the special value 180 -are accepted. -If the angle between the direction of the light and the direction from the -light to the vertex being lighted is greater than the spot cutoff angle, -the light is completely masked. -.BP -Otherwise, its intensity is controlled by the spot exponent and the -attenuation factors. -The initial spot cutoff is 180, -resulting in uniform light distribution. -.TP -\%\f3GL_CONSTANT_ATTENUATION\fP -.TP -\%\f3GL_LINEAR_ATTENUATION \fP -.TP -\%\f3GL_QUADRATIC_ATTENUATION\fP -\f2params\fP is a single integer or floating-point value that specifies -one of the three light attenuation factors. -Integer and floating-point values are mapped directly. -Only nonnegative values are accepted. -If the light is positional, -rather than directional, -its intensity is attenuated by the reciprocal of the sum of the constant -factor, the linear factor times the distance between the light -and the vertex being lighted, -and the quadratic factor times the square of the same distance. -The initial attenuation factors are (1, 0, 0), -resulting in no attenuation. -.SH NOTES -It is always the case that \%\f3GL_LIGHT\fP$i$ = \%\f3GL_LIGHT0\fP + $i$. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if either \f2light\fP or \f2pname\fP -is not an accepted value. -.P -\%\f3GL_INVALID_VALUE\fP is generated if a spot exponent value is specified -outside the range [0,128], -or if spot cutoff is specified outside the range [0,90] (except for the -special value 180), -or if a negative attenuation factor is specified. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glLight\fP is executed between -the execution of -\%\f3glBegin\fP and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetLight\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_LIGHTING\fP -.SH SEE ALSO -\%\f3glColorMaterial(3G)\fP, -\%\f3glLightModel(3G)\fP, -\%\f3glMaterial(3G)\fP diff --git a/doc/gl-docs/GL/gl/lightmodel.3gl b/doc/gl-docs/GL/gl/lightmodel.3gl deleted file mode 100644 index 538075d9..00000000 --- a/doc/gl-docs/GL/gl/lightmodel.3gl +++ /dev/null @@ -1,179 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 lightmode -.ds Xs 22290 8 lightmodel.gl -.TH GLLIGHTMODEL 3G -.SH NAME -.B "glLightModelf, glLightModeli, glLightModelfv, glLightModeliv -\- set the lighting model parameters - -.SH C SPECIFICATION -void \f3glLightModelf\fP( -GLenum \fIpname\fP, -.nf -.ta \w'\f3void \fPglLightModelf( 'u - GLfloat \fIparam\fP ) -.fi -void \f3glLightModeli\fP( -GLenum \fIpname\fP, -.nf -.ta \w'\f3void \fPglLightModeli( 'u - GLint \fIparam\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIparams\fP\ \ 'u -\f2pname\fP -Specifies a single-valued lighting model parameter. -\%\f3GL_LIGHT_MODEL_LOCAL_VIEWER\fP, -\%\f3GL_LIGHT_MODEL_COLOR_CONTROL\fP, and -\%\f3GL_LIGHT_MODEL_TWO_SIDE\fP are accepted. -.TP -\f2param\fP -Specifies the value that \f2param\fP will be set to. -.SH C SPECIFICATION -void \f3glLightModelfv\fP( -GLenum \fIpname\fP, -.nf -.ta \w'\f3void \fPglLightModelfv( 'u - const GLfloat \fI*params\fP ) -.fi -void \f3glLightModeliv\fP( -GLenum \fIpname\fP, -.nf -.ta \w'\f3void \fPglLightModeliv( 'u - const GLint \fI*params\fP ) -.fi - -.SH PARAMETERS -.TP -\f2pname\fP -Specifies a lighting model parameter. -\%\f3GL_LIGHT_MODEL_AMBIENT\fP, -\%\f3GL_LIGHT_MODEL_COLOR_CONTROL\fP, -\%\f3GL_LIGHT_MODEL_LOCAL_VIEWER\fP, and -\%\f3GL_LIGHT_MODEL_TWO_SIDE\fP are accepted. -.TP -\f2params\fP -Specifies a pointer to the value or values that \f2params\fP will be set to. -.SH DESCRIPTION -\%\f3glLightModel\fP sets the lighting model parameter. -\f2pname\fP names a parameter and \f2params\fP gives the new value. -There are three lighting model parameters: -.TP 10 -\%\f3GL_LIGHT_MODEL_AMBIENT\fP -\f2params\fP contains four integer or floating-point values that specify -the ambient RGBA intensity of the entire scene. -Integer values are mapped linearly such that the most positive representable -value maps to 1.0, -and the most negative representable value maps to \-1.0. -Floating-point values are mapped directly. -Neither integer nor floating-point values are clamped. -The initial ambient scene intensity is (0.2, 0.2, 0.2, 1.0). -.TP -\%\f3GL_LIGHT_MODEL_COLOR_CONTROL\fP -\f2params\fP must be either \%\f3GL_SEPARATE_SPECULAR_COLOR\fP or -\%\f3GL_SINGLE_COLOR\fP. -\%\f3GL_SINGLE_COLOR\fP specifies that a single color is generated from the -lighting computation for a vertex. \%\f3GL_SEPARATE_SPECULAR_COLOR\fP -specifies that the specular color computation of lighting be stored -separately from the remainder of the lighting computation. The specular -color is summed into the generated fragment's color after the application -of texture mapping (if enabled). The initial value is \%\f3GL_SINGLE_COLOR\fP. -.TP -\%\f3GL_LIGHT_MODEL_LOCAL_VIEWER\fP -\f2params\fP is a single integer or floating-point value that specifies -how specular reflection angles are computed. -If \f2params\fP is 0 (or 0.0), specular reflection angles take the -view direction to be parallel to and in the direction of the -\f2z\fP axis, -regardless of the location of the vertex in eye coordinates. -Otherwise, specular reflections are computed from the origin -of the eye coordinate system. -The initial value is 0. -.TP -\%\f3GL_LIGHT_MODEL_TWO_SIDE\fP -\f2params\fP is a single integer or floating-point value that specifies -whether one- or two-sided lighting calculations are done for polygons. -It has no effect on the lighting calculations for points, -lines, -or bitmaps. -If \f2params\fP is 0 (or 0.0), one-sided lighting is specified, -and only the \f2front\fP material parameters are used in the -lighting equation. -Otherwise, two-sided lighting is specified. -In this case, vertices of back-facing polygons are lighted using the -\f2back\fP material parameters, -and have their normals reversed before the lighting equation is evaluated. -Vertices of front-facing polygons are always lighted using the -\f2front\fP material parameters, -with no change to their normals. The initial value is 0. -.P -In RGBA mode, the lighted color of a vertex is the sum of -the material emission intensity, -the product of the material ambient reflectance and the lighting model full-scene -ambient intensity, -and the contribution of each enabled light source. -Each light source contributes the sum of three terms: -ambient, diffuse, and specular. -The ambient light source contribution is the product of the material ambient -reflectance and the light's ambient intensity. -The diffuse light source contribution is the product of the material diffuse -reflectance, -the light's diffuse intensity, -and the dot product of the vertex's normal with the normalized vector from -the vertex to the light source. -The specular light source contribution is the product of the material specular -reflectance, -the light's specular intensity, -and the dot product of the normalized vertex-to-eye and vertex-to-light -vectors, -raised to the power of the shininess of the material. -All three light source contributions are attenuated equally based on -the distance from the vertex to the light source and on light source -direction, spread exponent, and spread cutoff angle. -All dot products are replaced with 0 if they evaluate to a negative value. -.P -The alpha component of the resulting lighted color is set to the alpha value -of the material diffuse reflectance. -.P -In color index mode, -the value of the lighted index of a vertex ranges from the ambient -to the specular values passed to \%\f3glMaterial\fP using \%\f3GL_COLOR_INDEXES\fP. -Diffuse and specular coefficients, -computed with a (.30, .59, .11) weighting of the lights' colors, -the shininess of the material, -and the same reflection and attenuation equations as in the RGBA case, -determine how much above ambient the resulting index is. -.SH NOTES -\%\f3GL_LIGHT_MODEL_COLOR_CONTROL\fP is available only if the GL version is -1.2 or greater. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2pname\fP is not an accepted value. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2pname\fP is -\%\f3GL_LIGHT_MODEL_COLOR_CONTROL\fP and \f2params\fP is not one of -\%\f3GL_SINGLE_COLOR\fP or \%\f3GL_SEPARATE_SPECULAR_COLOR\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glLightModel\fP is executed between -the execution of \%\f3glBegin\fP and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_LIGHT_MODEL_AMBIENT\fP -.br -\%\f3glGet\fP with argument \%\f3GL_LIGHT_MODEL_COLOR_CONTROL\fP -.br -\%\f3glGet\fP with argument \%\f3GL_LIGHT_MODEL_LOCAL_VIEWER\fP -.br -\%\f3glGet\fP with argument \%\f3GL_LIGHT_MODEL_TWO_SIDE\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_LIGHTING\fP -.SH SEE ALSO -\%\f3glLight(3G)\fP, -\%\f3glMaterial(3G)\fP diff --git a/doc/gl-docs/GL/gl/linestipple.3gl b/doc/gl-docs/GL/gl/linestipple.3gl deleted file mode 100644 index f7e306f5..00000000 --- a/doc/gl-docs/GL/gl/linestipple.3gl +++ /dev/null @@ -1,87 +0,0 @@ -.\" $XFree86$ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 linestipp -.ds Xs 10486 5 linestipple.gl -.TH GLLINESTIPPLE 3G -.SH NAME -.B "glLineStipple -\- specify the line stipple pattern - -.SH C SPECIFICATION -void \f3glLineStipple\fP( -GLint \fIfactor\fP, -.nf -.ta \w'\f3void \fPglLineStipple( 'u - GLushort \fIpattern\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIpattern\fP\ \ 'u -\f2factor\fP -Specifies a multiplier for each bit in the line stipple pattern. -If \f2factor\fP is 3, -for example, -each bit in the pattern is used three times -before the next bit in the pattern is used. -\f2factor\fP is clamped to the range [1, 256] and defaults to 1. -.TP -\f2pattern\fP -Specifies a 16-bit integer whose bit pattern determines -which fragments of a line will be drawn when the line is rasterized. -Bit zero is used first; the default pattern is all 1's. -.SH DESCRIPTION -Line stippling masks out certain fragments produced by rasterization; -those fragments will not be drawn. -The masking is achieved by using three parameters: -the 16-bit line stipple pattern \f2pattern\fP, -the repeat count \f2factor\fP, -and an integer stipple counter $s$. -.P -Counter $s$ is reset to 0 whenever \%\f3glBegin\fP is called, -and before each line segment of a \%\f3glBegin\fP(\%\f3GL_LINES\fP)/\%\f3glEnd\fP -sequence is generated. -It is incremented after each fragment of a unit width aliased line segment is generated, -or after each $i$ fragments of an $i$ width line segment are generated. -The $i$ fragments associated with count $s$ are masked out if -.sp -.ce -\f2pattern\fP bit $(s ~/~ "factor") ~roman mod~ 16$ -.sp -is 0, otherwise these fragments are sent to the frame buffer. -Bit zero of \f2pattern\fP is the least significant bit. -.P -Antialiased lines are treated as a sequence of $1 times width$ rectangles -for purposes of stippling. -Whether rectangle $s$ is rasterized or not depends on the fragment rule -described for aliased lines, -counting rectangles rather than groups of fragments. -.P -To enable and disable line stippling, call \%\f3glEnable\fP and \%\f3glDisable\fP -with argument \%\f3GL_LINE_STIPPLE\fP. -When enabled, -the line stipple pattern is applied as described above. -When disabled, -it is as if the pattern were all 1's. -Initially, line stippling is disabled. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glLineStipple\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_LINE_STIPPLE_PATTERN\fP -.br -\%\f3glGet\fP with argument \%\f3GL_LINE_STIPPLE_REPEAT\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_LINE_STIPPLE\fP -.SH SEE ALSO -\%\f3glLineWidth(3G)\fP, -\%\f3glPolygonStipple(3G)\fP diff --git a/doc/gl-docs/GL/gl/linewidth.3gl b/doc/gl-docs/GL/gl/linewidth.3gl deleted file mode 100644 index 1006d317..00000000 --- a/doc/gl-docs/GL/gl/linewidth.3gl +++ /dev/null @@ -1,96 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 linewidth -.ds Xs 48623 5 linewidth.gl -.TH GLLINEWIDTH 3G -.SH NAME -.B "glLineWidth -\- specify the width of rasterized lines - -.SH C SPECIFICATION -void \f3glLineWidth\fP( -GLfloat \fIwidth\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2width\fP\ \ 'u -\f2width\fP -Specifies the width of rasterized lines. -The initial value is 1. -.SH DESCRIPTION -\%\f3glLineWidth\fP specifies the rasterized width of both aliased and antialiased -lines. -Using a line width other than 1 has different effects, -depending on whether line antialiasing is enabled. -To enable and disable line antialiasing, call -\%\f3glEnable\fP and \%\f3glDisable\fP -with argument \%\f3GL_LINE_SMOOTH\fP. Line antialiasing is initially -disabled. -.P -If line antialiasing is disabled, -the actual width is determined by rounding the supplied width -to the nearest integer. -(If the rounding results in the value 0, -it is as if the line width were 1.) -If -$| DELTA x | ~>=~ | DELTA y |$, -\f2i\fP pixels are filled in each column that is rasterized, -where \f2i\fP is the rounded value of \f2width\fP. -Otherwise, -\f2i\fP pixels are filled in each row that is rasterized. -.P -If antialiasing is enabled, -line rasterization produces a fragment for each pixel square -that intersects the region lying within the rectangle having width -equal to the current line width, -length equal to the actual length of the line, -and centered on the mathematical line segment. -The coverage value for each fragment is the window coordinate area -of the intersection of the rectangular region with the corresponding -pixel square. -This value is saved and used in the final rasterization step. -.P -Not all widths can be supported when line antialiasing is enabled. If an -unsupported width is requested, the nearest supported width is used. -Only width 1 is guaranteed to be supported; others depend on the -implementation. Likewise, there is a range for aliased line widths as well. -To query the range of supported widths and the size -difference between supported widths within the range, call \%\f3glGet\fP -with arguments \%\f3GL_ALIASED_LINE_WIDTH_RANGE\fP, -\%\f3GL_SMOOTH_LINE_WIDTH_RANGE\fP, \%\f3GL_SMOOTH_LINE_WIDTH_GRANULARITY\fP. -.SH NOTES -The line width specified by \%\f3glLineWidth\fP is always returned when \%\f3GL_LINE_WIDTH\fP -is queried. -Clamping and rounding for aliased and antialiased lines have no effect -on the specified value. -.P -Nonantialiased line width may be clamped to an implementation-dependent -maximum. Call \%\f3glGet\fP with \%\f3GL_ALIASED_LINE_WIDTH_RANGE\fP to -determine the maximum width. -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if \f2width\fP is less than or equal to 0. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glLineWidth\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_LINE_WIDTH\fP -.br -\%\f3glGet\fP with argument \%\f3GL_ALIASED_LINE_WIDTH_RANGE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_SMOOTH_LINE_WIDTH_RANGE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_SMOOTH_LINE_WIDTH_GRANULARITY\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_LINE_SMOOTH\fP -.SH SEE ALSO -\%\f3glEnable(3G)\fP diff --git a/doc/gl-docs/GL/gl/listbase.3gl b/doc/gl-docs/GL/gl/listbase.3gl deleted file mode 100644 index c29d2d3a..00000000 --- a/doc/gl-docs/GL/gl/listbase.3gl +++ /dev/null @@ -1,39 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 listbase. -.ds Xs 12110 3 listbase.gl -.TH GLLISTBASE 3G -.SH NAME -.B "glListBase -\- set the display-list base for \%\f3glCallLists\fP - -.SH C SPECIFICATION -void \f3glListBase\fP( -GLuint \fIbase\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2base\fP\ \ 'u -\f2base\fP -Specifies an integer offset that will be added to \%\f3glCallLists\fP -offsets to generate display-list names. -The initial value is 0. -.SH DESCRIPTION -\%\f3glCallLists\fP specifies an array of offsets. -Display-list names are generated by adding \f2base\fP to each offset. -Names that reference valid display lists are executed; -the others are ignored. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glListBase\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_LIST_BASE\fP -.SH SEE ALSO -\%\f3glCallLists(3G)\fP diff --git a/doc/gl-docs/GL/gl/loadidentity.3gl b/doc/gl-docs/GL/gl/loadidentity.3gl deleted file mode 100644 index cb5648ac..00000000 --- a/doc/gl-docs/GL/gl/loadidentity.3gl +++ /dev/null @@ -1,56 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 loadident -.ds Xs 65358 4 loadidentity.gl -.TH GLLOADIDENTITY 3G -.SH NAME -.B "glLoadIdentity -\- replace the current matrix with the identity matrix - -.SH C SPECIFICATION -void \f3glLoadIdentity\fP( void ) -.nf -.fi - -.SH DESCRIPTION -\%\f3glLoadIdentity\fP replaces the current matrix with the identity matrix. -It is semantically equivalent to calling \%\f3glLoadMatrix\fP -with the identity matrix - -.ce - -.EQ -left ( down 20 { ~ matrix { - ccol { 1 above 0 above 0 above 0~ } - ccol { 0 above 1 above 0 above 0~ } - ccol { 0 above 0 above 1 above 0~ } - ccol { 0 above 0 above 0 above 1 } -} } ~~ right ) -.EN - - -but in some cases it is more efficient. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glLoadIdentity\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_MATRIX_MODE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_COLOR_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MODELVIEW_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PROJECTION_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_TEXTURE_MATRIX\fP -.SH SEE ALSO -\%\f3glLoadMatrix(3G)\fP, -\%\f3glMatrixMode(3G)\fP, -\%\f3glMultMatrix(3G)\fP, -\%\f3glPushMatrix(3G)\fP diff --git a/doc/gl-docs/GL/gl/loadmatrix.3gl b/doc/gl-docs/GL/gl/loadmatrix.3gl deleted file mode 100644 index ce73f127..00000000 --- a/doc/gl-docs/GL/gl/loadmatrix.3gl +++ /dev/null @@ -1,95 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 loadmatri -.ds Xs 32571 5 loadmatrix.gl -.TH GLLOADMATRIX 3G -.SH NAME -.B "glLoadMatrixd, glLoadMatrixf -\- replace the current matrix with the specified matrix - -.SH C SPECIFICATION -void \f3glLoadMatrixd\fP( -const GLdouble \fI*m\fP ) -.nf -.fi -void \f3glLoadMatrixf\fP( -const GLfloat \fI*m\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2m\fP\ \ 'u -\f2m\fP -Specifies a pointer to 16 consecutive values, which are used as the -elements of a $4 ~times~ 4$ column-major matrix. -.SH DESCRIPTION -\%\f3glLoadMatrix\fP replaces the current matrix with the one whose elements are specified by -\f2m\fP. -The current matrix is the projection matrix, -modelview matrix, -or texture matrix, -depending on the current matrix mode -(see \%\f3glMatrixMode\fP). -.P -The current matrix, M, defines a transformation of coordinates. -For instance, assume M refers to the modelview matrix. -If $v ~=~ (v[0], v[1], v[2], v[3])$ is the set of object coordinates -of a vertex, -and \f2m\fP points to an array of $16$ -single- or double-precision -floating-point values $m[0], m[1],. . .,m[15]$, -then the modelview transformation $M(v)$ does the following: -.P - -.ce -.EQ -down 130 -{M(v) ~ = ~ -{{ left ( matrix { - ccol { ~m[0] above m[1] above m[2] above m[3] ~} - ccol { ~m[4] above m[5] above m[6] above m[7] ~} - ccol { ~m[8] above m[9] above m[10] above m[11] ~} - ccol { ~m[12]~ above m[13]~ above m[14]~ above m[15]~} -} right ) } ~~ times ~~ -{left ( matrix { -ccol { ~v[0]~ above ~v[1]~ above ~v[2]~ above ~v[3]~ } -} right )} }} -.EN - -.sp -.P -Where ``$times$'' denotes matrix multiplication. -.P -Projection and texture transformations are similarly defined. -.SH NOTES -While the elements of the matrix may be specified with -single or double precision, the GL implementation may -store or operate on these values in less than single -precision. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glLoadMatrix\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_MATRIX_MODE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_COLOR_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MODELVIEW_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PROJECTION_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_TEXTURE_MATRIX\fP -.SH SEE ALSO -\%\f3glLoadIdentity(3G)\fP, -\%\f3glMatrixMode(3G)\fP, -\%\f3glMultMatrix(3G)\fP, -\%\f3glPushMatrix(3G)\fP diff --git a/doc/gl-docs/GL/gl/loadname.3gl b/doc/gl-docs/GL/gl/loadname.3gl deleted file mode 100644 index 7f3301c1..00000000 --- a/doc/gl-docs/GL/gl/loadname.3gl +++ /dev/null @@ -1,48 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 loadname. -.ds Xs 53104 4 loadname.gl -.TH GLLOADNAME 3G -.SH NAME -.B "glLoadName -\- load a name onto the name stack - -.SH C SPECIFICATION -void \f3glLoadName\fP( -GLuint \fIname\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2name\fP\ \ 'u -\f2name\fP -Specifies a name that will replace the top value on the name stack. -.SH DESCRIPTION -The name stack is used during selection mode to allow sets of rendering -commands to be uniquely identified. -It consists of an ordered set of unsigned integers. -\%\f3glLoadName\fP causes \f2name\fP to replace the value on the top of the name stack, -which is initially empty. -.P -The name stack is always empty while the render mode is not \%\f3GL_SELECT\fP. -Calls to \%\f3glLoadName\fP while the render mode is not \%\f3GL_SELECT\fP are ignored. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glLoadName\fP is called while the -name stack is empty. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glLoadName\fP is executed between -the execution of \%\f3glBegin\fP and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_NAME_STACK_DEPTH\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAX_NAME_STACK_DEPTH\fP -.SH SEE ALSO -\%\f3glInitNames(3G)\fP, -\%\f3glPushName(3G)\fP, -\%\f3glRenderMode(3G)\fP, -\%\f3glSelectBuffer(3G)\fP diff --git a/doc/gl-docs/GL/gl/logicop.3gl b/doc/gl-docs/GL/gl/logicop.3gl deleted file mode 100644 index 5cc29006..00000000 --- a/doc/gl-docs/GL/gl/logicop.3gl +++ /dev/null @@ -1,112 +0,0 @@ -'\" et -'\"! eqn|tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 logicop.g -.ds Xs 60568 5 logicop.gl -.TH GLLOGICOP 3G -.SH NAME -.B "glLogicOp -\- specify a logical pixel operation for color index rendering - -.SH C SPECIFICATION -void \f3glLogicOp\fP( -GLenum \fIopcode\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2opcode\fP\ \ 'u -\f2opcode\fP -Specifies a symbolic constant that selects a logical operation. -The following symbols are accepted: -\%\f3GL_CLEAR\fP, -\%\f3GL_SET\fP, -\%\f3GL_COPY\fP, -\%\f3GL_COPY_INVERTED\fP, -\%\f3GL_NOOP\fP, -\%\f3GL_INVERT\fP, -\%\f3GL_AND\fP, -\%\f3GL_NAND\fP, -\%\f3GL_OR\fP, -\%\f3GL_NOR\fP, -\%\f3GL_XOR\fP, -\%\f3GL_EQUIV\fP, -\%\f3GL_AND_REVERSE\fP, -\%\f3GL_AND_INVERTED\fP, -\%\f3GL_OR_REVERSE\fP, and -\%\f3GL_OR_INVERTED\fP. The initial value is \%\f3GL_COPY\fP. -.SH DESCRIPTION -\%\f3glLogicOp\fP specifies a logical operation that, -when enabled, -is applied between the incoming color index or RGBA color -and the color index or RGBA color at the corresponding location in the -frame buffer. -To enable or disable the logical operation, call -\%\f3glEnable\fP and \%\f3glDisable\fP -using the symbolic constant \%\f3GL_COLOR_LOGIC_OP\fP for RGBA mode or -\%\f3GL_INDEX_LOGIC_OP\fP for color index mode. The initial value is -disabled for both operations. -.P -.ne -.TS -center; -lb lb -l c. -_ -Opcode Resulting Operation -_ -\%\f3GL_CLEAR\fP 0 -\%\f3GL_SET\fP 1 -\%\f3GL_COPY\fP s -\%\f3GL_COPY_INVERTED\fP ~s -\%\f3GL_NOOP\fP d -\%\f3GL_INVERT\fP ~d -\%\f3GL_AND\fP s & d -\%\f3GL_NAND\fP ~(s & d) -\%\f3GL_OR\fP s | d -\%\f3GL_NOR\fP ~(s | d) -\%\f3GL_XOR\fP s ^ d -\%\f3GL_EQUIV\fP ~(s ^ d) -\%\f3GL_AND_REVERSE\fP s & ~d -\%\f3GL_AND_INVERTED\fP ~s & d -\%\f3GL_OR_REVERSE\fP s | ~d -\%\f3GL_OR_INVERTED\fP ~s | d -_ -.TE - -\f2opcode\fP is a symbolic constant chosen from the list above. -In the explanation of the logical operations, -\f2s\fP represents the incoming color index and -\f2d\fP represents the index in the frame buffer. -Standard C-language operators are used. -As these bitwise operators suggest, -the logical operation is applied independently to each bit pair of the -source and destination indices or colors. -.SH NOTES -Color index logical operations are always supported. RGBA logical -operations are supported only if the GL version is 1.1 or greater. -.P -When more than one RGBA color or index buffer is enabled for drawing, -logical operations are performed separately for each enabled buffer, -using for the destination value the contents of that buffer -(see \%\f3glDrawBuffer\fP). -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2opcode\fP is not an accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glLogicOp\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_LOGIC_OP_MODE\fP. -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_COLOR_LOGIC_OP\fP or \%\f3GL_INDEX_LOGIC_OP\fP. -.SH SEE ALSO -\%\f3glAlphaFunc(3G)\fP, -\%\f3glBlendFunc(3G)\fP, -\%\f3glDrawBuffer(3G)\fP, -\%\f3glEnable(3G)\fP, -\%\f3glStencilOp(3G)\fP diff --git a/doc/gl-docs/GL/gl/map1.3gl b/doc/gl-docs/GL/gl/map1.3gl deleted file mode 100644 index 17d2c5d0..00000000 --- a/doc/gl-docs/GL/gl/map1.3gl +++ /dev/null @@ -1,271 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 map1.gl - -.ds Xs 15186 10 map1.gl -.TH GLMAP1 3G -.SH NAME -.B "glMap1d, glMap1f -\- define a one-dimensional evaluator - -.SH C SPECIFICATION -void \f3glMap1d\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMap1d( 'u - GLdouble \fIu1\fP, - GLdouble \fIu2\fP, - GLint \fIstride\fP, - GLint \fIorder\fP, - const GLdouble \fI*points\fP ) -.fi -void \f3glMap1f\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMap1f( 'u - GLfloat \fIu1\fP, - GLfloat \fIu2\fP, - GLint \fIstride\fP, - GLint \fIorder\fP, - const GLfloat \fI*points\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -Specifies the kind of values that are generated by the evaluator. -Symbolic constants -\%\f3GL_MAP1_VERTEX_3\fP, -\%\f3GL_MAP1_VERTEX_4\fP, -\%\f3GL_MAP1_INDEX\fP, -\%\f3GL_MAP1_COLOR_4\fP, -\%\f3GL_MAP1_NORMAL\fP, -\%\f3GL_MAP1_TEXTURE_COORD_1\fP, -\%\f3GL_MAP1_TEXTURE_COORD_2\fP, -\%\f3GL_MAP1_TEXTURE_COORD_3\fP, and -\%\f3GL_MAP1_TEXTURE_COORD_4\fP are accepted. -.TP -\f2u1\fP, \f2u2\fP -Specify a linear mapping of $u$, -as presented to \%\f3glEvalCoord1\fP, -to $u hat$, -the variable that is evaluated by the equations specified by this command. -.TP -\f2stride\fP -Specifies the number of floats or doubles between -the beginning of one control point and the beginning of the next one -in the data structure referenced in \f2points\fP. -This allows control points to be embedded in arbitrary data structures. -The only constraint is that the values for a particular control point -must occupy contiguous memory locations. -.TP -\f2order\fP -Specifies the number of control points. -Must be positive. -.TP -\f2points\fP -Specifies a pointer to the array of control points. - -.SH DESCRIPTION -Evaluators provide a way to use polynomial or rational polynomial mapping -to produce vertices, -normals, -texture coordinates, -and colors. -The values produced by an evaluator are sent to further stages -of GL processing just as if they had been presented using -\%\f3glVertex\fP, -\%\f3glNormal\fP, -\%\f3glTexCoord\fP, and -\%\f3glColor\fP commands, -except that the generated values do not update the current normal, -texture coordinates, -or color. -.P -All polynomial or rational polynomial splines of any degree -(up to the maximum degree supported by the GL implementation) -can be described using evaluators. -These include almost all splines used in computer graphics: B-splines, -Bezier curves, Hermite splines, and so on. -.P -Evaluators define curves based on Bernstein polynomials. -Define $p ( u hat ^) $ as -.sp -.ce -$p ( u hat ^) ~~=~~ up 10 { sum from i=0 to n } B sub i sup n ( u hat ^) R sub i$ -.sp -where -$R sub i$ -is a control point and -$B sub i sup n ( u hat ^)$ -is the $i$th Bernstein polynomial of degree $n$ (\f2order\fP = $n ~+~ 1$): -.sp -.ce -$B sub i sup n ( u hat ^) ~~=~~ left ( down 20 {cpile { n above i }} ~~ right ) u hat sup i ( 1 - u hat ^) sup { n - i }$ -.sp -Recall that -.sp -.ce -$0 sup 0 ~==~ 1 $ and $ left ( down 20 {cpile { n above ~0 }} ~~ right ) ~~==~~ 1 $ -.P -\%\f3glMap1\fP is used to define the basis and to specify what kind of values -are produced. -Once defined, -a map can be enabled and disabled by calling \%\f3glEnable\fP and \%\f3glDisable\fP -with the map name, one of the nine predefined values for \f2target\fP -described below. -\%\f3glEvalCoord1\fP evaluates the one-dimensional maps that are enabled. -When -.br -\%\f3glEvalCoord1\fP presents a value $u$, -the Bernstein functions are evaluated using $u hat$, where -.br - -.ce -$u hat ~~=~~ {u ~-~ "u1"} over {"u2" ~-~ "u1"}$ - -.br -.P -\f2target\fP is a symbolic constant that indicates what kind of control points -are provided in \f2points\fP, -and what output is generated when the map is evaluated. -It can assume one of nine predefined values: -.TP 25 -\%\f3GL_MAP1_VERTEX_3\fP -Each control point is three floating-point values representing -$x$, $y$, and $z$. -Internal \%\f3glVertex3\fP commands are generated when the map is evaluated. -.TP -\%\f3GL_MAP1_VERTEX_4\fP -Each control point is four floating-point values representing -$x$, $y$, $z$, and $w$. -Internal \%\f3glVertex4\fP commands are generated when the map is evaluated. -.TP -\%\f3GL_MAP1_INDEX\fP -Each control point is a single floating-point value representing a color index. -Internal \%\f3glIndex\fP commands are generated when the map is evaluated -but the current index is not updated with the value of these \%\f3glIndex\fP -commands. -.TP -\%\f3GL_MAP1_COLOR_4\fP -Each control point is four floating-point values representing -red, green, blue, and alpha. -Internal \%\f3glColor4\fP commands are generated when the map is -evaluated but the current color is not updated with the value of these -\%\f3glColor4\fP commands. -.TP -\%\f3GL_MAP1_NORMAL\fP -Each control point is three floating-point values representing -the $x$, $y$, and $z$ components of a normal vector. -Internal \%\f3glNormal\fP commands are generated when the map is -evaluated but the current normal is not updated with the value of -these \%\f3glNormal\fP commands. -.TP -\%\f3GL_MAP1_TEXTURE_COORD_1\fP -Each control point is a single floating-point value representing -the $s$ texture coordinate. -Internal -.br -\%\f3glTexCoord1\fP commands are generated when the map is -evaluated but the current texture coordinates are not updated with the value -of these \%\f3glTexCoord\fP commands. -.TP -\%\f3GL_MAP1_TEXTURE_COORD_2\fP -Each control point is two floating-point values representing -the $s$ and $t$ texture coordinates. -Internal -.br -\%\f3glTexCoord2\fP commands are generated when the map is -evaluated but the current texture coordinates are not updated with the value -of these \%\f3glTexCoord\fP commands. -.TP -\%\f3GL_MAP1_TEXTURE_COORD_3\fP -Each control point is three floating-point values representing -the $s$, $t$, and $r$ texture coordinates. -Internal \%\f3glTexCoord3\fP commands are generated when the map is -evaluated but the current texture coordinates are not updated with the value -of these \%\f3glTexCoord\fP commands. -.TP -\%\f3GL_MAP1_TEXTURE_COORD_4\fP -Each control point is four floating-point values representing -the $s$, $t$, $r$, and $q$ texture coordinates. -Internal -.br -\%\f3glTexCoord4\fP commands are generated when the map is evaluated but -the current texture coordinates are not updated with the value -of these \%\f3glTexCoord\fP commands. -.P -\f2stride\fP, -\f2order\fP, and -\f2points\fP define the array addressing for accessing the control points. -\f2points\fP is the location of the first control point, -which occupies one, two, three, or four contiguous memory locations, -depending on which map is being defined. -\f2order\fP is the number of control points in the array. -\f2stride\fP specifies how many float or double locations to advance the internal -memory pointer to reach the next control point. -.SH NOTES -As is the case with all GL commands that accept pointers to data, -it is as if the contents of \f2points\fP were copied by \%\f3glMap1\fP before \%\f3glMap1\fP -returns. -Changes to the contents of \f2points\fP have no effect after \%\f3glMap1\fP is called. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not an accepted value. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2u1\fP is equal to \f2u2\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2stride\fP is less than the number -of values in a control point. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2order\fP is less than 1 or -greater than the return value of \%\f3GL_MAX_EVAL_ORDER\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glMap1\fP -is executed between the execution of -\%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glMap1\fP is called and the value -of \%\f3GL_ACTIVE_TEXTURE_ARB\fP is not \%\f3GL_TEXTURE0_ARB\fP. -.SH ASSOCIATED GETS -\%\f3glGetMap\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAX_EVAL_ORDER\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP1_VERTEX_3\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP1_VERTEX_4\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP1_INDEX\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP1_COLOR_4\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP1_NORMAL\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP1_TEXTURE_COORD_1\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP1_TEXTURE_COORD_2\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP1_TEXTURE_COORD_3\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP1_TEXTURE_COORD_4\fP -.SH SEE ALSO -\%\f3glBegin(3G)\fP, -\%\f3glColor(3G)\fP, -\%\f3glEnable(3G)\fP, -\%\f3glEvalCoord(3G)\fP, -\%\f3glEvalMesh(3G)\fP, -\%\f3glEvalPoint(3G)\fP, -\%\f3glMap2(3G)\fP, -\%\f3glMapGrid(3G)\fP, -\%\f3glNormal(3G)\fP, -\%\f3glTexCoord(3G)\fP, -\%\f3glVertex(3G)\fP diff --git a/doc/gl-docs/GL/gl/map2.3gl b/doc/gl-docs/GL/gl/map2.3gl deleted file mode 100644 index 1d629e7e..00000000 --- a/doc/gl-docs/GL/gl/map2.3gl +++ /dev/null @@ -1,331 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 map2.gl - -.ds Xs 16004 12 map2.gl -.TH GLMAP2 3G -.SH NAME -.B "glMap2d, glMap2f -\- define a two-dimensional evaluator - -.SH C SPECIFICATION -void \f3glMap2d\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMap2d( 'u - GLdouble \fIu1\fP, - GLdouble \fIu2\fP, - GLint \fIustride\fP, - GLint \fIuorder\fP, - GLdouble \fIv1\fP, - GLdouble \fIv2\fP, - GLint \fIvstride\fP, - GLint \fIvorder\fP, - const GLdouble \fI*points\fP ) -.fi -void \f3glMap2f\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMap2f( 'u - GLfloat \fIu1\fP, - GLfloat \fIu2\fP, - GLint \fIustride\fP, - GLint \fIuorder\fP, - GLfloat \fIv1\fP, - GLfloat \fIv2\fP, - GLint \fIvstride\fP, - GLint \fIvorder\fP, - const GLfloat \fI*points\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIustride\fP\ \ 'u -\f2target\fP -Specifies the kind of values that are generated by the evaluator. -Symbolic constants -\%\f3GL_MAP2_VERTEX_3\fP, -\%\f3GL_MAP2_VERTEX_4\fP, -\%\f3GL_MAP2_INDEX\fP, -\%\f3GL_MAP2_COLOR_4\fP, -\%\f3GL_MAP2_NORMAL\fP, -\%\f3GL_MAP2_TEXTURE_COORD_1\fP, -\%\f3GL_MAP2_TEXTURE_COORD_2\fP, -\%\f3GL_MAP2_TEXTURE_COORD_3\fP, and -\%\f3GL_MAP2_TEXTURE_COORD_4\fP are accepted. -.TP -\f2u1\fP, \f2u2\fP -Specify a linear mapping of $u$, -as presented to \%\f3glEvalCoord2\fP, -to $u hat$, -one of the two variables that are evaluated by the equations specified -by this command. Initially, \f2u1\fP is 0 and \f2u2\fP is 1. -.TP -\f2ustride\fP -Specifies the number of floats or doubles between -the beginning of control point -$R sub ij$ -and the beginning of control point -$R sub { (i+1) j }$, -where $i$ and $j$ are the $u$ and $v$ control point indices, respectively. -This allows control points to be embedded in arbitrary data structures. -The only constraint is that the values for a particular control point -must occupy contiguous memory locations. The initial value of \f2ustride\fP is 0. -.TP -\f2uorder\fP -Specifies the dimension of the control point array in the $u$ axis. -Must be positive. The initial value is 1. -.TP -\f2v1\fP, \f2v2\fP -Specify a linear mapping of $v$, -as presented to \%\f3glEvalCoord2\fP, -to $v hat$, -one of the two variables that are evaluated by the equations specified -by this command. Initially, \f2v1\fP is 0 and \f2v2\fP is 1. -.TP -\f2vstride\fP -Specifies the number of floats or doubles between -the beginning of control point -$R sub ij$ -and the beginning of control point -$R sub { i (j+1) }$, -where $i$ and $j$ are the $u$ and $v$ control point indices, respectively. -This allows control points to be embedded in arbitrary data structures. -The only constraint is that the values for a particular control point -must occupy contiguous memory locations. The initial value of \f2vstride\fP is 0. -.TP -\f2vorder\fP -Specifies the dimension of the control point array in the $v$ axis. -Must be positive. The initial value is 1. -.TP -\f2points\fP -Specifies a pointer to the array of control points. -.SH DESCRIPTION -Evaluators provide a way to use polynomial or rational polynomial mapping -to produce vertices, -normals, -texture coordinates, -and colors. -The values produced by an evaluator are sent on to further stages -of GL processing just as if they had been presented using -\%\f3glVertex\fP, -\%\f3glNormal\fP, -\%\f3glTexCoord\fP, and -\%\f3glColor\fP commands, -except that the generated values do not update the current normal, -texture coordinates, -or color. -.P -All polynomial or rational polynomial splines of any degree -(up to the maximum degree supported by the GL implementation) -can be described using evaluators. -These include almost all surfaces used in computer graphics, -including B-spline surfaces, -NURBS surfaces, -Bezier surfaces, and so on. -.P -Evaluators define surfaces based on bivariate Bernstein polynomials. -Define $p ( u hat , v hat ) $ as -.ce -.sp -.EQ -p ( u hat , v hat ) ~~=~~ - down 30 {{size 18 {sum}} from {size 8 {i~=~0}} to {size 9 {n}} } ~ - {{size 18 {sum}} from {size 8 {j~=~0}} to {size 9 {m}} } ~ - up 15 { B sub i sup n ( u hat ) ~ B sub j sup m ( v hat ) ~ R sub ij } -.EN -.sp -.P -where $R sub ij$ is a control point, -$B sub i sup n ( u hat )$ -is the $i$th Bernstein polynomial of degree -.br -$n$ (\f2uorder\fP = $n ~+~ 1$) -.ce -.sp -.EQ -B sub i sup n ( u hat ) ~~=~~ left ( down 20 {cpile { n above i }} ~ right -) u hat sup i ( 1 - u hat ) sup { n - i } -.EN -.sp -and $B sub j sup m ( v hat )$ -is the $j$th Bernstein polynomial of degree $m$ (\f2vorder\fP = $m ~+~ 1$) -.ce -.sp -.EQ -B sub j sup m ( v hat ) ~~=~~ left ( ^down 20 {cpile { m above j }} ~^ right ) v hat sup j ( 1 - v hat ) sup { m - j } -.EN -.sp -Recall that -.ce -$0 sup 0 ~==~ 1 $ and $ left ( ^ down 20 {cpile { n above 0 }} ~^ right ) ~~==~~ 1 $ -.sp -\%\f3glMap2\fP is used to define the basis and to specify what kind of values -are produced. -Once defined, -a map can be enabled and disabled by calling \%\f3glEnable\fP and \%\f3glDisable\fP -with the map name, one of the nine predefined values for \f2target\fP, -described below. -When \%\f3glEvalCoord2\fP presents values $u$ and $v$, -the bivariate Bernstein polynomials are evaluated using $u hat$ and $v hat$, -where -.sp -.ce -$u hat ~~=~~ {u ~-~ "u1"} over {"u2" ~-~ "u1"}$ -.sp -.ce -$v hat ~~=~~ {v ~-~ "v1"} over {"v2" ~-~ "v1"}$ -.sp -\f2target\fP is a symbolic constant that indicates what kind of control points -are provided in \f2points\fP, -and what output is generated when the map is evaluated. -It can assume one of nine predefined values: -.TP 25 -\%\f3GL_MAP2_VERTEX_3\fP -Each control point is three floating-point values representing -$x$, $y$, and $z$. -Internal \%\f3glVertex3\fP commands are generated when the map is evaluated. -.TP -\%\f3GL_MAP2_VERTEX_4\fP -Each control point is four floating-point values representing -$x$, $y$, $z$, and $w$. -Internal \%\f3glVertex4\fP commands are generated when the map is evaluated. -.TP -\%\f3GL_MAP2_INDEX\fP -Each control point is a single floating-point value representing a color index. -Internal \%\f3glIndex\fP commands are generated when the map is evaluated -but the current index is not updated with the value of these -\%\f3glIndex\fP commands. -.TP -\%\f3GL_MAP2_COLOR_4\fP -Each control point is four floating-point values representing -red, green, blue, and alpha. -Internal \%\f3glColor4\fP commands are generated when the map is -evaluated but the current color is not updated with the value of -these \%\f3glColor4\fP commands. -.TP -\%\f3GL_MAP2_NORMAL\fP -Each control point is three floating-point values representing -the $x$, $y$, and $z$ components of a normal vector. -Internal \%\f3glNormal\fP commands are generated when the map is -evaluated but the current normal is not updated with the value of -these \%\f3glNormal\fP commands. -.TP -\%\f3GL_MAP2_TEXTURE_COORD_1\fP -Each control point is a single floating-point value representing -the $s$ texture coordinate. -Internal -.br -\%\f3glTexCoord1\fP commands are generated when the map is evaluated but -the current texture coordinates are not updated with the value -of these \%\f3glTexCoord\fP commands. -.TP -\%\f3GL_MAP2_TEXTURE_COORD_2\fP -Each control point is two floating-point values representing -the $s$ and $t$ texture coordinates. -Internal -.br -\%\f3glTexCoord2\fP commands are generated when the map is evaluated but -the current texture coordinates are not updated with the value -of these \%\f3glTexCoord\fP commands. -.TP -\%\f3GL_MAP2_TEXTURE_COORD_3\fP -Each control point is three floating-point values representing -the $s$, $t$, and $r$ texture coordinates. -Internal \%\f3glTexCoord3\fP commands are generated when the map is -evaluated but the current texture coordinates are not updated with the value -of these \%\f3glTexCoord\fP commands. -.TP -\%\f3GL_MAP2_TEXTURE_COORD_4\fP -Each control point is four floating-point values representing -the $s$, $t$, $r$, and $q$ texture coordinates. -Internal -.br -\%\f3glTexCoord4\fP commands are generated when the map is evaluated but the current texture coordinates are not updated with the value -of these \%\f3glTexCoord\fP commands. -.P -\f2ustride\fP, -\f2uorder\fP, -\f2vstride\fP, -\f2vorder\fP, and -\f2points\fP define the array addressing for accessing the control points. -\f2points\fP is the location of the first control point, -which occupies one, two, three, or four contiguous memory locations, -depending on which map is being defined. -There are $ "uorder" ~times~ "vorder" $ control points in the array. -\f2ustride\fP specifies how many float or double locations are skipped to advance -the internal memory pointer from control point -$R sub {i j} $ to control point $R sub {(i+1) j} $. -\f2vstride\fP specifies how many float or double locations are skipped to advance -the internal memory pointer from control point -$R sub {i j} $ to control point $R sub {i (j+1) } $. -.SH NOTES -As is the case with all GL commands that accept pointers to data, -it is as if the contents of \f2points\fP were copied by \%\f3glMap2\fP before \%\f3glMap2\fP -returns. -Changes to the contents of \f2points\fP have no effect after \%\f3glMap2\fP is called. -.P -Initially, \%\f3GL_AUTO_NORMAL\fP is enabled. If \%\f3GL_AUTO_NORMAL\fP is enabled, -normal vectors are generated when either -\%\f3GL_MAP2_VERTEX_3\fP or \%\f3GL_MAP2_VERTEX_4\fP is used to generate -vertices. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not an accepted value. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2u1\fP is equal to \f2u2\fP, -or if \f2v1\fP is equal to \f2v2\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if either \f2ustride\fP or \f2vstride\fP -is less than the number of values in a control point. -.P -\%\f3GL_INVALID_VALUE\fP is generated if either \f2uorder\fP or \f2vorder\fP -is less than 1 or greater than the return value of \%\f3GL_MAX_EVAL_ORDER\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glMap2\fP -is executed between the execution of -\%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glMap2\fP is called and the value -of \%\f3GL_ACTIVE_TEXTURE_ARB\fP is not \%\f3GL_TEXTURE0_ARB\fP. -.SH ASSOCIATED GETS -\%\f3glGetMap\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAX_EVAL_ORDER\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP2_VERTEX_3\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP2_VERTEX_4\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP2_INDEX\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP2_COLOR_4\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP2_NORMAL\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP2_TEXTURE_COORD_1\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP2_TEXTURE_COORD_2\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP2_TEXTURE_COORD_3\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_MAP2_TEXTURE_COORD_4\fP -.SH SEE ALSO -\%\f3glBegin(3G)\fP, -\%\f3glColor(3G)\fP, -\%\f3glEnable(3G)\fP, -\%\f3glEvalCoord(3G)\fP, -\%\f3glEvalMesh(3G)\fP, -\%\f3glEvalPoint(3G)\fP, -\%\f3glMap1(3G)\fP, -\%\f3glMapGrid(3G)\fP, -\%\f3glNormal(3G)\fP, -\%\f3glTexCoord(3G)\fP, -\%\f3glVertex(3G)\fP diff --git a/doc/gl-docs/GL/gl/mapgrid.3gl b/doc/gl-docs/GL/gl/mapgrid.3gl deleted file mode 100644 index a329c5e2..00000000 --- a/doc/gl-docs/GL/gl/mapgrid.3gl +++ /dev/null @@ -1,141 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 mapgrid.g -.ds Xs 53033 5 mapgrid.gl -.TH GLMAPGRID 3G -.SH NAME -.B "glMapGrid1d, glMapGrid1f, glMapGrid2d, glMapGrid2f -\- define a one- or two-dimensional mesh - -.SH C SPECIFICATION -void \f3glMapGrid1d\fP( -GLint \fIun\fP, -.nf -.ta \w'\f3void \fPglMapGrid1d( 'u - GLdouble \fIu1\fP, - GLdouble \fIu2\fP ) -.fi -void \f3glMapGrid1f\fP( -GLint \fIun\fP, -.nf -.ta \w'\f3void \fPglMapGrid1f( 'u - GLfloat \fIu1\fP, - GLfloat \fIu2\fP ) -.fi -void \f3glMapGrid2d\fP( -GLint \fIun\fP, -.nf -.ta \w'\f3void \fPglMapGrid2d( 'u - GLdouble \fIu1\fP, - GLdouble \fIu2\fP, - GLint \fIvn\fP, - GLdouble \fIv1\fP, - GLdouble \fIv2\fP ) -.fi -void \f3glMapGrid2f\fP( -GLint \fIun\fP, -.nf -.ta \w'\f3void \fPglMapGrid2f( 'u - GLfloat \fIu1\fP, - GLfloat \fIu2\fP, - GLint \fIvn\fP, - GLfloat \fIv1\fP, - GLfloat \fIv2\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2un\fP\ \ 'u -\f2un\fP -Specifies the number of partitions in the grid range interval -[\f2u1\fP, \f2u2\fP]. -Must be positive. -.TP -\f2u1\fP, \f2u2\fP -Specify the mappings for integer grid domain values $i~=~0$ and $i~=~"un"$. -.TP -\f2vn\fP -Specifies the number of partitions in the grid range interval -[\f2v1\fP, \f2v2\fP] -.br -(\%\f3glMapGrid2\fP only). -.TP -\f2v1\fP, \f2v2\fP -Specify the mappings for integer grid domain values $j~=~0$ and $j~=~"vn"$ -.br -(\%\f3glMapGrid2\fP only). -.SH DESCRIPTION -\%\f3glMapGrid\fP and \%\f3glEvalMesh\fP are used together to efficiently -generate and evaluate a series of evenly-spaced map domain values. -\%\f3glEvalMesh\fP steps through the integer domain -of a one- or two-dimensional grid, -whose range is the domain of the evaluation maps specified by -\%\f3glMap1\fP and \%\f3glMap2\fP. -.P -\%\f3glMapGrid1\fP and \%\f3glMapGrid2\fP specify the linear grid mappings -between the $i$ -(or $i$ and $j$) -integer grid coordinates, -to the $u$ -(or $u$ and $v$) -floating-point evaluation map coordinates. -See \%\f3glMap1\fP and \%\f3glMap2\fP for details of how $u$ and $v$ coordinates -are evaluated. -.P -\%\f3glMapGrid1\fP specifies a single linear mapping -such that integer grid coordinate 0 maps exactly to \f2u1\fP, -and integer grid coordinate \f2un\fP maps exactly to \f2u2\fP. -All other integer grid coordinates $i$ are mapped so that -.sp -.ce -.EQ -u ~=~ i ("u2" - "u1") / "un" ~+~ "u1" -.EN -.sp -\%\f3glMapGrid2\fP specifies two such linear mappings. -One maps integer grid coordinate $i~=~0$ exactly to \f2u1\fP, -and integer grid coordinate $i~=~"un"$ exactly to \f2u2\fP. -The other maps integer grid coordinate $j~=~0$ exactly to \f2v1\fP, -and integer grid coordinate $j~=~"vn"$ exactly to \f2v2\fP. -Other integer grid coordinates $i$ and $j$ are mapped such that -.P -.ce -.EQ -u ~=~ i ("u2" - "u1") / "un" ~+~ "u1" -.EN -.P -.ce -.EQ -v ~=~ j ("v2" - "v1") / "vn" ~+~ "v1" -.EN -.P -The mappings specified by \%\f3glMapGrid\fP are used identically by -\%\f3glEvalMesh\fP and \%\f3glEvalPoint\fP. -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if either \f2un\fP or \f2vn\fP is not -positive. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glMapGrid\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_MAP1_GRID_DOMAIN\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAP2_GRID_DOMAIN\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAP1_GRID_SEGMENTS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAP2_GRID_SEGMENTS\fP -.SH SEE ALSO -\%\f3glEvalCoord(3G)\fP, -\%\f3glEvalMesh(3G)\fP, -\%\f3glEvalPoint(3G)\fP, -\%\f3glMap1(3G)\fP, -\%\f3glMap2(3G)\fP diff --git a/doc/gl-docs/GL/gl/material.3gl b/doc/gl-docs/GL/gl/material.3gl deleted file mode 100644 index 5e5e3b96..00000000 --- a/doc/gl-docs/GL/gl/material.3gl +++ /dev/null @@ -1,213 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 material. -.ds Xs 18013 8 material.gl -.TH GLMATERIAL 3G -.SH NAME -.B "glMaterialf, glMateriali, glMaterialfv, glMaterialiv -\- specify material parameters for the lighting model - -.SH C SPECIFICATION -void \f3glMaterialf\fP( -GLenum \fIface\fP, -.nf -.ta \w'\f3void \fPglMaterialf( 'u - GLenum \fIpname\fP, - GLfloat \fIparam\fP ) -.fi -void \f3glMateriali\fP( -GLenum \fIface\fP, -.nf -.ta \w'\f3void \fPglMateriali( 'u - GLenum \fIpname\fP, - GLint \fIparam\fP ) -.fi - -.SH PARAMETERS -.TP \w'\fIparams\fP\ \ 'u -\f2face\fP -Specifies which face or faces are being updated. -Must be one of -\%\f3GL_FRONT\fP, -\%\f3GL_BACK\fP, or -\%\f3GL_FRONT_AND_BACK\fP. -.TP -\f2pname\fP -Specifies the single-valued material parameter of the face or faces -that is being updated. -Must be \%\f3GL_SHININESS\fP. -.TP -\f2param\fP -Specifies the value that parameter \%\f3GL_SHININESS\fP will be set to. -.SH C SPECIFICATION -void \f3glMaterialfv\fP( -GLenum \fIface\fP, -.nf -.ta \w'\f3void \fPglMaterialfv( 'u - GLenum \fIpname\fP, - const GLfloat \fI*params\fP ) -.fi -void \f3glMaterialiv\fP( -GLenum \fIface\fP, -.nf -.ta \w'\f3void \fPglMaterialiv( 'u - GLenum \fIpname\fP, - const GLint \fI*params\fP ) -.fi - -.SH PARAMETERS -.TP -\f2face\fP -Specifies which face or faces are being updated. -Must be one of -\%\f3GL_FRONT\fP, -\%\f3GL_BACK\fP, or -\%\f3GL_FRONT_AND_BACK\fP. -.TP -\f2pname\fP -Specifies the material parameter of the face or faces that is being updated. -Must be one of -\%\f3GL_AMBIENT\fP, -\%\f3GL_DIFFUSE\fP, -\%\f3GL_SPECULAR\fP, -\%\f3GL_EMISSION\fP, -\%\f3GL_SHININESS\fP, -\%\f3GL_AMBIENT_AND_DIFFUSE\fP, or -\%\f3GL_COLOR_INDEXES\fP. -.TP -\f2params\fP -Specifies a pointer to the value or values that \f2pname\fP will be set to. -.SH DESCRIPTION -\%\f3glMaterial\fP assigns values to material parameters. -There are two matched sets of material parameters. -One, -the \f2front-facing\fP set, -is used to shade points, -lines, -bitmaps, -and all polygons -(when two-sided lighting is disabled), -or just front-facing polygons -(when two-sided lighting is enabled). -The other set, -\f2back-facing\fP, -is used to shade back-facing polygons only when two-sided lighting is enabled. -Refer to the \%\f3glLightModel\fP reference page for details concerning one- and -two-sided lighting calculations. -.P -\%\f3glMaterial\fP takes three arguments. -The first, -\f2face\fP, -specifies whether the -\%\f3GL_FRONT\fP materials, the -\%\f3GL_BACK\fP materials, or both -\%\f3GL_FRONT_AND_BACK\fP materials will be modified. -The second, -\f2pname\fP, -specifies which of several parameters in one or both sets will be modified. -The third, -\f2params\fP, -specifies what value or values will be assigned to the specified parameter. -.P -Material parameters are used in the lighting equation that is optionally -applied to each vertex. -The equation is discussed in the \%\f3glLightModel\fP reference page. -The parameters that can be specified using \%\f3glMaterial\fP, -and their interpretations by the lighting equation, are as follows: -.TP 20 -\%\f3GL_AMBIENT\fP -\f2params\fP contains four integer or floating-point values that specify -the ambient RGBA reflectance of the material. -Integer values are mapped linearly such that the most positive representable -value maps to 1.0, -and the most negative representable value maps to \-1.0. -Floating-point values are mapped directly. -Neither integer nor floating-point values are clamped. -The initial ambient reflectance for both front- and back-facing materials -is (0.2, 0.2, 0.2, 1.0). -.TP -\%\f3GL_DIFFUSE\fP -\f2params\fP contains four integer or floating-point values that specify -the diffuse RGBA reflectance of the material. -Integer values are mapped linearly such that the most positive representable -value maps to 1.0, -and the most negative representable value maps to \-1.0. -Floating-point values are mapped directly. -Neither integer nor floating-point values are clamped. -The initial diffuse reflectance for both front- and back-facing materials -is (0.8, 0.8, 0.8, 1.0). -.TP -\%\f3GL_SPECULAR\fP -\f2params\fP contains four integer or floating-point values that specify -the specular RGBA reflectance of the material. -Integer values are mapped linearly such that the most positive representable -value maps to 1.0, -and the most negative representable value maps to \-1.0. -Floating-point values are mapped directly. -Neither integer nor floating-point values are clamped. -The initial specular reflectance for both front- and back-facing materials -is (0, 0, 0, 1). -.TP -\%\f3GL_EMISSION\fP -\f2params\fP contains four integer or floating-point values that specify -the RGBA emitted light intensity of the material. -Integer values are mapped linearly such that the most positive representable -value maps to 1.0, -and the most negative representable value maps to \-1.0. -Floating-point values are mapped directly. -Neither integer nor floating-point values are clamped. -The initial emission intensity for both front- and back-facing materials -is (0, 0, 0, 1). -.TP -\%\f3GL_SHININESS\fP -\f2params\fP is a single integer or floating-point value that specifies -the RGBA specular exponent of the material. -Integer and floating-point values are mapped directly. -Only values in the range [0,128] are accepted. -The initial specular exponent for both front- and back-facing materials -is 0. -.TP -\%\f3GL_AMBIENT_AND_DIFFUSE\fP -Equivalent to calling \%\f3glMaterial\fP twice with the same parameter values, -once with \%\f3GL_AMBIENT\fP and once with \%\f3GL_DIFFUSE\fP. -.TP -\%\f3GL_COLOR_INDEXES\fP -\f2params\fP contains three integer or floating-point values specifying -the color indices for ambient, -diffuse, -and specular lighting. -These three values, -and \%\f3GL_SHININESS\fP, -are the only material values used by the color index mode lighting equation. -Refer to the \%\f3glLightModel\fP reference page for a discussion -of color index lighting. -.SH NOTES -The material parameters can be updated at any time. -In particular, -\%\f3glMaterial\fP can be called between a call to \%\f3glBegin\fP and the corresponding -call to \%\f3glEnd\fP. -If only a single material parameter is to be changed per vertex, -however, -\%\f3glColorMaterial\fP is preferred over \%\f3glMaterial\fP -(see \%\f3glColorMaterial\fP). -.P -While the ambient, diffuse, specular and emission material parameters -all have alpha components, only the diffuse alpha component is used in -the lighting computation. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if either \f2face\fP or \f2pname\fP is not -an accepted value. -.P -\%\f3GL_INVALID_VALUE\fP is generated if a specular exponent outside the range -[0,128] is specified. -.SH ASSOCIATED GETS -\%\f3glGetMaterial\fP -.SH SEE ALSO -\%\f3glColorMaterial(3G)\fP, -\%\f3glLight(3G)\fP, -\%\f3glLightModel(3G)\fP diff --git a/doc/gl-docs/GL/gl/matrixmode.3gl b/doc/gl-docs/GL/gl/matrixmode.3gl deleted file mode 100644 index 264b2525..00000000 --- a/doc/gl-docs/GL/gl/matrixmode.3gl +++ /dev/null @@ -1,64 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 matrixmod -.ds Xs 9532 4 matrixmode.gl -.TH GLMATRIXMODE 3G -.SH NAME -.B "glMatrixMode -\- specify which matrix is the current matrix - -.SH C SPECIFICATION -void \f3glMatrixMode\fP( -GLenum \fImode\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2mode\fP\ \ 'u -\f2mode\fP -Specifies which matrix stack is the target -for subsequent matrix operations. -Three values are accepted: -\%\f3GL_MODELVIEW\fP, -\%\f3GL_PROJECTION\fP, and -\%\f3GL_TEXTURE\fP. -The initial value is \%\f3GL_MODELVIEW\fP. -.TE - -Additionally, if the \%\f3GL_ARB_imaging\fP extension is supported, -\%\f3GL_COLOR\fP is also accepted. -.SH DESCRIPTION -\%\f3glMatrixMode\fP sets the current matrix mode. -\f2mode\fP can assume one of four values: -.TP 25 -\%\f3GL_MODELVIEW\fP -Applies subsequent matrix operations to the modelview matrix stack. -.TP -\%\f3GL_PROJECTION\fP -Applies subsequent matrix operations to the projection matrix stack. -.TP -\%\f3GL_TEXTURE\fP -Applies subsequent matrix operations to the texture matrix stack. -.TP -\%\f3GL_COLOR\fP -Applies subsequent matrix operations to the color matrix stack. -.P -To find out which matrix stack is currently the target of all matrix -operations, call \%\f3glGet\fP with argument \%\f3GL_MATRIX_MODE\fP. The initial -value is \%\f3GL_MODELVIEW\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2mode\fP is not an accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glMatrixMode\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_MATRIX_MODE\fP -.SH SEE ALSO -\%\f3glLoadMatrix(3G)\fP, -\%\f3glPushMatrix(3G)\fP diff --git a/doc/gl-docs/GL/gl/minmax.3gl b/doc/gl-docs/GL/gl/minmax.3gl deleted file mode 100644 index 61c4a55d..00000000 --- a/doc/gl-docs/GL/gl/minmax.3gl +++ /dev/null @@ -1,120 +0,0 @@ -'\" t -'\"! tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 minmax.gl -.ds Xs 45595 6 minmax.gl -.TH GLMINMAX 3G -.SH NAME -.B "glMinmax -\- define minmax table - -.SH C SPECIFICATION -void \f3glMinmax\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMinmax( 'u - GLenum \fIinternalformat\fP, - GLboolean \fIsink\fP ) -.fi - -.SH PARAMETERS -.TP \w'\fIinternalformat\fP\ \ 'u -\f2target\fP -The minmax table whose parameters are to be set. -Must be -\%\f3GL_MINMAX\fP. -.TP -\f2internalformat\fP -The of entries in the minmax table. -Must be one of -\%\f3GL_ALPHA\fP, -\%\f3GL_ALPHA4\fP, -\%\f3GL_ALPHA8\fP, -\%\f3GL_ALPHA12\fP, -\%\f3GL_ALPHA16\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE4\fP, -\%\f3GL_LUMINANCE8\fP, -\%\f3GL_LUMINANCE12\fP, -\%\f3GL_LUMINANCE16\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_LUMINANCE4_ALPHA4\fP, -\%\f3GL_LUMINANCE6_ALPHA2\fP, -\%\f3GL_LUMINANCE8_ALPHA8\fP, -\%\f3GL_LUMINANCE12_ALPHA4\fP, -\%\f3GL_LUMINANCE12_ALPHA12\fP, -\%\f3GL_LUMINANCE16_ALPHA16\fP, -\%\f3GL_R3_G3_B2\fP, -\%\f3GL_RGB\fP, -\%\f3GL_RGB4\fP, -\%\f3GL_RGB5\fP, -\%\f3GL_RGB8\fP, -\%\f3GL_RGB10\fP, -\%\f3GL_RGB12\fP, -\%\f3GL_RGB16\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_RGBA2\fP, -\%\f3GL_RGBA4\fP, -\%\f3GL_RGB5_A1\fP, -\%\f3GL_RGBA8\fP, -\%\f3GL_RGB10_A2\fP, -\%\f3GL_RGBA12\fP, or -\%\f3GL_RGBA16\fP. -.TP -\f2sink\fP -If \%\f3GL_TRUE\fP, pixels will be consumed by the minmax -process and no drawing or texture loading will take place. -If \%\f3GL_FALSE\fP, pixels will proceed to the final conversion process after -minmax. -.SH DESCRIPTION -When \%\f3GL_MINMAX\fP is enabled, the RGBA components of incoming pixels are -compared to the minimum and maximum values for each component, which are -stored in the 2-element minmax table. -(The first element stores the minima, and the second element stores -the maxima.) -If a pixel component is greater than the corresponding component -in the maximum element, then the maximum element is updated with the -pixel component value. -If a pixel component is less than the corresponding component in -the minimum element, then the minimum element is updated with the -pixel component value. -(In both cases, if the internal of the minmax table includes -luminance, then the R color component of incoming pixels is used -for comparison.) -The contents of the minmax table may be retrieved at a later time -by calling \%\f3glGetMinmax\fP. -The minmax operation is enabled or disabled by calling \%\f3glEnable\fP or -\%\f3glDisable\fP, respectively, with an argument of \%\f3GL_MINMAX\fP. -.P -\%\f3glMinmax\fP redefines the current minmax table to have entries of the -specified by \f2internalformat\fP. -The maximum element is initialized with the smallest possible component -values, and the minimum element is initialized with the largest possible -component values. -The values in the previous minmax table, if any, are lost. -If \f2sink\fP is \%\f3GL_TRUE\fP, then pixels are discarded after minmax; -no further processing of the pixels takes place, and no drawing, -texture loading, or pixel readback will result. -.P -.SH NOTES -\%\f3glMinmax\fP is present only if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP -is called with an argument of \%\f3GL_EXTENSIONS\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2internalformat\fP is not one of the -allowable values. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glMinmax\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetMinmaxParameter\fP -.SH SEE ALSO -\%\f3glGetMinmax(3G)\fP, -\%\f3glResetMinmax(3G)\fP diff --git a/doc/gl-docs/GL/gl/multitexcoordARB.3gl b/doc/gl-docs/GL/gl/multitexcoordARB.3gl deleted file mode 100644 index a60b029d..00000000 --- a/doc/gl-docs/GL/gl/multitexcoordARB.3gl +++ /dev/null @@ -1,301 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 19:43 -.ds Dm 01 multitexc -.ds Xs 22 5 multitexcoordARB.gl -.TH GLMULTITEXCOORDARB 3G -.SH NAME -.B "glMultiTexCoord1dARB, glMultiTexCoord1fARB, glMultiTexCoord1iARB, glMultiTexCoord1sARB, glMultiTexCoord2dARB, glMultiTexCoord2fARB, glMultiTexCoord2iARB, glMultiTexCoord2sARB, glMultiTexCoord3dARB, glMultiTexCoord3fARB, glMultiTexCoord3iARB, glMultiTexCoord3sARB, glMultiTexCoord4dARB, glMultiTexCoord4fARB, glMultiTexCoord4iARB, glMultiTexCoord4sARB, glMultiTexCoord1dvARB, glMultiTexCoord1fvARB, glMultiTexCoord1ivARB, glMultiTexCoord1svARB, glMultiTexCoord2dvARB, glMultiTexCoord2fvARB, glMultiTexCoord2ivARB, glMultiTexCoord2svARB, glMultiTexCoord3dvARB, glMultiTexCoord3fvARB, glMultiTexCoord3ivARB, glMultiTexCoord3svARB, glMultiTexCoord4dvARB, glMultiTexCoord4fvARB, glMultiTexCoord4ivARB, glMultiTexCoord4svARB -\- set the current texture coordinates - -.SH C SPECIFICATION -void \f3glMultiTexCoord1dARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord1dARB( 'u - GLdouble \fIs\fP ) -.fi -void \f3glMultiTexCoord1fARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord1fARB( 'u - GLfloat \fIs\fP ) -.fi -void \f3glMultiTexCoord1iARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord1iARB( 'u - GLint \fIs\fP ) -.fi -void \f3glMultiTexCoord1sARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord1sARB( 'u - GLshort \fIs\fP ) -.fi -void \f3glMultiTexCoord2dARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord2dARB( 'u - GLdouble \fIs\fP, - GLdouble \fIt\fP ) -.fi -void \f3glMultiTexCoord2fARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord2fARB( 'u - GLfloat \fIs\fP, - GLfloat \fIt\fP ) -.fi -void \f3glMultiTexCoord2iARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord2iARB( 'u - GLint \fIs\fP, - GLint \fIt\fP ) -.fi -void \f3glMultiTexCoord2sARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord2sARB( 'u - GLshort \fIs\fP, - GLshort \fIt\fP ) -.fi -void \f3glMultiTexCoord3dARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord3dARB( 'u - GLdouble \fIs\fP, - GLdouble \fIt\fP, - GLdouble \fIr\fP ) -.fi -void \f3glMultiTexCoord3fARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord3fARB( 'u - GLfloat \fIs\fP, - GLfloat \fIt\fP, - GLfloat \fIr\fP ) -.fi -void \f3glMultiTexCoord3iARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord3iARB( 'u - GLint \fIs\fP, - GLint \fIt\fP, - GLint \fIr\fP ) -.fi -void \f3glMultiTexCoord3sARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord3sARB( 'u - GLshort \fIs\fP, - GLshort \fIt\fP, - GLshort \fIr\fP ) -.fi -void \f3glMultiTexCoord4dARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord4dARB( 'u - GLdouble \fIs\fP, - GLdouble \fIt\fP, - GLdouble \fIr\fP, - GLdouble \fIq\fP ) -.fi -void \f3glMultiTexCoord4fARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord4fARB( 'u - GLfloat \fIs\fP, - GLfloat \fIt\fP, - GLfloat \fIr\fP, - GLfloat \fIq\fP ) -.fi -void \f3glMultiTexCoord4iARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord4iARB( 'u - GLint \fIs\fP, - GLint \fIt\fP, - GLint \fIr\fP, - GLint \fIq\fP ) -.fi -void \f3glMultiTexCoord4sARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord4sARB( 'u - GLshort \fIs\fP, - GLshort \fIt\fP, - GLshort \fIr\fP, - GLshort \fIq\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -Specifies texture unit whose coordinates should be modified. The number -of texture units is implementation dependent, but must be at least -two. Must be one of \%\f3GL_TEXTURE\fP$i$\f3_ARB\fP where 0 \(<= $ i $ < -\%\f3GL_MAX_TEXTURE_UNITS_ARB\fP, which is an implementation-dependent value. -.TP -\f2s\fP, \f2t\fP, \f2r\fP, \f2q\fP -Specify \f2s\fP, \f2t\fP, \f2r\fP, and \f2q\fP texture coordinates for -\f2target\fP texture unit. Not all parameters are present in all forms -of the command. -.SH C SPECIFICATION -void \f3glMultiTexCoord1dvARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord1dvARB( 'u - const GLdouble \fI*v\fP ) -.fi -void \f3glMultiTexCoord1fvARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord1fvARB( 'u - const GLfloat \fI*v\fP ) -.fi -void \f3glMultiTexCoord1ivARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord1ivARB( 'u - const GLint \fI*v\fP ) -.fi -void \f3glMultiTexCoord1svARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord1svARB( 'u - const GLshort \fI*v\fP ) -.fi -void \f3glMultiTexCoord2dvARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord2dvARB( 'u - const GLdouble \fI*v\fP ) -.fi -void \f3glMultiTexCoord2fvARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord2fvARB( 'u - const GLfloat \fI*v\fP ) -.fi -void \f3glMultiTexCoord2ivARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord2ivARB( 'u - const GLint \fI*v\fP ) -.fi -void \f3glMultiTexCoord2svARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord2svARB( 'u - const GLshort \fI*v\fP ) -.fi -void \f3glMultiTexCoord3dvARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord3dvARB( 'u - const GLdouble \fI*v\fP ) -.fi -void \f3glMultiTexCoord3fvARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord3fvARB( 'u - const GLfloat \fI*v\fP ) -.fi -void \f3glMultiTexCoord3ivARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord3ivARB( 'u - const GLint \fI*v\fP ) -.fi -void \f3glMultiTexCoord3svARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord3svARB( 'u - const GLshort \fI*v\fP ) -.fi -void \f3glMultiTexCoord4dvARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord4dvARB( 'u - const GLdouble \fI*v\fP ) -.fi -void \f3glMultiTexCoord4fvARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord4fvARB( 'u - const GLfloat \fI*v\fP ) -.fi -void \f3glMultiTexCoord4ivARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord4ivARB( 'u - const GLint \fI*v\fP ) -.fi -void \f3glMultiTexCoord4svARB\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglMultiTexCoord4svARB( 'u - const GLshort \fI*v\fP ) -.fi - -.SH PARAMETERS -.TP -\f2target\fP -Specifies texture unit whose coordinates should be modified. The number -of texture units is implementation dependent, but must be at least -two. Must be one of \%\f3GL_TEXTURE\fP$i$\f3_ARB\fP, -where 0 \(<= $ i $ < the implementation-dependent value of -\%\f3GL_MAX_TEXTURE_UNITS_ARB\fP. -.TP -\f2v\fP -Specifies a pointer to an array of one, two, three, or four elements, -which in turn specify the \f2s\fP, \f2t\fP, \f2r\fP, -and \f2q\fP texture coordinates. -.SH DESCRIPTION -\%\f3glMultiTexCoordARB\fP specifies texture coordinates in one, two, three, or four -dimensions. -\%\f3glMultiTexCoord1ARB\fP sets the current texture -coordinates to (\f2s\fP,\ 0,\ 0,\ 1); -a call to \%\f3glMultiTexCoord2ARB\fP -sets them to (\f2s\fP,\ \f2t\fP,\ 0,\ 1). -Similarly, \%\f3glMultiTexCoord3ARB\fP specifies the texture coordinates as -(\f2s\fP,\ \f2t\fP,\ \f2r\fP,\ 1), and -\%\f3glMultiTexCoord4ARB\fP -defines all four components explicitly as -(\f2s\fP,\ \f2t\fP,\ \f2r\fP,\ \f2q\fP). -.P -The current texture coordinates are part of the data -that is associated with each vertex and with the current -raster position. -Initially, the values for -\f2s\fP, \f2t\fP, \f2r\fP, \f2q\fP are (0,\ 0,\ 0,\ 1). -.P -.SH NOTES -\%\f3glMultiTexCoordARB\fP is only supported if \%\f3GL_ARB_multitexture\fP is included in the -string returned by \%\f3glGetString\fP when called with the argument -\%\f3GL_EXTENSIONS\fP. -.P -The current texture coordinates can be updated at any time. -In particular, -\%\f3glMultiTexCoordARB\fP can be called between a call to \%\f3glBegin\fP and the corresponding -call to \%\f3glEnd\fP. -.P -It is always the case that \%\f3GL_TEXTURE\fP$i$\f3_ARB\fP = \%\f3GL_TEXTURE0_ARB\fP + $i$. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_CURRENT_TEXTURE_COORDS\fP with appropriate -texture unit selected. -.SH SEE ALSO -\%\f3glActiveTextureARB(3G)\fP, -\%\f3glClientActiveTextureARB(3G)\fP, -\%\f3glTexCoord(3G)\fP, -\%\f3glTexCoordPointer(3G)\fP, -\%\f3glVertex(3G)\fP diff --git a/doc/gl-docs/GL/gl/multmatrix.3gl b/doc/gl-docs/GL/gl/multmatrix.3gl deleted file mode 100644 index faa9f9bc..00000000 --- a/doc/gl-docs/GL/gl/multmatrix.3gl +++ /dev/null @@ -1,119 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 multmatri -.ds Xs 32348 6 multmatrix.gl -.TH GLMULTMATRIX 3G -.SH NAME -.B "glMultMatrixd, glMultMatrixf -\- multiply the current matrix with the specified matrix - -.SH C SPECIFICATION -void \f3glMultMatrixd\fP( -const GLdouble \fI*m\fP ) -.nf -.fi -void \f3glMultMatrixf\fP( -const GLfloat \fI*m\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2m\fP\ \ 'u -\f2m\fP -Points to 16 consecutive values that are used as the elements of -a $4 ~times~ 4$ column-major matrix. -.SH DESCRIPTION -\%\f3glMultMatrix\fP multiplies the current matrix with the one specified using \f2m\fP, and -replaces the current matrix with the product. -.P -The current matrix is determined by the current matrix mode (see \%\f3glMatrixMode\fP). It is either the projection matrix, -modelview matrix, -or the texture matrix. -.SH EXAMPLES -If the current matrix is $C$, and the coordinates -to be transformed are, $v ~=~ (v[0], v[1], v[2], v[3])$. -Then the current transformation is $C ~times~ v$, or -.sp -.ce -.EQ -down 130 -{{ left ( matrix { - ccol { c[0] above c[1] above c[2] above c[3] } - ccol { c[4] above c[5] above c[6] above c[7] } - ccol { c[8] above c[9] above c[10] above c[11] } - ccol { c[12]~ above c[13]~ above c[14]~ above c[15]~ } -} right ) } ~~ times ~~ -{left ( matrix { -ccol { v[0]~ above v[1]~ above v[2]~ above v[3]~ } -} right )} } -.EN -.sp -.P -Calling \%\f3glMultMatrix\fP with an argument of $"m" ~=~ m[0], m[1], ..., m[15]$ -replaces the current transformation with $(C ~times~ M) ~times~ v$, -or -.sp -.ce -.EQ -down 130 -{{ left ( matrix { - ccol { c[0] above c[1] above c[2] above c[3] } - ccol { c[4] above c[5] above c[6] above c[7] } - ccol { c[8] above c[9] above c[10] above c[11] } - ccol { c[12]~ above c[13]~ above c[14]~ above c[15]~ } -} right ) } ~~ times ~~ -{ left ( matrix { - ccol { m[0] above m[1] above m[2] above m[3] } - ccol { m[4] above m[5] above m[6] above m[7] } - ccol { m[8] above m[9] above m[10] above m[11] } - ccol { m[12]~ above m[13]~ above m[14]~ above m[15]~ } -} right ) } ~~ times ~~ -{left ( matrix { -ccol { v[0]~ above v[1]~ above v[2]~ above v[3]~ } -} right )} } -.EN -.sp -.P -Where '$times$' denotes matrix multiplication, and -$v$ is represented as a $4 ~times~ 1$ matrix. -.br -.SH NOTES -While the elements of the matrix may be specified with -single or double precision, the GL may store or operate on these -values in less than single precision. -.P -In many computer languages $4 ~times~ 4$ arrays are represented -in row-major order. The transformations just described -represent these matrices in column-major order. -The order of the multiplication is important. For example, if the current -transformation is a rotation, and \%\f3glMultMatrix\fP is called with a translation matrix, -the translation is done directly on the coordinates to be transformed, -while the rotation is done on the results of that translation. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glMultMatrix\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_MATRIX_MODE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_COLOR_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MODELVIEW_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PROJECTION_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_TEXTURE_MATRIX\fP -.SH SEE ALSO -\%\f3glLoadIdentity(3G)\fP, -\%\f3glLoadMatrix(3G)\fP, -\%\f3glMatrixMode(3G)\fP, -\%\f3glPushMatrix(3G)\fP - diff --git a/doc/gl-docs/GL/gl/newlist.3gl b/doc/gl-docs/GL/gl/newlist.3gl deleted file mode 100644 index f0c4de0f..00000000 --- a/doc/gl-docs/GL/gl/newlist.3gl +++ /dev/null @@ -1,153 +0,0 @@ -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 newlist.g -.ds Xs 55434 7 newlist.gl -.TH GLNEWLIST 3G -.SH NAME -.B "glNewList, glEndList -\- create or replace a display list - -.SH C SPECIFICATION -void \f3glNewList\fP( -GLuint \fIlist\fP, -.nf -.ta \w'\f3void \fPglNewList( 'u - GLenum \fImode\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2list\fP\ \ 'u -\f2list\fP -Specifies the display-list name. -.TP -\f2mode\fP -Specifies the compilation mode, -which can be -\%\f3GL_COMPILE\fP or -\%\f3GL_COMPILE_AND_EXECUTE\fP. -.SH C SPECIFICATION -void \f3glEndList\fP( void ) -.nf -.fi - -.SH DESCRIPTION -Display lists are groups of GL commands that have been stored -for subsequent execution. -Display lists are created with \%\f3glNewList\fP. -All subsequent commands are placed in the display list, -in the order issued, -until \%\f3glEndList\fP is called. -.P -\%\f3glNewList\fP has two arguments. -The first argument, -\f2list\fP, -is a positive integer that becomes the unique name for the display list. -Names can be created and reserved with \%\f3glGenLists\fP -and tested for uniqueness with \%\f3glIsList\fP. -The second argument, -\f2mode\fP, -is a symbolic constant that can assume one of two values: -.TP 30 -\%\f3GL_COMPILE\fP -Commands are merely compiled. -.TP -\%\f3GL_COMPILE_AND_EXECUTE\fP -Commands are executed as they are compiled into the display list. -.P -Certain commands are not compiled into the display list -but are executed immediately, -regardless of the display-list mode. -These commands are -\%\f3glAreTexturesResident\fP, -\%\f3glColorPointer\fP, -\%\f3glDeleteLists\fP, -\%\f3glDeleteTextures\fP, -\%\f3glDisableClientState\fP, -\%\f3glEdgeFlagPointer\fP, -\%\f3glEnableClientState\fP, -\%\f3glFeedbackBuffer\fP, -\%\f3glFinish\fP, -\%\f3glFlush\fP, -\%\f3glGenLists\fP, -\%\f3glGenTextures\fP, -\%\f3glIndexPointer\fP, -\%\f3glInterleavedArrays\fP, -\%\f3glIsEnabled\fP, -\%\f3glIsList\fP, -\%\f3glIsTexture\fP, -\%\f3glNormalPointer\fP, -\%\f3glPopClientAttrib\fP, -\%\f3glPixelStore\fP, -\%\f3glPushClientAttrib\fP, -\%\f3glReadPixels\fP, -\%\f3glRenderMode\fP, -\%\f3glSelectBuffer\fP, -\%\f3glTexCoordPointer\fP, -\%\f3glVertexPointer\fP, -and all of the \%\f3glGet\fP commands. -.P -Similarly, -\%\f3glTexImage1D\fP, \%\f3glTexImage2D\fP, and \%\f3glTexImage3D\fP -are executed immediately and not compiled into the display list when their -first argument is \%\f3GL_PROXY_TEXTURE_1D\fP, \%\f3GL_PROXY_TEXTURE_1D\fP, or -\%\f3GL_PROXY_TEXTURE_3D\fP, respectively. -.P -When the \%\f3GL_ARB_imaging\fP extension is supported, -\%\f3glHistogram\fP executes immediately when its argument is -\%\f3GL_PROXY_HISTOGRAM\fP. Similarly, \%\f3glColorTable\fP executes -immediately when its first argument is \%\f3glPROXY_COLOR_TABLE\fP, -\%\f3glPROXY_POST_CONVOLUTION_COLOR_TABLE\fP, or -\%\f3glPROXY_POST_COLOR_MATRIX_COLOR_TABLE\fP. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, -\%\f3glClientActiveTextureARB\fP is not compiled into display lists, but -executed immediately. -.P -When \%\f3glEndList\fP is encountered, -the display-list definition is completed by associating the list -with the unique name \f2list\fP -(specified in the \%\f3glNewList\fP command). -If a display list with name \f2list\fP already exists, -it is replaced only when \%\f3glEndList\fP is called. -.SH NOTES -\%\f3glCallList\fP and \%\f3glCallLists\fP can be entered into display lists. -Commands in the display list or lists executed by \%\f3glCallList\fP -or \%\f3glCallLists\fP are not included in the display list being created, -even if the list creation mode is \%\f3GL_COMPILE_AND_EXECUTE\fP. -.P -A display list is just a group of commands and arguments, so errors -generated by commands in a display list must be generated when the list is -executed. If the list is created in \%\f3GL_COMPILE\fP mode, errors are -not generated until the list is executed. -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if \f2list\fP is 0. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2mode\fP is not an accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glEndList\fP is called -without a preceding \%\f3glNewList\fP, -or if \%\f3glNewList\fP is called while a display list is being defined. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glNewList\fP or \%\f3glEndList\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.P -\%\f3GL_OUT_OF_MEMORY\fP is generated if there is insufficient memory to -compile the display list. If the GL version is 1.1 or greater, no -change is made to the previous contents of the display list, if any, -and no other change is made to the GL state. (It is as if no attempt -had been made to create the new display list.) -.SH ASSOCIATED GETS -\%\f3glIsList\fP -.br -\%\f3glGet\fP with argument \%\f3GL_LIST_INDEX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_LIST_MODE\fP -.SH SEE ALSO -\%\f3glCallList(3G)\fP, -\%\f3glCallLists(3G)\fP, -\%\f3glDeleteLists(3G)\fP, -\%\f3glGenLists(3G)\fP diff --git a/doc/gl-docs/GL/gl/normal.3gl b/doc/gl-docs/GL/gl/normal.3gl deleted file mode 100644 index 650bbedb..00000000 --- a/doc/gl-docs/GL/gl/normal.3gl +++ /dev/null @@ -1,123 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 normal.gl -.ds Xs 22982 4 normal.gl -.TH GLNORMAL 3G -.SH NAME -.B "glNormal3b, glNormal3d, glNormal3f, glNormal3i, glNormal3s, glNormal3bv, glNormal3dv, glNormal3fv, glNormal3iv, glNormal3sv -\- set the current normal vector - -.EQ -delim $$ -.EN -.SH C SPECIFICATION -void \f3glNormal3b\fP( -GLbyte \fInx\fP, -.nf -.ta \w'\f3void \fPglNormal3b( 'u - GLbyte \fIny\fP, - GLbyte \fInz\fP ) -.fi -void \f3glNormal3d\fP( -GLdouble \fInx\fP, -.nf -.ta \w'\f3void \fPglNormal3d( 'u - GLdouble \fIny\fP, - GLdouble \fInz\fP ) -.fi -void \f3glNormal3f\fP( -GLfloat \fInx\fP, -.nf -.ta \w'\f3void \fPglNormal3f( 'u - GLfloat \fIny\fP, - GLfloat \fInz\fP ) -.fi -void \f3glNormal3i\fP( -GLint \fInx\fP, -.nf -.ta \w'\f3void \fPglNormal3i( 'u - GLint \fIny\fP, - GLint \fInz\fP ) -.fi -void \f3glNormal3s\fP( -GLshort \fInx\fP, -.nf -.ta \w'\f3void \fPglNormal3s( 'u - GLshort \fIny\fP, - GLshort \fInz\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2nx\fP\ \f2ny\fP\ \f2nz\fP\ \ 'u -\f2nx\fP, \f2ny\fP, \f2nz\fP -Specify the $x$, $y$, and $z$ coordinates of the new current normal. -The initial value of the current normal is the unit vector, (0, 0, 1). -.P -.SH C SPECIFICATION -void \f3glNormal3bv\fP( -const GLbyte \fI*v\fP ) -.nf -.fi -void \f3glNormal3dv\fP( -const GLdouble \fI*v\fP ) -.nf -.fi -void \f3glNormal3fv\fP( -const GLfloat \fI*v\fP ) -.nf -.fi -void \f3glNormal3iv\fP( -const GLint \fI*v\fP ) -.nf -.fi -void \f3glNormal3sv\fP( -const GLshort \fI*v\fP ) -.nf -.fi - -.SH PARAMETERS -.TP -\f2v\fP -Specifies a pointer to an array of three elements: -the $x$, $y$, and $z$ coordinates of the new current normal. -.P -.SH DESCRIPTION -The current normal is set to the given coordinates -whenever \%\f3glNormal\fP is issued. -Byte, short, or integer arguments are converted to floating-point - with a linear mapping that maps the most positive representable integer -value to 1.0, -and the most negative representable integer value to \-1.0. -.P -Normals specified with \%\f3glNormal\fP need not have unit length. -If \%\f3GL_NORMALIZE\fP is enabled, -then normals of any length specified with \%\f3glNormal\fP are normalized after transformation. -If \%\f3GL_RESCALE_NORMAL\fP is enabled, normals are scaled by a scaling factor -derived from the modelview matrix. \%\f3GL_RESCALE_NORMAL\fP requires that the -originally specified normals were of unit length, and that the modelview -matrix contain only uniform scales for proper results. -To enable and disable normalization, call \%\f3glEnable\fP and \%\f3glDisable\fP -with either \%\f3GL_NORMALIZE\fP or \%\f3GL_RESCALE_NORMAL\fP. -Normalization is initially disabled. -.SH NOTES -The current normal can be updated at any time. -In particular, \%\f3glNormal\fP can be called between a call to \%\f3glBegin\fP and -the corresponding call to \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_CURRENT_NORMAL\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_NORMALIZE\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_RESCALE_NORMAL\fP -.SH SEE ALSO -\%\f3glBegin(3G)\fP, -\%\f3glColor(3G)\fP, -\%\f3glIndex(3G)\fP, -\%\f3glNormalPointer(3G)\fP, -\%\f3glTexCoord(3G)\fP, -\%\f3glVertex(3G)\fP diff --git a/doc/gl-docs/GL/gl/normalpointer.3gl b/doc/gl-docs/GL/gl/normalpointer.3gl deleted file mode 100644 index a1f23a43..00000000 --- a/doc/gl-docs/GL/gl/normalpointer.3gl +++ /dev/null @@ -1,113 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 normalpoi -.ds Xs 28721 6 normalpointer.gl -.TH GLNORMALPOINTER 3G -.SH NAME -.B "glNormalPointer -\- define an array of normals - -.SH C SPECIFICATION -void \f3glNormalPointer\fP( -GLenum \fItype\fP, -.nf -.ta \w'\f3void \fPglNormalPointer( 'u - GLsizei \fIstride\fP, - const GLvoid \fI*ptr\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIstride\fP\ \ 'u -\f2type\fP -Specifies the data type of each coordinate in the array. -Symbolic constants -\%\f3GL_BYTE\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, and -\%\f3GL_DOUBLE\fP -are accepted. The initial value is \%\f3GL_FLOAT\fP. -.TP -\f2stride\fP -Specifies the byte offset between consecutive normals. If \f2stride\fP is 0\- -the initial value\-the normals are understood to be tightly packed in -the array. -The initial value is 0. -.TP -\f2ptr\fP -Specifies a pointer to the first coordinate of the first normal in the -array. -The initial value is 0. -.SH DESCRIPTION -\%\f3glNormalPointer\fP specifies the location and data of an array of normals -to use when rendering. -\f2type\fP specifies the data type of -the normal coordinates and \f2stride\fP gives the byte stride from one -normal to the next, allowing vertices and attributes -to be packed into a single array or stored in separate arrays. -(Single-array storage may be more efficient on some implementations; -see \%\f3glInterleavedArrays\fP.) -When a normal array is specified, \f2type\fP, \f2stride\fP, and \f2ptr\fP are -saved as client-side state. -.P -To enable and disable the normal array, call \%\f3glEnableClientState\fP and -\%\f3glDisableClientState\fP with the argument \%\f3GL_NORMAL_ARRAY\fP. If -enabled, the normal array is used -when \%\f3glDrawArrays\fP, \%\f3glDrawElements\fP, or \%\f3glArrayElement\fP is called. -.P -Use \%\f3glDrawArrays\fP to construct a sequence of primitives (all of the -same type) from prespecified vertex and vertex attribute arrays. -Use \%\f3glArrayElement\fP to specify primitives -by indexing vertices and vertex attributes and \%\f3glDrawElements\fP to -construct a sequence of primitives by indexing vertices and vertex attributes. -.SH NOTES -\%\f3glNormalPointer\fP is available only if the GL version is 1.1 or greater. -.P -The normal array is initially disabled and isn't accessed when -\%\f3glArrayElement\fP, \%\f3glDrawElements\fP, or \%\f3glDrawArrays\fP is called. -.P -Execution of \%\f3glNormalPointer\fP is not allowed between -\%\f3glBegin\fP and the corresponding \%\f3glEnd\fP, -but an error may or may not be generated. If an error is not generated, -the operation is undefined. -.P -\%\f3glNormalPointer\fP is typically implemented on the client side. -.P -Since the normal array parameters are client-side state, they are not -saved or restored by \%\f3glPushAttrib\fP and \%\f3glPopAttrib\fP. -Use \%\f3glPushClientAttrib\fP and -\%\f3glPopClientAttrib\fP instead. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not an accepted value. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2stride\fP is negative. -.SH ASSOCIATED GETS -\%\f3glIsEnabled\fP with argument \%\f3GL_NORMAL_ARRAY\fP -.br -\%\f3glGet\fP with argument \%\f3GL_NORMAL_ARRAY_TYPE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_NORMAL_ARRAY_STRIDE\fP -.br -\%\f3glGetPointerv\fP with argument \%\f3GL_NORMAL_ARRAY_POINTER\fP -.SH SEE ALSO -\%\f3glArrayElement(3G)\fP, -\%\f3glColorPointer(3G)\fP, -\%\f3glDrawArrays(3G)\fP, -\%\f3glDrawElements(3G)\fP, -\%\f3glEdgeFlagPointer(3G)\fP, -\%\f3glEnable(3G)\fP, -\%\f3glGetPointerv(3G)\fP, -\%\f3glIndexPointer(3G)\fP, -\%\f3glInterleavedArrays(3G)\fP, -\%\f3glPopClientAttrib(3G)\fP, -\%\f3glPushClientAttrib(3G)\fP, -\%\f3glTexCoordPointer(3G)\fP, -\%\f3glVertexPointer(3G)\fP diff --git a/doc/gl-docs/GL/gl/ortho.3gl b/doc/gl-docs/GL/gl/ortho.3gl deleted file mode 100644 index 6f31b804..00000000 --- a/doc/gl-docs/GL/gl/ortho.3gl +++ /dev/null @@ -1,105 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 ortho.gl -.ds Xs 2001 5 ortho.gl -.TH GLORTHO 3G -.SH NAME -.B "glOrtho -\- multiply the current matrix with an orthographic matrix - -.SH C SPECIFICATION -void \f3glOrtho\fP( -GLdouble \fIleft\fP, -.nf -.ta \w'\f3void \fPglOrtho( 'u - GLdouble \fIright\fP, - GLdouble \fIbottom\fP, - GLdouble \fItop\fP, - GLdouble \fInear_val\fP, - GLdouble \fIfar_val\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2left\fP\ \f2right\fP\ \ 'u -\f2left\fP, \f2right\fP -Specify the coordinates for the left and right vertical clipping planes. -.TP -\f2bottom\fP, \f2top\fP -Specify the coordinates for the bottom and top horizontal clipping planes. -.TP -\f2near_val\fP, \f2far_val\fP -Specify the distances to the nearer and farther depth clipping planes. -These values are negative if the plane is to be behind the viewer. -.SH DESCRIPTION -\%\f3glOrtho\fP describes a transformation that produces a parallel projection. -The current matrix (see \%\f3glMatrixMode\fP) is multiplied by this matrix -and the result replaces the current matrix, as if -\%\f3glMultMatrix\fP were called with the following matrix -as its argument: -.sp -.ce -.EQ -left ( matrix { - ccol { {2 over {"right" - "left"}} above 0 above 0 above 0 } - ccol { 0 above {2 over {"top" - "bottom"}} above 0 above 0 } - ccol { 0 above 0 above {-2 over {"far_val" - "near_val"}} above 0 } - ccol { {t sub x}~ above {t sub y}~ above {t sub z}~ above 1~ } -} right ) -.EN -.BP -.P -where -.ce -.EQ -t sub x ~=~ -^{{"right" ~+~ "left"} over {"right" ~-~ "left"}} -.EN - -.ce -.EQ -t sub y ~=~ -^{{"top" ~+~ "bottom"} over {"top" ~-~ "bottom"}} -.EN - -.ce -.EQ -t sub z ~=~ -^{{"far_val" ~+~ "near_val"} over {"far_val" ~-~ "near_val"}} -.EN - -.RE -.P -Typically, the matrix mode is \%\f3GL_PROJECTION\fP, and -(\f2left\fP, \f2bottom\fP, \-\f2near_val\fP) and (\f2right\fP, \f2top\fP, \-\f2near_val\fP) -specify the points on the near clipping plane that are mapped -to the lower left and upper right corners of the window, -respectively, -assuming that the eye is located at (0, 0, 0). -\-\f2far_val\fP specifies the location of the far clipping plane. -Both \f2near_val\fP and \f2far_val\fP can be either positive or negative. -.P -Use \%\f3glPushMatrix\fP and \%\f3glPopMatrix\fP to save and restore -the current matrix stack. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glOrtho\fP -is executed between the execution of -\%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_MATRIX_MODE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_COLOR_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MODELVIEW_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PROJECTION_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_TEXTURE_MATRIX\fP -.SH SEE ALSO -\%\f3glFrustum(3G)\fP, -\%\f3glMatrixMode(3G)\fP, -\%\f3glMultMatrix(3G)\fP, -\%\f3glPushMatrix(3G)\fP, -\%\f3glViewport(3G)\fP diff --git a/doc/gl-docs/GL/gl/passthrough.3gl b/doc/gl-docs/GL/gl/passthrough.3gl deleted file mode 100644 index 0610a849..00000000 --- a/doc/gl-docs/GL/gl/passthrough.3gl +++ /dev/null @@ -1,55 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 passthrou -.ds Xs 49492 4 passthrough.gl -.TH GLPASSTHROUGH 3G -.SH NAME -.B "glPassThrough -\- place a marker in the feedback buffer - -.SH C SPECIFICATION -void \f3glPassThrough\fP( -GLfloat \fItoken\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2token\fP\ \ 'u -\f2token\fP -Specifies a marker value to be placed in the feedback buffer -following a \%\f3GL_PASS_THROUGH_TOKEN\fP. -.SH DESCRIPTION -.P -Feedback is a GL render mode. -The mode is selected by calling -\%\f3glRenderMode\fP with \%\f3GL_FEEDBACK\fP. -When the GL is in feedback mode, -no pixels are produced by rasterization. -Instead, -information about primitives that would have been rasterized -is fed back to the application using the GL. -See the \%\f3glFeedbackBuffer\fP reference page for a description of the -feedback buffer and the values in it. -.P -\%\f3glPassThrough\fP inserts a user-defined marker in the feedback buffer -when it is executed in feedback mode. -\f2token\fP is returned as if it were a primitive; -it is indicated with its own unique identifying value: -\%\f3GL_PASS_THROUGH_TOKEN\fP. -The order of \%\f3glPassThrough\fP commands with respect to the specification -of graphics primitives is maintained. -.SH NOTES -\%\f3glPassThrough\fP is ignored if the GL is not in feedback mode. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glPassThrough\fP is executed between -the execution of \%\f3glBegin\fP and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_RENDER_MODE\fP -.SH SEE ALSO -\%\f3glFeedbackBuffer(3G)\fP, -\%\f3glRenderMode(3G)\fP diff --git a/doc/gl-docs/GL/gl/pixelmap.3gl b/doc/gl-docs/GL/gl/pixelmap.3gl deleted file mode 100644 index 93640731..00000000 --- a/doc/gl-docs/GL/gl/pixelmap.3gl +++ /dev/null @@ -1,252 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 pixelmap. -.ds Xs 20188 9 pixelmap.gl -.TH GLPIXELMAP 3G -.SH NAME -.B "glPixelMapfv, glPixelMapuiv, glPixelMapusv -\- set up pixel transfer maps - -.SH C SPECIFICATION -void \f3glPixelMapfv\fP( -GLenum \fImap\fP, -.nf -.ta \w'\f3void \fPglPixelMapfv( 'u - GLint \fImapsize\fP, - const GLfloat \fI*values\fP ) -.fi -void \f3glPixelMapuiv\fP( -GLenum \fImap\fP, -.nf -.ta \w'\f3void \fPglPixelMapuiv( 'u - GLint \fImapsize\fP, - const GLuint \fI*values\fP ) -.fi -void \f3glPixelMapusv\fP( -GLenum \fImap\fP, -.nf -.ta \w'\f3void \fPglPixelMapusv( 'u - GLint \fImapsize\fP, - const GLushort \fI*values\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fImapsize\fP\ \ 'u -\f2map\fP -.na -Specifies a symbolic map name. -Must be one of the following: -\%\f3GL_PIXEL_MAP_I_TO_I\fP, -\%\f3GL_PIXEL_MAP_S_TO_S\fP, -\%\f3GL_PIXEL_MAP_I_TO_R\fP, -\%\f3GL_PIXEL_MAP_I_TO_G\fP, -\%\f3GL_PIXEL_MAP_I_TO_B\fP, -\%\f3GL_PIXEL_MAP_I_TO_A\fP, -\%\f3GL_PIXEL_MAP_R_TO_R\fP, -\%\f3GL_PIXEL_MAP_G_TO_G\fP, -\%\f3GL_PIXEL_MAP_B_TO_B\fP, or -\%\f3GL_PIXEL_MAP_A_TO_A\fP. -.TP -\f2mapsize\fP -Specifies the size of the map being defined. -.TP -\f2values\fP -Specifies an array of \f2mapsize\fP values. -.SH DESCRIPTION -\%\f3glPixelMap\fP sets up translation tables, -or \f2maps\fP, -used by -\%\f3glCopyPixels\fP, -\%\f3glCopyTexImage1D\fP, -\%\f3glCopyTexImage2D\fP, -\%\f3glCopyTexSubImage1D\fP, -\%\f3glCopyTexSubImage2D\fP, -\%\f3glCopyTexSubImage3D\fP, -\%\f3glDrawPixels\fP, -\%\f3glReadPixels\fP, -\%\f3glTexImage1D\fP, -\%\f3glTexImage2D\fP, -\%\f3glTexImage3D\fP, -\%\f3glTexSubImage1D\fP, -\%\f3glTexSubImage2D\fP, and -\%\f3glTexSubImage3D\fP. -Additionally, if the \%\f3GL_ARB_imaging\fP subset is supported, the -routines -\%\f3glColorTable\fP, -\%\f3glColorSubTable\fP, -\%\f3glConvolutionFilter1D\fP, -\%\f3glConvolutionFilter2D\fP, -\%\f3glHistogram\fP, -\%\f3glMinmax\fP, and -\%\f3glSeparableFilter2D\fP. -Use of these maps is described completely in the -\%\f3glPixelTransfer\fP reference page, -and partly in the reference pages for the pixel and texture image commands. -Only the specification of the maps is described in this reference page. -.P -\f2map\fP is a symbolic map name, -indicating one of ten maps to set. -\f2mapsize\fP specifies the number of entries in the map, -and \f2values\fP is a pointer to an array of \f2mapsize\fP map values. -.P -The ten maps are as follows: -.TP 30 -\%\f3GL_PIXEL_MAP_I_TO_I\fP -Maps color indices to color indices. -.TP -\%\f3GL_PIXEL_MAP_S_TO_S\fP -Maps stencil indices to stencil indices. -.TP -\%\f3GL_PIXEL_MAP_I_TO_R\fP -Maps color indices to red components. -.TP -\%\f3GL_PIXEL_MAP_I_TO_G\fP -Maps color indices to green components. -.TP -\%\f3GL_PIXEL_MAP_I_TO_B\fP -Maps color indices to blue components. -.TP -\%\f3GL_PIXEL_MAP_I_TO_A\fP -Maps color indices to alpha components. -.TP -\%\f3GL_PIXEL_MAP_R_TO_R\fP -Maps red components to red components. -.TP -\%\f3GL_PIXEL_MAP_G_TO_G\fP -Maps green components to green components. -.TP -\%\f3GL_PIXEL_MAP_B_TO_B\fP -Maps blue components to blue components. -.TP -\%\f3GL_PIXEL_MAP_A_TO_A\fP -Maps alpha components to alpha components. -.P -The entries in a map can be specified as single-precision -floating-point numbers, -unsigned short integers, -or unsigned long integers. -Maps that store color component values -(all but \%\f3GL_PIXEL_MAP_I_TO_I\fP and \%\f3GL_PIXEL_MAP_S_TO_S\fP) -retain their values in floating-point , -with unspecified mantissa and exponent sizes. -Floating-point values specified by \%\f3glPixelMapfv\fP are converted directly -to the internal floating-point of these maps, -then clamped to the range [0,1]. -Unsigned integer values specified by \%\f3glPixelMapusv\fP and -\%\f3glPixelMapuiv\fP are converted linearly such that -the largest representable integer maps to 1.0, -and 0 maps to 0.0. -.P -Maps that store indices, -\%\f3GL_PIXEL_MAP_I_TO_I\fP and \%\f3GL_PIXEL_MAP_S_TO_S\fP, -retain their values in fixed-point , -with an unspecified number of bits to the right of the binary point. -Floating-point values specified by \%\f3glPixelMapfv\fP are converted directly -to the internal fixed-point of these maps. -Unsigned integer values specified by \%\f3glPixelMapusv\fP and -\%\f3glPixelMapuiv\fP specify integer values, -with all 0's to the right of the binary point. -.P -The following table shows the initial sizes and values for each of the maps. -Maps that are indexed by either color or stencil indices must have -\f2mapsize\fP = $2 sup n$ for some $n$ or the results are undefined. -The maximum allowable size for each map depends on the implementation -and can be determined by calling \%\f3glGet\fP with argument -\%\f3GL_MAX_PIXEL_MAP_TABLE\fP. -The single maximum applies to all maps; it is at -least 32. -.bp -.TS -center tab(:) delim($$) ; -lb cb cb cb cb -l c c c c. -_ -\f2map\fP:Lookup Index:Lookup Value:Initial Size:Initial Value -_ -\%\f3GL_PIXEL_MAP_I_TO_I\fP:color index:color index:1:0 -\%\f3GL_PIXEL_MAP_S_TO_S\fP:stencil index :stencil index :1:0 -\%\f3GL_PIXEL_MAP_I_TO_R\fP:color index :R:1:0 -\%\f3GL_PIXEL_MAP_I_TO_G\fP:color index :G:1:0 -\%\f3GL_PIXEL_MAP_I_TO_B\fP:color index:B:1:0 -\%\f3GL_PIXEL_MAP_I_TO_A\fP:color index:A:1:0 -\%\f3GL_PIXEL_MAP_R_TO_R\fP:R:R:1:0 -\%\f3GL_PIXEL_MAP_G_TO_G\fP:G:G:1:0 -\%\f3GL_PIXEL_MAP_B_TO_B\fP:B:B:1:0 -\%\f3GL_PIXEL_MAP_A_TO_A\fP:A:A:1:0 -_ -.TE - -.RE -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2map\fP is not an accepted value. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2mapsize\fP is less than one -or larger than \%\f3GL_MAX_PIXEL_MAP_TABLE\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2map\fP is -\%\f3GL_PIXEL_MAP_I_TO_I\fP, -\%\f3GL_PIXEL_MAP_S_TO_S\fP, -\%\f3GL_PIXEL_MAP_I_TO_R\fP, -\%\f3GL_PIXEL_MAP_I_TO_G\fP, -\%\f3GL_PIXEL_MAP_I_TO_B\fP, or -\%\f3GL_PIXEL_MAP_I_TO_A\fP, -and \f2mapsize\fP is not a power of two. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glPixelMap\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetPixelMap\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PIXEL_MAP_I_TO_I_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PIXEL_MAP_S_TO_S_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PIXEL_MAP_I_TO_R_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PIXEL_MAP_I_TO_G_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PIXEL_MAP_I_TO_B_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PIXEL_MAP_I_TO_A_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PIXEL_MAP_R_TO_R_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PIXEL_MAP_G_TO_G_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PIXEL_MAP_B_TO_B_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PIXEL_MAP_A_TO_A_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAX_PIXEL_MAP_TABLE\fP -.SH SEE ALSO -\%\f3glColorTable(3G)\fP, -\%\f3glColorSubTable(3G)\fP, -\%\f3glConvolutionFilter1D(3G)\fP, -\%\f3glConvolutionFilter2D(3G)\fP, -\%\f3glCopyPixels(3G)\fP, -\%\f3glCopyTexImage1D(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glCopyTexSubImage1D(3G)\fP, -\%\f3glCopyTexSubImage2D(3G)\fP, -\%\f3glDrawPixels(3G)\fP, -\%\f3glHistogram(3G)\fP, -\%\f3glMinmax(3G)\fP, -\%\f3glPixelStore(3G)\fP, -\%\f3glPixelTransfer(3G)\fP, -\%\f3glReadPixels(3G)\fP, -\%\f3glSeparableFilter2D(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexImage3D(3G)\fP, -\%\f3glTexSubImage1D(3G)\fP, -\%\f3glTexSubImage2D(3G)\fP, -\%\f3glTexSubImage3D(3G)\fP diff --git a/doc/gl-docs/GL/gl/pixelstore.3gl b/doc/gl-docs/GL/gl/pixelstore.3gl deleted file mode 100644 index a9d68ea3..00000000 --- a/doc/gl-docs/GL/gl/pixelstore.3gl +++ /dev/null @@ -1,506 +0,0 @@ -.\" $XFree86$ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 pixelstor -.ds Xs 12758 17 pixelstore.gl -.TH GLPIXELSTORE 3G -.SH NAME -.B "glPixelStoref, glPixelStorei -\- set pixel storage modes - -.SH C SPECIFICATION -void \f3glPixelStoref\fP( -GLenum \fIpname\fP, -.nf -.ta \w'\f3void \fPglPixelStoref( 'u - GLfloat \fIparam\fP ) -.fi -void \f3glPixelStorei\fP( -GLenum \fIpname\fP, -.nf -.ta \w'\f3void \fPglPixelStorei( 'u - GLint \fIparam\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2pname\fP\ \ 'u -\f2pname\fP -Specifies the symbolic name of the parameter to be set. -Six values affect the packing of pixel data into memory: -\%\f3GL_PACK_SWAP_BYTES\fP, -\%\f3GL_PACK_LSB_FIRST\fP, -\%\f3GL_PACK_ROW_LENGTH\fP, -\%\f3GL_PACK_IMAGE_HEIGHT\fP, -\%\f3GL_PACK_SKIP_PIXELS\fP, -\%\f3GL_PACK_SKIP_ROWS\fP, -\%\f3GL_PACK_SKIP_IMAGES\fP, and -\%\f3GL_PACK_ALIGNMENT\fP. -Six more affect the unpacking of pixel data \f2from\fP memory: -\%\f3GL_UNPACK_SWAP_BYTES\fP, -\%\f3GL_UNPACK_LSB_FIRST\fP, -\%\f3GL_UNPACK_ROW_LENGTH\fP, -\%\f3GL_UNPACK_IMAGE_HEIGHT\fP, -\%\f3GL_UNPACK_SKIP_PIXELS\fP, -\%\f3GL_UNPACK_SKIP_ROWS\fP, -\%\f3GL_UNPACK_SKIP_IMAGES\fP, and -\%\f3GL_UNPACK_ALIGNMENT\fP. -.TP -\f2param\fP -Specifies the value that \f2pname\fP is set to. -.SH DESCRIPTION - -\%\f3glPixelStore\fP sets pixel storage modes that affect the operation of subsequent -\%\f3glDrawPixels\fP and \%\f3glReadPixels\fP as well as the unpacking of -polygon stipple patterns (see \%\f3glPolygonStipple\fP), bitmaps (see -\%\f3glBitmap\fP), texture patterns (see \%\f3glTexImage1D\fP, -\%\f3glTexImage2D\fP, \%\f3glTexImage3D\fP, \%\f3glTexSubImage1D\fP, -\%\f3glTexSubImage2D\fP, \%\f3glTexSubImage3D\fP). -Additionally, if the \%\f3GL_ARB_imaging\fP extension is supported, pixle -storage modes affect convlution filters -(see \%\f3glConvolutionFilter1D\fP, \%\f3glConvolutionFilter2D\fP, and -\%\f3glSeparableFilter2D\fP, color table (see \%\f3glColorTable\fP, and -\%\f3glColorSubTable\fP, and unpacking histogram (See \%\f3glHistogram\fP), -and minmax (See \%\f3glMinmax\fP) data. -.P -\f2pname\fP is a symbolic constant indicating the parameter to be set, and -\f2param\fP is the new value. Six of the twelve storage parameters affect -how pixel data is returned to client memory. -They are as follows: -.TP 10 -\%\f3GL_PACK_SWAP_BYTES\fP -If true, -byte ordering for multibyte color components, -depth components, -color indices, -or stencil indices -is reversed. -That is, -if a four-byte component consists of bytes -$b sub 0$, -$b sub 1$, -$b sub 2$, -$b sub 3$, -it is stored in memory as -$b sub 3$, -$b sub 2$, -$b sub 1$, -$b sub 0$ -if \%\f3GL_PACK_SWAP_BYTES\fP is true. -\%\f3GL_PACK_SWAP_BYTES\fP has no effect on the memory order of components -within a pixel, -only on the order of bytes within components or indices. -For example, -the three components of a \%\f3GL_RGB\fP pixel are always stored with -red first, -green second, -and blue third, -regardless of the value of \%\f3GL_PACK_SWAP_BYTES\fP. -.TP -\%\f3GL_PACK_LSB_FIRST\fP -If true, -bits are ordered within a byte from least significant to most significant; -otherwise, -the first bit in each byte is the most significant one. -This parameter is significant for bitmap data only. -.TP -\%\f3GL_PACK_ROW_LENGTH\fP -If greater than 0, -\%\f3GL_PACK_ROW_LENGTH\fP defines the number of pixels in a row. -If the first pixel of a row is placed at location $p$ in memory, -then the location of the first pixel of the next row is obtained by skipping -.sp -.ce -$k ~=~~ left { ^ lpile { n l above {a over s left ceiling { s n l } over a right ceiling}} ~~ lpile {s ~>=~ a above s ~<~ a }$ -.sp -components or indices, -where $n$ is the number of components or indices in a pixel, -$l$ is the number of pixels in a row -(\%\f3GL_PACK_ROW_LENGTH\fP if it is greater than 0, -the $width$ argument to the pixel routine otherwise), -$a$ is the value of \%\f3GL_PACK_ALIGNMENT\fP, and -$s$ is the size, in bytes, of a single component -(if $ a < s$, then it is as if $a ~=~ s$). -In the case of 1-bit values, -the location of the next row is obtained by skipping -.sp -.ce -$k ~=~ 8 a left ceiling { n l } over { 8 a } ^ right ceiling$ -.sp -components or indices. -.IP -The word \f2component\fP in this description refers to the nonindex values -red, -green, -blue, -alpha, -and depth. -Storage \%\f3GL_RGB\fP, -for example, -has three components per pixel: -first red, -then green, -and finally blue. -.TP -\%\f3GL_PACK_IMAGE_HEIGHT\fP -If greater than 0, -\%\f3GL_PACK_IMAGE_HEIGHT\fP defines the number of pixels in an image -three-dimensional texture volume. -Where ``image'' is defined by all pixels sharing the same third -dimension index. -If the first pixel of a row is placed at location $p$ in memory, -then the location of the first pixel of the next row is obtained by skipping -.sp -.ce -$k ~=~~ left { ~ lpile { n l h above {a over s left ceiling { s n l h } -over a ^ right ceiling}} ~~ lpile {s ~>=~ a above s ~<~ a }$ -.sp -components or indices, where $n$ is the number of components or indices -in a pixel, $l$ is the number of pixels in a row -(\%\f3GL_PACK_ROW_LENGTH\fP if it is greater than 0, the -$width$ argument to \%\f3glTexImage3d\fP otherwise), $h$ is the number of -rows in a pixel image (\%\f3GL_PACK_IMAGE_HEIGHT\fP if it is greater than -0, the $height$ argument to the \%\f3glTexImage3D\fP routine otherwise), -$a$ is the value of -\%\f3GL_PACK_ALIGNMENT\fP, and $s$ is the size, in bytes, of a single -component (if $ a < s$, then it is as if $a = s$). -.IP -The word \f2component\fP in this description refers to the nonindex values -red, -green, -blue, -alpha, -and depth. -Storage \%\f3GL_RGB\fP, -for example, -has three components per pixel: -first red, -then green, -and finally blue. -.TP -\%\f3GL_PACK_SKIP_PIXELS\fP, \%\f3GL_PACK_SKIP_ROWS\fP, and \%\f3GL_PACK_SKIP_IMAGES\fP -These values are provided as a convenience to the programmer; -they provide no functionality that cannot be duplicated simply by -incrementing the pointer passed to \%\f3glReadPixels\fP. -Setting \%\f3GL_PACK_SKIP_PIXELS\fP to $i$ is equivalent to incrementing -the pointer by $i n$ components or indices, -where $n$ is the number of components or indices in each pixel. -Setting \%\f3GL_PACK_SKIP_ROWS\fP to $j$ is equivalent to incrementing -the pointer by $j m$ components or indices, -where $m$ is the number of components or indices per row, -as just computed in the \%\f3GL_PACK_ROW_LENGTH\fP section. -Setting \%\f3GL_PACK_SKIP_IMAGES\fP to $k$ is equivalent to incrementing -the pointer by $k p$, where $p$ is the number of components or indices -per image, as computed in the \%\f3GL_PACK_IMAGE_HEIGHT\fP section. -.TP -\%\f3GL_PACK_ALIGNMENT\fP -Specifies the alignment requirements for the start of each pixel row in memory. -The allowable values are -1 (byte-alignment), -2 (rows aligned to even-numbered bytes), -4 (word-alignment), and -8 (rows start on double-word boundaries). -.P -The other six of the twelve storage parameters affect how pixel data is -read from client memory. -These values are significant for \%\f3glDrawPixels\fP, -\%\f3glTexImage1D\fP, -\%\f3glTexImage2D\fP, -\%\f3glTexImage3D\fP, -\%\f3glTexSubImage1D\fP, -\%\f3glTexSubImage2D\fP, -\%\f3glTexSubImage3D\fP, -\%\f3glBitmap\fP, and -\%\f3glPolygonStipple\fP. -.P -Additionally, if the \%\f3GL_ARB_imaging\fP extension is supported, -\%\f3glColorTable\fP, -\%\f3glColorSubTable\fP, -\%\f3glConvolutionFilter1D\fP, -\%\f3glConvolutionFilter2D\fP, and -\%\f3glSeparableFilter2D\fP. -They are as follows: -.TP -\%\f3GL_UNPACK_SWAP_BYTES\fP -If true, -byte ordering for multibyte color components, -depth components, -color indices, -or stencil indices -is reversed. -That is, -if a four-byte component consists of bytes -$b sub 0$, -$b sub 1$, -$b sub 2$, -$b sub 3$, -it is taken from memory as -$b sub 3$, -$b sub 2$, -$b sub 1$, -$b sub 0$ -if \%\f3GL_UNPACK_SWAP_BYTES\fP is true. -\%\f3GL_UNPACK_SWAP_BYTES\fP has no effect on the memory order of components -within a pixel, -only on the order of bytes within components or indices. -For example, -the three components of a \%\f3GL_RGB\fP pixel are always stored with -red first, -green second, -and blue third, -regardless of the value of \%\f3GL_UNPACK_SWAP_BYTES\fP. -.TP -\%\f3GL_UNPACK_LSB_FIRST\fP -If true, -bits are ordered within a byte from least significant to most significant; -otherwise, -the first bit in each byte is the most significant one. -This is relevant only for bitmap data. -.TP -\%\f3GL_UNPACK_ROW_LENGTH\fP -If greater than 0, -\%\f3GL_UNPACK_ROW_LENGTH\fP defines the number of pixels in a row. -If the first pixel of a row is placed at location $p$ in memory, -then the location of the first pixel of the next row is obtained by skipping -.sp -.ce -$k ~=~~ left { ~ lpile { n l above {a over s left ceiling { s n l } -over a ^ right ceiling}} ~~ lpile {s ~>=~ a above s ~<~ a }$ -.sp -components or indices, -where $n$ is the number of components or indices in a pixel, -$l$ is the number of pixels in a row -(\%\f3GL_UNPACK_ROW_LENGTH\fP if it is greater than 0, -the $width$ argument to the pixel routine otherwise), -$a$ is the value of \%\f3GL_UNPACK_ALIGNMENT\fP, and -$s$ is the size, in bytes, of a single component -(if $ a < s$, then it is as if $a = s$). -In the case of 1-bit values, -the location of the next row is obtained by skipping -.sp -.ce -$k ~=~ 8 a left ceiling { n l } over { 8 a } right ceiling$ -.sp -components or indices. -.IP -The word \f2component\fP in this description refers to the nonindex values -red, -green, -blue, -alpha, -and depth. -Storage \%\f3GL_RGB\fP, -for example, -has three components per pixel: -first red, -then green, -and finally blue. -.TP -\%\f3GL_UNPACK_IMAGE_HEIGHT\fP -If greater than 0, -\%\f3GL_UNPACK_IMAGE_HEIGHT\fP defines the number of pixels in an image of -a three-dimensional texture volume. Where ``image'' is defined by all -pixel sharing the same third dimension index. -If the first pixel of a row is placed at location $p$ in memory, -then the location of the first pixel of the next row is obtained by skipping -.sp -.ce -$k ~=~~ left {~ lpile { n l h above {a over s left ceiling { s n l h } -over a ^ right ceiling}} ~~ lpile {s ~ >=~ a above s ~<~ a }$ -.sp -components or indices, -where $n$ is the number of components or indices in a pixel, -$l$ is the number of pixels in a row -(\%\f3GL_UNPACK_ROW_LENGTH\fP if it is greater than 0, -the $width$ argument to \%\f3glTexImage3D\fP otherwise), -$h$ is the number of rows in an image (\%\f3GL_UNPACK_IMAGE_HEIGHT\fP if -it is greater than 0, the $height$ argument to \%\f3glTexImage3D\fP otherwise), -$a$ is the value of \%\f3GL_UNPACK_ALIGNMENT\fP, and -$s$ is the size, in bytes, of a single component -(if $ a < s$, then it is as if $a ~=~ s$). -.IP -The word \f2component\fP in this description refers to the nonindex values -red, -green, -blue, -alpha, -and depth. -Storage \%\f3GL_RGB\fP, -for example, -has three components per pixel: -first red, -then green, -and finally blue. -.TP -\%\f3GL_UNPACK_SKIP_PIXELS\fP and \%\f3GL_UNPACK_SKIP_ROWS\fP -These values are provided as a convenience to the programmer; -they provide no functionality that cannot be duplicated by -incrementing the pointer passed to -\%\f3glDrawPixels\fP, -\%\f3glTexImage1D\fP, -\%\f3glTexImage2D\fP, -\%\f3glTexSubImage1D\fP, -\%\f3glTexSubImage2D\fP, -\%\f3glBitmap\fP, or -\%\f3glPolygonStipple\fP. -Setting \%\f3GL_UNPACK_SKIP_PIXELS\fP to $i$ is equivalent to incrementing -the pointer by $i n$ components or indices, -where $n$ is the number of components or indices in each pixel. -Setting \%\f3GL_UNPACK_SKIP_ROWS\fP to $j$ is equivalent to incrementing -the pointer by $j k$ components or indices, -where $k$ is the number of components or indices per row, -as just computed in the \%\f3GL_UNPACK_ROW_LENGTH\fP section. -.TP -\%\f3GL_UNPACK_ALIGNMENT\fP -Specifies the alignment requirements for the start of each pixel row in memory. -The allowable values are -1 (byte-alignment), -2 (rows aligned to even-numbered bytes), -4 (word-alignment), and -8 (rows start on double-word boundaries). -.P -The following table gives the type, -initial value, -and range of valid values for each storage parameter -that can be set with \%\f3glPixelStore\fP. -.sp - -.TS -center tab(:) delim($$) ; -lb cb cb cb -l c c c. -_ -\f2pname\fP:Type:Initial Value:Valid Range -_ -\%\f3GL_PACK_SWAP_BYTES\fP:boolean:false:true or false -\%\f3GL_PACK_LSB_FIRST\fP:boolean:false:true or false -\%\f3GL_PACK_ROW_LENGTH\fP:integer:0:[0,\(if) -\%\f3GL_PACK_IMAGE_HEIGHT\fP:integer:0:[0, \(if) -\%\f3GL_PACK_SKIP_ROWS\fP:integer:0:[0,\(if) -\%\f3GL_PACK_SKIP_PIXELS\fP:integer:0:[0,\(if) -\%\f3GL_PACK_SKIP_IMAGES\fP:integer:0:[0,\(if) -\%\f3GL_PACK_ALIGNMENT\fP:integer:4:1, 2, 4, or 8 -_ -\%\f3GL_UNPACK_SWAP_BYTES\fP:boolean:false:true or false -\%\f3GL_UNPACK_LSB_FIRST\fP:boolean:false:true or false -\%\f3GL_UNPACK_ROW_LENGTH\fP:integer:0:[0,\(if) -\%\f3GL_UNPACK_IMAGE_HEIGHT\fP:integer:0:[0,\(if) -\%\f3GL_UNPACK_SKIP_ROWS\fP:integer:0:[0,\(if) -\%\f3GL_UNPACK_SKIP_PIXELS\fP:integer:0:[0,\(if) -\%\f3GL_UNPACK_SKIP_IMAGES\fP:integer:0:[0,\(if) -\%\f3GL_UNPACK_ALIGNMENT\fP:integer:4:1, 2, 4, or 8 -_ -.TE - -.sp -\%\f3glPixelStoref\fP can be used to set any pixel store parameter. -If the parameter type is boolean, -then if \f2param\fP is 0, -the parameter is false; -otherwise it is set to true. -If \f2pname\fP is a integer type parameter, -\f2param\fP is rounded to the nearest integer. -.P -Likewise, \%\f3glPixelStorei\fP can also be used to set any of the -pixel store parameters. -Boolean parameters are set to false if \f2param\fP is 0 and true otherwise. -.SH NOTES -The pixel storage modes in effect when -\%\f3glDrawPixels\fP, -\%\f3glReadPixels\fP, -\%\f3glTexImage1D\fP, -\%\f3glTexImage2D\fP, -\%\f3glTexImage3D\fP, -\%\f3glTexSubImage1D\fP, -\%\f3glTexSubImage2D\fP, -\%\f3glTexSubImage3D\fP, -\%\f3glBitmap\fP, -or \%\f3glPolygonStipple\fP is placed in a display list control the interpretation -of memory data. -Likewise, if the \%\f3GL_ARB_imaging\fP extension is supported, the pixel -storage modes in effect when -\%\f3glColorTable\fP, -\%\f3glColorSubTable\fP, -\%\f3glConvolutionFilter1D\fP, -\%\f3glConvolutionFilter2D\fP, of -\%\f3glSeparableFilter2D\fP is placed in a display list control the -interpretation of memory data. -The pixel storage modes in effect when a display list is executed are -not significant. -.P -Pixel storage modes are client state and must be pushed and restored -using -.br -\%\f3glPushClientAttrib\fP and \%\f3glPopClientAttrib\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2pname\fP is not an accepted value. -.P -\%\f3GL_INVALID_VALUE\fP is generated if a negative row length, -pixel skip, -or row skip value is specified, -or if alignment is specified as other than 1, 2, 4, or 8. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glPixelStore\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_PACK_SWAP_BYTES\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PACK_LSB_FIRST\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PACK_ROW_LENGTH\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PACK_IMAGE_HEIGHT\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PACK_SKIP_ROWS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PACK_SKIP_PIXELS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PACK_SKIP_IMAGES\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PACK_ALIGNMENT\fP -.br -\%\f3glGet\fP with argument \%\f3GL_UNPACK_SWAP_BYTES\fP -.br -\%\f3glGet\fP with argument \%\f3GL_UNPACK_LSB_FIRST\fP -.br -\%\f3glGet\fP with argument \%\f3GL_UNPACK_ROW_LENGTH\fP -.br -\%\f3glGet\fP with argument \%\f3GL_UNPACK_IMAGE_HEIGHT\fP -.br -\%\f3glGet\fP with argument \%\f3GL_UNPACK_SKIP_ROWS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_UNPACK_SKIP_PIXELS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_UNPACK_SKIP_IMAGES\fP -.br -\%\f3glGet\fP with argument \%\f3GL_UNPACK_ALIGNMENT\fP -.SH SEE ALSO -\%\f3glBitmap(3G)\fP, -\%\f3glColorTable(3G)\fP, -\%\f3glColorSubTable(3G)\fP, -\%\f3glConvolutionFilter1D(3G)\fP, -\%\f3glConvolutionFilter2D(3G)\fP, -\%\f3glSeparableFilter2D(3G)\fP, -\%\f3glDrawPixels(3G)\fP, -\%\f3glHistogram(3G)\fP, -\%\f3glMinmax(3G)\fP, -\%\f3glPixelMap(3G)\fP, -\%\f3glPixelTransfer(3G)\fP, -\%\f3glPixelZoom(3G)\fP, -\%\f3glPolygonStipple(3G)\fP, -\%\f3glPushClientAttrib(3G)\fP, -\%\f3glReadPixels(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexImage3D(3G)\fP, -\%\f3glTexSubImage1D(3G)\fP, -\%\f3glTexSubImage2D(3G)\fP, -\%\f3glTexSubImage3D(3G)\fP diff --git a/doc/gl-docs/GL/gl/pixeltransfer.3gl b/doc/gl-docs/GL/gl/pixeltransfer.3gl deleted file mode 100644 index 591607a6..00000000 --- a/doc/gl-docs/GL/gl/pixeltransfer.3gl +++ /dev/null @@ -1,439 +0,0 @@ -.\" $XFree86$ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 pixeltran -.ds Xs 52457 17 pixeltransfer.gl -.TH GLPIXELTRANSFER 3G -.SH NAME -.B "glPixelTransferf, glPixelTransferi -\- set pixel transfer modes - -.SH C SPECIFICATION -void \f3glPixelTransferf\fP( -GLenum \fIpname\fP, -.nf -.ta \w'\f3void \fPglPixelTransferf( 'u - GLfloat \fIparam\fP ) -.fi -void \f3glPixelTransferi\fP( -GLenum \fIpname\fP, -.nf -.ta \w'\f3void \fPglPixelTransferi( 'u - GLint \fIparam\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2pname\fP\ \ 'u -\f2pname\fP -Specifies the symbolic name of the pixel transfer parameter to be set. -Must be one of the following: -\%\f3GL_MAP_COLOR\fP, -\%\f3GL_MAP_STENCIL\fP, -\%\f3GL_INDEX_SHIFT\fP, -\%\f3GL_INDEX_OFFSET\fP, -\%\f3GL_RED_SCALE\fP, -\%\f3GL_RED_BIAS\fP, -\%\f3GL_GREEN_SCALE\fP, -\%\f3GL_GREEN_BIAS\fP, -\%\f3GL_BLUE_SCALE\fP, -\%\f3GL_BLUE_BIAS\fP, -\%\f3GL_ALPHA_SCALE\fP, -\%\f3GL_ALPHA_BIAS\fP, -\%\f3GL_DEPTH_SCALE\fP, or -\%\f3GL_DEPTH_BIAS\fP. -.IP -Additionally, if the \%\f3GL_ARB_imaging\fP extension is supported, the -following symbolic names are accepted: -\%\f3GL_POST_COLOR_MATRIX_RED_SCALE\fP, -\%\f3GL_POST_COLOR_MATRIX_GREEN_SCALE\fP, -\%\f3GL_POST_COLOR_MATRIX_BLUE_SCALE\fP, -\%\f3GL_POST_COLOR_MATRIX_ALPHA_SCALE\fP, -\%\f3GL_POST_COLOR_MATRIX_RED_BIAS\fP, -\%\f3GL_POST_COLOR_MATRIX_GREEN_BIAS\fP, -\%\f3GL_POST_COLOR_MATRIX_BLUE_BIAS\fP, -\%\f3GL_POST_COLOR_MATRIX_ALPHA_BIAS\fP, -\%\f3GL_POST_CONVOLUTION_RED_SCALE\fP, -\%\f3GL_POST_CONVOLUTION_GREEN_SCALE\fP, -\%\f3GL_POST_CONVOLUTION_BLUE_SCALE\fP, -\%\f3GL_POST_CONVOLUTION_ALPHA_SCALE\fP, -\%\f3GL_POST_CONVOLUTION_RED_BIAS\fP, -\%\f3GL_POST_CONVOLUTION_GREEN_BIAS\fP, -\%\f3GL_POST_CONVOLUTION_BLUE_BIAS\fP, and -\%\f3GL_POST_CONVOLUTION_ALPHA_BIAS\fP. -.TP -\f2param\fP -Specifies the value that \f2pname\fP is set to. -.SH DESCRIPTION -\%\f3glPixelTransfer\fP sets pixel transfer modes that affect the operation of subsequent -\%\f3glCopyPixels\fP, -\%\f3glCopyTexImage1D\fP, -\%\f3glCopyTexImage2D\fP, -\%\f3glCopyTexSubImage1D\fP, -\%\f3glCopyTexSubImage2D\fP, -\%\f3glCopyTexSubImage3D\fP, -\%\f3glDrawPixels\fP, -\%\f3glReadPixels\fP, -\%\f3glTexImage1D\fP, -\%\f3glTexImage2D\fP, -\%\f3glTexImage3D\fP, -\%\f3glTexSubImage1D\fP, -\%\f3glTexSubImage2D\fP, and -\%\f3glTexSubImage3D\fP commands. -Additionally, if the \%\f3GL_ARB_imaging\fP subset is supported, the -routines -\%\f3glColorTable\fP, -\%\f3glColorSubTable\fP, -\%\f3glConvolutionFilter1D\fP, -\%\f3glConvolutionFilter2D\fP, -\%\f3glHistogram\fP, -\%\f3glMinmax\fP, and -\%\f3glSeparableFilter2D\fP are also affected. -The algorithms that are specified by pixel transfer modes operate on -pixels after they are read from the frame buffer -(\%\f3glCopyPixels\fP -\%\f3glCopyTexImage1D\fP, -\%\f3glCopyTexImage2D\fP, -\%\f3glCopyTexSubImage1D\fP, -\%\f3glCopyTexSubImage2D\fP, -\%\f3glCopyTexSubImage3D\fP, and -\%\f3glReadPixels\fP), -or unpacked from client memory -(\%\f3glDrawPixels\fP, \%\f3glTexImage1D\fP, \%\f3glTexImage2D\fP, \%\f3glTexImage3D\fP, -\%\f3glTexSubImage1D\fP, \%\f3glTexSubImage2D\fP, and \%\f3glTexSubImage3D\fP). -Pixel transfer operations happen in the same order, -and in the same manner, -regardless of the command that resulted in the pixel operation. -Pixel storage modes -(see \%\f3glPixelStore\fP) -control the unpacking of pixels being read from client memory, -and the packing of pixels being written back into client memory. -.P -Pixel transfer operations handle four fundamental pixel types: -\f2color\fP, -\f2color index\fP, -\f2depth\fP, and -\f2stencil\fP. -\f2Color\fP pixels consist of four floating-point values -with unspecified mantissa and exponent sizes, -scaled such that 0 represents zero intensity -and 1 represents full intensity. -\f2Color indices\fP comprise a single fixed-point value, -with unspecified precision to the right of the binary point. -\f2Depth\fP pixels comprise a single floating-point value, -with unspecified mantissa and exponent sizes, -scaled such that 0.0 represents the minimum depth buffer value, -and 1.0 represents the maximum depth buffer value. -Finally, -\f2stencil\fP pixels comprise a single fixed-point value, -with unspecified precision to the right of the binary point. -.BP -.P -The pixel transfer operations performed on the four basic pixel types are -as follows: -.TP 12 -Color -Each of the four color components is multiplied by a scale factor, -then added to a bias factor. -That is, -the red component is multiplied by \%\f3GL_RED_SCALE\fP, -then added to \%\f3GL_RED_BIAS\fP; -the green component is multiplied by \%\f3GL_GREEN_SCALE\fP, -then added to \%\f3GL_GREEN_BIAS\fP; -the blue component is multiplied by \%\f3GL_BLUE_SCALE\fP, -then added to \%\f3GL_BLUE_BIAS\fP; and -the alpha component is multiplied by \%\f3GL_ALPHA_SCALE\fP, -then added to \%\f3GL_ALPHA_BIAS\fP. -After all four color components are scaled and biased, -each is clamped to the range [0,1]. -All color, scale, and bias values are specified with \%\f3glPixelTransfer\fP. -.IP -If \%\f3GL_MAP_COLOR\fP is true, -each color component is scaled by the size of the corresponding -color-to-color map, -then replaced by the contents of that map indexed by the scaled component. -That is, -the red component is scaled by \%\f3GL_PIXEL_MAP_R_TO_R_SIZE\fP, -then replaced by the contents of \%\f3GL_PIXEL_MAP_R_TO_R\fP indexed by itself. -The green component is scaled by \%\f3GL_PIXEL_MAP_G_TO_G_SIZE\fP, -then replaced by the contents of \%\f3GL_PIXEL_MAP_G_TO_G\fP indexed by itself. -The blue component is scaled by \%\f3GL_PIXEL_MAP_B_TO_B_SIZE\fP, -then replaced by the contents of \%\f3GL_PIXEL_MAP_B_TO_B\fP indexed by itself. -And -the alpha component is scaled by \%\f3GL_PIXEL_MAP_A_TO_A_SIZE\fP, -then replaced by the contents of \%\f3GL_PIXEL_MAP_A_TO_A\fP indexed by itself. -All components taken from the maps are then clamped to the range [0,1]. -\%\f3GL_MAP_COLOR\fP is specified with \%\f3glPixelTransfer\fP. -The contents of the various maps are specified with \%\f3glPixelMap\fP. -.IP -If the \%\f3GL_ARB_imaging\fP extension is supported, each of the four -color components may be scaled and biased after transformation by the -color matrix. -That is, -the red component is multiplied by \%\f3GL_POST_COLOR_MATRIX_RED_SCALE\fP, -then added to \%\f3GL_POST_COLOR_MATRIX_RED_BIAS\fP; -the green component is multiplied by \%\f3GL_POST_COLOR_MATRIX_GREEN_SCALE\fP, -then added to \%\f3GL_POST_COLOR_MATRIX_GREEN_BIAS\fP; -the blue component is multiplied by \%\f3GL_POST_COLOR_MATRIX_BLUE_SCALE\fP, -then added to \%\f3GL_POST_COLOR_MATRIX_BLUE_BIAS\fP; and -the alpha component is multiplied by \%\f3GL_POST_COLOR_MATRIX_ALPHA_SCALE\fP, -then added to \%\f3GL_POST_COLOR_MATRIX_ALPHA_BIAS\fP. -After all four color components are scaled and biased, -each is clamped to the range [0,1]. -.IP -Similiarly, if the \%\f3GL_ARB_imaging\fP extension is supported, each of -the four color components may be scaled and biased after processing by -the enabled convolution filter. -That is, -the red component is multiplied by \%\f3GL_POST_CONVOLUTION_RED_SCALE\fP, -then added to \%\f3GL_POST_CONVOLUTION_RED_BIAS\fP; -the green component is multiplied by \%\f3GL_POST_CONVOLUTION_GREEN_SCALE\fP, -then added to \%\f3GL_POST_CONVOLUTION_GREEN_BIAS\fP; -the blue component is multiplied by \%\f3GL_POST_CONVOLUTION_BLUE_SCALE\fP, -then added to \%\f3GL_POST_CONVOLUTION_BLUE_BIAS\fP; and -the alpha component is multiplied by \%\f3GL_POST_CONVOLUTION_ALPHA_SCALE\fP, -then added to \%\f3GL_POST_CONVOLUTION_ALPHA_BIAS\fP. -After all four color components are scaled and biased, -each is clamped to the range [0,1]. -.TP -Color index -Each color index is shifted left by \%\f3GL_INDEX_SHIFT\fP bits; any bits -beyond the number of fraction bits carried -by the fixed-point index are filled with zeros. -If \%\f3GL_INDEX_SHIFT\fP is negative, -the shift is to the right, -again zero filled. -Then \%\f3GL_INDEX_OFFSET\fP is added to the index. -\%\f3GL_INDEX_SHIFT\fP and \%\f3GL_INDEX_OFFSET\fP are specified with -.br -\%\f3glPixelTransfer\fP. -.IP -From this point, operation diverges depending on the required of -the resulting pixels. -If the resulting pixels are to be written to a color index buffer, -or if they are being read back to client memory in \%\f3GL_COLOR_INDEX\fP , -the pixels continue to be treated as indices. -If \%\f3GL_MAP_COLOR\fP is true, -each index is masked by $2 sup n ~-~ 1$, -where $n$ is \%\f3GL_PIXEL_MAP_I_TO_I_SIZE\fP, -then replaced by the contents of \%\f3GL_PIXEL_MAP_I_TO_I\fP indexed by the -masked value. -\%\f3GL_MAP_COLOR\fP is specified with \%\f3glPixelTransfer\fP. -The contents of the index map is specified with \%\f3glPixelMap\fP. -.IP -If the resulting pixels are to be written to an RGBA color buffer, -or if they are read back to client memory in a other than -\%\f3GL_COLOR_INDEX\fP, -the pixels are converted from indices to colors by referencing the -four maps -\%\f3GL_PIXEL_MAP_I_TO_R\fP, -\%\f3GL_PIXEL_MAP_I_TO_G\fP, -\%\f3GL_PIXEL_MAP_I_TO_B\fP, and -\%\f3GL_PIXEL_MAP_I_TO_A\fP. -Before being dereferenced, -the index is masked by $2 sup n ~-~ 1$, -where $n$ is -\%\f3GL_PIXEL_MAP_I_TO_R_SIZE\fP for the red map, -\%\f3GL_PIXEL_MAP_I_TO_G_SIZE\fP for the green map, -\%\f3GL_PIXEL_MAP_I_TO_B_SIZE\fP for the blue map, and -\%\f3GL_PIXEL_MAP_I_TO_A_SIZE\fP for the alpha map. -All components taken from the maps are then clamped to the range [0,1]. -The contents of the four maps is specified with \%\f3glPixelMap\fP. -.TP -Depth -Each depth value is multiplied by \%\f3GL_DEPTH_SCALE\fP, -added to \%\f3GL_DEPTH_BIAS\fP, -then clamped to the range [0,1]. -.TP -Stencil -Each index is shifted \%\f3GL_INDEX_SHIFT\fP bits just as a color index is, -then added to \%\f3GL_INDEX_OFFSET\fP. -If \%\f3GL_MAP_STENCIL\fP is true, -each index is masked by $2 sup n ~-~ 1$, -where $n$ is \%\f3GL_PIXEL_MAP_S_TO_S_SIZE\fP, -then replaced by the contents of \%\f3GL_PIXEL_MAP_S_TO_S\fP indexed by the -masked value. -.P -The following table gives the type, -initial value, -and range of valid values for each of the pixel transfer parameters -that are set with \%\f3glPixelTransfer\fP. -.sp - -.TS -center tab(:); -lb cb cb cb -l c c c. -_ -\f2pname\fP:Type:Initial Value:Valid Range -_ -\%\f3GL_MAP_COLOR\fP:boolean:false:true/false -\%\f3GL_MAP_STENCIL\fP:boolean:false:true/false -\%\f3GL_INDEX_SHIFT\fP:integer:0:(-\(if,\(if) -\%\f3GL_INDEX_OFFSET\fP:integer:0:(-\(if,\(if) -\%\f3GL_RED_SCALE\fP:float:1:(-\(if,\(if) -\%\f3GL_GREEN_SCALE\fP:float:1:(-\(if,\(if) -\%\f3GL_BLUE_SCALE\fP:float:1:(-\(if,\(if) -\%\f3GL_ALPHA_SCALE\fP:float:1:(-\(if,\(if) -\%\f3GL_DEPTH_SCALE\fP:float:1:(-\(if,\(if) -\%\f3GL_RED_BIAS\fP:float:0:(-\(if,\(if) -\%\f3GL_GREEN_BIAS\fP:float:0:(-\(if,\(if) -\%\f3GL_BLUE_BIAS\fP:float:0:(-\(if,\(if) -\%\f3GL_ALPHA_BIAS\fP:float:0:(-\(if,\(if) -\%\f3GL_DEPTH_BIAS\fP:float:0:(-\(if,\(if) -\%\f3GL_POST_COLOR_MATRIX_RED_SCALE\fP:float:1:(-\(if,\(if) -\%\f3GL_POST_COLOR_MATRIX_GREEN_SCALE\fP:float:1:(-\(if,\(if) -\%\f3GL_POST_COLOR_MATRIX_BLUE_SCALE\fP:float:1:(-\(if,\(if) -\%\f3GL_POST_COLOR_MATRIX_ALPHA_SCALE\fP:float:1:(-\(if,\(if) -\%\f3GL_POST_COLOR_MATRIX_RED_BIAS\fP:float:0:(-\(if,\(if) -\%\f3GL_POST_COLOR_MATRIX_GREEN_BIAS\fP:float:0:(-\(if,\(if) -\%\f3GL_POST_COLOR_MATRIX_BLUE_BIAS\fP:float:0:(-\(if,\(if) -\%\f3GL_POST_COLOR_MATRIX_ALPHA_BIAS\fP:float:0:(-\(if,\(if) -\%\f3GL_POST_CONVOLUTION_RED_SCALE\fP:float:1:(-\(if,\(if) -\%\f3GL_POST_CONVOLUTION_GREEN_SCALE\fP:float:1:(-\(if,\(if) -\%\f3GL_POST_CONVOLUTION_BLUE_SCALE\fP:float:1:(-\(if,\(if) -\%\f3GL_POST_CONVOLUTION_ALPHA_SCALE\fP:float:1:(-\(if,\(if) -\%\f3GL_POST_CONVOLUTION_RED_BIAS\fP:float:0:(-\(if,\(if) -\%\f3GL_POST_CONVOLUTION_GREEN_BIAS\fP:float:0:(-\(if,\(if) -\%\f3GL_POST_CONVOLUTION_BLUE_BIAS\fP:float:0:(-\(if,\(if) -\%\f3GL_POST_CONVOLUTION_ALPHA_BIAS\fP:float:0:(-\(if,\(if) -_ -.TE - -.sp -\%\f3glPixelTransferf\fP can be used to set any pixel transfer parameter. -If the parameter type is boolean, -0 implies false and any other value implies true. -If \f2pname\fP is an integer parameter, -\f2param\fP is rounded to the nearest integer. -.P -Likewise, -\%\f3glPixelTransferi\fP can be used to set any of the -pixel transfer parameters. -Boolean parameters are set to false if \f2param\fP is 0 and to true otherwise. -\f2param\fP is converted to floating point before being assigned to real-valued parameters. -.SH NOTES -If a -\%\f3glColorTable\fP, -\%\f3glColorSubTable\fP, -\%\f3glConvolutionFilter1D\fP, -\%\f3glConvolutionFilter2D\fP, -\%\f3glCopyPixels\fP, -\%\f3glCopyTexImage1D\fP, -\%\f3glCopyTexImage2D\fP, -\%\f3glCopyTexSubImage1D\fP, -\%\f3glCopyTexSubImage2D\fP, -\%\f3glCopyTexSubImage3D\fP, -\%\f3glDrawPixels\fP, -\%\f3glReadPixels\fP, -\%\f3glSeparableFilter2D\fP, -\%\f3glTexImage1D\fP, -\%\f3glTexImage2D\fP, -\%\f3glTexImage3D\fP, -\%\f3glTexSubImage1D\fP, -\%\f3glTexSubImage2D\fP, or -\%\f3glTexSubImage3D\fP. -command is placed in a display list -(see \%\f3glNewList\fP and \%\f3glCallList\fP), -the pixel transfer mode settings in effect when the display list is -.I executed -are the ones that are used. -They may be different from the settings when the command was compiled -into the display list. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2pname\fP is not an accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glPixelTransfer\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_MAP_COLOR\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAP_STENCIL\fP -.br -\%\f3glGet\fP with argument \%\f3GL_INDEX_SHIFT\fP -.br -\%\f3glGet\fP with argument \%\f3GL_INDEX_OFFSET\fP -.br -\%\f3glGet\fP with argument \%\f3GL_RED_SCALE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_RED_BIAS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_GREEN_SCALE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_GREEN_BIAS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_BLUE_SCALE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_BLUE_BIAS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_ALPHA_SCALE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_ALPHA_BIAS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_DEPTH_SCALE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_DEPTH_BIAS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_POST_COLOR_MATRIX_RED_SCALE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_POST_COLOR_MATRIX_RED_BIAS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_POST_COLOR_MATRIX_GREEN_SCALE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_POST_COLOR_MATRIX_GREEN_BIAS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_POST_COLOR_MATRIX_BLUE_SCALE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_POST_COLOR_MATRIX_BLUE_BIAS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_POST_COLOR_MATRIX_ALPHA_SCALE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_POST_COLOR_MATRIX_ALPHA_BIAS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_POST_CONVOLUTION_RED_SCALE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_POST_CONVOLUTION_RED_BIAS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_POST_CONVOLUTION_GREEN_SCALE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_POST_CONVOLUTION_GREEN_BIAS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_POST_CONVOLUTION_BLUE_SCALE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_POST_CONVOLUTION_BLUE_BIAS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_POST_CONVOLUTION_ALPHA_SCALE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_POST_CONVOLUTION_ALPHA_BIAS\fP -.SH SEE ALSO -\%\f3glCallList(3G)\fP, -\%\f3glColorTable(3G)\fP, -\%\f3glColorSubTable(3G)\fP, -\%\f3glConvolutionFilter1D(3G)\fP, -\%\f3glConvolutionFilter2D(3G)\fP, -\%\f3glCopyPixels(3G)\fP, -\%\f3glCopyTexImage1D(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glCopyTexSubImage1D(3G)\fP, -\%\f3glCopyTexSubImage2D(3G)\fP, -\%\f3glCopyTexSubImage3D(3G)\fP, -\%\f3glDrawPixels(3G)\fP, -\%\f3glNewList(3G)\fP, -\%\f3glPixelMap(3G)\fP, -\%\f3glPixelStore(3G)\fP, -\%\f3glPixelZoom(3G)\fP, -\%\f3glReadPixels(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexImage3D(3G)\fP, -\%\f3glTexSubImage1D(3G)\fP, -\%\f3glTexSubImage2D(3G)\fP, -\%\f3glTexSubImage3D(3G)\fP diff --git a/doc/gl-docs/GL/gl/pixelzoom.3gl b/doc/gl-docs/GL/gl/pixelzoom.3gl deleted file mode 100644 index a331c32c..00000000 --- a/doc/gl-docs/GL/gl/pixelzoom.3gl +++ /dev/null @@ -1,60 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 pixelzoom -.ds Xs 46374 4 pixelzoom.gl -.TH GLPIXELZOOM 3G -.SH NAME -.B "glPixelZoom -\- specify the pixel zoom factors - -.SH C SPECIFICATION -void \f3glPixelZoom\fP( -GLfloat \fIxfactor\fP, -.nf -.ta \w'\f3void \fPglPixelZoom( 'u - GLfloat \fIyfactor\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2xfactor\fP\ \f2yfactor\fP\ \ 'u -\f2xfactor\fP, \f2yfactor\fP -Specify the $x$ and $y$ zoom factors for pixel write operations. -.SH DESCRIPTION -\%\f3glPixelZoom\fP specifies values for the $x$ and $y$ zoom factors. -During the execution of \%\f3glDrawPixels\fP or \%\f3glCopyPixels\fP, -if ($xr $, $yr $) is the current raster position, -and a given element is in the $m$th row and $n$th column of the pixel rectangle, -then pixels whose centers are in the rectangle with corners at -.sp -.ce -($xr ~+~ n cdot "xfactor"$, $yr ~+~ m cdot "yfactor"$) -.sp -.ce -($xr ~+~ (n+1) cdot "xfactor"$, $yr ~+~ (m+1) cdot "yfactor"$) -.sp -are candidates for replacement. -Any pixel whose center lies on the bottom or left edge of this rectangular -region is also modified. -.P -Pixel zoom factors are not limited to positive values. -Negative zoom factors reflect the resulting image about the current -raster position. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glPixelZoom\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_ZOOM_X\fP -.br -\%\f3glGet\fP with argument \%\f3GL_ZOOM_Y\fP -.SH SEE ALSO -\%\f3glCopyPixels(3G)\fP, -\%\f3glDrawPixels(3G)\fP diff --git a/doc/gl-docs/GL/gl/pointsize.3gl b/doc/gl-docs/GL/gl/pointsize.3gl deleted file mode 100644 index 6de3fbe8..00000000 --- a/doc/gl-docs/GL/gl/pointsize.3gl +++ /dev/null @@ -1,128 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 pointsize -.ds Xs 46128 6 pointsize.gl -.TH GLPOINTSIZE 3G -.SH NAME -.B "glPointSize -\- specify the diameter of rasterized points - -.SH C SPECIFICATION -void \f3glPointSize\fP( -GLfloat \fIsize\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2size\fP\ \ 'u -\f2size\fP -Specifies the diameter of rasterized points. -The initial value is 1. -.SH DESCRIPTION -\%\f3glPointSize\fP specifies the rasterized diameter of both aliased and antialiased -points. -Using a point size other than 1 has different effects, -depending on whether point antialiasing is enabled. -To enable and disable point antialiasing, call -\%\f3glEnable\fP and \%\f3glDisable\fP -with argument \%\f3GL_POINT_SMOOTH\fP. Point antialiasing is initially disabled. -.P -If point antialiasing is disabled, -the actual size is determined by rounding the supplied size -to the nearest integer. -(If the rounding results in the value 0, -it is as if the point size were 1.) -If the rounded size is odd, -then the center point -($ x $, $ y $) -of the pixel fragment that represents the point is computed as -.sp -.ce -( $ \(lf ~ x sub w ~ \(rf ~+~ .5 $, $ \(lf ~ y sub w ~ \(rf ~+~ .5 $) -.sp -where $w$ subscripts indicate window coordinates. -All pixels that lie within the square grid of the rounded size centered at -($ x $, $ y $) -make up the fragment. -If the size is even, -the center point is -.sp -.ce -( $ \(lf ~ x sub w ~+~ .5 ~ \(rf$, $ \(lf ~ y sub w ~+~ .5 ~ \(rf $) -.sp -and the rasterized fragment's centers are the half-integer window coordinates -within the square of the rounded size centered at -($ x $, $ y $). -All pixel fragments produced in rasterizing a nonantialiased point are -assigned the same associated data, -that of the vertex corresponding to the point. -.P -If antialiasing is enabled, -then point rasterization produces a fragment for each pixel square -that intersects the region lying within the circle having diameter -equal to the current point size and centered at the point's -($ x sub w $, $ y sub w $). -The coverage value for each fragment is the window coordinate area -of the intersection of the circular region with the corresponding pixel square. -This value is saved and used in the final rasterization step. -The data associated with each fragment is the data associated with -the point being rasterized. -.P -Not all sizes are supported when point antialiasing is enabled. -If an unsupported size is requested, -the nearest supported size is used. -Only size 1 is guaranteed to be supported; -others depend on the implementation. -To query the range of supported sizes and the size difference between -supported sizes within the range, call -\%\f3glGet\fP with arguments -\%\f3GL_SMOOTH_POINT_SIZE_RANGE\fP and -\%\f3GL_SMOOTH_POINT_SIZE_GRANULARITY\fP. -For aliased points, query the supported ranges and granularity with -\%\f3glGet\fP with arguments -\%\f3GL_ALIASED_POINT_SIZE_RANGE\fP and -\%\f3GL_ALIASED_POINT_SIZE_GRANULARITY\fP. -.SH NOTES -The point size specified by \%\f3glPointSize\fP is always returned when \%\f3GL_POINT_SIZE\fP -is queried. -Clamping and rounding for aliased and antialiased points have no effect -on the specified value. -.P -A non-antialiased point size may be clamped to an implementation-dependent -maximum. -Although this maximum cannot be queried, -it must be no less than the maximum value for antialiased points, -rounded to the nearest integer value. -.P -\%\f3GL_POINT_SIZE_RANGE\fP and \%\f3GL_POINT_SIZE_GRANULARITY\fP are -deprecated in GL versions 1.2 and greater. Their functionality has been -replaced by \%\f3GL_SMOOTH_POINT_SIZE_RANGE\fP and -\%\f3GL_SMOOTH_POINT_SIZE_GRANULARITY\fP. -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if \f2size\fP is less than or equal to 0. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glPointSize\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_POINT_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_ALIASED_POINT_SIZE_RANGE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_ALIASED_POINT_SIZE_GRANULARITY\fP -.br -\%\f3glGet\fP with argument \%\f3GL_SMOOTH_POINT_SIZE_RANGE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_SMOOTH_POINT_SIZE_GRANULARITY\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_POINT_SMOOTH\fP -.SH SEE ALSO -\%\f3glEnable(3G)\fP diff --git a/doc/gl-docs/GL/gl/polygonmode.3gl b/doc/gl-docs/GL/gl/polygonmode.3gl deleted file mode 100644 index f4138678..00000000 --- a/doc/gl-docs/GL/gl/polygonmode.3gl +++ /dev/null @@ -1,103 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 polygonmo -.ds Xs 24991 5 polygonmode.gl -.TH GLPOLYGONMODE 3G -.SH NAME -.B "glPolygonMode -\- select a polygon rasterization mode - -.SH C SPECIFICATION -void \f3glPolygonMode\fP( -GLenum \fIface\fP, -.nf -.ta \w'\f3void \fPglPolygonMode( 'u - GLenum \fImode\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2face\fP\ \ 'u -\f2face\fP -Specifies the polygons that \f2mode\fP applies to. -Must be -\%\f3GL_FRONT\fP for front-facing polygons, -\%\f3GL_BACK\fP for back-facing polygons, -or \%\f3GL_FRONT_AND_BACK\fP for front- and back-facing polygons. -.TP -\f2mode\fP -Specifies how polygons will be rasterized. -Accepted values are -\%\f3GL_POINT\fP, -\%\f3GL_LINE\fP, and -\%\f3GL_FILL\fP. -The initial value is \%\f3GL_FILL\fP for both front- and back-facing polygons. -.SH DESCRIPTION -\%\f3glPolygonMode\fP controls the interpretation of polygons for rasterization. -\f2face\fP describes which polygons \f2mode\fP applies to: -front-facing polygons (\%\f3GL_FRONT\fP), -back-facing polygons (\%\f3GL_BACK\fP), -or both (\%\f3GL_FRONT_AND_BACK\fP). -The polygon mode affects only the final rasterization of polygons. -In particular, -a polygon's vertices are lit and -the polygon is clipped and possibly culled before these modes are applied. -.P -Three modes are defined and can be specified in \f2mode\fP: -.TP 14 -\%\f3GL_POINT\fP -Polygon vertices that are marked as the start of a boundary edge -are drawn as points. -Point attributes such as -\%\f3GL_POINT_SIZE\fP and -\%\f3GL_POINT_SMOOTH\fP control -the rasterization of the points. -Polygon rasterization attributes other than \%\f3GL_POLYGON_MODE\fP have no effect. -.TP -\%\f3GL_LINE\fP -Boundary edges of the polygon are drawn as line segments. -They are treated as connected line segments for line stippling; -the line stipple counter and pattern are not reset between segments -(see \%\f3glLineStipple\fP). -Line attributes such as -\%\f3GL_LINE_WIDTH\fP and -\%\f3GL_LINE_SMOOTH\fP control -the rasterization of the lines. -Polygon rasterization attributes other than \%\f3GL_POLYGON_MODE\fP have no effect. -.TP -\%\f3GL_FILL\fP -The interior of the polygon is filled. -Polygon attributes such as -\%\f3GL_POLYGON_STIPPLE\fP and -\%\f3GL_POLYGON_SMOOTH\fP control the rasterization of the polygon. -.SH EXAMPLES -To draw a surface with filled back-facing polygons -and outlined front-facing polygons, -call -.Ex 1 -glPolygonMode(\%\f3GL_FRONT\fP, \%\f3GL_LINE\fP); -.Ee -.SH NOTES -Vertices are marked as boundary or nonboundary with an edge flag. -Edge flags are generated internally by the GL when it decomposes -polygons; they can be set explicitly using \%\f3glEdgeFlag\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if either \f2face\fP or \f2mode\fP is not -an accepted value. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glPolygonMode\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_POLYGON_MODE\fP -.SH SEE ALSO -\%\f3glBegin(3G)\fP, -\%\f3glEdgeFlag(3G)\fP, -\%\f3glLineStipple(3G)\fP, -\%\f3glLineWidth(3G)\fP, -\%\f3glPointSize(3G)\fP, -\%\f3glPolygonStipple(3G)\fP diff --git a/doc/gl-docs/GL/gl/polygonoffset.3gl b/doc/gl-docs/GL/gl/polygonoffset.3gl deleted file mode 100644 index ec1b95b9..00000000 --- a/doc/gl-docs/GL/gl/polygonoffset.3gl +++ /dev/null @@ -1,73 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 polygonof -.ds Xs 10762 4 polygonoffset.gl -.TH GLPOLYGONOFFSET 3G -.SH NAME -.B "glPolygonOffset -\- set the scale and units used to calculate depth values - -.SH C SPECIFICATION -void \f3glPolygonOffset\fP( -GLfloat \fIfactor\fP, -.nf -.ta \w'\f3void \fPglPolygonOffset( 'u - GLfloat \fIunits\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2factor\fP\ \ 'u -\f2factor\fP -Specifies a scale factor that is used to create a variable -depth offset for each polygon. The initial value is 0. -.TP -\f2units\fP -Is multiplied by an implementation-specific value to -create a constant depth offset. The initial value is 0. -.SH DESCRIPTION -When \%\f3GL_POLYGON_OFFSET_FILL\fP, \%\f3GL_POLYGON_OFFSET_LINE\fP, or -\%\f3GL_POLYGON_OFFSET_POINT\fP is enabled, each -fragment's \f2depth\fP value will be offset after it is interpolated -from the \f2depth\fP values of the appropriate vertices. -The value of the offset is $"factor" ~*~ DZ ~~+~~ r ~*~ "units"$, -where $DZ~$ is a measurement of the change in depth relative to the screen -area of the polygon, and $r$ is the smallest value that is guaranteed to -produce a resolvable offset for a given implementation. -The offset is added before the depth test is performed and before -the value is written into the depth buffer. -.P -\%\f3glPolygonOffset\fP is useful for rendering hidden-line images, for applying decals -to surfaces, and for rendering solids with highlighted edges. -.SH NOTES -\%\f3glPolygonOffset\fP is available only if the GL version is 1.1 or greater. -.P -\%\f3glPolygonOffset\fP has no effect on depth coordinates placed in the -feedback buffer. -.P -\%\f3glPolygonOffset\fP has no effect on selection. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glPolygonOffset\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.bp -.SH ASSOCIATED GETS -\%\f3glIsEnabled\fP with argument -\%\f3GL_POLYGON_OFFSET_FILL\fP, -\%\f3GL_POLYGON_OFFSET_LINE\fP, -or \%\f3GL_POLYGON_OFFSET_POINT\fP. -.P -\%\f3glGet\fP with argument \%\f3GL_POLYGON_OFFSET_FACTOR\fP or -\%\f3GL_POLYGON_OFFSET_UNITS\fP. -.SH SEE ALSO -\%\f3glDepthFunc(3G)\fP, -\%\f3glEnable(3G)\fP, -\%\f3glGet(3G)\fP, -\%\f3glIsEnabled(3G)\fP diff --git a/doc/gl-docs/GL/gl/polygonstipple.3gl b/doc/gl-docs/GL/gl/polygonstipple.3gl deleted file mode 100644 index e964abb7..00000000 --- a/doc/gl-docs/GL/gl/polygonstipple.3gl +++ /dev/null @@ -1,80 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 polygonst -.ds Xs 22714 4 polygonstipple.gl -.TH GLPOLYGONSTIPPLE 3G -.SH NAME -.B "glPolygonStipple -\- set the polygon stippling pattern - -.SH C SPECIFICATION -void \f3glPolygonStipple\fP( -const GLubyte \fI*mask\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2mask\fP\ \ 'u -\f2mask\fP -Specifies a pointer to a $32 ~times~ 32$ stipple pattern that will be unpacked -from memory in the same way that \%\f3glDrawPixels\fP unpacks pixels. -.SH DESCRIPTION -Polygon stippling, -like line stippling -(see \%\f3glLineStipple\fP), -masks out certain fragments produced by rasterization, -creating a pattern. -Stippling is independent of polygon antialiasing. -.P -\f2mask\fP is a pointer to a $32 ~times~ 32$ stipple pattern that is stored -in memory just like the pixel data supplied to a \%\f3glDrawPixels\fP -call with -.I -height -and -.I width -both equal to 32, a pixel -of \%\f3GL_COLOR_INDEX\fP, and data type -of \%\f3GL_BITMAP\fP. -That is, -the stipple pattern is represented as a $32 ~times~ 32$ array -of 1-bit color indices packed in unsigned bytes. -\%\f3glPixelStore\fP parameters like \%\f3GL_UNPACK_SWAP_BYTES\fP -and \%\f3GL_UNPACK_LSB_FIRST\fP affect the assembling of the bits into a -stipple pattern. -Pixel transfer operations -(shift, offset, pixel map) -are not applied to the stipple image, -however. -.P -To enable and disable polygon stippling, call -\%\f3glEnable\fP and \%\f3glDisable\fP -with argument \%\f3GL_POLYGON_STIPPLE\fP. Polygon stippling is initially -disabled. If it's enabled, -a rasterized polygon fragment with window coordinates $x sub w$ and $y sub w$ -is sent to the next stage of the GL if and only if the -($x sub w~roman mod~32$)th bit in the ($y sub w~roman mod~32$)th row -of the stipple pattern is 1 (one). -When polygon stippling is disabled, it is as if the stipple pattern -consists of all 1's. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glPolygonStipple\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetPolygonStipple\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_POLYGON_STIPPLE\fP -.SH SEE ALSO -\%\f3glDrawPixels(3G)\fP, -\%\f3glLineStipple(3G)\fP, -\%\f3glPixelStore(3G)\fP, -\%\f3glPixelTransfer(3G)\fP diff --git a/doc/gl-docs/GL/gl/prioritizetextures.3gl b/doc/gl-docs/GL/gl/prioritizetextures.3gl deleted file mode 100644 index 16f69a0a..00000000 --- a/doc/gl-docs/GL/gl/prioritizetextures.3gl +++ /dev/null @@ -1,83 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 prioritiz -.ds Xs 38862 5 prioritizetextures.gl -.TH GLPRIORITIZETEXTURES 3G -.SH NAME -.B "glPrioritizeTextures -\- set texture residence priority - -.SH C SPECIFICATION -void \f3glPrioritizeTextures\fP( -GLsizei \fIn\fP, -.nf -.ta \w'\f3void \fPglPrioritizeTextures( 'u - const GLuint \fI*textures\fP, - const GLclampf \fI*priorities\fP ) -.fi - -.SH PARAMETERS -.TP \w'\fIpriorities\fP\ \ 'u -\f2n\fP -Specifies the number of textures to be prioritized. -.TP -\f2textures\fP -Specifies an array containing the names of the textures to be prioritized. -.TP -\f2priorities\fP -Specifies an array containing the texture priorities. -A priority given in an element of \f2priorities\fP applies to the texture -named by the corresponding element of \f2textures\fP. -.SH DESCRIPTION -\%\f3glPrioritizeTextures\fP assigns the \f2n\fP texture priorities given in \f2priorities\fP to the -\f2n\fP textures named in \f2textures\fP. -.P -The GL establishes -a ``working set'' of textures that are resident in texture memory. -These textures may be bound to a texture target much more efficiently -than textures that are not resident. -By specifying a priority for each texture, -\%\f3glPrioritizeTextures\fP allows applications to guide the GL implementation in determining -which textures should be resident. -.P -The priorities given in \f2priorities\fP are clamped to the range [0,\1] -before they are assigned. -0 indicates the lowest priority; textures with priority 0 -are least likely to be resident. -1 indicates the highest priority; textures with priority 1 -are most likely to be resident. -However, textures are not guaranteed to be resident until they are used. -.P -\%\f3glPrioritizeTextures\fP silently ignores attempts to prioritize texture 0, or any texture -name that does not correspond to an existing texture. -.P -\%\f3glPrioritizeTextures\fP does not require that any of the textures named by \f2textures\fP -be bound to a texture target. -\%\f3glTexParameter\fP may also be used to set a texture's priority, -but only if the texture is currently bound. -This is the only way to set the priority of a default texture. -.SH NOTES -\%\f3glPrioritizeTextures\fP is available only if the GL version is 1.1 or greater. -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if \f2n\fP is negative. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glPrioritizeTextures\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetTexParameter\fP with parameter name \%\f3GL_TEXTURE_PRIORITY\fP -retrieves the priority of a currently bound texture. -.SH SEE ALSO -\%\f3glAreTexturesResident(3G)\fP, -\%\f3glBindTexture(3G)\fP, -\%\f3glCopyTexImage1D(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexImage3D(3G)\fP, -\%\f3glTexParameter(3G)\fP diff --git a/doc/gl-docs/GL/gl/pushattrib.3gl b/doc/gl-docs/GL/gl/pushattrib.3gl deleted file mode 100644 index bd8a5015..00000000 --- a/doc/gl-docs/GL/gl/pushattrib.3gl +++ /dev/null @@ -1,267 +0,0 @@ -'\" et -'\"! eqn|tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 pushattri -.ds Xs 21569 10 pushattrib.gl -.TH GLPUSHATTRIB 3G -.SH NAME -.B "glPushAttrib, glPopAttrib -\- push and pop the server attribute stack - -.SH C SPECIFICATION -void \f3glPushAttrib\fP( -GLbitfield \fImask\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2mask\fP\ \ 'u -\f2mask\fP -Specifies a mask that indicates which attributes to save. Values for -\f2mask\fP are listed below. -.SH C SPECIFICATION -void \f3glPopAttrib\fP( void ) -.nf -.fi - -.SH DESCRIPTION -\%\f3glPushAttrib\fP takes one argument, -a mask that indicates which groups of state variables -to save on the attribute stack. -Symbolic constants are used to set bits in the mask. -\f2mask\fP -is typically constructed by ORing several of these constants together. -The special mask -\%\f3GL_ALL_ATTRIB_BITS\fP -can be used to save all stackable states. -.P -The symbolic mask constants and their associated GL state are as follows -(the second column lists which attributes are saved): -.P -.TS -; -l l . -\%\f3GL_ACCUM_BUFFER_BIT\fP Accumulation buffer clear value - -\%\f3GL_COLOR_BUFFER_BIT\fP \%\f3GL_ALPHA_TEST\fP enable bit - Alpha test function and reference value - \%\f3GL_BLEND\fP enable bit - Blending source and destination functions - Constant blend color - Blending equation - \%\f3GL_DITHER\fP enable bit - \%\f3GL_DRAW_BUFFER\fP setting - \%\f3GL_COLOR_LOGIC_OP\fP enable bit - \%\f3GL_INDEX_LOGIC_OP\fP enable bit - Logic op function - Color mode and index mode clear values - Color mode and index mode writemasks - -\%\f3GL_CURRENT_BIT\fP Current RGBA color - Current color index - Current normal vector - Current texture coordinates - Current raster position - \%\f3GL_CURRENT_RASTER_POSITION_VALID\fP flag - RGBA color associated with current raster position - Color index associated with current raster position - Texture coordinates associated with current raster position - \%\f3GL_EDGE_FLAG\fP flag - -\%\f3GL_DEPTH_BUFFER_BIT\fP \%\f3GL_DEPTH_TEST\fP enable bit - Depth buffer test function - Depth buffer clear value - \%\f3GL_DEPTH_WRITEMASK\fP enable bit - -\%\f3GL_ENABLE_BIT\fP \%\f3GL_ALPHA_TEST\fP flag - \%\f3GL_AUTO_NORMAL\fP flag - \%\f3GL_BLEND\fP flag - Enable bits for the user-definable clipping planes - \%\f3GL_COLOR_MATERIAL\fP - \%\f3GL_CULL_FACE\fP flag - \%\f3GL_DEPTH_TEST\fP flag - \%\f3GL_DITHER\fP flag - \%\f3GL_FOG\fP flag - \%\f3GL_LIGHT\fP\f2i\fP where 0\ <= \f2i\fP<\%\f3GL_MAX_LIGHTS\fP - \%\f3GL_LIGHTING\fP flag - \%\f3GL_LINE_SMOOTH\fP flag - \%\f3GL_LINE_STIPPLE\fP flag - \%\f3GL_COLOR_LOGIC_OP\fP flag - \%\f3GL_INDEX_LOGIC_OP\fP flag - \%\f3GL_MAP1_\fP\f2x\fP where \f2x\fP is a map type - \%\f3GL_MAP2_\fP\f2x\fP where \f2x\fP is a map type - \%\f3GL_NORMALIZE\fP flag - \%\f3GL_POINT_SMOOTH\fP flag - \%\f3GL_POLYGON_OFFSET_LINE\fP flag - \%\f3GL_POLYGON_OFFSET_FILL\fP flag - \%\f3GL_POLYGON_OFFSET_POINT\fP flag - \%\f3GL_POLYGON_SMOOTH\fP flag - \%\f3GL_POLYGON_STIPPLE\fP flag - \%\f3GL_SCISSOR_TEST\fP flag - \%\f3GL_STENCIL_TEST\fP flag - \%\f3GL_TEXTURE_1D\fP flag - \%\f3GL_TEXTURE_2D\fP flag - \%\f3GL_TEXTURE_3D\fP flag - Flags \%\f3GL_TEXTURE_GEN_\fP\f2x\fP where \f2x\fP is S, T, R, or Q - -\%\f3GL_EVAL_BIT\fP \%\f3GL_MAP1_\fP\f2x\fP enable bits, where \f2x\fP is a map type - \%\f3GL_MAP2_\fP\f2x\fP enable bits, where \f2x\fP is a map type - 1D grid endpoints and divisions - 2D grid endpoints and divisions - \%\f3GL_AUTO_NORMAL\fP enable bit - -\%\f3GL_FOG_BIT\fP \%\f3GL_FOG\fP enable bit - Fog color - Fog density - Linear fog start - Linear fog end - Fog index - \%\f3GL_FOG_MODE\fP value - -\%\f3GL_HINT_BIT\fP \%\f3GL_PERSPECTIVE_CORRECTION_HINT\fP setting - \%\f3GL_POINT_SMOOTH_HINT\fP setting - \%\f3GL_LINE_SMOOTH_HINT\fP setting - \%\f3GL_POLYGON_SMOOTH_HINT\fP setting - \%\f3GL_FOG_HINT\fP setting - -\%\f3GL_LIGHTING_BIT\fP \%\f3GL_COLOR_MATERIAL\fP enable bit - \%\f3GL_COLOR_MATERIAL_FACE\fP value - Color material parameters that are tracking the current color - Ambient scene color - \%\f3GL_LIGHT_MODEL_LOCAL_VIEWER\fP value - \%\f3GL_LIGHT_MODEL_TWO_SIDE\fP setting - \%\f3GL_LIGHTING\fP enable bit - Enable bit for each light - Ambient, diffuse, and specular intensity for each light - Direction, position, exponent, and cutoff angle for each light - Constant, linear, and quadratic attenuation factors for each light - Ambient, diffuse, specular, and emissive color for each material - Ambient, diffuse, and specular color indices for each material - Specular exponent for each material - \%\f3GL_SHADE_MODEL\fP setting - -\%\f3GL_LINE_BIT\fP \%\f3GL_LINE_SMOOTH\fP flag - \%\f3GL_LINE_STIPPLE\fP enable bit - Line stipple pattern and repeat counter - Line width - -\%\f3GL_LIST_BIT\fP \%\f3GL_LIST_BASE\fP setting - -\%\f3GL_PIXEL_MODE_BIT\fP \%\f3GL_RED_BIAS\fP and \%\f3GL_RED_SCALE\fP settings - \%\f3GL_GREEN_BIAS\fP and \%\f3GL_GREEN_SCALE\fP values - \%\f3GL_BLUE_BIAS\fP and \%\f3GL_BLUE_SCALE\fP - \%\f3GL_ALPHA_BIAS\fP and \%\f3GL_ALPHA_SCALE\fP - \%\f3GL_DEPTH_BIAS\fP and \%\f3GL_DEPTH_SCALE\fP - \%\f3GL_INDEX_OFFSET\fP and \%\f3GL_INDEX_SHIFT\fP values - \%\f3GL_MAP_COLOR\fP and \%\f3GL_MAP_STENCIL\fP flags - \%\f3GL_ZOOM_X\fP and \%\f3GL_ZOOM_Y\fP factors - \%\f3GL_READ_BUFFER\fP setting - -\%\f3GL_POINT_BIT\fP \%\f3GL_POINT_SMOOTH\fP flag - Point size - -\%\f3GL_POLYGON_BIT\fP \%\f3GL_CULL_FACE\fP enable bit - \%\f3GL_CULL_FACE_MODE\fP value - \%\f3GL_FRONT_FACE\fP indicator - \%\f3GL_POLYGON_MODE\fP setting - \%\f3GL_POLYGON_SMOOTH\fP flag - \%\f3GL_POLYGON_STIPPLE\fP enable bit - \%\f3GL_POLYGON_OFFSET_FILL\fP flag - \%\f3GL_POLYGON_OFFSET_LINE\fP flag - \%\f3GL_POLYGON_OFFSET_POINT\fP flag - \%\f3GL_POLYGON_OFFSET_FACTOR\fP - \%\f3GL_POLYGON_OFFSET_UNITS\fP - -\%\f3GL_POLYGON_STIPPLE_BIT\fP Polygon stipple image - -\%\f3GL_SCISSOR_BIT\fP \%\f3GL_SCISSOR_TEST\fP flag - Scissor box - -\%\f3GL_STENCIL_BUFFER_BIT\fP \%\f3GL_STENCIL_TEST\fP enable bit - Stencil function and reference value - Stencil value mask - Stencil fail, pass, and depth buffer pass actions - Stencil buffer clear value - Stencil buffer writemask - -\%\f3GL_TEXTURE_BIT\fP Enable bits for the four texture coordinates - Border color for each texture image - Minification function for each texture image - Magnification function for each texture image - Texture coordinates and wrap mode for each texture image - Color and mode for each texture environment - Enable bits \%\f3GL_TEXTURE_GEN_\fP\f2x\fP, \f2x\fP is S, T, R, and Q - \%\f3GL_TEXTURE_GEN_MODE\fP setting for S, T, R, and Q - \%\f3glTexGen\fP plane equations for S, T, R, and Q - Current texture bindings (for example, \%\f3GL_TEXTURE_BINDING_2D\fP) - -\%\f3GL_TRANSFORM_BIT\fP Coefficients of the six clipping planes - Enable bits for the user-definable clipping planes - \%\f3GL_MATRIX_MODE\fP value - \%\f3GL_NORMALIZE\fP flag - \%\f3GL_RESCALE_NORMAL\fP flag - -\%\f3GL_VIEWPORT_BIT\fP Depth range (near and far) - Viewport origin and extent -.TE -.P -\%\f3glPopAttrib\fP restores the values of the state variables saved with the last -.br -\%\f3glPushAttrib\fP command. -Those not saved are left unchanged. -.P -It is an error to push attributes onto a full stack, -or to pop attributes off an empty stack. -In either case, the error flag is set -and no other change is made to GL state. -.P -Initially, the attribute stack is empty. -.SH NOTES -Not all values for GL state can be saved on the attribute stack. -For example, -render mode state, -and select and feedback state cannot be saved. -Client state must be saved with -\%\f3glPushClientAttrib\fP. -.P -The depth of the attribute stack depends on the implementation, -but it must be at least 16. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, pushing and -popping texture state apples to all supported texture units. -.SH ERRORS -\%\f3GL_STACK_OVERFLOW\fP is generated if \%\f3glPushAttrib\fP is called while -the attribute stack is full. -.P -\%\f3GL_STACK_UNDERFLOW\fP is generated if \%\f3glPopAttrib\fP is called while -the attribute stack is empty. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glPushAttrib\fP or \%\f3glPopAttrib\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_ATTRIB_STACK_DEPTH\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAX_ATTRIB_STACK_DEPTH\fP -.SH SEE ALSO -\%\f3glGet(3G)\fP, -\%\f3glGetClipPlane(3G)\fP, -\%\f3glGetError(3G)\fP, -\%\f3glGetLight(3G)\fP, -\%\f3glGetMap(3G)\fP, -\%\f3glGetMaterial(3G)\fP, -.br -\%\f3glGetPixelMap(3G)\fP, -\%\f3glGetPolygonStipple(3G)\fP, -\%\f3glGetString(3G)\fP, -\%\f3glGetTexEnv(3G)\fP, -\%\f3glGetTexGen(3G)\fP, -\%\f3glGetTexImage(3G)\fP, -\%\f3glGetTexLevelParameter(3G)\fP, -\%\f3glGetTexParameter(3G)\fP, -\%\f3glIsEnabled(3G)\fP, -\%\f3glPushClientAttrib(3G)\fP diff --git a/doc/gl-docs/GL/gl/pushclientattrib.3gl b/doc/gl-docs/GL/gl/pushclientattrib.3gl deleted file mode 100644 index 555afaca..00000000 --- a/doc/gl-docs/GL/gl/pushclientattrib.3gl +++ /dev/null @@ -1,101 +0,0 @@ -.\" $XFree86$ -'\" et -'\"! eqn|tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 pushclien -.ds Xs 42589 5 pushclientattrib.gl -.TH GLPUSHCLIENTATTRIB 3G -.SH NAME -.B "glPushClientAttrib, glPopClientAttrib -\- push and pop the client attribute stack - -.SH C SPECIFICATION -void \f3glPushClientAttrib\fP( -GLbitfield mask); \fI1.1\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f21.1\fP\ \ 'u -\f21.1\fP -Specifies a mask that indicates which attributes to save. Values for -\f21.1\fP are listed below. -.SH C SPECIFICATION -void \f3glPopClientAttrib\fP( -void); \fI1.1\fP ) -.nf -.fi - -.SH DESCRIPTION -\%\f3glPushClientAttrib\fP takes one argument, -a mask that indicates which groups of client-state variables -to save on the client attribute stack. -Symbolic constants are used to set bits in the mask. -\f21.1\fP -is typically constructed by OR'ing several of these constants together. -The special mask -\%\f3GL_CLIENT_ALL_ATTRIB_BITS\fP -can be used to save all stackable client state. -.P -The symbolic mask constants and their associated GL client state are as follows -(the second column lists which attributes are saved): -.P -\%\f3GL_CLIENT_PIXEL_STORE_BIT\fP Pixel storage modes -.br -\%\f3GL_CLIENT_VERTEX_ARRAY_BIT\fP Vertex arrays (and enables) -.P -\%\f3glPopClientAttrib\fP restores the values of the client-state variables -saved with the last \%\f3glPushClientAttrib\fP. -Those not saved are left unchanged. -.P -It is an error to push attributes onto a full client attribute stack, -or to pop attributes off an empty stack. -In either case, the error flag is set, -and no other change is made to GL state. -.P -Initially, the client attribute stack is empty. -.SH NOTES -\%\f3glPushClientAttrib\fP is available only if the GL version is 1.1 or greater. -.P -Not all values for GL client state can be saved on the attribute stack. -For example, select and feedback state cannot be saved. -.P -The depth of the attribute stack depends on the implementation, -but it must be at least 16. -.P -Use \%\f3glPushAttrib\fP and \%\f3glPopAttrib\fP to push and restore -state which is kept on the server. Only pixel storage modes and -vertex array state may be pushed and popped with -\%\f3glPushClientAttrib\fP and \%\f3glPopClientAttrib\fP. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, pushing and -popping client vertex array state apples to all supported texture units, -and the active client texture state. -.SH ERRORS -\%\f3GL_STACK_OVERFLOW\fP is generated if \%\f3glPushClientAttrib\fP is called while -the attribute stack is full. -.P -\%\f3GL_STACK_UNDERFLOW\fP is generated if \%\f3glPopClientAttrib\fP is called while -the attribute stack is empty. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_ATTRIB_STACK_DEPTH\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAX_CLIENT_ATTRIB_STACK_DEPTH\fP -.SH SEE ALSO -\%\f3glColorPointer(3G)\fP, -\%\f3glDisableClientState(3G)\fP, -\%\f3glEdgeFlagPointer(3G)\fP, -\%\f3glEnableClientState(3G)\fP, -\%\f3glGet(3G)\fP, -\%\f3glGetError(3G)\fP, -\%\f3glIndexPointer(3G)\fP, -\%\f3glNormalPointer(3G)\fP, -\%\f3glNewList(3G)\fP, -\%\f3glPixelStore(3G)\fP, -\%\f3glPushAttrib(3G)\fP, -\%\f3glTexCoordPointer(3G)\fP, -\%\f3glVertexPointer(3G)\fP diff --git a/doc/gl-docs/GL/gl/pushmatrix.3gl b/doc/gl-docs/GL/gl/pushmatrix.3gl deleted file mode 100644 index 294efd4a..00000000 --- a/doc/gl-docs/GL/gl/pushmatrix.3gl +++ /dev/null @@ -1,92 +0,0 @@ -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 pushmatri -.ds Xs 41127 5 pushmatrix.gl -.TH GLPUSHMATRIX 3G -.SH NAME -.B "glPushMatrix, glPopMatrix -\- push and pop the current matrix stack - -.SH C SPECIFICATION -void \f3glPushMatrix\fP( void ) -.nf -.fi - -.SH C SPECIFICATION -void \f3glPopMatrix\fP( void ) -.nf -.fi - -.SH DESCRIPTION -There is a stack of matrices for each of the matrix modes. -In \%\f3GL_MODELVIEW\fP mode, -the stack depth is at least 32. -In the other modes, -\%\f3GL_COLOR\fP, const(PROJECTION), and \%\f3GL_TEXTURE\fP, -the depth is at least 2. -The current matrix in any mode is the matrix on the top of the stack -for that mode. -.P -\%\f3glPushMatrix\fP pushes the current matrix stack down by one, -duplicating the current matrix. -That is, -after a \%\f3glPushMatrix\fP call, -the matrix on top of the stack is identical to the one below it. -.P -\%\f3glPopMatrix\fP pops the current matrix stack, -replacing the current matrix with the one below it on the stack. -.P -Initially, each of the stacks contains one matrix, an identity matrix. -.P -It is an error to push a full matrix stack, -or to pop a matrix stack that contains only a single matrix. -In either case, the error flag is set -and no other change is made to GL state. -.SH ERRORS -\%\f3GL_STACK_OVERFLOW\fP is generated if \%\f3glPushMatrix\fP is called while -the current matrix stack is full. -.P -\%\f3GL_STACK_UNDERFLOW\fP is generated if \%\f3glPopMatrix\fP is called while -the current matrix stack contains only a single matrix. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glPushMatrix\fP or \%\f3glPopMatrix\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_MATRIX_MODE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_COLOR_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MODELVIEW_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PROJECTION_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_TEXTURE_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_COLOR_STACK_DEPTH\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MODELVIEW_STACK_DEPTH\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PROJECTION_STACK_DEPTH\fP -.br -\%\f3glGet\fP with argument \%\f3GL_TEXTURE_STACK_DEPTH\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAX_MODELVIEW_STACK_DEPTH\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAX_PROJECTION_STACK_DEPTH\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAX_TEXTURE_STACK_DEPTH\fP -.SH SEE ALSO -\%\f3glFrustum(3G)\fP, -\%\f3glLoadIdentity(3G)\fP, -\%\f3glLoadMatrix(3G)\fP, -\%\f3glMatrixMode(3G)\fP, -\%\f3glMultMatrix(3G)\fP, -\%\f3glOrtho(3G)\fP, -\%\f3glRotate(3G)\fP, -\%\f3glScale(3G)\fP, -\%\f3glTranslate(3G)\fP, -\%\f3glViewport(3G)\fP diff --git a/doc/gl-docs/GL/gl/pushname.3gl b/doc/gl-docs/GL/gl/pushname.3gl deleted file mode 100644 index 72b22cb4..00000000 --- a/doc/gl-docs/GL/gl/pushname.3gl +++ /dev/null @@ -1,68 +0,0 @@ -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 pushname. -.ds Xs 59541 4 pushname.gl -.TH GLPUSHNAME 3G -.SH NAME -.B "glPushName, glPopName -\- push and pop the name stack - -.SH C SPECIFICATION -void \f3glPushName\fP( -GLuint \fIname\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2name\fP\ \ 'u -\f2name\fP -Specifies a name that will be pushed onto the name stack. -.SH C SPECIFICATION -void \f3glPopName\fP( void ) -.nf -.fi - -.SH DESCRIPTION -The name stack is used during selection mode to allow sets of rendering -commands to be uniquely identified. -It consists of an ordered set of unsigned integers and is initially empty. -.P -\%\f3glPushName\fP causes \f2name\fP to be pushed onto the name stack. -\%\f3glPopName\fP pops one name off the top of the stack. -.P -The maximum name stack depth is implementation-dependent; call -\%\f3GL_MAX_NAME_STACK_DEPTH\fP to find out the value for a particular -implementation. It is an -error to push a name onto a full stack, -or to pop a name off an empty stack. -It is also an error to manipulate the name stack between the execution of -\%\f3glBegin\fP and the corresponding execution of \%\f3glEnd\fP. -In any of these cases, the error flag is set and no other change is -made to GL state. -.P -The name stack is always empty while the render mode is not \%\f3GL_SELECT\fP. -Calls to \%\f3glPushName\fP or \%\f3glPopName\fP while the render mode is not -\%\f3GL_SELECT\fP are ignored. -.SH ERRORS -\%\f3GL_STACK_OVERFLOW\fP is generated if \%\f3glPushName\fP is called while the -name stack is full. -.P -\%\f3GL_STACK_UNDERFLOW\fP is generated if \%\f3glPopName\fP is called while the -name stack is empty. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glPushName\fP or \%\f3glPopName\fP -is executed between a call to \%\f3glBegin\fP and the corresponding call to -\%\f3glEnd\fP. -.bp -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_NAME_STACK_DEPTH\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAX_NAME_STACK_DEPTH\fP -.SH SEE ALSO -\%\f3glInitNames(3G)\fP, -\%\f3glLoadName(3G)\fP, -\%\f3glRenderMode(3G)\fP, -\%\f3glSelectBuffer(3G)\fP diff --git a/doc/gl-docs/GL/gl/rasterpos.3gl b/doc/gl-docs/GL/gl/rasterpos.3gl deleted file mode 100644 index f86baff7..00000000 --- a/doc/gl-docs/GL/gl/rasterpos.3gl +++ /dev/null @@ -1,287 +0,0 @@ -.\" $XFree86$ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 rasterpos -.ds Xs 20383 7 rasterpos.gl -.TH GLRASTERPOS 3G -.SH NAME -.B "glRasterPos2d, glRasterPos2f, glRasterPos2i, glRasterPos2s, glRasterPos3d, glRasterPos3f, glRasterPos3i, glRasterPos3s, glRasterPos4d, glRasterPos4f, glRasterPos4i, glRasterPos4s, glRasterPos2dv, glRasterPos2fv, glRasterPos2iv, glRasterPos2sv, glRasterPos3dv, glRasterPos3fv, glRasterPos3iv, glRasterPos3sv, glRasterPos4dv, glRasterPos4fv, glRasterPos4iv, glRasterPos4sv -\- specify the raster position for pixel operations - -.SH C SPECIFICATION -void \f3glRasterPos2d\fP( -GLdouble \fIx\fP, -.nf -.ta \w'\f3void \fPglRasterPos2d( 'u - GLdouble \fIy\fP ) -.fi -void \f3glRasterPos2f\fP( -GLfloat \fIx\fP, -.nf -.ta \w'\f3void \fPglRasterPos2f( 'u - GLfloat \fIy\fP ) -.fi -void \f3glRasterPos2i\fP( -GLint \fIx\fP, -.nf -.ta \w'\f3void \fPglRasterPos2i( 'u - GLint \fIy\fP ) -.fi -void \f3glRasterPos2s\fP( -GLshort \fIx\fP, -.nf -.ta \w'\f3void \fPglRasterPos2s( 'u - GLshort \fIy\fP ) -.fi -void \f3glRasterPos3d\fP( -GLdouble \fIx\fP, -.nf -.ta \w'\f3void \fPglRasterPos3d( 'u - GLdouble \fIy\fP, - GLdouble \fIz\fP ) -.fi -void \f3glRasterPos3f\fP( -GLfloat \fIx\fP, -.nf -.ta \w'\f3void \fPglRasterPos3f( 'u - GLfloat \fIy\fP, - GLfloat \fIz\fP ) -.fi -void \f3glRasterPos3i\fP( -GLint \fIx\fP, -.nf -.ta \w'\f3void \fPglRasterPos3i( 'u - GLint \fIy\fP, - GLint \fIz\fP ) -.fi -void \f3glRasterPos3s\fP( -GLshort \fIx\fP, -.nf -.ta \w'\f3void \fPglRasterPos3s( 'u - GLshort \fIy\fP, - GLshort \fIz\fP ) -.fi -void \f3glRasterPos4d\fP( -GLdouble \fIx\fP, -.nf -.ta \w'\f3void \fPglRasterPos4d( 'u - GLdouble \fIy\fP, - GLdouble \fIz\fP, - GLdouble \fIw\fP ) -.fi -void \f3glRasterPos4f\fP( -GLfloat \fIx\fP, -.nf -.ta \w'\f3void \fPglRasterPos4f( 'u - GLfloat \fIy\fP, - GLfloat \fIz\fP, - GLfloat \fIw\fP ) -.fi -void \f3glRasterPos4i\fP( -GLint \fIx\fP, -.nf -.ta \w'\f3void \fPglRasterPos4i( 'u - GLint \fIy\fP, - GLint \fIz\fP, - GLint \fIw\fP ) -.fi -void \f3glRasterPos4s\fP( -GLshort \fIx\fP, -.nf -.ta \w'\f3void \fPglRasterPos4s( 'u - GLshort \fIy\fP, - GLshort \fIz\fP, - GLshort \fIw\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2x\fP\ \f2y\fP\ \f2z\fP\ \f2w\fP\ \ 'u -\f2x\fP, \f2y\fP, \f2z\fP, \f2w\fP -Specify the $x$, $y$, $z$, and $w$ object coordinates -(if present) -for the raster position. -.SH C SPECIFICATION -void \f3glRasterPos2dv\fP( -const GLdouble \fI*v\fP ) -.nf -.fi -void \f3glRasterPos2fv\fP( -const GLfloat \fI*v\fP ) -.nf -.fi -void \f3glRasterPos2iv\fP( -const GLint \fI*v\fP ) -.nf -.fi -void \f3glRasterPos2sv\fP( -const GLshort \fI*v\fP ) -.nf -.fi -void \f3glRasterPos3dv\fP( -const GLdouble \fI*v\fP ) -.nf -.fi -void \f3glRasterPos3fv\fP( -const GLfloat \fI*v\fP ) -.nf -.fi -void \f3glRasterPos3iv\fP( -const GLint \fI*v\fP ) -.nf -.fi -void \f3glRasterPos3sv\fP( -const GLshort \fI*v\fP ) -.nf -.fi -void \f3glRasterPos4dv\fP( -const GLdouble \fI*v\fP ) -.nf -.fi -void \f3glRasterPos4fv\fP( -const GLfloat \fI*v\fP ) -.nf -.fi -void \f3glRasterPos4iv\fP( -const GLint \fI*v\fP ) -.nf -.fi -void \f3glRasterPos4sv\fP( -const GLshort \fI*v\fP ) -.nf -.fi - -.SH PARAMETERS -.TP -\f2v\fP -Specifies a pointer to an array of two, -three, -or four elements, -specifying $x$, $y$, $z$, and $w$ coordinates, respectively. -.SH DESCRIPTION -The GL maintains a 3D position in window coordinates. -This position, -called the raster position, -is used to position pixel and bitmap write operations. It is -maintained with subpixel accuracy. -See \%\f3glBitmap\fP, \%\f3glDrawPixels\fP, and \%\f3glCopyPixels\fP. -.P -The current raster position consists of three window coordinates -($x$, $y$, $z$), -a clip coordinate value ($w$), -an eye coordinate distance, -a valid bit, -and associated color data and texture coordinates. -The $w$ coordinate is a clip coordinate, -because $w$ is not projected to window coordinates. -\%\f3glRasterPos4\fP specifies object coordinates $x$, $y$, $z$, and $w$ -explicitly. -\%\f3glRasterPos3\fP specifies object coordinate $x$, $y$, and $z$ explicitly, -while $w$ is implicitly set to 1. -\%\f3glRasterPos2\fP uses the argument values for $x$ and $y$ while -implicitly setting $z$ and $w$ to 0 and 1. -.P -The object coordinates presented by \%\f3glRasterPos\fP are treated just like those -of a \%\f3glVertex\fP command: -They are transformed by the current modelview and projection matrices -and passed to the clipping stage. -If the vertex is not culled, -then it is projected and scaled to window coordinates, -which become the new current raster position, -and the \%\f3GL_CURRENT_RASTER_POSITION_VALID\fP flag is set. -If the vertex -.I is -culled, -then the valid bit is cleared and the current raster position -and associated color and texture coordinates are undefined. -.P -The current raster position also includes some associated color data -and texture coordinates. -If lighting is enabled, -then \%\f3GL_CURRENT_RASTER_COLOR\fP -(in RGBA mode) -or \%\f3GL_CURRENT_RASTER_INDEX\fP -(in color index mode) -is set to the color produced by the lighting calculation -(see \%\f3glLight\fP, \%\f3glLightModel\fP, and -.br -\%\f3glShadeModel\fP). -If lighting is disabled, -current color -(in RGBA mode, state variable \%\f3GL_CURRENT_COLOR\fP) -or color index -(in color index mode, state variable \%\f3GL_CURRENT_INDEX\fP) -is used to update the current raster color. -.P -Likewise, -\%\f3GL_CURRENT_RASTER_TEXTURE_COORDS\fP is updated as a function -of \%\f3GL_CURRENT_TEXTURE_COORDS\fP, -based on the texture matrix and the texture generation functions -(see \%\f3glTexGen\fP). -Finally, -the distance from the origin of the eye coordinate system to the -vertex as transformed by only the modelview matrix replaces -\%\f3GL_CURRENT_RASTER_DISTANCE\fP. -.P -Initially, the current raster position is (0, 0, 0, 1), -the current raster distance is 0, -the valid bit is set, -the associated RGBA color is (1, 1, 1, 1), -the associated color index is 1, -and the associated texture coordinates are (0, 0, 0, 1). -In RGBA mode, -\%\f3GL_CURRENT_RASTER_INDEX\fP is always 1; -in color index mode, -the current raster RGBA color always maintains its initial value. -.SH NOTES -The raster position is modified both by \%\f3glRasterPos\fP and by \%\f3glBitmap\fP. -.P -When the raster position coordinates are invalid, -drawing commands that are based on the raster position are -ignored (that is, they do not result in changes to GL state). -.P -Calling \%\f3glDrawElements\fP, or \%\f3glDrawRangeElements\fP may leave the -current color or index indeterminate. -If \%\f3glRasterPos\fP is executed while the current color or index is indeterminate, the -current raster color or current raster index remains indeterminate. -.P -To set a valid raster position outside the viewport, first set a valid -raster position, then call \%\f3glBitmap\fP with NULL as the \f2bitmap\fP -parameter. -.P -When the \%\f3GL_ARB_imaging\fP extension is supported, there are distinct -raster texture coordinates for each texture unit. Each texture unit's -current raster texture coordinates are updated by \%\f3glRasterPos\fP. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glRasterPos\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_CURRENT_RASTER_POSITION\fP -.br -\%\f3glGet\fP with argument \%\f3GL_CURRENT_RASTER_POSITION_VALID\fP -.br -\%\f3glGet\fP with argument \%\f3GL_CURRENT_RASTER_DISTANCE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_CURRENT_RASTER_COLOR\fP -.br -\%\f3glGet\fP with argument \%\f3GL_CURRENT_RASTER_INDEX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_CURRENT_RASTER_TEXTURE_COORDS\fP -.SH SEE ALSO -\%\f3glBitmap(3G)\fP, -\%\f3glCopyPixels(3G)\fP, -\%\f3glDrawArrays(3G)\fP, -\%\f3glDrawElements(3G)\fP, -\%\f3glDrawRangeElements(3G)\fP, -\%\f3glDrawPixels(3G)\fP, -\%\f3glTexCoord(3G)\fP, -\%\f3glTexGen(3G)\fP, -\%\f3glVertex(3G)\fP diff --git a/doc/gl-docs/GL/gl/readbuffer.3gl b/doc/gl-docs/GL/gl/readbuffer.3gl deleted file mode 100644 index 6e5e40ce..00000000 --- a/doc/gl-docs/GL/gl/readbuffer.3gl +++ /dev/null @@ -1,81 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 readbuffe -.ds Xs 2004 4 readbuffer.gl -.TH GLREADBUFFER 3G -.SH NAME -.B "glReadBuffer -\- select a color buffer source for pixels - -.SH C SPECIFICATION -void \f3glReadBuffer\fP( -GLenum \fImode\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2mode\fP\ \ 'u -\f2mode\fP -Specifies a color buffer. -Accepted values are -\%\f3GL_FRONT_LEFT\fP, -\%\f3GL_FRONT_RIGHT\fP, -\%\f3GL_BACK_LEFT\fP, -\%\f3GL_BACK_RIGHT\fP, -\%\f3GL_FRONT\fP, -\%\f3GL_BACK\fP, -\%\f3GL_LEFT\fP, -\%\f3GL_RIGHT\fP, and -\%\f3GL_AUX\fP\f2i\fP, -where \f2i\fP is between 0 and \%\f3GL_AUX_BUFFERS\fP \-1. -.SH DESCRIPTION -\%\f3glReadBuffer\fP specifies a color buffer as the source for subsequent -\%\f3glReadPixels\fP, \%\f3glCopyTexImage1D\fP, \%\f3glCopyTexImage2D\fP, -\%\f3glCopyTexSubImage1D\fP, \%\f3glCopyTexSubImage2D\fP, -\%\f3glCopyTexSubImage3D\fP, and -\%\f3glCopyPixels\fP commands. -\f2mode\fP accepts one of twelve or more predefined values. -(\%\f3GL_AUX0\fP through \%\f3GL_AUX3\fP are always defined.) -In a fully configured system, -\%\f3GL_FRONT\fP, -\%\f3GL_LEFT\fP, and -\%\f3GL_FRONT_LEFT\fP all name the front left buffer, -\%\f3GL_FRONT_RIGHT\fP and -\%\f3GL_RIGHT\fP name the front right buffer, and -\%\f3GL_BACK_LEFT\fP and -\%\f3GL_BACK\fP name the back left buffer. -.P -Nonstereo double-buffered configurations have only a front left and a -back left buffer. -Single-buffered configurations have a front left and a front right -buffer if stereo, and only a front left buffer if nonstereo. -It is an error to specify a nonexistent buffer to \%\f3glReadBuffer\fP. -.P -\f2mode\fP is initially \%\f3GL_FRONT\fP in single-buffered configurations, -and \%\f3GL_BACK\fP in double-buffered configurations. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2mode\fP is not one of the twelve -(or more) accepted values. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2mode\fP specifies a buffer -that does not exist. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glReadBuffer\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_READ_BUFFER\fP -.SH SEE ALSO -\%\f3glCopyPixels(3G)\fP, -\%\f3glCopyTexImage1D(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glCopyTexSubImage1D(3G)\fP, -\%\f3glCopyTexSubImage2D(3G)\fP, -\%\f3glCopyTexSubImage3D(3G)\fP, -\%\f3glDrawBuffer(3G)\fP, -\%\f3glReadPixels(3G)\fP diff --git a/doc/gl-docs/GL/gl/readpixels.3gl b/doc/gl-docs/GL/gl/readpixels.3gl deleted file mode 100644 index 5c44475a..00000000 --- a/doc/gl-docs/GL/gl/readpixels.3gl +++ /dev/null @@ -1,348 +0,0 @@ -.\" $XFree86$ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 readpixel -.ds Xs 11505 13 readpixels.gl -.TH GLREADPIXELS 3G -.SH NAME -.B "glReadPixels -\- read a block of pixels from the frame buffer - -.SH C SPECIFICATION -void \f3glReadPixels\fP( -GLint \fIx\fP, -.nf -.ta \w'\f3void \fPglReadPixels( 'u - GLint \fIy\fP, - GLsizei \fIwidth\fP, - GLsizei \fIheight\fP, - GLenum \fIformat\fP, - GLenum \fItype\fP, - GLvoid \fI*pixels\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2x\fP\ \f2y\fP\ \ 'u -\f2x\fP, \f2y\fP -Specify the window coordinates of the first pixel -that is read from the frame buffer. -This location is the lower left corner of a rectangular block of pixels. -.TP -\f2width\fP, \f2height\fP -Specify the dimensions of the pixel rectangle. -\f2width\fP and \f2height\fP of one correspond to a single pixel. -.TP -\f2format\fP -Specifies the of the pixel data. -The following symbolic values are accepted: -\%\f3GL_COLOR_INDEX\fP, -\%\f3GL_STENCIL_INDEX\fP, -\%\f3GL_DEPTH_COMPONENT\fP, -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_BGR\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, and -\%\f3GL_LUMINANCE_ALPHA\fP. -.TP -\f2type\fP -Specifies the data type of the pixel data. -Must be one of -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP. -.TP -\f2pixels\fP -Returns the pixel data. -.SH DESCRIPTION -\%\f3glReadPixels\fP returns pixel data from the frame buffer, -starting with the pixel whose lower left corner -is at location (\f2x\fP, \f2y\fP), -into client memory starting at location \f2pixels\fP. -Several parameters control the processing of the pixel data before -it is placed into client memory. -These parameters are set with three commands: -\%\f3glPixelStore\fP, -\%\f3glPixelTransfer\fP, and -\%\f3glPixelMap\fP. -This reference page describes the effects on \%\f3glReadPixels\fP of most, -but not all of the parameters specified by these three commands. -.P -When the \%\f3GL_ARB_imaging\fP extension is supported, the pixel data may -be processed by additional operations including color table lookup, -color matrix transformations, convolutions, histograms and minimum and -maximun pixel value computations. -.P -\%\f3glReadPixels\fP returns values from each pixel with lower left corner at -(\f2x\fP + $i$, \f2y\fP + $j$) for 0 \(<= $i$ < \f2width\fP and -0 \(<= $j$ < \f2height\fP. -This pixel is said to be the $i$th pixel in the $j$th row. -Pixels are returned in row order from the lowest to the highest row, -left to right in each row. -.P -\f2format\fP specifies the for the returned pixel values; -accepted values are: -.TP 10 -\%\f3GL_COLOR_INDEX\fP -Color indices are read from the color buffer -selected by \%\f3glReadBuffer\fP. -Each index is converted to fixed point, -shifted left or right depending on the value and sign of \%\f3GL_INDEX_SHIFT\fP, -and added to \%\f3GL_INDEX_OFFSET\fP. -If \%\f3GL_MAP_COLOR\fP is \%\f3GL_TRUE\fP, -indices are replaced by their mappings in the table \%\f3GL_PIXEL_MAP_I_TO_I\fP. -.TP -\%\f3GL_STENCIL_INDEX\fP -Stencil values are read from the stencil buffer. -Each index is converted to fixed point, -shifted left or right depending on the value and sign of \%\f3GL_INDEX_SHIFT\fP, -and added to \%\f3GL_INDEX_OFFSET\fP. -If \%\f3GL_MAP_STENCIL\fP is \%\f3GL_TRUE\fP, -indices are replaced by their mappings in the table \%\f3GL_PIXEL_MAP_S_TO_S\fP. -.TP -\%\f3GL_DEPTH_COMPONENT\fP -Depth values are read from the depth buffer. -Each component is converted to floating point such that the minimum depth -value maps to 0 and the maximum value maps to 1. -Each component is then multiplied by \%\f3GL_DEPTH_SCALE\fP, -added to \%\f3GL_DEPTH_BIAS\fP, -and finally clamped to the range [0,1]. -.TP -\%\f3GL_RED\fP -.TP -\%\f3GL_GREEN\fP -.TP -\%\f3GL_BLUE\fP -.TP -\%\f3GL_ALPHA\fP -.TP -\%\f3GL_RGB\fP -.TP -\%\f3GL_BGR\fP -.TP -\%\f3GL_RGBA\fP -.TP -\%\f3GL_BGRA\fP -.TP -\%\f3GL_LUMINANCE\fP -.TP -\%\f3GL_LUMINANCE_ALPHA\fP -Processing differs depending on whether color buffers store color indices -or RGBA color components. -If color indices are stored, -they are read from the color buffer selected by \%\f3glReadBuffer\fP. -Each index is converted to fixed point, -shifted left or right depending on the value and sign of \%\f3GL_INDEX_SHIFT\fP, -and added to \%\f3GL_INDEX_OFFSET\fP. -Indices are then replaced by the red, -green, -blue, -and alpha values obtained by indexing the tables -\%\f3GL_PIXEL_MAP_I_TO_R\fP, -\%\f3GL_PIXEL_MAP_I_TO_G\fP, -\%\f3GL_PIXEL_MAP_I_TO_B\fP, and -\%\f3GL_PIXEL_MAP_I_TO_A\fP. -Each table must be of size $2 sup n$, but $n$ may be different for -different tables. -Before an index is used to look up a value in a table of -size $2 sup n$, it must be masked against $2 sup n - 1$. -.IP -If RGBA color components are stored in the color buffers, -they are read from the color buffer selected by \%\f3glReadBuffer\fP. -Each color component is converted to floating point such that zero intensity -maps to 0.0 and full intensity maps to 1.0. -Each component is then multiplied by \%\f3GL_c_SCALE\fP and -added to \%\f3GL_c_BIAS\fP, -where \f2c\fP is RED, GREEN, BLUE, or ALPHA. -Finally, -if \%\f3GL_MAP_COLOR\fP is \%\f3GL_TRUE\fP, -each component is clamped to the range [0,\ 1], -scaled to the size of its corresponding table, and is then -replaced by its mapping in the table -\%\f3GL_PIXEL_MAP_c_TO_c\fP, -where \f2c\fP is R, G, B, or A. -.IP -Unneeded data is then discarded. -For example, -\%\f3GL_RED\fP discards the green, blue, and alpha components, -while \%\f3GL_RGB\fP discards only the alpha component. -\%\f3GL_LUMINANCE\fP computes a single-component value as the sum of -the red, -green, -and blue components, -and \%\f3GL_LUMINANCE_ALPHA\fP does the same, -while keeping alpha as a second value. -The final values are clamped to the range [0,\ 1]. -.P -The shift, -scale, -bias, -and lookup factors just described are all specified by -.br -\%\f3glPixelTransfer\fP. -The lookup table contents themselves are specified by \%\f3glPixelMap\fP. -.P -Finally, the indices or components -are converted to the proper , -as specified by \f2type\fP. -If \f2format\fP is \%\f3GL_COLOR_INDEX\fP or \%\f3GL_STENCIL_INDEX\fP -and \f2type\fP is not \%\f3GL_FLOAT\fP, -each index is masked with the mask value given in the following table. -If \f2type\fP is \%\f3GL_FLOAT\fP, then each integer index is converted to -single-precision floating-point . -.P -If \f2format\fP is -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_BGR\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, or -\%\f3GL_LUMINANCE_ALPHA\fP and \f2type\fP is not \%\f3GL_FLOAT\fP, -each component is multiplied by the multiplier shown in the following table. -If type is \%\f3GL_FLOAT\fP, then each component is passed as is -(or converted to the client's single-precision floating-point if -it is different from the one used by the GL). -.P -.TS -center tab(:); -l cb cb -l c c. -_ -\f2type\fP:index mask:component conversion -_ -.sp .5 -\%\f3GL_UNSIGNED_BYTE\fP:$2"^"8 - 1$:$(2"^"8 - 1) c$ -\%\f3GL_BYTE\fP:$2"^"7 - 1$:$[(2"^"8 - 1) c - 1] / 2$ -\%\f3GL_BITMAP\fP:$1$:$1$ -\%\f3GL_UNSIGNED_SHORT\fP:$2"^"16 - 1$:$(2"^"16 - 1) c$ -\%\f3GL_SHORT\fP:$2"^"15 - 1$:$[(2"^"16 - 1) c - 1] / 2$ -\%\f3GL_UNSIGNED_INT\fP:$2"^"32 - 1$:$(2"^"32 - 1) c$ -\%\f3GL_INT\fP:$2"^"31 - 1$:$[(2"^"32 - 1) c - 1] / 2$ -\%\f3GL_FLOAT\fP:none:$c$ -_ -.TE -.P -Return values are placed in memory as follows. -If \f2format\fP is -\%\f3GL_COLOR_INDEX\fP, -\%\f3GL_STENCIL_INDEX\fP, -\%\f3GL_DEPTH_COMPONENT\fP, -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, or -\%\f3GL_LUMINANCE\fP, -a single value is returned and the data for the $i$th pixel in the $j$th row -is placed in location $(j)~"width"~+~i$. -\%\f3GL_RGB\fP and \%\f3GL_BGR\fP return three values, -\%\f3GL_RGBA\fP and \%\f3GL_BGRA\fP return four values, -and \%\f3GL_LUMINANCE_ALPHA\fP returns two values for each pixel, -with all values corresponding to a single pixel occupying contiguous space -in \f2pixels\fP. -Storage parameters set by \%\f3glPixelStore\fP, -such as \%\f3GL_PACK_LSB_FIRST\fP and \%\f3GL_PACK_SWAP_BYTES\fP, -affect the way that data is written into memory. -See \%\f3glPixelStore\fP for a description. -.SH NOTES -Values for pixels that lie outside the window -connected to the current GL context are undefined. -.P -If an error is generated, -no change is made to the contents of \f2pixels\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2format\fP or \f2type\fP is not an -accepted value. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is \%\f3GL_BITMAP\fP and \f2format\fP is -not \%\f3GL_COLOR_INDEX\fP or \%\f3GL_STENCIL_INDEX\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if either \f2width\fP or \f2height\fP is negative. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2format\fP is \%\f3GL_COLOR_INDEX\fP -and the color buffers store RGBA color components. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2format\fP is \%\f3GL_STENCIL_INDEX\fP -and there is no stencil buffer. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2format\fP is \%\f3GL_DEPTH_COMPONENT\fP -and there is no depth buffer. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glReadPixels\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, or -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -The formats \%\f3GL_BGR\fP, and \%\f3GL_BGRA\fP and types -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP are available only if the GL version -is 1.2 or greater. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_INDEX_MODE\fP -.SH SEE ALSO -\%\f3glCopyPixels(3G)\fP, -\%\f3glDrawPixels(3G)\fP, -\%\f3glPixelMap(3G)\fP, -\%\f3glPixelStore(3G)\fP, -\%\f3glPixelTransfer(3G)\fP, -.br -\%\f3glReadBuffer(3G)\fP diff --git a/doc/gl-docs/GL/gl/rect.3gl b/doc/gl-docs/GL/gl/rect.3gl deleted file mode 100644 index 635c56c4..00000000 --- a/doc/gl-docs/GL/gl/rect.3gl +++ /dev/null @@ -1,117 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 rect.gl - -.ds Xs 25554 4 rect.gl -.TH GLRECT 3G -.SH NAME -.B "glRectd, glRectf, glRecti, glRects, glRectdv, glRectfv, glRectiv, glRectsv -\- draw a rectangle - -.SH C SPECIFICATION -void \f3glRectd\fP( -GLdouble \fIx1\fP, -.nf -.ta \w'\f3void \fPglRectd( 'u - GLdouble \fIy1\fP, - GLdouble \fIx2\fP, - GLdouble \fIy2\fP ) -.fi -void \f3glRectf\fP( -GLfloat \fIx1\fP, -.nf -.ta \w'\f3void \fPglRectf( 'u - GLfloat \fIy1\fP, - GLfloat \fIx2\fP, - GLfloat \fIy2\fP ) -.fi -void \f3glRecti\fP( -GLint \fIx1\fP, -.nf -.ta \w'\f3void \fPglRecti( 'u - GLint \fIy1\fP, - GLint \fIx2\fP, - GLint \fIy2\fP ) -.fi -void \f3glRects\fP( -GLshort \fIx1\fP, -.nf -.ta \w'\f3void \fPglRects( 'u - GLshort \fIy1\fP, - GLshort \fIx2\fP, - GLshort \fIy2\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2x1\fP\ \f2y1\fP\ \ 'u -\f2x1\fP, \f2y1\fP -Specify one vertex of a rectangle. -.TP -\f2x2\fP, \f2y2\fP -Specify the opposite vertex of the rectangle. -.SH C SPECIFICATION -void \f3glRectdv\fP( -const GLdouble \fI*v1\fP, -.nf -.ta \w'\f3void \fPglRectdv( 'u - const GLdouble \fI*v2\fP ) -.fi -void \f3glRectfv\fP( -const GLfloat \fI*v1\fP, -.nf -.ta \w'\f3void \fPglRectfv( 'u - const GLfloat \fI*v2\fP ) -.fi -void \f3glRectiv\fP( -const GLint \fI*v1\fP, -.nf -.ta \w'\f3void \fPglRectiv( 'u - const GLint \fI*v2\fP ) -.fi -void \f3glRectsv\fP( -const GLshort \fI*v1\fP, -.nf -.ta \w'\f3void \fPglRectsv( 'u - const GLshort \fI*v2\fP ) -.fi - -.BP -.SH PARAMETERS -.TP -\f2v1\fP -Specifies a pointer to one vertex of a rectangle. -.TP -\f2v2\fP -Specifies a pointer to the opposite vertex of the rectangle. -.SH DESCRIPTION -\%\f3glRect\fP supports efficient specification of rectangles as two corner points. -Each -rectangle command takes four arguments, -organized either as two consecutive pairs of (\f2x\fP,\f2y\fP) coordinates, -or as two pointers to arrays, -each containing an (\f2x\fP,\f2y\fP) pair. -The resulting rectangle is defined in the \f2z\fP = 0 plane. -.P -\%\f3glRect\fP(\f2x1\fP, \f2y1\fP, \f2x2\fP, \f2y2\fP) -is exactly equivalent to the following sequence: -.Ex 6 -glBegin(\%\f3GL_POLYGON\fP); -glVertex2(\f2x1\fP, \f2y1\fP); -glVertex2(\f2x2\fP, \f2y1\fP); -glVertex2(\f2x2\fP, \f2y2\fP); -glVertex2(\f2x1\fP, \f2y2\fP); -glEnd(); -.Ee -Note that if the second vertex is above and to the right of the first vertex, -the rectangle is constructed with a counterclockwise winding. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glRect\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glBegin(3G)\fP, -\%\f3glVertex(3G)\fP diff --git a/doc/gl-docs/GL/gl/rendermode.3gl b/doc/gl-docs/GL/gl/rendermode.3gl deleted file mode 100644 index 8727873e..00000000 --- a/doc/gl-docs/GL/gl/rendermode.3gl +++ /dev/null @@ -1,107 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 rendermod -.ds Xs 54049 5 rendermode.gl -.TH GLRENDERMODE 3G -.SH NAME -.B "glRenderMode -\- set rasterization mode - -.SH C SPECIFICATION -GLint \f3glRenderMode\fP( -GLenum \fImode\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2mode\fP\ \ 'u -\f2mode\fP -Specifies the rasterization mode. -Three values are accepted: -\%\f3GL_RENDER\fP, -\%\f3GL_SELECT\fP, and -\%\f3GL_FEEDBACK\fP. -The initial value is \%\f3GL_RENDER\fP. -.SH DESCRIPTION -\%\f3glRenderMode\fP sets the rasterization mode. -It takes one argument, -\f2mode\fP, -which can assume one of three predefined values: -.TP 16 -\%\f3GL_RENDER\fP -Render mode. Primitives are rasterized, -producing pixel fragments, -which are written into the frame buffer. -This is the normal mode -and also the default mode. -.TP -\%\f3GL_SELECT\fP -Selection mode. -No pixel fragments are produced, -and no change to the frame buffer contents is made. -Instead, -a record of the names of primitives that would have been drawn -if the render mode had been \%\f3GL_RENDER\fP is returned in a select buffer, -which must be created (see \%\f3glSelectBuffer\fP) before selection mode -is entered. -.TP -\%\f3GL_FEEDBACK\fP -Feedback mode. -No pixel fragments are produced, -and no change to the frame buffer contents is made. -Instead, -the coordinates and attributes of vertices that would have been drawn -if the render mode had been \%\f3GL_RENDER\fP is returned in a feedback buffer, -which must be created (see \%\f3glFeedbackBuffer\fP) before feedback mode -is entered. -.P -The return value of \%\f3glRenderMode\fP is determined by the render mode at the time -\%\f3glRenderMode\fP is called, -rather than by \f2mode\fP. -The values returned for the three render modes are as follows: -.TP 16 -\%\f3GL_RENDER\fP -0. -.TP -\%\f3GL_SELECT\fP -The number of hit records transferred to the select buffer. -.TP -\%\f3GL_FEEDBACK\fP -The number of values (not vertices) transferred to the feedback buffer. -.P -See the \%\f3glSelectBuffer\fP and \%\f3glFeedbackBuffer\fP reference pages for -more details concerning selection and feedback operation. -.SH NOTES -If an error is generated, -\%\f3glRenderMode\fP returns 0 regardless of the current render mode. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2mode\fP is not one of the three -accepted values. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glSelectBuffer\fP is called -while the render mode is \%\f3GL_SELECT\fP, -or if \%\f3glRenderMode\fP is called with argument \%\f3GL_SELECT\fP before -\%\f3glSelectBuffer\fP is called at least once. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glFeedbackBuffer\fP is called -while the render mode is \%\f3GL_FEEDBACK\fP, -or if \%\f3glRenderMode\fP is called with argument \%\f3GL_FEEDBACK\fP before -\%\f3glFeedbackBuffer\fP is called at least once. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glRenderMode\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_RENDER_MODE\fP -.SH SEE ALSO -\%\f3glFeedbackBuffer(3G)\fP, -\%\f3glInitNames(3G)\fP, -\%\f3glLoadName(3G)\fP, -\%\f3glPassThrough(3G)\fP, -\%\f3glPushName(3G)\fP, -\%\f3glSelectBuffer(3G)\fP diff --git a/doc/gl-docs/GL/gl/resethistogram.3gl b/doc/gl-docs/GL/gl/resethistogram.3gl deleted file mode 100644 index ed656ad9..00000000 --- a/doc/gl-docs/GL/gl/resethistogram.3gl +++ /dev/null @@ -1,38 +0,0 @@ -'\" t -'\"! tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 resethist -.ds Xs 3266 3 resethistogram.gl -.TH GLRESETHISTOGRAM 3G -.SH NAME -.B "glResetHistogram -\- reset histogram table entries to zero - -.SH C SPECIFICATION -void \f3glResetHistogram\fP( -GLenum \fItarget\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -Must be -\%\f3GL_HISTOGRAM\fP. -.SH DESCRIPTION -\%\f3glResetHistogram\fP resets all the elements of the current histogram table to zero. -.SH NOTES -\%\f3glResetHistogram\fP is present only if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP -is called with an argument of \%\f3GL_EXTENSIONS\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not \%\f3GL_HISTOGRAM\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glResetHistogram\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glHistogram(3G)\fP diff --git a/doc/gl-docs/GL/gl/resetminmax.3gl b/doc/gl-docs/GL/gl/resetminmax.3gl deleted file mode 100644 index 284615b4..00000000 --- a/doc/gl-docs/GL/gl/resetminmax.3gl +++ /dev/null @@ -1,41 +0,0 @@ -'\" t -'\"! tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 resetminm -.ds Xs 18776 3 resetminmax.gl -.TH GLRESETMINMAX 3G -.SH NAME -.B "glResetMinmax -\- reset minmax table entries to initial values - -.SH C SPECIFICATION -void \f3glResetMinmax\fP( -GLenum \fItarget\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -Must be -\%\f3GL_MINMAX\fP. -.SH DESCRIPTION -\%\f3glResetMinmax\fP resets the elements of the current minmax table to their -initial values: the ``maximum'' element receives the minimum possible -component values, and the ``minimum'' element receives the maximum -possible component values. -.SH NOTES -\%\f3glResetMinmax\fP is present only if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP -is called with an argument of \%\f3GL_EXTENSIONS\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not \%\f3GL_MINMAX\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glResetMinmax\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.SH SEE ALSO -\%\f3glMinmax(3G)\fP diff --git a/doc/gl-docs/GL/gl/rotate.3gl b/doc/gl-docs/GL/gl/rotate.3gl deleted file mode 100644 index 88b5805f..00000000 --- a/doc/gl-docs/GL/gl/rotate.3gl +++ /dev/null @@ -1,110 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 rotate.gl -.ds Xs 52762 5 rotate.gl -.TH GLROTATE 3G -.SH NAME -.B "glRotated, glRotatef -\- multiply the current matrix by a rotation matrix - -.SH C SPECIFICATION -void \f3glRotated\fP( -GLdouble \fIangle\fP, -.nf -.ta \w'\f3void \fPglRotated( 'u - GLdouble \fIx\fP, - GLdouble \fIy\fP, - GLdouble \fIz\fP ) -.fi -void \f3glRotatef\fP( -GLfloat \fIangle\fP, -.nf -.ta \w'\f3void \fPglRotatef( 'u - GLfloat \fIx\fP, - GLfloat \fIy\fP, - GLfloat \fIz\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2angle\fP\ \ 'u -\f2angle\fP -Specifies the angle of rotation, in degrees. -.TP -\f2x\fP, \f2y\fP, \f2z\fP -Specify the \f2x\fP, \f2y\fP, and \f2z\fP coordinates of a vector, respectively. -.SH DESCRIPTION -\%\f3glRotate\fP produces a rotation of \f2angle\fP degrees around -the vector $("x", "y", "z")$. -The current matrix (see \%\f3glMatrixMode\fP) is multiplied by a rotation -matrix with the product -replacing the current matrix, as if \%\f3glMultMatrix\fP were called -with the following matrix as its argument: -.P -.ce -.EQ -left ( ~ down 20 matrix { - ccol { - "x" sup 2 (1 ^-^ c)~+~ c above - "y" "x" (1 ^-^ c)~+~ "z" s above - "x" "z" (1 ^-^ c)~-~"y" s above - ~0 - } - ccol { - ~~ "x" "y" (1 ^-^ c)~-~"z" s above - ~~ "y" sup 2 (1 ^-^ c)~+~ c above - ~~ "y" "z" (1 ^-^ c)~+~ "x" s above - ~~ ~0 - } - ccol { - ~~ "x" "z" (1 ^-^ c)~+~ "y" s above - ~~ "y" "z" (1 ^-^ c)~-~ "x" s above - ~~ "z" sup 2 (1 ^-^ c) ~+~ c above - ~~ ~0 - } - ccol { ~0 above ~0 above ~0 above ~1} -} ~~ right ) -.EN -.P -.sp -Where $c ~=~ cos ("angle")$, $s ~=~ sin ("angle")$, and -$||(~"x", "y", "z"~)|| ~=~ 1$ (if not, the GL -will normalize this vector). -.sp -.sp -.P -If the matrix mode is either \%\f3GL_MODELVIEW\fP or \%\f3GL_PROJECTION\fP, -all objects drawn after \%\f3glRotate\fP is called are rotated. -Use \%\f3glPushMatrix\fP and \%\f3glPopMatrix\fP to save and restore -the unrotated coordinate system. -.SH NOTES -This rotation follows the right-hand rule, so -if the vector $("x", "y", "z")$ points toward the -user, the rotation will be counterclockwise. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glRotate\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_MATRIX_MODE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_COLOR_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MODELVIEW_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PROJECTION_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_TEXTURE_MATRIX\fP -.SH SEE ALSO -\%\f3glMatrixMode(3G)\fP, -\%\f3glMultMatrix(3G)\fP, -\%\f3glPushMatrix(3G)\fP, -\%\f3glScale(3G)\fP, -\%\f3glTranslate(3G)\fP diff --git a/doc/gl-docs/GL/gl/scale.3gl b/doc/gl-docs/GL/gl/scale.3gl deleted file mode 100644 index 11c09e38..00000000 --- a/doc/gl-docs/GL/gl/scale.3gl +++ /dev/null @@ -1,92 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 scale.gl -.ds Xs 39478 4 scale.gl -.TH GLSCALE 3G -.SH NAME -.B "glScaled, glScalef -\- multiply the current matrix by a general scaling matrix - -.SH C SPECIFICATION -void \f3glScaled\fP( -GLdouble \fIx\fP, -.nf -.ta \w'\f3void \fPglScaled( 'u - GLdouble \fIy\fP, - GLdouble \fIz\fP ) -.fi -void \f3glScalef\fP( -GLfloat \fIx\fP, -.nf -.ta \w'\f3void \fPglScalef( 'u - GLfloat \fIy\fP, - GLfloat \fIz\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2x\fP\ \f2y\fP\ \f2z\fP\ \ 'u -\f2x\fP, \f2y\fP, \f2z\fP -Specify scale factors along the \f2x\fP, \f2y\fP, and \f2z\fP axes, respectively. -.SH DESCRIPTION -\%\f3glScale\fP produces a nonuniform scaling along the \f2x\fP, \f2y\fP, and -\f2z\fP axes. -The three parameters indicate the desired scale factor along -each of the three axes. -.P -The current matrix -(see \%\f3glMatrixMode\fP) -is multiplied by this scale matrix, -and the product replaces the current matrix -as if \%\f3glScale\fP were called with the following matrix -as its argument: - -.P -.ce -.EQ -left ( ~ down 20 matrix { - ccol { ~"x" above ~0 above ~0 above ~0 } - ccol { ~0 above ~"y" above ~0 above ~0 } - ccol { ~0 above ~0 above ~"z" above ~0 } - ccol { ~0 above ~0 above ~0 above ~1} -} ~~ right ) -.EN -.sp -If the matrix mode is either \%\f3GL_MODELVIEW\fP or \%\f3GL_PROJECTION\fP, -all objects drawn after \%\f3glScale\fP is called are scaled. -.P -Use \%\f3glPushMatrix\fP and \%\f3glPopMatrix\fP to save and restore -the unscaled coordinate system. -.SH NOTES -If scale factors other than 1 are applied to the modelview matrix -and lighting is enabled, lighting often appears wrong. -In that case, enable automatic normalization of normals by -calling \%\f3glEnable\fP with the argument \%\f3GL_NORMALIZE\fP. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glScale\fP -is executed between the execution of -\%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_MATRIX_MODE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_COLOR_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MODELVIEW_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PROJECTION_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_TEXTURE_MATRIX\fP -.SH SEE ALSO -\%\f3glMatrixMode(3G)\fP, -\%\f3glMultMatrix(3G)\fP, -\%\f3glPushMatrix(3G)\fP, -\%\f3glRotate(3G)\fP, -\%\f3glTranslate(3G)\fP diff --git a/doc/gl-docs/GL/gl/scissor.3gl b/doc/gl-docs/GL/gl/scissor.3gl deleted file mode 100644 index d60c22ff..00000000 --- a/doc/gl-docs/GL/gl/scissor.3gl +++ /dev/null @@ -1,69 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 scissor.g -.ds Xs 30565 4 scissor.gl -.TH GLSCISSOR 3G -.SH NAME -.B "glScissor -\- define the scissor box - -.SH C SPECIFICATION -void \f3glScissor\fP( -GLint \fIx\fP, -.nf -.ta \w'\f3void \fPglScissor( 'u - GLint \fIy\fP, - GLsizei \fIwidth\fP, - GLsizei \fIheight\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2x\fP\ \f2y\fP\ \ 'u -\f2x\fP, \f2y\fP -Specify the lower left corner of the scissor box. -Initially (0, 0). -.TP -\f2width\fP, \f2height\fP -Specify the width and height of the scissor box. -When a GL context is first attached to a window, -\f2width\fP and \f2height\fP are set to the dimensions of that window. -.SH DESCRIPTION -\%\f3glScissor\fP defines a rectangle, called the scissor box, -in window coordinates. -The first two arguments, -\f2x\fP and \f2y\fP, -specify the lower left corner of the box. -\f2width\fP and \f2height\fP specify the width and height of the box. -.P -To enable and disable the scissor test, call -\%\f3glEnable\fP and \%\f3glDisable\fP with argument -\%\f3GL_SCISSOR_TEST\fP. The test is initially disabled. -While the test is enabled, only pixels that lie within the scissor box -can be modified by drawing commands. -Window coordinates have integer values at the shared corners of -frame buffer pixels. -\f7glScissor(0,0,1,1)\fP allows modification of only the lower left -pixel in the window, and \f7glScissor(0,0,0,0)\fP doesn't allow -modification of any pixels in the window. -.P -When the scissor test is disabled, -it is as though the scissor box includes the entire window. -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if either \f2width\fP or \f2height\fP is negative. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glScissor\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.bp -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_SCISSOR_BOX\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_SCISSOR_TEST\fP -.SH SEE ALSO -\%\f3glEnable(3G)\fP, -\%\f3glViewport(3G)\fP diff --git a/doc/gl-docs/GL/gl/selectbuffer.3gl b/doc/gl-docs/GL/gl/selectbuffer.3gl deleted file mode 100644 index 6bb102c1..00000000 --- a/doc/gl-docs/GL/gl/selectbuffer.3gl +++ /dev/null @@ -1,113 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 selectbuf -.ds Xs 39171 6 selectbuffer.gl -.TH GLSELECTBUFFER 3G -.SH NAME -.B "glSelectBuffer -\- establish a buffer for selection mode values - -.SH C SPECIFICATION -void \f3glSelectBuffer\fP( -GLsizei \fIsize\fP, -.nf -.ta \w'\f3void \fPglSelectBuffer( 'u - GLuint \fI*buffer\fP ) -.fi - -.SH PARAMETERS -.TP \w'\fIbuffer\fP\ \ 'u -\f2size\fP -Specifies the size of \f2buffer\fP. -.TP -\f2buffer\fP -Returns the selection data. -.SH DESCRIPTION -\%\f3glSelectBuffer\fP has two arguments: -\f2buffer\fP is a pointer to an array of unsigned integers, -and \f2size\fP indicates the size of the array. -\f2buffer\fP returns values from the name stack -(see \%\f3glInitNames\fP, \%\f3glLoadName\fP, \%\f3glPushName\fP) -when the rendering mode is \%\f3GL_SELECT\fP (see \%\f3glRenderMode\fP). -\%\f3glSelectBuffer\fP must be issued before selection mode is enabled, -and it must not be issued while the rendering mode is \%\f3GL_SELECT\fP. -.P -A programmer can use selection to determine which primitives -are drawn into some region of a window. -The region is defined by the current modelview and perspective matrices. -.P -In selection mode, no pixel fragments are produced from rasterization. -Instead, -if a primitive or a raster position intersects the clipping -volume defined by the viewing frustum -and the user-defined clipping planes, -this primitive causes a selection hit. -(With polygons, no hit occurs if the polygon is culled.) -When a change is made to the name stack, -or when \%\f3glRenderMode\fP is called, -a hit record is copied to \f2buffer\fP if any hits have occurred since the -last such event -(name stack change or -\%\f3glRenderMode\fP call). -The hit record consists of the number of names in the name stack at the -time of the event, followed by the minimum and maximum depth values -of all vertices that hit since the previous event, -followed by the name stack contents, -bottom name first. -.P -Depth values (which are in the range [0,1]) are multiplied by 2^32 - 1, -before being placed in the hit record. -.P -An internal index into \f2buffer\fP is reset to 0 whenever selection mode -is entered. -Each time a hit record is copied into \f2buffer\fP, -the index is incremented to point to the cell just past the end -of the block of names \- that is, to the next available cell. -If the hit record is larger than the number of remaining locations in \f2buffer\fP, -as much data as can fit is copied, -and the overflow flag is set. -If the name stack is empty when a hit record is copied, -that record consists of 0 followed by the minimum and maximum depth values. -.P -To exit selection mode, call \%\f3glRenderMode\fP with an argument -other than \%\f3GL_SELECT\fP. -Whenever \%\f3glRenderMode\fP is called while the render mode is \%\f3GL_SELECT\fP, -it returns the number of hit records copied to \f2buffer\fP, -resets the overflow flag and the selection buffer pointer, -and initializes the name stack to be empty. -If the overflow bit was set when \%\f3glRenderMode\fP was called, -a negative hit record count is returned. -.SH NOTES -The contents of \f2buffer\fP is undefined until \%\f3glRenderMode\fP is called -with an argument other than \%\f3GL_SELECT\fP. -.P -\%\f3glBegin\fP/\%\f3glEnd\fP primitives and calls to \%\f3glRasterPos\fP -can result in hits. -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if \f2size\fP is negative. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glSelectBuffer\fP is called while the -render mode is \%\f3GL_SELECT\fP, -or if \%\f3glRenderMode\fP is called with argument \%\f3GL_SELECT\fP before -\%\f3glSelectBuffer\fP is called at least once. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glSelectBuffer\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_NAME_STACK_DEPTH\fP -.br -\%\f3glGet\fP with argument \%\f3GL_SELECTION_BUFFER_SIZE\fP -.br -\%\f3glGetPointerv\fP with argument \%\f3GL_SELECTION_BUFFER_POINTER\fP -.SH SEE ALSO -\%\f3glFeedbackBuffer(3G)\fP, -\%\f3glInitNames(3G)\fP, -\%\f3glLoadName(3G)\fP, -\%\f3glPushName(3G)\fP, -\%\f3glRenderMode(3G)\fP diff --git a/doc/gl-docs/GL/gl/separablefilter2d.3gl b/doc/gl-docs/GL/gl/separablefilter2d.3gl deleted file mode 100644 index 48190c7d..00000000 --- a/doc/gl-docs/GL/gl/separablefilter2d.3gl +++ /dev/null @@ -1,245 +0,0 @@ -'\" t -'\"! tbl | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 separable -.ds Xs 28833 9 separablefilter2d.gl -.TH GLSEPARABLEFILTER2D 3G -.SH NAME -.B "glSeparableFilter2D -\- define a separable two-dimensional convolution filter - -.SH C SPECIFICATION -void \f3glSeparableFilter2D\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglSeparableFilter2D( 'u - GLenum \fIinternalformat\fP, - GLsizei \fIwidth\fP, - GLsizei \fIheight\fP, - GLenum \fIformat\fP, - GLenum \fItype\fP, - const GLvoid \fI*row\fP, - const GLvoid \fI*column\fP ) -.fi - -.SH PARAMETERS -.TP \w'\fIinternalformat\fP\ \ 'u -\f2target\fP -Must be \%\f3GL_SEPARABLE_2D\fP. -.TP -\f2internalformat\fP -The internal of the convolution filter kernel. -The allowable values are -\%\f3GL_ALPHA\fP, -\%\f3GL_ALPHA4\fP, -\%\f3GL_ALPHA8\fP, -\%\f3GL_ALPHA12\fP, -\%\f3GL_ALPHA16\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE4\fP, -\%\f3GL_LUMINANCE8\fP, -\%\f3GL_LUMINANCE12\fP, -\%\f3GL_LUMINANCE16\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_LUMINANCE4_ALPHA4\fP, -\%\f3GL_LUMINANCE6_ALPHA2\fP, -\%\f3GL_LUMINANCE8_ALPHA8\fP, -\%\f3GL_LUMINANCE12_ALPHA4\fP, -\%\f3GL_LUMINANCE12_ALPHA12\fP, -\%\f3GL_LUMINANCE16_ALPHA16\fP, -\%\f3GL_INTENSITY\fP, -\%\f3GL_INTENSITY4\fP, -\%\f3GL_INTENSITY8\fP, -\%\f3GL_INTENSITY12\fP, -\%\f3GL_INTENSITY16\fP, -\%\f3GL_R3_G3_B2\fP, -\%\f3GL_RGB\fP, -\%\f3GL_RGB4\fP, -\%\f3GL_RGB5\fP, -\%\f3GL_RGB8\fP, -\%\f3GL_RGB10\fP, -\%\f3GL_RGB12\fP, -\%\f3GL_RGB16\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_RGBA2\fP, -\%\f3GL_RGBA4\fP, -\%\f3GL_RGB5_A1\fP, -\%\f3GL_RGBA8\fP, -\%\f3GL_RGB10_A2\fP, -\%\f3GL_RGBA12\fP, or -\%\f3GL_RGBA16\fP. -.TP -\f2width\fP -The number of elements in the pixel array referenced by \f2row\fP. -(This is the width of the separable filter kernel.) -.TP -\f2height\fP -The number of elements in the pixel array referenced by \f2column\fP. -(This is the height of the separable filter kernel.) -.TP -\f2format\fP -The of the pixel data in \f2row\fP and \f2column\fP. -The allowable values are -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_BGR\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_INTENSITY\fP, -\%\f3GL_LUMINANCE\fP, and -\%\f3GL_LUMINANCE_ALPHA\fP. -.TP -\f2type\fP -The type of the pixel data in \f2row\fP and \f2column\fP. -Symbolic constants -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -are accepted. -.TP -\f2row\fP -Pointer to a one-dimensional array of pixel data that is processed to -build the row filter kernel. -.TP -\f2column\fP -Pointer to a one-dimensional array of pixel data that is processed to -build the column filter kernel. -.SH DESCRIPTION -\%\f3glSeparableFilter2D\fP builds a two-dimensional separable convolution filter kernel from -two arrays of pixels. -.sp -The pixel arrays specified by (\f2width\fP, \f2format\fP, \f2type\fP, \f2row\fP) -and (\f2height\fP, \f2format\fP, \f2type\fP, \f2column\fP) are processed just as if -they had been passed to \%\f3glDrawPixels\fP, -but processing stops after the final expansion to RGBA is completed. -.sp -Next, the R, G, B, and A components of all pixels in both arrays are scaled -by the four separable 2D \%\f3GL_CONVOLUTION_FILTER_SCALE\fP parameters and -biased by the four separable 2D \%\f3GL_CONVOLUTION_FILTER_BIAS\fP parameters. -(The scale and bias parameters are set by \%\f3glConvolutionParameter\fP -using the \%\f3GL_SEPARABLE_2D\fP target and the names -\%\f3GL_CONVOLUTION_FILTER_SCALE\fP and \%\f3GL_CONVOLUTION_FILTER_BIAS\fP. -The parameters themselves are vectors of four values that are applied to red, -green, blue, and alpha, in that order.) -The R, G, B, and A values are not clamped to [0,1] at any time during this -process. -.sp -Each pixel is then converted to the internal specified by -\f2internalformat\fP. -This conversion simply maps the component values of the pixel (R, G, B, -and A) to the values included in the internal (red, green, blue, -alpha, luminance, and intensity). The mapping is as follows: -.bp -.TS -center; -l c c c c c c. -_ -Internal Format Red Green Blue Alpha Luminance Intensity -_ -\%\f3GL_LUMINANCE\fP R -\%\f3GL_LUMINANCE_ALPHA\fP A R -\%\f3GL_INTENSITY\fP R -\%\f3GL_RGB\fP R G B -\%\f3GL_RGBA\fP R G B A -_ -.TE - -.sp -The red, green, blue, alpha, luminance, and/or intensity components of -the resulting pixels are stored in floating-point rather than integer -. -They form two one-dimensional filter kernel images. -The row image is indexed by coordinate \f2i\fP starting at zero and -increasing from left to right. -Each location in the row image is derived from element \f2i\fP of \f2row\fP. -The column image is indexed by coordinate \f2j\fP starting at zero -and increasing from bottom to top. -Each location in the column image is derived from element \f2j\fP of \f2column\fP. -.PP -Note that after a convolution is performed, the resulting color -components are also scaled by their corresponding -\%\f3GL_POST_CONVOLUTION_c_SCALE\fP parameters and biased by their -corresponding \%\f3GL_POST_CONVOLUTION_c_BIAS\fP parameters (where -\f2c\fP takes on the values \f3RED\fP, \f3GREEN\fP, \f3BLUE\fP, and -\f3ALPHA\fP). -These parameters are set by \%\f3glPixelTransfer\fP. -.SH NOTES -\%\f3glSeparableFilter2D\fP is present only if \%\f3GL_ARB_imaging\fP is returned when \%\f3glGetString\fP -is called with an argument of \%\f3GL_EXTENSIONS\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not -\%\f3GL_SEPARABLE_2D\fP. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2internalformat\fP is not one of the -allowable values. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2width\fP is less than zero or greater -than the maximum supported value. -This value may be queried with \%\f3glGetConvolutionParameter\fP -using target \%\f3GL_SEPARABLE_2D\fP and name -\%\f3GL_MAX_CONVOLUTION_WIDTH\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2height\fP is less than zero or greater -than the maximum supported value. -This value may be queried with \%\f3glGetConvolutionParameter\fP -using target \%\f3GL_SEPARABLE_2D\fP and name -\%\f3GL_MAX_CONVOLUTION_HEIGHT\fP. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2format\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not one of the allowable -values. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glSeparableFilter2D\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2height\fP is one of -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, or -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2height\fP is one of -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.SH ASSOCIATED GETS -\%\f3glGetConvolutionParameter\fP, \%\f3glGetSeparableFilter\fP -.SH SEE ALSO -\%\f3glConvolutionFilter1D(3G)\fP, -\%\f3glConvolutionFilter2D(3G)\fP, -\%\f3glConvolutionParameter(3G)\fP, -\%\f3glPixelTransfer(3G)\fP diff --git a/doc/gl-docs/GL/gl/shademodel.3gl b/doc/gl-docs/GL/gl/shademodel.3gl deleted file mode 100644 index 74c54245..00000000 --- a/doc/gl-docs/GL/gl/shademodel.3gl +++ /dev/null @@ -1,87 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 shademode -.ds Xs 4246 5 shademodel.gl -.TH GLSHADEMODEL 3G -.SH NAME -.B "glShadeModel -\- select flat or smooth shading - -.SH C SPECIFICATION -void \f3glShadeModel\fP( -GLenum \fImode\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2mode\fP\ \ 'u -\f2mode\fP -Specifies a symbolic value representing a shading technique. -Accepted values are \%\f3GL_FLAT\fP and \%\f3GL_SMOOTH\fP. -The initial value is \%\f3GL_SMOOTH\fP. -.SH DESCRIPTION -GL primitives can have either flat or smooth shading. -Smooth shading, -the default, -causes the computed colors of vertices to be interpolated as the -primitive is rasterized, -typically assigning different colors to each resulting pixel fragment. -Flat shading selects the computed color of just one vertex -and assigns it to all the pixel fragments -generated by rasterizing a single primitive. -In either case, the computed color of a vertex is the result of -lighting if lighting is enabled, -or it is the current color at the time the vertex was specified if -lighting is disabled. -.P -Flat and smooth shading are indistinguishable for points. -Starting when \%\f3glBegin\fP is issued and counting vertices and -primitives from 1, the GL gives each flat-shaded line segment $i$ the -computed color of vertex $i ~+~ 1$, its second vertex. -Counting similarly from 1, -the GL gives each flat-shaded polygon the computed color of the vertex listed -in the following table. -This is the last vertex to specify the polygon in all cases except single -polygons, -where the first vertex specifies the flat-shaded color. -.sp -.TS -center; -lb cb -l c . -_ -Primitive Type of Polygon $i$ Vertex -_ -Single polygon ($ i ~==~ 1 $) 1 -Triangle strip $i ~+~ 2$ -Triangle fan $i ~+~ 2$ -Independent triangle $ 3 i$ -Quad strip $2 i ~+~ 2$ -Independent quad $ 4 i $ -_ -.TE -.sp -Flat and smooth shading are specified by \%\f3glShadeModel\fP with \f2mode\fP set to -\%\f3GL_FLAT\fP and \%\f3GL_SMOOTH\fP, respectively. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2mode\fP is any value other than -\%\f3GL_FLAT\fP or \%\f3GL_SMOOTH\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glShadeModel\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_SHADE_MODEL\fP -.SH SEE ALSO -\%\f3glBegin(3G)\fP, -\%\f3glColor(3G)\fP, -\%\f3glLight(3G)\fP, -\%\f3glLightModel(3G)\fP diff --git a/doc/gl-docs/GL/gl/stencilfunc.3gl b/doc/gl-docs/GL/gl/stencilfunc.3gl deleted file mode 100644 index ba01c37e..00000000 --- a/doc/gl-docs/GL/gl/stencilfunc.3gl +++ /dev/null @@ -1,147 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 stencilfu -.ds Xs 21383 6 stencilfunc.gl -.TH GLSTENCILFUNC 3G -.SH NAME -.B "glStencilFunc -\- set function and reference value for stencil testing - -.EQ -delim $$ -.EN -.SH C SPECIFICATION -void \f3glStencilFunc\fP( -GLenum \fIfunc\fP, -.nf -.ta \w'\f3void \fPglStencilFunc( 'u - GLint \fIref\fP, - GLuint \fImask\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2func\fP\ \ 'u -\f2func\fP -Specifies the test function. -Eight tokens are valid: -\%\f3GL_NEVER\fP, -\%\f3GL_LESS\fP, -\%\f3GL_LEQUAL\fP, -\%\f3GL_GREATER\fP, -\%\f3GL_GEQUAL\fP, -\%\f3GL_EQUAL\fP, -\%\f3GL_NOTEQUAL\fP, and -\%\f3GL_ALWAYS\fP. The initial value is \%\f3GL_ALWAYS\fP. -.TP -\f2ref\fP -Specifies the reference value for the stencil test. -\f2ref\fP is clamped to the range [0,$2 sup n - 1$], -where $n$ is the number of bitplanes in the stencil buffer. The -initial value is 0. -.TP -\f2mask\fP -Specifies a mask that is ANDed with both the reference value -and the stored stencil value when the test is done. The initial value -is all 1's. -.SH DESCRIPTION -Stenciling, -like depth-buffering, -enables and disables drawing on a per-pixel basis. -You draw into the stencil planes using GL drawing primitives, -then render geometry and images, -using the stencil planes to mask out portions of the screen. -Stenciling is typically used in multipass rendering algorithms -to achieve special effects, -such as decals, -outlining, -and constructive solid geometry rendering. -.P -The stencil test conditionally eliminates a pixel based on the outcome -of a comparison between the reference value -and the value in the stencil buffer. -To enable and disable the test, call \%\f3glEnable\fP and \%\f3glDisable\fP -with argument \%\f3GL_STENCIL_TEST\fP. -To specify actions based on the outcome of the stencil test, call -\%\f3glStencilOp\fP. -.P -\f2func\fP is a symbolic constant that determines the stencil comparison function. -It accepts one of eight values, -shown in the following list. -\f2ref\fP is an integer reference value that is used in the stencil comparison. -It is clamped to the range [0,$2 sup n - 1$], -where $n$ is the number of bitplanes in the stencil buffer. -\f2mask\fP is bitwise ANDed with both the reference value -and the stored stencil value, -with the ANDed values participating in the comparison. -.P -If \f2stencil\fP represents the value stored in the corresponding -stencil buffer location, -the following list shows the effect of each comparison function -that can be specified by \f2func\fP. -Only if the comparison succeeds is the pixel passed through -to the next stage in the rasterization process -(see \%\f3glStencilOp\fP). -All tests treat \f2stencil\fP values as unsigned integers in the range -[0,$2 sup n - 1$], -where $n$ is the number of bitplanes in the stencil buffer. -.P -The following values are accepted by \f2func\fP: -.TP 18 -\%\f3GL_NEVER\fP -Always fails. -.TP -\%\f3GL_LESS\fP -Passes if ( \f2ref\fP & \f2mask\fP ) < ( \f2stencil\fP & \f2mask\fP ). -.TP -\%\f3GL_LEQUAL\fP -Passes if ( \f2ref\fP & \f2mask\fP ) \(<= ( \f2stencil\fP & \f2mask\fP ). -.TP -\%\f3GL_GREATER\fP -Passes if ( \f2ref\fP & \f2mask\fP ) > ( \f2stencil\fP & \f2mask\fP ). -.TP -\%\f3GL_GEQUAL\fP -Passes if ( \f2ref\fP & \f2mask\fP ) \(>= ( \f2stencil\fP & \f2mask\fP ). -.TP -\%\f3GL_EQUAL\fP -Passes if ( \f2ref\fP & \f2mask\fP ) = ( \f2stencil\fP & \f2mask\fP ). -.TP -\%\f3GL_NOTEQUAL\fP -Passes if ( \f2ref\fP & \f2mask\fP ) \(!= ( \f2stencil\fP & \f2mask\fP ). -.TP -\%\f3GL_ALWAYS\fP -Always passes. -.SH NOTES -Initially, the stencil test is disabled. -If there is no stencil buffer, -no stencil modification can occur and it is as if -the stencil test always passes. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2func\fP is not one of the eight -accepted values. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glStencilFunc\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_STENCIL_FUNC\fP -.br -\%\f3glGet\fP with argument \%\f3GL_STENCIL_VALUE_MASK\fP -.br -\%\f3glGet\fP with argument \%\f3GL_STENCIL_REF\fP -.br -\%\f3glGet\fP with argument \%\f3GL_STENCIL_BITS\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_STENCIL_TEST\fP -.SH SEE ALSO -\%\f3glAlphaFunc(3G)\fP, -\%\f3glBlendFunc(3G)\fP, -\%\f3glDepthFunc(3G)\fP, -\%\f3glEnable(3G)\fP, -\%\f3glIsEnabled(3G)\fP, -\%\f3glLogicOp(3G)\fP, -\%\f3glStencilOp(3G)\fP diff --git a/doc/gl-docs/GL/gl/stencilmask.3gl b/doc/gl-docs/GL/gl/stencilmask.3gl deleted file mode 100644 index cbb79212..00000000 --- a/doc/gl-docs/GL/gl/stencilmask.3gl +++ /dev/null @@ -1,53 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 stencilma -.ds Xs 54403 4 stencilmask.gl -.TH GLSTENCILMASK 3G -.SH NAME -.B "glStencilMask -\- control the writing of individual bits in the stencil planes - -.SH C SPECIFICATION -void \f3glStencilMask\fP( -GLuint \fImask\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2mask\fP\ \ 'u -\f2mask\fP -Specifies a bit mask to enable and disable writing of individual bits -in the stencil planes. -Initially, the mask is all 1's. -.SH DESCRIPTION -\%\f3glStencilMask\fP controls the writing of individual bits in the stencil planes. -The least significant $n$ bits of \f2mask\fP, -where $n$ is the number of bits in the stencil buffer, -specify a mask. -Where a 1 appears in the mask, -it's possible to write to the corresponding bit in the stencil buffer. -Where a 0 appears, -the corresponding bit is write-protected. -Initially, all bits are enabled for writing. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glStencilMask\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_STENCIL_WRITEMASK\fP -.br -\%\f3glGet\fP with argument \%\f3GL_STENCIL_BITS\fP -.SH SEE ALSO -\%\f3glColorMask(3G)\fP, -\%\f3glDepthMask(3G)\fP, -\%\f3glIndexMask(3G)\fP, -\%\f3glStencilFunc(3G)\fP, -\%\f3glStencilOp(3G)\fP diff --git a/doc/gl-docs/GL/gl/stencilop.3gl b/doc/gl-docs/GL/gl/stencilop.3gl deleted file mode 100644 index b0af24ed..00000000 --- a/doc/gl-docs/GL/gl/stencilop.3gl +++ /dev/null @@ -1,143 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 stencilop -.ds Xs 3015 6 stencilop.gl -.TH GLSTENCILOP 3G -.SH NAME -.B "glStencilOp -\- set stencil test actions - -.EQ -delim $$ -.EN -.SH C SPECIFICATION -void \f3glStencilOp\fP( -GLenum \fIfail\fP, -.nf -.ta \w'\f3void \fPglStencilOp( 'u - GLenum \fIzfail\fP, - GLenum \fIzpass\fP ) -.fi - -.SH PARAMETERS -.TP \w'\fIzfail\fP\ \ 'u -\f2fail\fP -Specifies the action to take when the stencil test fails. -Six symbolic constants are accepted: -\%\f3GL_KEEP\fP, -\%\f3GL_ZERO\fP, -\%\f3GL_REPLACE\fP, -\%\f3GL_INCR\fP, -\%\f3GL_DECR\fP, and -\%\f3GL_INVERT\fP. The initial value is \%\f3GL_KEEP\fP. -.TP -\f2zfail\fP -Specifies the stencil action when the stencil test passes, -but the depth test fails. -\f2zfail\fP accepts the same symbolic constants as \f2fail\fP. The initial value -is \%\f3GL_KEEP\fP. -.TP -\f2zpass\fP -Specifies the stencil action when both the stencil test and the depth -test pass, or when the stencil test passes and either there is no -depth buffer or depth testing is not enabled. -\f2zpass\fP accepts the same symbolic constants as \f2fail\fP. The initial value -is \%\f3GL_KEEP\fP. -.SH DESCRIPTION -Stenciling, -like depth-buffering, -enables and disables drawing on a per-pixel basis. -You draw into the stencil planes using GL drawing primitives, -then render geometry and images, -using the stencil planes to mask out portions of the screen. -Stenciling is typically used in multipass rendering algorithms -to achieve special effects, -such as decals, -outlining, -and constructive solid geometry rendering. -.P -The stencil test conditionally eliminates a pixel based on the outcome -of a comparison between the value in the stencil buffer and a -reference value. To enable and disable the test, call \%\f3glEnable\fP -and \%\f3glDisable\fP with argument -\%\f3GL_STENCIL_TEST\fP; to control it, call \%\f3glStencilFunc\fP. -.P -\%\f3glStencilOp\fP takes three arguments that indicate what happens -to the stored stencil value while stenciling is enabled. -If the stencil test fails, -no change is made to the pixel's color or depth buffers, -and \f2fail\fP specifies what happens to the stencil buffer contents. -The following six actions are possible. -.TP 16 -\%\f3GL_KEEP\fP -Keeps the current value. -.TP -\%\f3GL_ZERO\fP -Sets the stencil buffer value to 0. -.TP -\%\f3GL_REPLACE\fP -Sets the stencil buffer value to \f2ref\fP, -as specified by \%\f3glStencilFunc\fP. -.TP -\%\f3GL_INCR\fP -Increments the current stencil buffer value. -Clamps to the maximum representable unsigned value. -.TP -\%\f3GL_DECR\fP -Decrements the current stencil buffer value. -Clamps to 0. -.TP -\%\f3GL_INVERT\fP -Bitwise inverts the current stencil buffer value. -.P -Stencil buffer values are treated as unsigned integers. -When incremented and decremented, -values are clamped to 0 and $2 sup n - 1$, -where $n$ is the value returned by querying \%\f3GL_STENCIL_BITS\fP. -.P -The other two arguments to \%\f3glStencilOp\fP specify stencil buffer actions -that depend on whether subsequent depth buffer tests succeed (\f2zpass\fP) -or fail (\f2zfail\fP) (see -.br -\%\f3glDepthFunc\fP). -The actions are specified using the same six symbolic constants as \f2fail\fP. -Note that \f2zfail\fP is ignored when there is no depth buffer, -or when the depth buffer is not enabled. -In these cases, \f2fail\fP and \f2zpass\fP specify stencil action when the -stencil test fails and passes, -respectively. -.SH NOTES -Initially the stencil test is disabled. -If there is no stencil buffer, -no stencil modification can occur -and it is as if the stencil tests always pass, -regardless of any call to \%\f3glStencilOp\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2fail\fP, -\f2zfail\fP, or \f2zpass\fP is any value other than the six defined constant values. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glStencilOp\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_STENCIL_FAIL\fP -.br -\%\f3glGet\fP with argument \%\f3GL_STENCIL_PASS_DEPTH_PASS\fP -.br -\%\f3glGet\fP with argument \%\f3GL_STENCIL_PASS_DEPTH_FAIL\fP -.br -\%\f3glGet\fP with argument \%\f3GL_STENCIL_BITS\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_STENCIL_TEST\fP -.SH SEE ALSO -\%\f3glAlphaFunc(3G)\fP, -\%\f3glBlendFunc(3G)\fP, -\%\f3glDepthFunc(3G)\fP, -\%\f3glEnable(3G)\fP, -\%\f3glLogicOp(3G)\fP, -\%\f3glStencilFunc(3G)\fP diff --git a/doc/gl-docs/GL/gl/texcoord.3gl b/doc/gl-docs/GL/gl/texcoord.3gl deleted file mode 100644 index ac6aff04..00000000 --- a/doc/gl-docs/GL/gl/texcoord.3gl +++ /dev/null @@ -1,237 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 texcoord. -.ds Xs 3537 4 texcoord.gl -.TH GLTEXCOORD 3G -.SH NAME -.B "glTexCoord1d, glTexCoord1f, glTexCoord1i, glTexCoord1s, glTexCoord2d, glTexCoord2f, glTexCoord2i, glTexCoord2s, glTexCoord3d, glTexCoord3f, glTexCoord3i, glTexCoord3s, glTexCoord4d, glTexCoord4f, glTexCoord4i, glTexCoord4s, glTexCoord1dv, glTexCoord1fv, glTexCoord1iv, glTexCoord1sv, glTexCoord2dv, glTexCoord2fv, glTexCoord2iv, glTexCoord2sv, glTexCoord3dv, glTexCoord3fv, glTexCoord3iv, glTexCoord3sv, glTexCoord4dv, glTexCoord4fv, glTexCoord4iv, glTexCoord4sv -\- set the current texture coordinates - -.SH C SPECIFICATION -void \f3glTexCoord1d\fP( -GLdouble \fIs\fP ) -.nf -.fi -void \f3glTexCoord1f\fP( -GLfloat \fIs\fP ) -.nf -.fi -void \f3glTexCoord1i\fP( -GLint \fIs\fP ) -.nf -.fi -void \f3glTexCoord1s\fP( -GLshort \fIs\fP ) -.nf -.fi -void \f3glTexCoord2d\fP( -GLdouble \fIs\fP, -.nf -.ta \w'\f3void \fPglTexCoord2d( 'u - GLdouble \fIt\fP ) -.fi -void \f3glTexCoord2f\fP( -GLfloat \fIs\fP, -.nf -.ta \w'\f3void \fPglTexCoord2f( 'u - GLfloat \fIt\fP ) -.fi -void \f3glTexCoord2i\fP( -GLint \fIs\fP, -.nf -.ta \w'\f3void \fPglTexCoord2i( 'u - GLint \fIt\fP ) -.fi -void \f3glTexCoord2s\fP( -GLshort \fIs\fP, -.nf -.ta \w'\f3void \fPglTexCoord2s( 'u - GLshort \fIt\fP ) -.fi -void \f3glTexCoord3d\fP( -GLdouble \fIs\fP, -.nf -.ta \w'\f3void \fPglTexCoord3d( 'u - GLdouble \fIt\fP, - GLdouble \fIr\fP ) -.fi -void \f3glTexCoord3f\fP( -GLfloat \fIs\fP, -.nf -.ta \w'\f3void \fPglTexCoord3f( 'u - GLfloat \fIt\fP, - GLfloat \fIr\fP ) -.fi -void \f3glTexCoord3i\fP( -GLint \fIs\fP, -.nf -.ta \w'\f3void \fPglTexCoord3i( 'u - GLint \fIt\fP, - GLint \fIr\fP ) -.fi -void \f3glTexCoord3s\fP( -GLshort \fIs\fP, -.nf -.ta \w'\f3void \fPglTexCoord3s( 'u - GLshort \fIt\fP, - GLshort \fIr\fP ) -.fi -void \f3glTexCoord4d\fP( -GLdouble \fIs\fP, -.nf -.ta \w'\f3void \fPglTexCoord4d( 'u - GLdouble \fIt\fP, - GLdouble \fIr\fP, - GLdouble \fIq\fP ) -.fi -void \f3glTexCoord4f\fP( -GLfloat \fIs\fP, -.nf -.ta \w'\f3void \fPglTexCoord4f( 'u - GLfloat \fIt\fP, - GLfloat \fIr\fP, - GLfloat \fIq\fP ) -.fi -void \f3glTexCoord4i\fP( -GLint \fIs\fP, -.nf -.ta \w'\f3void \fPglTexCoord4i( 'u - GLint \fIt\fP, - GLint \fIr\fP, - GLint \fIq\fP ) -.fi -void \f3glTexCoord4s\fP( -GLshort \fIs\fP, -.nf -.ta \w'\f3void \fPglTexCoord4s( 'u - GLshort \fIt\fP, - GLshort \fIr\fP, - GLshort \fIq\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2s\fP\ \f2t\fP\ \f2r\fP\ \f2q\fP\ \ 'u -\f2s\fP, \f2t\fP, \f2r\fP, \f2q\fP -Specify \f2s\fP, \f2t\fP, \f2r\fP, and \f2q\fP texture coordinates. -Not all parameters are present in all forms of the command. -.SH C SPECIFICATION -void \f3glTexCoord1dv\fP( -const GLdouble \fI*v\fP ) -.nf -.fi -void \f3glTexCoord1fv\fP( -const GLfloat \fI*v\fP ) -.nf -.fi -void \f3glTexCoord1iv\fP( -const GLint \fI*v\fP ) -.nf -.fi -void \f3glTexCoord1sv\fP( -const GLshort \fI*v\fP ) -.nf -.fi -void \f3glTexCoord2dv\fP( -const GLdouble \fI*v\fP ) -.nf -.fi -void \f3glTexCoord2fv\fP( -const GLfloat \fI*v\fP ) -.nf -.fi -void \f3glTexCoord2iv\fP( -const GLint \fI*v\fP ) -.nf -.fi -void \f3glTexCoord2sv\fP( -const GLshort \fI*v\fP ) -.nf -.fi -void \f3glTexCoord3dv\fP( -const GLdouble \fI*v\fP ) -.nf -.fi -void \f3glTexCoord3fv\fP( -const GLfloat \fI*v\fP ) -.nf -.fi -void \f3glTexCoord3iv\fP( -const GLint \fI*v\fP ) -.nf -.fi -void \f3glTexCoord3sv\fP( -const GLshort \fI*v\fP ) -.nf -.fi -void \f3glTexCoord4dv\fP( -const GLdouble \fI*v\fP ) -.nf -.fi -void \f3glTexCoord4fv\fP( -const GLfloat \fI*v\fP ) -.nf -.fi -void \f3glTexCoord4iv\fP( -const GLint \fI*v\fP ) -.nf -.fi -void \f3glTexCoord4sv\fP( -const GLshort \fI*v\fP ) -.nf -.fi - -.SH PARAMETERS -.TP -\f2v\fP -Specifies a pointer to an array of one, two, three, or four elements, -which in turn specify the -\f2s\fP, -\f2t\fP, -\f2r\fP, and -\f2q\fP texture coordinates. -.SH DESCRIPTION -\%\f3glTexCoord\fP specifies texture coordinates in -one, -two, -three, or -four dimensions. -\%\f3glTexCoord1\fP sets the current texture coordinates to -(\f2s\fP, 0, 0, 1); -a call to -.br -\%\f3glTexCoord2\fP sets them to -(\f2s\fP, \f2t\fP, 0, 1). -.BP -Similarly, \%\f3glTexCoord3\fP specifies the texture coordinates as -(\f2s\fP, \f2t\fP, \f2r\fP, 1), and -\%\f3glTexCoord4\fP defines all four components explicitly as -(\f2s\fP, \f2t\fP, \f2r\fP, \f2q\fP). -.P -The current texture coordinates are part of the data -that is associated with each vertex and with the current -raster position. -Initially, the values for -\f2s\fP, -\f2t\fP, -\f2r\fP, and -\f2q\fP -are (0, 0, 0, 1). -.P -.SH NOTES -The current texture coordinates can be updated at any time. -In particular, -\%\f3glTexCoord\fP can be called between a call to \%\f3glBegin\fP and the corresponding -call to \%\f3glEnd\fP. -.P -When the \%\f3GL_ARB_imaging\fP extension is supported, \%\f3glTexCoord\fP always -updates texture unit \%\f3GL_TEXTURE0_ARB\fP. -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_CURRENT_TEXTURE_COORDS\fP -.SH SEE ALSO -\%\f3glTexCoordPointer(3G)\fP, -\%\f3glVertex(3G)\fP diff --git a/doc/gl-docs/GL/gl/texcoordpointer.3gl b/doc/gl-docs/GL/gl/texcoordpointer.3gl deleted file mode 100644 index 9944db69..00000000 --- a/doc/gl-docs/GL/gl/texcoordpointer.3gl +++ /dev/null @@ -1,132 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 texcoordp -.ds Xs 65158 7 texcoordpointer.gl -.TH GLTEXCOORDPOINTER 3G -.SH NAME -.B "glTexCoordPointer -\- define an array of texture coordinates - -.SH C SPECIFICATION -void \f3glTexCoordPointer\fP( -GLint \fIsize\fP, -.nf -.ta \w'\f3void \fPglTexCoordPointer( 'u - GLenum \fItype\fP, - GLsizei \fIstride\fP, - const GLvoid \fI*ptr\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIstride\fP\ \ 'u -\f2size\fP -Specifies the number of coordinates per array element. Must be 1, 2, 3 -or 4. The initial value is 4. -.TP -\f2type\fP -Specifies the data type of each texture coordinate. -Symbolic constants -\%\f3GL_SHORT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -or \%\f3GL_DOUBLE\fP -are accepted. The initial value is \%\f3GL_FLOAT\fP. -.TP -\f2stride\fP -Specifies the byte offset between consecutive array elements. -If \f2stride\fP is 0, the array elements are understood -to be tightly packed. The initial value is 0. -.TP -\f2ptr\fP -Specifies a pointer to the first coordinate of the first element in the -array. The initial value is 0. -.SH DESCRIPTION -\%\f3glTexCoordPointer\fP specifies the location and data of an array of texture -coordinates to use when rendering. -\f2size\fP specifies the number of coordinates per -element, and must be 1, 2, 3, or 4. -\f2type\fP specifies the data type of each texture coordinate -and \f2stride\fP specifies the byte stride from one -array element to the next allowing vertices and attributes -to be packed into a single array or stored in separate arrays. -(Single-array storage may be more efficient on some implementations; -see -.br -\%\f3glInterleavedArrays\fP.) -When a texture -coordinate array is specified, \f2size\fP, \f2type\fP, \f2stride\fP, and \f2ptr\fP -are saved client-side state. -.P -To enable and disable the texture coordinate array, call -\%\f3glEnableClientState\fP and \%\f3glDisableClientState\fP with the argument -\%\f3GL_TEXTURE_COORD_ARRAY\fP. If -enabled, the texture coordinate array is used -when \%\f3glDrawArrays\fP, \%\f3glDrawElements\fP, \%\f3glDrawRangeElements\fP or -\%\f3glArrayElement\fP is called. -.P -Use \%\f3glDrawArrays\fP to construct a sequence of primitives (all of the -same type) from prespecified vertex and vertex attribute arrays. -Use \%\f3glArrayElement\fP to specify primitives -by indexing vertices and vertex attributes and \%\f3glDrawElements\fP to -construct a sequence of primitives by indexing vertices and vertex attributes. -.SH NOTES -\%\f3glTexCoordPointer\fP is available only if the GL version is 1.1 or greater. -.P -The texture coordinate array is initially disabled and it won't be -accessed when -\%\f3glArrayElement\fP, \%\f3glDrawElements\fP, \%\f3glDrawRangeElements\fP, or -\%\f3glDrawArrays\fP is called. -.P -Execution of \%\f3glTexCoordPointer\fP is not allowed between the execution of -\%\f3glBegin\fP and the corresponding execution of \%\f3glEnd\fP, -but an error may or may not be generated. If no error is generated, -the operation is undefined. -.P -\%\f3glTexCoordPointer\fP is typically implemented on the client side with no protocol. -.P -The texture coordinate array parameters are client-side state and are -therefore not saved or restored by \%\f3glPushAttrib\fP and \%\f3glPopAttrib\fP. -Use \%\f3glPushClientAttrib\fP and -\%\f3glPopClientAttrib\fP instead. -.P -When the \%\f3GL_ARB_imaging\fP extension is supported, \%\f3glTexCoordPointer\fP updates the -texture coordinate array state of the active client texture unit, -specified with \%\f3glClientActiveTextureARB\fP. -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if \f2size\fP is not 1, 2, 3, or 4. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not an accepted value. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2stride\fP is negative. -.SH ASSOCIATED GETS -\%\f3glIsEnabled\fP with argument \%\f3GL_TEXTURE_COORD_ARRAY\fP -.br -\%\f3glGet\fP with argument \%\f3GL_TEXTURE_COORD_ARRAY_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_TEXTURE_COORD_ARRAY_TYPE\fP -.br -\%\f3glGetPointerv\fP with argument \%\f3GL_TEXTURE_COORD_ARRAY_POINTER\fP -.SH SEE ALSO -\%\f3glArrayElement(3G)\fP, -\%\f3glClientActiveTextureARB(3G)\fP, -\%\f3glColorPointer(3G)\fP, -\%\f3glDrawArrays(3G)\fP, -\%\f3glDrawElements(3G)\fP, -\%\f3glDrawRangeElements(3G)\fP, -\%\f3glEdgeFlagPointer(3G)\fP, -\%\f3glEnable(3G)\fP, -\%\f3glGetPointerv(3G)\fP, -\%\f3glIndexPointer(3G)\fP, -\%\f3glNormalPointer(3G)\fP, -\%\f3glPopClientAttrib(3G)\fP, -\%\f3glPushClientAttrib(3G)\fP, -\%\f3glTexCoord(3G)\fP, -\%\f3glVertexPointer(3G)\fP diff --git a/doc/gl-docs/GL/gl/texenv.3gl b/doc/gl-docs/GL/gl/texenv.3gl deleted file mode 100644 index 171f78e5..00000000 --- a/doc/gl-docs/GL/gl/texenv.3gl +++ /dev/null @@ -1,196 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 texenv.gl -.ds Xs 19951 8 texenv.gl -.TH GLTEXENV 3G -.SH NAME -.B "glTexEnvf, glTexEnvi, glTexEnvfv, glTexEnviv -\- set texture environment parameters - -.SH C SPECIFICATION -void \f3glTexEnvf\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglTexEnvf( 'u - GLenum \fIpname\fP, - GLfloat \fIparam\fP ) -.fi -void \f3glTexEnvi\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglTexEnvi( 'u - GLenum \fIpname\fP, - GLint \fIparam\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -Specifies a texture environment. -Must be \%\f3GL_TEXTURE_ENV\fP. -.TP -\f2pname\fP -Specifies the symbolic name of a single-valued texture environment parameter. -Must be \%\f3GL_TEXTURE_ENV_MODE\fP. -.TP -\f2param\fP -Specifies a single symbolic constant, one of \%\f3GL_MODULATE\fP, -\%\f3GL_DECAL\fP, \%\f3GL_BLEND\fP, or \%\f3GL_REPLACE\fP. -.SH C SPECIFICATION -void \f3glTexEnvfv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglTexEnvfv( 'u - GLenum \fIpname\fP, - const GLfloat \fI*params\fP ) -.fi -void \f3glTexEnviv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglTexEnviv( 'u - GLenum \fIpname\fP, - const GLint \fI*params\fP ) -.fi - -.SH PARAMETERS -.TP -\f2target\fP -Specifies a texture environment. -Must be \%\f3GL_TEXTURE_ENV\fP. -.TP -\f2pname\fP -Specifies the symbolic name of a texture environment parameter. -Accepted values are \%\f3GL_TEXTURE_ENV_MODE\fP and \%\f3GL_TEXTURE_ENV_COLOR\fP. -.TP -\f2params\fP -Specifies a pointer to a parameter array that contains -either a single symbolic constant or an RGBA color. -.SH DESCRIPTION -A texture environment specifies how texture values are interpreted -when a fragment is textured. -\f2target\fP must be \%\f3GL_TEXTURE_ENV\fP. -\f2pname\fP can be either \%\f3GL_TEXTURE_ENV_MODE\fP or \%\f3GL_TEXTURE_ENV_COLOR\fP. -.P -If \f2pname\fP is \%\f3GL_TEXTURE_ENV_MODE\fP, -then \f2params\fP is (or points to) the symbolic name of a texture function. -Four texture functions may be specified: -\%\f3GL_MODULATE\fP, -\%\f3GL_DECAL\fP, -\%\f3GL_BLEND\fP, and -\%\f3GL_REPLACE\fP. -.P -A texture function acts on the fragment to be textured using -the texture image value that applies to the fragment -(see \%\f3glTexParameter\fP) -and produces an RGBA color for that fragment. -The following table shows how the RGBA color is produced for each -of the three texture functions that can be chosen. -$C$ is a triple of color values (RGB) and $A$ is the associated alpha value. -RGBA values extracted from a texture image are in the range [0,1]. -The subscript $f$ refers to the incoming fragment, -the subscript $t$ to the texture image, -the subscript $c$ to the texture environment color, -and subscript $v$ indicates a value produced by the texture function. -.P -A texture image can have up to four components per texture element -(see \%\f3glTexImage1D\fP, \%\f3glTexImage2D\fP, \%\f3glTexImage3D\fP, -\%\f3glCopyTexImage1D\fP, and \%\f3glCopyTexImage2D\fP). -In a one-component image, -$L sub t$ indicates that single component. -A two-component image uses $L sub t$ and $A sub t$. -A three-component image has only a color value, $C sub t$. -A four-component image has both a color value $C sub t$ -and an alpha value $A sub t$. -.sp -.ne -.TS -center tab(:) ; -cb cb s s s -ci c c c c -c c c c c. -_ -Base internal:Texture functions -:\%\f3GL_MODULATE\fP:\%\f3GL_DECAL\fP:\%\f3GL_BLEND\fP:\%\f3GL_REPLACE\fP -_ -\%\f3GL_ALPHA\fP:$C sub v ~=~ C sub f$:undefined:$C sub v ~=~ C sub f$:$C sub v ~=~ C sub f$ -\^ :$A sub v ~=~ A sub f A sub t$:\^:$A sub v ~=~ A sub f$:$A sub v ~=~ A sub t$ -_ -\%\f3GL_LUMINANCE\fP:$C sub v ~=~ L sub t C sub f$:undefined:$C sub v ~=~ ( 1 - L sub t ) C sub f$:$C sub v ~=~ L sub t$ -: : :$+ L sub t C sub c$: -1: $A sub v ~=~ A sub f$:\^: $A sub v ~=~ A sub f$:$A sub v ~=~ A sub f$ -_ -\%\f3GL_LUMINANCE\fP:$C sub v ~=~ L sub t C sub f$:undefined:$C sub v ~=~ ( 1 - L sub t ) C sub f $:$C sub v ~=~ L sub t$ -\\f3_ALPHA\fP: : : $+ L sub t C sub c$ -2:$A sub v ~=~ A sub t A sub f$:\^:$A sub v ~=~ A sub t A sub f$:$A sub v ~=~ A sub t$ -_ -\%\f3GL_INTENSITY\fP:$C sub v ~=~ C sub f I sub t$:undefined:$C sub v ~=~ ( 1 - I sub t ) C sub f$ :$C sub v ~=~ I sub t$ -: : :$+ I sub t C sub c$ -c\^ :$A sub v ~=~ A sub f I sub t$:\^:$A sub v ~=~ ( 1 - I sub t ) A sub f $:$A sub v ~=~ I sub t$ -: : :$+ I sub t A sub c$: -_ -\%\f3GL_RGB\fP:$C sub v ~=~ C sub t C sub f$:$C sub v ~=~ C sub t$:$C sub v ~=~ (1 - C sub t) C sub f $:$C sub v ~=~ C sub t$ -: : : $+ C sub t C sub c$ -3:$A sub v ~=~ A sub f$:$A sub v ~=~ A sub f$:$A sub v ~=~ A sub f$:$A sub v ~=~ A sub f$ -_ -\%\f3GL_RGBA\fP:$C sub v ~=~ C sub t C sub f$:$C sub v ~=~ ( 1 - A sub t ) C sub f $:$C sub v ~=~ (1 - C sub t) C sub f $:$C sub v ~=~ C sub t$ -: :$+ A sub t C sub t$: $+ C sub t C sub c$ -4:$A sub v ~=~ A sub t A sub f$:$A sub v ~=~ A sub f$:$A sub v ~=~ A sub t A sub f$:$A sub v ~=~ A sub t$ -_ -.TE -.bp -If \f2pname\fP is \%\f3GL_TEXTURE_ENV_COLOR\fP, -\f2params\fP is a pointer to an array that holds an RGBA color consisting of four -values. -Integer color components are interpreted linearly such that the most -positive integer maps to 1.0, -and the most negative integer maps to -1.0. -The values are clamped to the range [0,1] when they are specified. -$C sub c$ takes these four values. -.P -\%\f3GL_TEXTURE_ENV_MODE\fP defaults to \%\f3GL_MODULATE\fP and -\%\f3GL_TEXTURE_ENV_COLOR\fP defaults to (0, 0, 0, 0). -.SH NOTES -\%\f3GL_REPLACE\fP may only be used if the GL version is 1.1 or greater. -.P -Internal formats other than 1, 2, 3, or 4 may only be used if the GL -version is 1.1 or greater. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, \%\f3glTexEnv\fP controls -the texture environment for the current active texture unit, selected by -\%\f3glActiveTextureARB\fP. -.sh ERRORS -\%\f3GL_INVALID_ENUM\fP is generated when \f2target\fP or \f2pname\fP is not -one of the accepted defined values, -or when \f2params\fP should have a defined constant value -(based on the value of \f2pname\fP) -and does not. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glTexEnv\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetTexEnv\fP -.SH SEE ALSO -\%\f3glActiveTextureARB(3G)\fP, -\%\f3glCopyPixels(3G)\fP, -\%\f3glCopyTexImage1D(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glCopyTexSubImage1D(3G)\fP, -\%\f3glCopyTexSubImage2D(3G)\fP, -\%\f3glCopyTexSubImage3D(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexImage3D(3G)\fP, -\%\f3glTexParameter(3G)\fP, -\%\f3glTexSubImage1D(3G)\fP, -\%\f3glTexSubImage2D(3G)\fP, -\%\f3glTexSubImage3D(3G)\fP - diff --git a/doc/gl-docs/GL/gl/texgen.3gl b/doc/gl-docs/GL/gl/texgen.3gl deleted file mode 100644 index 9f77b6db..00000000 --- a/doc/gl-docs/GL/gl/texgen.3gl +++ /dev/null @@ -1,270 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 texgen.gl -.ds Xs 27155 9 texgen.gl -.TH GLTEXGEN 3G -.SH NAME -.B "glTexGend, glTexGenf, glTexGeni, glTexGendv, glTexGenfv, glTexGeniv -\- control the generation of texture coordinates - -.SH C SPECIFICATION -void \f3glTexGend\fP( -GLenum \fIcoord\fP, -.nf -.ta \w'\f3void \fPglTexGend( 'u - GLenum \fIpname\fP, - GLdouble \fIparam\fP ) -.fi -void \f3glTexGenf\fP( -GLenum \fIcoord\fP, -.nf -.ta \w'\f3void \fPglTexGenf( 'u - GLenum \fIpname\fP, - GLfloat \fIparam\fP ) -.fi -void \f3glTexGeni\fP( -GLenum \fIcoord\fP, -.nf -.ta \w'\f3void \fPglTexGeni( 'u - GLenum \fIpname\fP, - GLint \fIparam\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIparams\fP\ \ 'u -\f2coord\fP -Specifies a texture coordinate. -Must be one of \%\f3GL_S\fP, \%\f3GL_T\fP, \%\f3GL_R\fP, or \%\f3GL_Q\fP. -.TP -\f2pname\fP -Specifies the symbolic name of the texture-coordinate generation function. -Must be \%\f3GL_TEXTURE_GEN_MODE\fP. -.TP -\f2param\fP -Specifies a single-valued texture generation parameter, -one of \%\f3GL_OBJECT_LINEAR\fP, \%\f3GL_EYE_LINEAR\fP, or \%\f3GL_SPHERE_MAP\fP. -.SH C SPECIFICATION -void \f3glTexGendv\fP( -GLenum \fIcoord\fP, -.nf -.ta \w'\f3void \fPglTexGendv( 'u - GLenum \fIpname\fP, - const GLdouble \fI*params\fP ) -.fi -void \f3glTexGenfv\fP( -GLenum \fIcoord\fP, -.nf -.ta \w'\f3void \fPglTexGenfv( 'u - GLenum \fIpname\fP, - const GLfloat \fI*params\fP ) -.fi -void \f3glTexGeniv\fP( -GLenum \fIcoord\fP, -.nf -.ta \w'\f3void \fPglTexGeniv( 'u - GLenum \fIpname\fP, - const GLint \fI*params\fP ) -.fi - -.SH PARAMETERS -.TP -\f2coord\fP -Specifies a texture coordinate. -Must be one of \%\f3GL_S\fP, \%\f3GL_T\fP, \%\f3GL_R\fP, or \%\f3GL_Q\fP. -.TP -\f2pname\fP -Specifies the symbolic name of the texture-coordinate generation function -or function parameters. -Must be -\%\f3GL_TEXTURE_GEN_MODE\fP, -\%\f3GL_OBJECT_PLANE\fP, or -\%\f3GL_EYE_PLANE\fP. -.TP -\f2params\fP -Specifies a pointer to an array of texture generation parameters. -If \f2pname\fP is \%\f3GL_TEXTURE_GEN_MODE\fP, -then the array must contain a single symbolic constant, -one of -\%\f3GL_OBJECT_LINEAR\fP, -\%\f3GL_EYE_LINEAR\fP, or -\%\f3GL_SPHERE_MAP\fP. -Otherwise, -\f2params\fP holds the coefficients for the texture-coordinate generation function -specified by \f2pname\fP. -.SH DESCRIPTION -\%\f3glTexGen\fP selects a texture-coordinate generation function -or supplies coefficients for one of the functions. -\f2coord\fP names one of the (\f2s\fP, \f2t\fP, \f2r\fP, \f2q\fP) texture -coordinates; it must be one of the symbols -\%\f3GL_S\fP, -\%\f3GL_T\fP, -\%\f3GL_R\fP, or -\%\f3GL_Q\fP. -\f2pname\fP must be one of three symbolic constants: -\%\f3GL_TEXTURE_GEN_MODE\fP, -\%\f3GL_OBJECT_PLANE\fP, or -\%\f3GL_EYE_PLANE\fP. -If \f2pname\fP is \%\f3GL_TEXTURE_GEN_MODE\fP, -then \f2params\fP chooses a mode, -one of -\%\f3GL_OBJECT_LINEAR\fP, -\%\f3GL_EYE_LINEAR\fP, or -\%\f3GL_SPHERE_MAP\fP. -If \f2pname\fP is either \%\f3GL_OBJECT_PLANE\fP or \%\f3GL_EYE_PLANE\fP, -\f2params\fP contains coefficients for the corresponding -texture generation function. -.P -If the texture generation function is \%\f3GL_OBJECT_LINEAR\fP, -the function -.P -.ce -$g ~=~ p sub 1^x sub o ~+~ p sub 2^y sub o ~+~ p sub 3^z sub o ~+~ p sub 4^w sub o$ -.P -.br -is used, where $g$ is the value computed for the coordinate named in \f2coord\fP, -$p sub 1$, -$p sub 2$, -$p sub 3$, -and -$p sub 4$ are the four values supplied in \f2params\fP, and -$x sub o$, -$y sub o$, -$z sub o$, and -$w sub o$ are the object coordinates of the vertex. -This function can be used, for example, to texture-map terrain using sea level -as a reference plane -(defined by $p sub 1$, $p sub 2$, $p sub 3$, and $p sub 4$). -The altitude of a terrain vertex is computed by the \%\f3GL_OBJECT_LINEAR\fP -coordinate generation function as its distance from sea level; -that altitude can then be used to index the texture image to map white snow -onto peaks and green grass onto foothills. -.P -If the texture generation function is \%\f3GL_EYE_LINEAR\fP, the function -.P -.ce -$g ~=~ p sub 1 sup prime ^x sub e ~+~ p sub 2 sup prime ^y sub e ~+~ p sub 3 sup prime ^z sub e ~+~ p sub 4 sup prime ^w sub e$ -.P -.br -is used, where -.P -.ce -$( p sub 1 sup prime -~~p sub 2 sup prime~~p sub 3 sup prime~~ -{ p sub 4 sup prime}) ~=~ ( p sub 1~~ p sub 2~~ p sub 3~~ p sub 4 ) ~M sup -1$ -.P -.br -and -$x sub e$, -$y sub e$, -$z sub e$, and -$w sub e$ are the eye coordinates of the vertex, -$p sub 1$, -$p sub 2$, -$p sub 3$, -and -$p sub 4$ are the values supplied in \f2params\fP, and -$M$ is the modelview matrix when \%\f3glTexGen\fP is invoked. -If $M$ is poorly conditioned or singular, -texture coordinates generated by the resulting function may be inaccurate -or undefined. -.P -Note that the values in \f2params\fP define a reference plane in eye coordinates. -The modelview matrix that is applied to them may not be the same one -in effect when the polygon vertices are transformed. -This function establishes a field of texture coordinates -that can produce dynamic contour lines on moving objects. -.P -If \f2pname\fP is \%\f3GL_SPHERE_MAP\fP and \f2coord\fP is either -\%\f3GL_S\fP or -\%\f3GL_T\fP, -$s$ and $t$ texture coordinates are generated as follows. -Let \f2u\fP be the unit vector pointing from the origin to the polygon vertex -(in eye coordinates). -Let \f2n\fP sup prime be the current normal, -after transformation to eye coordinates. -Let -.P -.ce -$f ~=~ ( f sub x~~f sub y~~f sub z ) sup T$ -be the reflection vector such that -.P -.ce -$f ~=~ u ~-~ 2 n sup prime n sup prime sup T u$ -.br -.P -Finally, let $ m ~=~ 2 sqrt { f sub x sup {~2} ~+~ f sub y sup {~2} ~+~ (f sub z ~+~ 1 ) sup 2}$. -Then the values assigned to the $s$ and $t$ texture coordinates are -.P -.ce 1 -$s ~=~ f sub x over m ~+~ 1 over 2$ -.sp -.ce 1 -$t ~=~ f sub y over m ~+~ 1 over 2$ -.P -To enable or disable a texture-coordinate generation function, call -\%\f3glEnable\fP or \%\f3glDisable\fP -with one of the symbolic texture-coordinate names -(\%\f3GL_TEXTURE_GEN_S\fP, -\%\f3GL_TEXTURE_GEN_T\fP, -\%\f3GL_TEXTURE_GEN_R\fP, or -\%\f3GL_TEXTURE_GEN_Q\fP) as the argument. -When enabled, -the specified texture coordinate is computed -according to the generating function associated with that coordinate. -When disabled, -subsequent vertices take the specified texture coordinate -from the current set of texture coordinates. Initially, all texture -generation functions are set to \%\f3GL_EYE_LINEAR\fP and are disabled. -Both $s$ plane equations are (1, 0, 0, 0), -both $t$ plane equations are (0, 1, 0, 0), -and all $r$ and $q$ plane equations are (0, 0, 0, 0). -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, \%\f3glTexGen\fP set the -texture generation parameters for the currently active texture unit, -selected with \%\f3glActiveTextureARB\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated when \f2coord\fP or \f2pname\fP is not an -accepted defined value, -or when \f2pname\fP is \%\f3GL_TEXTURE_GEN_MODE\fP and \f2params\fP is not an -accepted defined value. -.P -\%\f3GL_INVALID_ENUM\fP is generated when \f2pname\fP is \%\f3GL_TEXTURE_GEN_MODE\fP, -\f2params\fP is \%\f3GL_SPHERE_MAP\fP, -and \f2coord\fP is either \%\f3GL_R\fP or \%\f3GL_Q\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glTexGen\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetTexGen\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_TEXTURE_GEN_S\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_TEXTURE_GEN_T\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_TEXTURE_GEN_R\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_TEXTURE_GEN_Q\fP -.SH SEE ALSO -\%\f3glActiveTextureARB(3G)\fP, -\%\f3glCopyPixels(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glCopyTexSubImage1D(3G)\fP, -\%\f3glCopyTexSubImage2D(3G)\fP, -\%\f3glCopyTexSubImage3D(3G)\fP, -\%\f3glTexEnv(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexImage3D(3G)\fP, -\%\f3glTexParameter(3G)\fP, -\%\f3glTexSubImage1D(3G)\fP, -\%\f3glTexSubImage2D(3G)\fP, -\%\f3glTexSubImage3D(3G)\fP diff --git a/doc/gl-docs/GL/gl/teximage1d.3gl b/doc/gl-docs/GL/gl/teximage1d.3gl deleted file mode 100644 index d1962be8..00000000 --- a/doc/gl-docs/GL/gl/teximage1d.3gl +++ /dev/null @@ -1,449 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 teximage1 -.ds Xs 26416 17 teximage1d.gl -.TH GLTEXIMAGE1D 3G -.SH NAME -.B "glTexImage1D -\- specify a one-dimensional texture image - -.SH C SPECIFICATION -void \f3glTexImage1D\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglTexImage1D( 'u - GLint \fIlevel\fP, - GLint \fIinternalFormat\fP, - GLsizei \fIwidth\fP, - GLint \fIborder\fP, - GLenum \fIformat\fP, - GLenum \fItype\fP, - const GLvoid \fI*pixels\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIinternalFormat\fP\ \ 'u -\f2target\fP -Specifies the target texture. -Must be \%\f3GL_TEXTURE_1D\fP or \%\f3GL_PROXY_TEXTURE_1D\fP. -.TP -\f2level\fP -Specifies the level-of-detail number. -Level 0 is the base image level. -Level \f2n\fP is the \f2n\fPth mipmap reduction image. -.TP -\f2internalFormat\fP -Specifies the number of color components in the texture. -Must be 1, 2, 3, or 4, or one of the following symbolic constants: -\%\f3GL_ALPHA\fP, -\%\f3GL_ALPHA4\fP, -\%\f3GL_ALPHA8\fP, -\%\f3GL_ALPHA12\fP, -\%\f3GL_ALPHA16\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE4\fP, -\%\f3GL_LUMINANCE8\fP, -\%\f3GL_LUMINANCE12\fP, -\%\f3GL_LUMINANCE16\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_LUMINANCE4_ALPHA4\fP, -\%\f3GL_LUMINANCE6_ALPHA2\fP, -\%\f3GL_LUMINANCE8_ALPHA8\fP, -\%\f3GL_LUMINANCE12_ALPHA4\fP, -\%\f3GL_LUMINANCE12_ALPHA12\fP, -\%\f3GL_LUMINANCE16_ALPHA16\fP, -\%\f3GL_INTENSITY\fP, -\%\f3GL_INTENSITY4\fP, -\%\f3GL_INTENSITY8\fP, -\%\f3GL_INTENSITY12\fP, -\%\f3GL_INTENSITY16\fP, -\%\f3GL_RGB\fP, -\%\f3GL_R3_G3_B2\fP, -\%\f3GL_RGB4\fP, -\%\f3GL_RGB5\fP, -\%\f3GL_RGB8\fP, -\%\f3GL_RGB10\fP, -\%\f3GL_RGB12\fP, -\%\f3GL_RGB16\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_RGBA2\fP, -\%\f3GL_RGBA4\fP, -\%\f3GL_RGB5_A1\fP, -\%\f3GL_RGBA8\fP, -\%\f3GL_RGB10_A2\fP, -\%\f3GL_RGBA12\fP, or -\%\f3GL_RGBA16\fP. -.TP -\f2width\fP -Specifies the width of the texture image. -Must be $2 sup n + 2 ( "border" )$ for some integer $n$. All -implementations support texture images that are at least 64 texels -wide. The height of the 1D texture image is 1. -.TP -\f2border\fP -Specifies the width of the border. -Must be either 0 or 1. -.TP -\f2format\fP -Specifies the of the pixel data. -The following symbolic values are accepted: -\%\f3GL_COLOR_INDEX\fP, -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_BGR\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, and -\%\f3GL_LUMINANCE_ALPHA\fP. -.TP -\f2type\fP -Specifies the data type of the pixel data. -The following symbolic values are accepted: -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP. -.TP -\f2pixels\fP -Specifies a pointer to the image data in memory. -.SH DESCRIPTION -Texturing maps a portion of a specified texture image -onto each graphical primitive for which texturing is enabled. -To enable and disable one-dimensional texturing, call \%\f3glEnable\fP -and \%\f3glDisable\fP with argument \%\f3GL_TEXTURE_1D\fP. -.P -Texture images are defined with \%\f3glTexImage1D\fP. -The arguments describe the parameters of the texture image, -such as width, -width of the border, -level-of-detail number -(see \%\f3glTexParameter\fP), -and the internal resolution and used to store the image. -The last three arguments describe how the image is represented in -memory; they are identical to the pixel formats used for -\%\f3glDrawPixels\fP. -.P -If \f2target\fP is \%\f3GL_PROXY_TEXTURE_1D\fP, no data is read from \f2pixels\fP, but -all of the texture image state is recalculated, checked for -consistency, and checked against the implementation's capabilities. -If the implementation cannot handle a texture of the -requested texture size, it sets all of the image state to 0, -but does not generate an error (see \%\f3glGetError\fP). To query for an -entire mipmap array, use an image array level greater than or equal to -1. -.P -If \f2target\fP is \%\f3GL_TEXTURE_1D\fP, -data is read from \f2pixels\fP as a sequence of signed or unsigned bytes, -shorts, -or longs, -or single-precision floating-point values, -depending on \f2type\fP. -These values are grouped into sets of one, -two, -three, -or four values, -depending on \f2format\fP, -to form elements. -If \f2type\fP is \%\f3GL_BITMAP\fP, -the data is considered as a string of unsigned bytes -(and \f2format\fP must be \%\f3GL_COLOR_INDEX\fP). -Each data byte is treated as eight 1-bit elements, -with bit ordering determined by \%\f3GL_UNPACK_LSB_FIRST\fP -(see \%\f3glPixelStore\fP). -.P -The first element corresponds to the left end of the texture array. -Subsequent elements progress left-to-right through the remaining texels -in the texture array. -The final element corresponds to the right end of the texture array. -.P -\f2format\fP determines the composition of each element in \f2pixels\fP. -It can assume one of eleven symbolic values: -.TP 10 -\%\f3GL_COLOR_INDEX\fP -Each element is a single value, -a color index. -The GL converts it to fixed point -(with an unspecified number of zero bits to the right of the binary point), -shifted left or right depending on the value and sign of \%\f3GL_INDEX_SHIFT\fP, -and added to \%\f3GL_INDEX_OFFSET\fP -(see \%\f3glPixelTransfer\fP). -The resulting index is converted to a set of color components -using the -\%\f3GL_PIXEL_MAP_I_TO_R\fP, -\%\f3GL_PIXEL_MAP_I_TO_G\fP, -\%\f3GL_PIXEL_MAP_I_TO_B\fP, and -\%\f3GL_PIXEL_MAP_I_TO_A\fP tables, -and clamped to the range [0,1]. -.TP -\%\f3GL_RED\fP -Each element is a single red component. -The GL converts it to floating point and assembles it into an RGBA element -by attaching 0 for green and blue, and 1 for alpha. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP. -and clamped to the range [0,1] -(see \%\f3glPixelTransfer\fP). -.TP -\%\f3GL_GREEN\fP -Each element is a single green component. -The GL converts it to floating point and assembles it into an RGBA element -by attaching 0 for red and blue, and 1 for alpha. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see \%\f3glPixelTransfer\fP). -.TP -\%\f3GL_BLUE\fP -Each element is a single blue component. -The GL converts it to floating point and assembles it into an RGBA element -by attaching 0 for red and green, and 1 for alpha. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see \%\f3glPixelTransfer\fP). -.TP -\%\f3GL_ALPHA\fP -Each element is a single alpha component. -The GL converts it to floating point and assembles it into an RGBA element -by attaching 0 for red, green, and blue. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see \%\f3glPixelTransfer\fP). -.TP -\%\f3GL_RGB\fP -.TP -\%\f3GL_BGR\fP -Each element is an RGB triple. -The GL converts it to floating point and assembles it into an RGBA element -by attaching 1 for alpha. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see \%\f3glPixelTransfer\fP). -.TP -\%\f3GL_RGBA\fP -.TP -\%\f3GL_BGRA\fP -Each element contains all four components. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see \%\f3glPixelTransfer\fP). -.TP -\%\f3GL_LUMINANCE\fP -Each element is a single luminance value. -The GL converts it to floating point, -then assembles it into an RGBA element by replicating the luminance value -three times for red, green, and blue and attaching 1 for alpha. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see \%\f3glPixelTransfer\fP). -.TP -\%\f3GL_LUMINANCE_ALPHA\fP -Each element is a luminance/alpha pair. -The GL converts it to floating point, -then assembles it into an RGBA element by replicating the luminance value -three times for red, green, and blue. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] (see \%\f3glPixelTransfer\fP). -.P -If an application wants to store the texture at a certain -resolution or in a certain , it can request the resolution -and with \f2internalFormat\fP. The GL will choose an internal -representation that closely approximates that requested by \f2internalFormat\fP, but -it may not match exactly. -(The representations specified by \%\f3GL_LUMINANCE\fP, \%\f3GL_LUMINANCE_ALPHA\fP, \%\f3GL_RGB\fP, -and \%\f3GL_RGBA\fP must match exactly. The numeric values 1, 2, 3, and 4 may also be used to -specify the preceding representations.) -.P -Use the \%\f3GL_PROXY_TEXTURE_1D\fP target to try out a resolution and -. The implementation will -update and recompute its best match for the requested storage resolution -and . To query this state, call \%\f3glGetTexLevelParameter\fP. -If the texture cannot be accommodated, texture state is set to 0. -.P -A one-component texture image uses only the red component of the RGBA -color from \f2pixels\fP. -A two-component image uses the R and A values. -A three-component image uses the R, G, and B values. -A four-component image uses all of the RGBA components. -.SH NOTES -Texturing has no effect in color index mode. -.P -If the \%\f3GL_ARB_imaging\fP extension is supported, RGBA elements may -also be processed by the imaging pipeline. The following stages may be -applied to an RGBA color before color component clamping to the range -[0,\ 1]: -.TP 3 -1. Color component replacement by the color table specified for -\%\f3GL_COLOR_TABLE\fP, if enabled. See \%\f3glColorTable\fP. -.TP -2. One-dimensional convolution filtering, if enabled. See -\%\f3glConvolutionFilter1D\fP. -.IP -If a convolution filter changes the __width of the texture (by -processing with a \%\f3GL_CONVOLUTION_BORDER_MODE\fP of \%\f3GL_REDUCE\fP, for -example), the \f2width\fP must $2 sup n + 2 ( "border" )$, for some -integer $n$, after filtering. -.TP -3. RGBA components may be multiplied by \%\f3GL_POST_CONVOLUTION_c_SCALE\fP, -and added to \%\f3GL_POST_CONVOLUTION_c_BIAS\fP, if enabled. See -\%\f3glPixelTransfer\fP. -.TP -4. Color component replacement by the color table specified for -\%\f3GL_POST_CONVOLUTION_COLOR_TABLE\fP, if enabled. See \%\f3glColorTable\fP. -.TP -5. Transformation by the color matrix. See \%\f3glMatrixMode\fP. -.TP -6. RGBA components may be multiplied by \%\f3GL_POST_COLOR_MATRIX_c_SCALE\fP, -and added to \%\f3GL_POST_COLOR_MATRIX_c_BIAS\fP, if enabled. See -\%\f3glPixelTransfer\fP. -.TP -7. Color component replacement by the color table specified for -\%\f3GL_POST_COLOR_MATRIX_COLOR_TABLE\fP, if enabled. See \%\f3glColorTable\fP. -.P -The texture image can be represented by the same data formats -as the pixels in a \%\f3glDrawPixels\fP command, -except that \%\f3GL_STENCIL_INDEX\fP and \%\f3GL_DEPTH_COMPONENT\fP -cannot be used. -\%\f3glPixelStore\fP and \%\f3glPixelTransfer\fP modes affect texture images -in exactly the way they affect \%\f3glDrawPixels\fP. -.P -\%\f3GL_PROXY_TEXTURE_1D\fP may be used only if the GL version is 1.1 or greater. -.P -Internal formats other than 1, 2, 3, or 4 may be -used only if the GL version is 1.1 or greater. -.P -In GL version 1.1 or greater, -\f2pixels\fP may be a null pointer. In this case texture memory is -allocated to accommodate a texture of width \f2width\fP. -You can then download subtextures to initialize the -texture memory. The image is undefined if the program tries to apply -an uninitialized portion of the texture image to a primitive. -.P -Formats \%\f3GL_BGR\fP, and \%\f3GL_BGRA\fP and types -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP are available only if the GL version -is 1.2 or greater. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, \%\f3glTexImage1D\fP -specifies the one-dimensional texture for the current texture unit, -specified with \%\f3glActiveTextureARB\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not \%\f3GL_TEXTURE_1D\fP -or \%\f3GL_PROXY_TEXTURE_1D\fP. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2format\fP is not an accepted - constant. -Format constants other than \%\f3GL_STENCIL_INDEX\fP and \%\f3GL_DEPTH_COMPONENT\fP -are accepted. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not a type constant. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is \%\f3GL_BITMAP\fP and -\f2format\fP is not \%\f3GL_COLOR_INDEX\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2level\fP is less than 0. -.P -\%\f3GL_INVALID_VALUE\fP may be generated if \f2level\fP is greater than $log -sub 2$\f2max\fP, -where \f2max\fP is the returned value of \%\f3GL_MAX_TEXTURE_SIZE\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2internalFormat\fP is not 1, 2, 3, 4, or -one of the accepted resolution and symbolic constants. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2width\fP is less than 0 -or greater than 2 + \%\f3GL_MAX_TEXTURE_SIZE\fP, -or if it cannot be represented as $2 sup n ~+~ 2("border")$ -for some integer value of \f2n\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2border\fP is not 0 or 1. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glTexImage1D\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, or -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.SH ASSOCIATED GETS -\%\f3glGetTexImage\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_TEXTURE_1D\fP -.SH SEE ALSO -\%\f3glActiveTextureARB(3G)\fP, -\%\f3glColorTable(3G)\fP, -\%\f3glConvolutionFilter1D(3G)\fP, -\%\f3glCopyPixels(3G)\fP, -\%\f3glCopyTexImage1D(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glCopyTexSubImage1D(3G)\fP, -\%\f3glCopyTexSubImage2D(3G)\fP, -\%\f3glCopyTexSubImage3D(3G)\fP, -\%\f3glDrawPixels(3G)\fP, -\%\f3glMatrixMode(3G)\fP, -\%\f3glPixelStore(3G)\fP, -\%\f3glPixelTransfer(3G)\fP, -\%\f3glTexEnv(3G)\fP, -\%\f3glTexGen(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexImage3D(3G)\fP, -\%\f3glTexSubImage1D(3G)\fP, -\%\f3glTexSubImage2D(3G)\fP, -\%\f3glTexSubImage3D(3G)\fP, -\%\f3glTexParameter(3G)\fP - diff --git a/doc/gl-docs/GL/gl/teximage2d.3gl b/doc/gl-docs/GL/gl/teximage2d.3gl deleted file mode 100644 index b50d7463..00000000 --- a/doc/gl-docs/GL/gl/teximage2d.3gl +++ /dev/null @@ -1,478 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 teximage2 -.ds Xs 14330 17 teximage2d.gl -.TH GLTEXIMAGE2D 3G -.SH NAME -.B "glTexImage2D -\- specify a two-dimensional texture image - -.SH C SPECIFICATION -void \f3glTexImage2D\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglTexImage2D( 'u - GLint \fIlevel\fP, - GLint \fIinternalFormat\fP, - GLsizei \fIwidth\fP, - GLsizei \fIheight\fP, - GLint \fIborder\fP, - GLenum \fIformat\fP, - GLenum \fItype\fP, - const GLvoid \fI*pixels\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIinternalFormat\fP\ \ 'u -\f2target\fP -Specifies the target texture. -Must be \%\f3GL_TEXTURE_2D\fP or \%\f3GL_PROXY_TEXTURE_2D\fP. -.TP -\f2level\fP -Specifies the level-of-detail number. -Level 0 is the base image level. -Level \f2n\fP is the \f2n\fPth mipmap reduction image. -.TP -\f2internalFormat\fP -Specifies the number of color components in the texture. -Must be 1, 2, 3, or 4, or one of the following symbolic constants: -\%\f3GL_ALPHA\fP, -\%\f3GL_ALPHA4\fP, -\%\f3GL_ALPHA8\fP, -\%\f3GL_ALPHA12\fP, -\%\f3GL_ALPHA16\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE4\fP, -\%\f3GL_LUMINANCE8\fP, -\%\f3GL_LUMINANCE12\fP, -\%\f3GL_LUMINANCE16\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_LUMINANCE4_ALPHA4\fP, -\%\f3GL_LUMINANCE6_ALPHA2\fP, -\%\f3GL_LUMINANCE8_ALPHA8\fP, -\%\f3GL_LUMINANCE12_ALPHA4\fP, -\%\f3GL_LUMINANCE12_ALPHA12\fP, -\%\f3GL_LUMINANCE16_ALPHA16\fP, -\%\f3GL_INTENSITY\fP, -\%\f3GL_INTENSITY4\fP, -\%\f3GL_INTENSITY8\fP, -\%\f3GL_INTENSITY12\fP, -\%\f3GL_INTENSITY16\fP, -\%\f3GL_R3_G3_B2\fP, -\%\f3GL_RGB\fP, -\%\f3GL_RGB4\fP, -\%\f3GL_RGB5\fP, -\%\f3GL_RGB8\fP, -\%\f3GL_RGB10\fP, -\%\f3GL_RGB12\fP, -\%\f3GL_RGB16\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_RGBA2\fP, -\%\f3GL_RGBA4\fP, -\%\f3GL_RGB5_A1\fP, -\%\f3GL_RGBA8\fP, -\%\f3GL_RGB10_A2\fP, -\%\f3GL_RGBA12\fP, or -\%\f3GL_RGBA16\fP. -.TP -\f2width\fP -Specifies the width of the texture image. -Must be $2 sup n ~+~ 2 ( "border" )$ for some integer $n$. All -implementations support texture images that are at least 64 texels -wide. -.TP -\f2height\fP -Specifies the height of the texture image. -Must be $2 sup m ~+~ 2 ( "border" )$ for some integer $m$. All -implementations support texture images that are at least 64 texels -high. -.TP -\f2border\fP -Specifies the width of the border. -Must be either 0 or 1. -.TP -\f2format\fP -Specifies the of the pixel data. -The following symbolic values are accepted: -\%\f3GL_COLOR_INDEX\fP, -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_BGR\fP -\%\f3GL_RGBA\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, and -\%\f3GL_LUMINANCE_ALPHA\fP. -.TP -\f2type\fP -Specifies the data type of the pixel data. -The following symbolic values are accepted: -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP. -.TP -\f2pixels\fP -Specifies a pointer to the image data in memory. -.SH DESCRIPTION -Texturing maps a portion of a specified texture image -onto each graphical primitive for which texturing is enabled. -To enable and disable two-dimensional texturing, call \%\f3glEnable\fP -and \%\f3glDisable\fP with argument \%\f3GL_TEXTURE_2D\fP. -.P -To define texture images, call \%\f3glTexImage2D\fP. -The arguments describe the parameters of the texture image, -such as height, -width, -width of the border, -level-of-detail number -(see \%\f3glTexParameter\fP), -and number of color components provided. -The last three arguments describe how the image is represented in memory; -they are identical to the pixel formats used for \%\f3glDrawPixels\fP. -.P -If \f2target\fP is \%\f3GL_PROXY_TEXTURE_2D\fP, no data is read from \f2pixels\fP, but -all of the texture image state is recalculated, checked for -consistency, and checked -against the implementation's capabilities. If the implementation cannot -handle a texture of the requested texture size, it sets -all of the image state to 0, -but does not generate an error (see \%\f3glGetError\fP). To query for an -entire mipmap array, use an image array level greater than or equal to -1. -.P -If \f2target\fP is \%\f3GL_TEXTURE_2D\fP, -data is read from \f2pixels\fP as a sequence of signed or unsigned bytes, -shorts, -or longs, -or single-precision floating-point values, -depending on \f2type\fP. -These values are grouped into sets of one, -two, -three, -or four values, -depending on \f2format\fP, -to form elements. -If \f2type\fP is \%\f3GL_BITMAP\fP, -the data is considered as a string of unsigned bytes (and -\f2format\fP must be \%\f3GL_COLOR_INDEX\fP). -.bp -Each data byte is treated as eight 1-bit elements, -with bit ordering determined by \%\f3GL_UNPACK_LSB_FIRST\fP -(see \%\f3glPixelStore\fP). -.P -The first element corresponds to the lower left corner of the texture -image. -Subsequent elements progress left-to-right through the remaining texels -in the lowest row of the texture image, and then in successively higher -rows of the texture image. -The final element corresponds to the upper right corner of the texture -image. -.P -\f2format\fP determines the composition of each element in \f2pixels\fP. -It can assume one of eleven symbolic values: -.TP 10 -\%\f3GL_COLOR_INDEX\fP -Each element is a single value, -a color index. -The GL converts it to fixed point -(with an unspecified number of zero bits to the right of the binary point), -shifted left or right depending on the value and sign of \%\f3GL_INDEX_SHIFT\fP, -and added to \%\f3GL_INDEX_OFFSET\fP -(see -.br -\%\f3glPixelTransfer\fP). -The resulting index is converted to a set of color components -using the -\%\f3GL_PIXEL_MAP_I_TO_R\fP, -\%\f3GL_PIXEL_MAP_I_TO_G\fP, -\%\f3GL_PIXEL_MAP_I_TO_B\fP, and -\%\f3GL_PIXEL_MAP_I_TO_A\fP tables, -and clamped to the range [0,1]. -.TP -\%\f3GL_RED\fP -Each element is a single red component. -The GL converts it to floating point and assembles it into an RGBA element -by attaching 0 for green and blue, and 1 for alpha. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see \%\f3glPixelTransfer\fP). -.TP -\%\f3GL_GREEN\fP -Each element is a single green component. -The GL converts it to floating point and assembles it into an RGBA element -by attaching 0 for red and blue, and 1 for alpha. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see \%\f3glPixelTransfer\fP). -.TP -\%\f3GL_BLUE\fP -Each element is a single blue component. -The GL converts it to floating point and assembles it into an RGBA element -by attaching 0 for red and green, and 1 for alpha. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see \%\f3glPixelTransfer\fP). -.TP -\%\f3GL_ALPHA\fP -Each element is a single alpha component. -The GL converts it to floating point and assembles it into an RGBA element -by attaching 0 for red, green, and blue. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see \%\f3glPixelTransfer\fP). -.TP -\%\f3GL_RGB\fP -.TP -\%\f3GL_BGR\fP -Each element is an RGB triple. -The GL converts it to floating point and assembles it into an RGBA element -by attaching 1 for alpha. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see -.br -\%\f3glPixelTransfer\fP). -.TP -\%\f3GL_RGBA\fP -.TP -\%\f3GL_BGRA\fP -Each element contains all four components. -Each component is multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see \%\f3glPixelTransfer\fP). -.TP -\%\f3GL_LUMINANCE\fP -Each element is a single luminance value. -The GL converts it to floating point, -then assembles it into an RGBA element by replicating the luminance value -three times for red, green, and blue and attaching 1 for alpha. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see \%\f3glPixelTransfer\fP). -.TP -\%\f3GL_LUMINANCE_ALPHA\fP -Each element is a luminance/alpha pair. -The GL converts it to floating point, -then assembles it into an RGBA element by replicating the luminance value -three times for red, green, and blue. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see -.br -\%\f3glPixelTransfer\fP). -.P -Refer to the \%\f3glDrawPixels\fP reference page for a description of -the acceptable values for the \f2type\fP parameter. -.P -If an application wants to store the texture at a certain -resolution or in a certain , it can request the resolution -and with \f2internalFormat\fP. The GL will choose an internal -representation that closely approximates that requested by \f2internalFormat\fP, but -it may not match exactly. -(The representations specified by \%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, \%\f3GL_RGB\fP, -and \%\f3GL_RGBA\fP must match exactly. The numeric values 1, 2, 3, and 4 -may also be used to specify the above representations.) -.P -Use the \%\f3GL_PROXY_TEXTURE_2D\fP target to try out a resolution and -. The implementation will -update and recompute its best match for the requested storage resolution -and . To then query this state, call -\%\f3glGetTexLevelParameter\fP. -If the texture cannot be accommodated, texture state is set to 0. -.P -A one-component texture image uses only the red component of the RGBA -color extracted from \f2pixels\fP. -A two-component image uses the R and A values. -A three-component image uses the R, G, and B values. -A four-component image uses all of the RGBA components. -.SH NOTES -Texturing has no effect in color index mode. -.P -If the \%\f3GL_ARB_imaging\fP extension is supported, RGBA elements may -also be processed by the imaging pipeline. The following stages may be -applied to an RGBA color before color component clamping to the range -[0,\ 1]: -.TP 3 -1. Color component replacement by the color table specified for -\%\f3GL_COLOR_TABLE\fP, if enabled. See \%\f3glColorTable\fP. -.TP -2. Two-dimensional Convolution filtering, if enabled. See -\%\f3glConvolutionFilter1D\fP. -.IP -If a convolution filter changes the __width of the texture (by -processing with a \%\f3GL_CONVOLUTION_BORDER_MODE\fP of \%\f3GL_REDUCE\fP, for -example), the \f2width\fP must $2 sup n + 2 ( "height" )$, for some -integer $n$, and \f2height\fP must be $2 sup m + ( "border" )$, for some -integer $m$, after filtering. -.TP -3. RGBA components may be multiplied by \%\f3GL_POST_CONVOLUTION_c_SCALE\fP, -and added to \%\f3GL_POST_CONVOLUTION_c_BIAS\fP, if enabled. See -\%\f3glPixelTransfer\fP. -.TP -4. Color component replacement by the color table specified for -\%\f3GL_POST_CONVOLUTION_COLOR_TABLE\fP, if enabled. See \%\f3glColorTable\fP. -.TP -5. Transformation by the color matrix. See \%\f3glMatrixMode\fP. -.TP -6. RGBA components may be multiplied by \%\f3GL_POST_COLOR_MATRIX_c_SCALE\fP, -and added to \%\f3GL_POST_COLOR_MATRIX_c_BIAS\fP, if enabled. See -\%\f3glPixelTransfer\fP. -.TP -7. Color component replacement by the color table specified for -\%\f3GL_POST_COLOR_MATRIX_COLOR_TABLE\fP, if enabled. See -\%\f3glColorTable\fP. -.P -The texture image can be represented by the same data formats -as the pixels in a \%\f3glDrawPixels\fP command, -except that \%\f3GL_STENCIL_INDEX\fP and \%\f3GL_DEPTH_COMPONENT\fP -cannot be used. -\%\f3glPixelStore\fP and \%\f3glPixelTransfer\fP modes affect texture images -in exactly the way they affect \%\f3glDrawPixels\fP. -.P -.P -\%\f3glTexImage2D\fP and \%\f3GL_PROXY_TEXTURE_2D\fP are available only if the GL -version is 1.1 or greater. -.P -Internal formats other than 1, 2, 3, or 4 may be used only if the GL -version is 1.1 or greater. -.P -In GL version 1.1 or greater, \f2pixels\fP may be a null pointer. -In this case texture memory is -allocated to accommodate a texture of width \f2width\fP and height \f2height\fP. -You can then download subtextures to initialize this -texture memory. -The image is undefined if the user tries to apply -an uninitialized portion of the texture image to a primitive. -.P -Formats \%\f3GL_BGR\fP, and \%\f3GL_BGRA\fP and types -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP are available only if the GL version -is 1.2 or greater. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, \%\f3glTexImage2D\fP -specifies the two-dimensional texture for the current texture unit, -specified with \%\f3glActiveTextureARB\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not \%\f3GL_TEXTURE_2D\fP -or \%\f3GL_PROXY_TEXTURE_2D\fP. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2format\fP is not an accepted - constant. -Format constants other than \%\f3GL_STENCIL_INDEX\fP and \%\f3GL_DEPTH_COMPONENT\fP -are accepted. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not a type constant. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is \%\f3GL_BITMAP\fP and -\f2format\fP is not \%\f3GL_COLOR_INDEX\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2level\fP is less than 0. -.P -\%\f3GL_INVALID_VALUE\fP may be generated if \f2level\fP is greater than $log -sub 2$\f2max\fP, -where \f2max\fP is the returned value of \%\f3GL_MAX_TEXTURE_SIZE\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2internalFormat\fP is not 1, 2, 3, 4, or one of the -accepted resolution and symbolic constants. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2width\fP or \f2height\fP is less than 0 -or greater than 2 + \%\f3GL_MAX_TEXTURE_SIZE\fP, -or if either cannot be represented as $2 sup k ~+~ 2("border")$ for some -integer value of \f2k\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2border\fP is not 0 or 1. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glTexImage2D\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, or -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.SH ASSOCIATED GETS -\%\f3glGetTexImage\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_TEXTURE_2D\fP -.SH SEE ALSO -\%\f3glColorTable(3G)\fP, -\%\f3glConvolutionFilter2D(3G)\fP, -\%\f3glCopyPixels(3G)\fP, -\%\f3glCopyTexImage1D(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glCopyTexSubImage1D(3G)\fP, -\%\f3glCopyTexSubImage2D(3G)\fP, -\%\f3glCopyTexSubImage3D(3G)\fP, -\%\f3glDrawPixels(3G)\fP, -\%\f3glMatrixMode(3G)\fP, -\%\f3glPixelStore(3G)\fP, -\%\f3glPixelTransfer(3G)\fP, -\%\f3glSeparableFilter2D(3G)\fP, -\%\f3glTexEnv(3G)\fP, -\%\f3glTexGen(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage3D(3G)\fP, -\%\f3glTexSubImage1D(3G)\fP, -\%\f3glTexSubImage2D(3G)\fP, -\%\f3glTexSubImage3D(3G)\fP, -\%\f3glTexParameter(3G)\fP - diff --git a/doc/gl-docs/GL/gl/teximage3d.3gl b/doc/gl-docs/GL/gl/teximage3d.3gl deleted file mode 100644 index 2911d884..00000000 --- a/doc/gl-docs/GL/gl/teximage3d.3gl +++ /dev/null @@ -1,470 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 teximage3 -.ds Xs 11081 17 teximage3d.gl -.TH GLTEXIMAGE3D 3G -.SH NAME -.B "glTexImage3D -\- specify a three-dimensional texture image - -.SH C SPECIFICATION -void \f3glTexImage3D\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglTexImage3D( 'u - GLint \fIlevel\fP, - GLint \fIinternalFormat\fP, - GLsizei \fIwidth\fP, - GLsizei \fIheight\fP, - GLsizei \fIdepth\fP, - GLint \fIborder\fP, - GLenum \fIformat\fP, - GLenum \fItype\fP, - const GLvoid \fI*pixels\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIinternalFormat\fP\ \ 'u -\f2target\fP -Specifies the target texture. -Must be \%\f3GL_TEXTURE_3D\fP or \%\f3GL_PROXY_TEXTURE_3D\fP. -.TP -\f2level\fP -Specifies the level-of-detail number. -Level 0 is the base image level. -Level $n$ is the $n sup th$ mipmap reduction image. -.TP -\f2internalFormat\fP -Specifies the number of color components in the texture. -Must be 1, 2, 3, or 4, or one of the following symbolic constants: -\%\f3GL_ALPHA\fP, -\%\f3GL_ALPHA4\fP, -\%\f3GL_ALPHA8\fP, -\%\f3GL_ALPHA12\fP, -\%\f3GL_ALPHA16\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE4\fP, -\%\f3GL_LUMINANCE8\fP, -\%\f3GL_LUMINANCE12\fP, -\%\f3GL_LUMINANCE16\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_LUMINANCE4_ALPHA4\fP, -\%\f3GL_LUMINANCE6_ALPHA2\fP, -\%\f3GL_LUMINANCE8_ALPHA8\fP, -\%\f3GL_LUMINANCE12_ALPHA4\fP, -\%\f3GL_LUMINANCE12_ALPHA12\fP, -\%\f3GL_LUMINANCE16_ALPHA16\fP, -\%\f3GL_INTENSITY\fP, -\%\f3GL_INTENSITY4\fP, -\%\f3GL_INTENSITY8\fP, -\%\f3GL_INTENSITY12\fP, -\%\f3GL_INTENSITY16\fP, -\%\f3GL_R3_G3_B2\fP, -\%\f3GL_RGB\fP, -\%\f3GL_RGB4\fP, -\%\f3GL_RGB5\fP, -\%\f3GL_RGB8\fP, -\%\f3GL_RGB10\fP, -\%\f3GL_RGB12\fP, -\%\f3GL_RGB16\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_RGBA2\fP, -\%\f3GL_RGBA4\fP, -\%\f3GL_RGB5_A1\fP, -\%\f3GL_RGBA8\fP, -\%\f3GL_RGB10_A2\fP, -\%\f3GL_RGBA12\fP, or -\%\f3GL_RGBA16\fP. -.TP -\f2width\fP -Specifies the width of the texture image. -Must be $2 sup n ~+~ 2 ( "border" )$ for some integer $n$. All -implementations support texture images that are at least 64 texels -wide. -.TP -\f2height\fP -Specifies the height of the texture image. -Must be $2 sup m ~+~ 2 ( "border" )$ for some integer $m$. All -implementations support texture images that are at least 64 texels -high. -.TP -\f2depth\fP -Specifies the depth of the texture image. -Must be $2 sup k ~+~ 2 ( "border" )$ for some integer $k$. All -implementations support texture images that are at least 64 texels -deep. -.TP -\f2border\fP -Specifies the width of the border. -Must be either 0 or 1. -.TP -\f2format\fP -Specifies the of the pixel data. -The following symbolic values are accepted: -\%\f3GL_COLOR_INDEX\fP, -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_BGR\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, and -\%\f3GL_LUMINANCE_ALPHA\fP. -.TP -\f2type\fP -Specifies the data type of the pixel data. -The following symbolic values are accepted: -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP. -.TP -\f2pixels\fP -Specifies a pointer to the image data in memory. -.SH DESCRIPTION -Texturing maps a portion of a specified texture image -onto each graphical primitive for which texturing is enabled. -To enable and disable three-dimensional texturing, call \%\f3glEnable\fP -and \%\f3glDisable\fP with argument \%\f3GL_TEXTURE_3D\fP. -.P -To define texture images, call \%\f3glTexImage3D\fP. -The arguments describe the parameters of the texture image, -such as height, -width, depth, -width of the border, -level-of-detail number -(see \%\f3glTexParameter\fP), -and number of color components provided. -The last three arguments describe how the image is represented in memory; -they are identical to the pixel formats used for \%\f3glDrawPixels\fP. -.P -If \f2target\fP is \%\f3GL_PROXY_TEXTURE_3D\fP, no data is read from \f2pixels\fP, but -all of the texture image state is recalculated, checked for -consistency, and checked -against the implementation's capabilities. If the implementation cannot -handle a texture of the requested texture size, it sets -all of the image state to 0, -but does not generate an error (see \%\f3glGetError\fP). To query for an -entire mipmap array, use an image array level greater than or equal to -1. -.P -If \f2target\fP is \%\f3GL_TEXTURE_3D\fP, -data is read from \f2pixels\fP as a sequence of signed or unsigned bytes, -shorts, -or longs, -or single-precision floating-point values, -depending on \f2type\fP. -These values are grouped into sets of one, -two, -three, -or four values, -depending on \f2format\fP, -to form elements. -If \f2type\fP is \%\f3GL_BITMAP\fP, -the data is considered as a string of unsigned bytes (and -\f2format\fP must be \%\f3GL_COLOR_INDEX\fP). -Each data byte is treated as eight 1-bit elements, -with bit ordering determined by \%\f3GL_UNPACK_LSB_FIRST\fP -(see \%\f3glPixelStore\fP). -.P -The first element corresponds to the lower left corner of the texture -image. -Subsequent elements progress left-to-right through the remaining texels -in the lowest row of the texture image, and then in successively higher -rows of the texture image. -The final element corresponds to the upper right corner of the texture -image. -.P -\f2format\fP determines the composition of each element in \f2pixels\fP. -It can assume one of eleven symbolic values: -.TP 10 -\%\f3GL_COLOR_INDEX\fP -Each element is a single value, -a color index. -The GL converts it to fixed point -(with an unspecified number of zero bits to the right of the binary point), -shifted left or right depending on the value and sign of \%\f3GL_INDEX_SHIFT\fP, -and added to \%\f3GL_INDEX_OFFSET\fP -(see -.br -\%\f3glPixelTransfer\fP). -The resulting index is converted to a set of color components -using the -\%\f3GL_PIXEL_MAP_I_TO_R\fP, -\%\f3GL_PIXEL_MAP_I_TO_G\fP, -\%\f3GL_PIXEL_MAP_I_TO_B\fP, and -\%\f3GL_PIXEL_MAP_I_TO_A\fP tables, -and clamped to the range [0,1]. -.TP -\%\f3GL_RED\fP -Each element is a single red component. -The GL converts it to floating point and assembles it into an RGBA element -by attaching 0 for green and blue, and 1 for alpha. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see \%\f3glPixelTransfer\fP). -.TP -\%\f3GL_GREEN\fP -Each element is a single green component. -The GL converts it to floating point and assembles it into an RGBA element -by attaching 0 for red and blue, and 1 for alpha. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see \%\f3glPixelTransfer\fP). -.TP -\%\f3GL_BLUE\fP -Each element is a single blue component. -The GL converts it to floating point and assembles it into an RGBA element -by attaching 0 for red and green, and 1 for alpha. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see \%\f3glPixelTransfer\fP). -.TP -\%\f3GL_ALPHA\fP -Each element is a single alpha component. -The GL converts it to floating point and assembles it into an RGBA element -by attaching 0 for red, green, and blue. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see \%\f3glPixelTransfer\fP). -.TP -\%\f3GL_RGB\fP -.TP -\%\f3GL_BGR\fP -Each element is an RGB triple. -The GL converts it to floating point and assembles it into an RGBA element -by attaching 1 for alpha. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see -.br -\%\f3glPixelTransfer\fP). -.TP -\%\f3GL_RGBA\fP -.TP -\%\f3GL_BGRA\fP -Each element contains all four components. -Each component is multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see \%\f3glPixelTransfer\fP). -.TP -\%\f3GL_LUMINANCE\fP -Each element is a single luminance value. -The GL converts it to floating point, -then assembles it into an RGBA element by replicating the luminance value -three times for red, green, and blue and attaching 1 for alpha. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see \%\f3glPixelTransfer\fP). -.TP -\%\f3GL_LUMINANCE_ALPHA\fP -Each element is a luminance/alpha pair. -The GL converts it to floating point, -then assembles it into an RGBA element by replicating the luminance value -three times for red, green, and blue. -Each component is then multiplied by the signed scale factor \%\f3GL_c_SCALE\fP, -added to the signed bias \%\f3GL_c_BIAS\fP, -and clamped to the range [0,1] -(see -.br -\%\f3glPixelTransfer\fP). -.P -Refer to the \%\f3glDrawPixels\fP reference page for a description of -the acceptable values for the \f2type\fP parameter. -.P -If an application wants to store the texture at a certain -resolution or in a certain , it can request the resolution -and with \f2internalFormat\fP. The GL will choose an internal -representation that closely approximates that requested by \f2internalFormat\fP, but -it may not match exactly. -(The representations specified by \%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, \%\f3GL_RGB\fP, -and \%\f3GL_RGBA\fP must match exactly. The numeric values 1, 2, 3, and 4 -may also be used to specify the above representations.) -.P -Use the \%\f3GL_PROXY_TEXTURE_3D\fP target to try out a resolution and -. The implementation will -update and recompute its best match for the requested storage resolution -and . To then query this state, call -\%\f3glGetTexLevelParameter\fP. -If the texture cannot be accommodated, texture state is set to 0. -.P -A one-component texture image uses only the red component of the RGBA -color extracted from \f2pixels\fP. -A two-component image uses the R and A values. -A three-component image uses the R, G, and B values. -A four-component image uses all of the RGBA components. -.SH NOTES -Texturing has no effect in color index mode. -.P -The texture image can be represented by the same data formats -as the pixels in a \%\f3glDrawPixels\fP command, -except that \%\f3GL_STENCIL_INDEX\fP and \%\f3GL_DEPTH_COMPONENT\fP -cannot be used. -\%\f3glPixelStore\fP and \%\f3glPixelTransfer\fP modes affect texture images -in exactly the way they affect \%\f3glDrawPixels\fP. -.P -.P -\%\f3glTexImage3D\fP is available only if the GL version is 1.2 or greater. -.P -Internal formats other than 1, 2, 3, or 4 may be used only if the GL -version is 1.1 or greater. -.P -\f2pixels\fP may be a null pointer. -In this case texture memory is -allocated to accommodate a texture of width \f2width\fP, height \f2height\fP, -and depth \f2depth\fP. -You can then download subtextures to initialize this -texture memory. -The image is undefined if the user tries to apply -an uninitialized portion of the texture image to a primitive. -.P -Formats \%\f3GL_BGR\fP, and \%\f3GL_BGRA\fP and types -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP are available only if the GL version -is 1.2 or greater. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, \%\f3glTexImage3D\fP -specifies the three-dimensional texture for the current texture unit, -specified with \%\f3glActiveTextureARB\fP. -.P -If the \%\f3GL_ARB_imaging\fP extension is supported, RGBA elements may -also be processed by the imaging pipeline. The following stages may be -applied to an RGBA color before color component clamping to the range -[0,\ 1]: -.TP 3 -1. Color component replacement by the color table specified for -\%\f3GL_COLOR_TABLE\fP, if enabled. See \%\f3glColorTable\fP. -.TP -2. Color component replacement by the color table specified for -\%\f3GL_POST_CONVOLUTION_COLOR_TABLE\fP, if enabled. See \%\f3glColorTable\fP. -.TP -3. Transformation by the color matrix. See \%\f3glMatrixMode\fP. -.TP -4. RGBA components may be multiplied by \%\f3GL_POST_COLOR_MATRIX_c_SCALE\fP, -and added to \%\f3GL_POST_COLOR_MATRIX_c_BIAS\fP, if enabled. See -\%\f3glPixelTransfer\fP. -.TP -5. Color component replacement by the color table specified for -\%\f3GL_POST_COLOR_MATRIX_COLOR_TABLE\fP, if enabled. See -\%\f3glColorTable\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not \%\f3GL_TEXTURE_3D\fP -or \%\f3GL_PROXY_TEXTURE_3D\fP. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2format\fP is not an accepted - constant. -Format constants other than \%\f3GL_STENCIL_INDEX\fP and \%\f3GL_DEPTH_COMPONENT\fP -are accepted. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not a type constant. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is \%\f3GL_BITMAP\fP and -\f2format\fP is not \%\f3GL_COLOR_INDEX\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2level\fP is less than 0. -.P -.P -\%\f3GL_INVALID_VALUE\fP may be generated if \f2level\fP is greater than $log -sub 2$\f2max\fP, -where \f2max\fP is the returned value of \%\f3GL_MAX_TEXTURE_SIZE\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2internalFormat\fP is not 1, 2, 3, 4, or one of the -accepted resolution and symbolic constants. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2width\fP, \f2height\fP, or \f2depth\fP -is less than 0 or greater than 2 + \%\f3GL_MAX_TEXTURE_SIZE\fP, -or if either cannot be represented as $2 sup k ~+~ 2( "border" )$ for some -integer value of \f2k\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2border\fP is not 0 or 1. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glTexImage3D\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, or -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.SH ASSOCIATED GETS -\%\f3glGetTexImage\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_TEXTURE_3D\fP -.SH SEE ALSO -\%\f3glActiveTextureARB(3G)\fP, -\%\f3glCopyPixels(3G)\fP, -\%\f3glCopyTexImage1D(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glCopyTexSubImage1D(3G)\fP, -\%\f3glCopyTexSubImage2D(3G)\fP, -\%\f3glCopyTexSubImage3D(3G)\fP, -\%\f3glDrawPixels(3G)\fP, -\%\f3glPixelStore(3G)\fP, -\%\f3glPixelTransfer(3G)\fP, -\%\f3glTexEnv(3G)\fP, -\%\f3glTexGen(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexSubImage1D(3G)\fP, -\%\f3glTexSubImage2D(3G)\fP, -\%\f3glTexSubImage3D(3G)\fP, -\%\f3glTexParameter(3G)\fP - - diff --git a/doc/gl-docs/GL/gl/texparameter.3gl b/doc/gl-docs/GL/gl/texparameter.3gl deleted file mode 100644 index e556444c..00000000 --- a/doc/gl-docs/GL/gl/texparameter.3gl +++ /dev/null @@ -1,348 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 texparame -.ds Xs 38873 13 texparameter.gl -.TH GLTEXPARAMETER 3G -.SH NAME -.B "glTexParameterf, glTexParameteri, glTexParameterfv, glTexParameteriv -\- set texture parameters - -.SH C SPECIFICATION -void \f3glTexParameterf\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglTexParameterf( 'u - GLenum \fIpname\fP, - GLfloat \fIparam\fP ) -.fi -void \f3glTexParameteri\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglTexParameteri( 'u - GLenum \fIpname\fP, - GLint \fIparam\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2target\fP\ \ 'u -\f2target\fP -Specifies the target texture, -which must be either \%\f3GL_TEXTURE_1D\fP, \%\f3GL_TEXTURE_2D\fP, or -\%\f3GL_TEXTURE_3D\fP. -.TP -\f2pname\fP -Specifies the symbolic name of a single-valued texture parameter. -\f2pname\fP can be one of the following: -\%\f3GL_TEXTURE_MIN_FILTER\fP, -\%\f3GL_TEXTURE_MAG_FILTER\fP, -\%\f3GL_TEXTURE_MIN_LOD\fP, -\%\f3GL_TEXTURE_MAX_LOD\fP, -\%\f3GL_TEXTURE_BASE_LEVEL\fP, -\%\f3GL_TEXTURE_MAX_LEVEL\fP, -\%\f3GL_TEXTURE_WRAP_S\fP, -\%\f3GL_TEXTURE_WRAP_T\fP, -\%\f3GL_TEXTURE_WRAP_R\fP, or -\%\f3GL_TEXTURE_PRIORITY\fP. -.TP -\f2param\fP -Specifies the value of \f2pname\fP. -.SH C SPECIFICATION -void \f3glTexParameterfv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglTexParameterfv( 'u - GLenum \fIpname\fP, - const GLfloat \fI*params\fP ) -.fi -void \f3glTexParameteriv\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglTexParameteriv( 'u - GLenum \fIpname\fP, - const GLint \fI*params\fP ) -.fi - -.SH PARAMETERS -.TP -\f2target\fP -Specifies the target texture, -which must be either \%\f3GL_TEXTURE_1D\fP, \%\f3GL_TEXTURE_2D\fP or -\%\f3GL_TEXTURE_3D\fP. -.TP -\f2pname\fP -Specifies the symbolic name of a texture parameter. -\f2pname\fP can be one of the following: -\%\f3GL_TEXTURE_MIN_FILTER\fP, -\%\f3GL_TEXTURE_MAG_FILTER\fP, -\%\f3GL_TEXTURE_MIN_LOD\fP, -\%\f3GL_TEXTURE_MAX_LOD\fP, -\%\f3GL_TEXTURE_BASE_LEVEL\fP, -\%\f3GL_TEXTURE_MAX_LEVEL\fP, -\%\f3GL_TEXTURE_WRAP_S\fP, -\%\f3GL_TEXTURE_WRAP_T\fP, -\%\f3GL_TEXTURE_WRAP_R\fP, -\%\f3GL_TEXTURE_BORDER_COLOR\fP, or -\%\f3GL_TEXTURE_PRIORITY\fP. -.TP -\f2params\fP -Specifies a pointer to an array where the value or values of \f2pname\fP -are stored. -.SH DESCRIPTION -Texture mapping is a technique that applies an image onto an object's surface -as if the image were a decal or cellophane shrink-wrap. -The image is created in texture space, -with an ($s$, $t$) coordinate system. -A texture is a one- or two-dimensional image and a set of parameters -that determine how samples are derived from the image. -.P -\%\f3glTexParameter\fP assigns the value or values in \f2params\fP to the texture parameter -specified as \f2pname\fP. -\f2target\fP defines the target texture, -either \%\f3GL_TEXTURE_1D\fP, \%\f3GL_TEXTURE_2D\fP, or \%\f3GL_TEXTURE_3D\fP. -The following symbols are accepted in \f2pname\fP: -.TP 10 -\%\f3GL_TEXTURE_MIN_FILTER\fP -The texture minifying function is used whenever the pixel being textured -maps to an area greater than one texture element. -There are six defined minifying functions. -Two of them use the nearest one or nearest four texture elements -to compute the texture value. -The other four use mipmaps. -.IP -A mipmap is an ordered set of arrays representing the same image -at progressively lower resolutions. -If the texture has dimensions $2 sup n ~times~ 2 sup m$, there are -$ bold max ( n, m ) + 1 $ mipmaps. -The first mipmap is the original texture, -with dimensions $2 sup n ~times~ 2 sup m$. -Each subsequent mipmap has dimensions $2 sup { k - 1 } ~times~ 2 sup { l - 1 }$, -where $2 sup k ~times~ 2 sup l$ are the dimensions of the previous mipmap, -until either $k ~=~ 0$ or $l~=~0$. -At that point, -subsequent mipmaps have dimension $ 1 ~times~ 2 sup { l - 1 } $ -or $ 2 sup { k - 1} ~times~ 1 $ until the final mipmap, -which has dimension $1 ~times~ 1$. -To define the mipmaps, call \%\f3glTexImage1D\fP, \%\f3glTexImage2D\fP, -\%\f3glTexImage3D\fP, -\%\f3glCopyTexImage1D\fP, or \%\f3glCopyTexImage2D\fP -with the \f2level\fP argument indicating the order of the mipmaps. -Level 0 is the original texture; -level $ bold max ( n, m ) $ is the final $1 ~times~ 1$ mipmap. -.IP -\f2params\fP supplies a function for minifying the texture as one of the following: -.RS 10 -.TP 10 -\%\f3GL_NEAREST\fP -Returns the value of the texture element that is nearest -(in Manhattan distance) -to the center of the pixel being textured. -.TP -\%\f3GL_LINEAR\fP -Returns the weighted average of the four texture elements -that are closest to the center of the pixel being textured. -These can include border texture elements, -depending on the values of \%\f3GL_TEXTURE_WRAP_S\fP and \%\f3GL_TEXTURE_WRAP_T\fP, -and on the exact mapping. -.TP -\%\f3GL_NEAREST_MIPMAP_NEAREST\fP -Chooses the mipmap that most closely matches the size of the pixel -being textured and uses the \%\f3GL_NEAREST\fP criterion -(the texture element nearest to the center of the pixel) -to produce a texture value. -.TP -\%\f3GL_LINEAR_MIPMAP_NEAREST\fP -Chooses the mipmap that most closely matches the size of the pixel -being textured and uses the \%\f3GL_LINEAR\fP criterion -(a weighted average of the four texture elements that are closest -to the center of the pixel) -to produce a texture value. -.TP -\%\f3GL_NEAREST_MIPMAP_LINEAR\fP -Chooses the two mipmaps that most closely match the size of the pixel -being textured and uses the \%\f3GL_NEAREST\fP criterion -(the texture element nearest to the center of the pixel) -to produce a texture value from each mipmap. -The final texture value is a weighted average of those two values. -.TP -\%\f3GL_LINEAR_MIPMAP_LINEAR\fP -Chooses the two mipmaps that most closely match the size of the pixel -being textured and uses the \%\f3GL_LINEAR\fP criterion -(a weighted average of the four texture elements that are closest -to the center of the pixel) -to produce a texture value from each mipmap. -The final texture value is a weighted average of those two values. -.RE -.IP -As more texture elements are sampled in the minification process, -fewer aliasing artifacts will be apparent. -While the \%\f3GL_NEAREST\fP and \%\f3GL_LINEAR\fP minification functions can be -faster than the other four, -they sample only one or four texture elements to determine the texture value -of the pixel being rendered and can produce moire patterns -or ragged transitions. -The initial value of \%\f3GL_TEXTURE_MIN_FILTER\fP is -\%\f3GL_NEAREST_MIPMAP_LINEAR\fP. -.TP 10 -\%\f3GL_TEXTURE_MAG_FILTER\fP -The texture magnification function is used when the pixel being textured -maps to an area less than or equal to one texture element. -It sets the texture magnification function to either \%\f3GL_NEAREST\fP -or \%\f3GL_LINEAR\fP (see below). \%\f3GL_NEAREST\fP is generally faster -than \%\f3GL_LINEAR\fP, -but it can produce textured images with sharper edges -because the transition between texture elements is not as smooth. -The initial value of \%\f3GL_TEXTURE_MAG_FILTER\fP is \%\f3GL_LINEAR\fP. -.RS 10 -.TP 10 -\%\f3GL_NEAREST\fP -Returns the value of the texture element that is nearest -(in Manhattan distance) -to the center of the pixel being textured. -.TP -\%\f3GL_LINEAR\fP -Returns the weighted average of the four texture elements -that are closest to the center of the pixel being textured. -These can include border texture elements, -depending on the values of \%\f3GL_TEXTURE_WRAP_S\fP and \%\f3GL_TEXTURE_WRAP_T\fP, -and on the exact mapping. -.P -.RE -.P -.TP 10 -\%\f3GL_TEXTURE_MIN_LOD\fP -Sets the minimum level-of-detail parameter. This floating-point value -limits the selection of highest resolution mipmap (lowest mipmap -level). The initial value is -1000. -.P -.TP 10 -\%\f3GL_TEXTURE_MAX_LOD\fP -Sets the maximum level-of-detail parameter. This floating-point value -limits the selection of the lowest resolution mipmap (highest mipmap -level). The initial value is 1000. -.P -.TP 10 -\%\f3GL_TEXTURE_BASE_LEVEL\fP -Specifies the index of the lowest defined mipmap level. This is an -integer value. The initial value is 0. -.P -.TP 10 -\%\f3GL_TEXTURE_MAX_LEVEL\fP -Sets the index of the highest defined mipmap level. This is an integer -value. The initial value is 1000. -.P -.TP 10 -\%\f3GL_TEXTURE_WRAP_S\fP -Sets the wrap parameter for texture coordinate $s$ to either -\%\f3GL_CLAMP\fP, \%\f3GL_CLAMP_TO_EDGE\fP, or \%\f3GL_REPEAT\fP. -\%\f3GL_CLAMP\fP causes $s$ coordinates to be clamped to the range [0,1] -and is useful for preventing wrapping artifacts when mapping -a single image onto an object. -\%\f3GL_CLAMP_TO_EDGE\fP causes $s$ coordinates to be clamped to the range -$left [ {1 over 2N}, 1 - {1 over 2N} right ]$, where $N$ is the size -of the texture in the direction of clamping. -\%\f3GL_REPEAT\fP causes the integer part of the $s$ coordinate to be ignored; -the GL uses only the fractional part, -thereby creating a repeating pattern. -Border texture elements are accessed only if wrapping is set to \%\f3GL_CLAMP\fP. -Initially, \%\f3GL_TEXTURE_WRAP_S\fP is set to \%\f3GL_REPEAT\fP. -.P -.TP 10 -\%\f3GL_TEXTURE_WRAP_T\fP -Sets the wrap parameter for texture coordinate $t$ to either -\%\f3GL_CLAMP\fP, \%\f3GL_CLAMP_TO_EDGE\fP, or \%\f3GL_REPEAT\fP. -See the discussion under \%\f3GL_TEXTURE_WRAP_S\fP. -Initially, \%\f3GL_TEXTURE_WRAP_T\fP is set to \%\f3GL_REPEAT\fP. -.TP 10 -\%\f3GL_TEXTURE_WRAP_R\fP -Sets the wrap parameter for texture coordinate $r$ to either -\%\f3GL_CLAMP\fP, \%\f3GL_CLAMP_TO_EDGE\fP, or \%\f3GL_REPEAT\fP. -See the discussion under \%\f3GL_TEXTURE_WRAP_S\fP. -Initially, \%\f3GL_TEXTURE_WRAP_R\fP is set to \%\f3GL_REPEAT\fP. -.TP -\%\f3GL_TEXTURE_BORDER_COLOR\fP -Sets a border color. -\f2params\fP contains four values that comprise the RGBA color -of the texture border. -Integer color components are interpreted linearly such that the most -positive integer maps to 1.0, -and the most negative integer maps to -1.0. -The values are clamped to the range [0,1] when they are specified. -Initially, the border color is (0, 0, 0, 0). -.TP 10 -\%\f3GL_TEXTURE_PRIORITY\fP -Specifies the texture residence priority of the currently bound texture. -Permissible values are in the range [0,\ 1]. -See \%\f3glPrioritizeTextures\fP and \%\f3glBindTexture\fP for more information. -.SH NOTES -\%\f3GL_TEXTURE_3D\fP, \%\f3GL_TEXTURE_MIN_LOD\fP, \%\f3GL_TEXTURE_MAX_LOD\fP, -\%\f3GL_TEXTURE_BASE_LEVEL\fP, and \%\f3GL_TEXTURE_MAX_LEVEL\fP are only -available if the GL version is 1.2 or greater. -.P -Suppose that a program has enabled texturing -(by calling \%\f3glEnable\fP -with argument \%\f3GL_TEXTURE_1D\fP, \%\f3GL_TEXTURE_2D\fP, or \%\f3GL_TEXTURE_3D\fP) -and has set \%\f3GL_TEXTURE_MIN_FILTER\fP to one of the functions -that requires a mipmap. -If either the dimensions of the texture images currently defined -(with previous calls to \%\f3glTexImage1D\fP, \%\f3glTexImage2D\fP, -\%\f3glTexImage3D\fP, -\%\f3glCopyTexImage1D\fP, or \%\f3glCopyTexImage2D\fP) -do not follow the proper sequence for mipmaps -(described above), -or there are fewer texture images defined than are needed, -or the set of texture images have differing numbers of texture components, -then it is as if texture mapping were disabled. -.P -Linear filtering accesses the four nearest texture elements only in 2D -textures. -In 1D textures, linear filtering accesses the two nearest texture -elements. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, \%\f3glTexParameter\fP -specifies the texture parameters for the active texture unit, specified -by calling \%\f3glActiveTextureARB\fP. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP or \f2pname\fP is not -one of the accepted defined values. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2params\fP should have a defined -constant value (based on the value of \f2pname\fP) and does not. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glTexParameter\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.SH ASSOCIATED GETS -\%\f3glGetTexParameter\fP -.br -\%\f3glGetTexLevelParameter\fP -.SH SEE ALSO -\%\f3glActiveTextureARB(3G)\fP, -\%\f3glBindTexture(3G)\fP, -\%\f3glCopyPixels(3G)\fP, -\%\f3glCopyTexImage1D(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glCopyTexSubImage1D(3G)\fP, -\%\f3glCopyTexSubImage2D(3G)\fP, -\%\f3glCopyTexSubImage3D(3G)\fP, -\%\f3glDrawPixels(3G)\fP, -\%\f3glPixelStore(3G)\fP, -\%\f3glPixelTransfer(3G)\fP, -\%\f3glPrioritizeTextures(3G)\fP, -\%\f3glTexEnv(3G)\fP, -\%\f3glTexGen(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexImage3D(3G)\fP, -\%\f3glTexSubImage1D(3G)\fP, -\%\f3glTexSubImage2D(3G)\fP, -\%\f3glTexSubImage3D(3G)\fP - - diff --git a/doc/gl-docs/GL/gl/texsubimage1d.3gl b/doc/gl-docs/GL/gl/texsubimage1d.3gl deleted file mode 100644 index 6a9e0c4d..00000000 --- a/doc/gl-docs/GL/gl/texsubimage1d.3gl +++ /dev/null @@ -1,207 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 texsubima -.ds Xs 43886 8 texsubimage1d.gl -.TH GLTEXSUBIMAGE1D 3G -.SH NAME -.B "glTexSubImage1D -\- specify a one-dimensional texture subimage - -.SH C SPECIFICATION -void \f3glTexSubImage1D\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglTexSubImage1D( 'u - GLint \fIlevel\fP, - GLint \fIxoffset\fP, - GLsizei \fIwidth\fP, - GLenum \fIformat\fP, - GLenum \fItype\fP, - const GLvoid \fI*pixels\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIxoffset\fP\ \ 'u -\f2target\fP -Specifies the target texture. -Must be \%\f3GL_TEXTURE_1D\fP. -.TP -\f2level\fP -Specifies the level-of-detail number. -Level 0 is the base image level. -Level \f2n\fP is the \f2n\fPth mipmap reduction image. -.TP -\f2xoffset\fP -Specifies a texel offset in the x direction within the texture array. -.TP -\f2width\fP -Specifies the width of the texture subimage. -.TP -\f2format\fP -Specifies the of the pixel data. -The following symbolic values are accepted: -\%\f3GL_COLOR_INDEX\fP, -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_BGR\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, and -\%\f3GL_LUMINANCE_ALPHA\fP. -.TP -\f2type\fP -Specifies the data type of the pixel data. -The following symbolic values are accepted: -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP. -.TP -\f2pixels\fP -Specifies a pointer to the image data in memory. -.SH DESCRIPTION -Texturing maps a portion of a specified texture image -onto each graphical primitive for which texturing is enabled. -To enable or disable one-dimensional texturing, call \%\f3glEnable\fP -and \%\f3glDisable\fP with argument \%\f3GL_TEXTURE_1D\fP. -.P -\%\f3glTexSubImage1D\fP redefines a contiguous subregion of an existing one-dimensional -texture image. -The texels referenced by \f2pixels\fP replace the portion of the -existing texture array with x indices \f2xoffset\fP and -$"xoffset"~+~"width"~-~1$,inclusive. -This region may not include any texels outside the range of the -texture array as it was originally specified. -It is not an error to specify a subtexture with width of 0, but -such a specification has no effect. -.SH NOTES -\%\f3glTexSubImage1D\fP is available only if the GL version is 1.1 or greater. -.P -Texturing has no effect in color index mode. -.P -\%\f3glPixelStore\fP and \%\f3glPixelTransfer\fP modes affect texture images -in exactly the way they affect \%\f3glDrawPixels\fP. -.P -Formats \%\f3GL_BGR\fP, and \%\f3GL_BGRA\fP and types -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP are available only if the GL version -is 1.2 or greater. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, \%\f3glTexSubImage1D\fP -specifies a one-dimensional sub texture for the current texture unit, -specified with \%\f3glActiveTextureARB\fP. -.P -When the \%\f3GL_ARB_imaging\fP extension is supported, the RGBA components -specified in \f2pixels\fP may be processed by the imaging pipeline. See -\%\f3glTexImage1D\fP for specific details. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not one of the -allowable values. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if the texture array has not -been defined by a previous \%\f3glTexImage1D\fP operation. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2level\fP is less than 0. -.P -\%\f3GL_INVALID_VALUE\fP may be generated if \f2level\fP is greater -than $log sub 2$\f2max\fP, -where \f2max\fP is the returned value of \%\f3GL_MAX_TEXTURE_SIZE\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if $"xoffset" ~<~ ~-b$, -or if $("xoffset"~+~"width") ~>~ (w ~-~ b)$, -where $w$ is the \%\f3GL_TEXTURE_WIDTH\fP, and $b$ is -the width of the \%\f3GL_TEXTURE_BORDER\fP -of the texture image being modified. -Note that $w$ includes twice the border width. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2width\fP is less than 0. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2format\fP is not an accepted - constant. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not a type constant. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is \%\f3GL_BITMAP\fP and -\f2format\fP is not \%\f3GL_COLOR_INDEX\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glTexSubImage1D\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, or -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.SH ASSOCIATED GETS -\%\f3glGetTexImage\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_TEXTURE_1D\fP -.SH SEE ALSO -\%\f3glActiveTextureARB(3G)\fP, -\%\f3glCopyTexImage1D(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glCopyTexSubImage1D(3G)\fP, -\%\f3glCopyTexSubImage2D(3G)\fP, -\%\f3glCopyTexSubImage3D(3G)\fP, -\%\f3glDrawPixels(3G)\fP, -\%\f3glPixelStore(3G)\fP, -\%\f3glPixelTransfer(3G)\fP, -\%\f3glTexEnv(3G)\fP, -\%\f3glTexGen(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexImage3D(3G)\fP, -\%\f3glTexParameter(3G)\fP, -\%\f3glTexSubImage2D(3G)\fP, -\%\f3glTexSubImage3D(3G)\fP - diff --git a/doc/gl-docs/GL/gl/texsubimage2d.3gl b/doc/gl-docs/GL/gl/texsubimage2d.3gl deleted file mode 100644 index 854c9651..00000000 --- a/doc/gl-docs/GL/gl/texsubimage2d.3gl +++ /dev/null @@ -1,216 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 texsubima -.ds Xs 33804 8 texsubimage2d.gl -.TH GLTEXSUBIMAGE2D 3G -.SH NAME -.B "glTexSubImage2D -\- specify a two-dimensional texture subimage - -.SH C SPECIFICATION -void \f3glTexSubImage2D\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglTexSubImage2D( 'u - GLint \fIlevel\fP, - GLint \fIxoffset\fP, - GLint \fIyoffset\fP, - GLsizei \fIwidth\fP, - GLsizei \fIheight\fP, - GLenum \fIformat\fP, - GLenum \fItype\fP, - const GLvoid \fI*pixels\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIxoffset\fP\ \ 'u -\f2target\fP -Specifies the target texture. -Must be \%\f3GL_TEXTURE_2D\fP. -.TP -\f2level\fP -Specifies the level-of-detail number. -Level 0 is the base image level. -Level \f2n\fP is the \f2n\fPth mipmap reduction image. -.TP -\f2xoffset\fP -Specifies a texel offset in the x direction within the texture array. -.TP -\f2yoffset\fP -Specifies a texel offset in the y direction within the texture array. -.TP -\f2width\fP -Specifies the width of the texture subimage. -.TP -\f2height\fP -Specifies the height of the texture subimage. -.TP -\f2format\fP -Specifies the of the pixel data. -The following symbolic values are accepted: -\%\f3GL_COLOR_INDEX\fP, -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_BGR\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, and -\%\f3GL_LUMINANCE_ALPHA\fP. -.TP -\f2type\fP -Specifies the data type of the pixel data. -The following symbolic values are accepted: -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP. -.TP -\f2pixels\fP -Specifies a pointer to the image data in memory. -.SH DESCRIPTION -Texturing maps a portion of a specified texture image -onto each graphical primitive for which texturing is enabled. -To enable and disable two-dimensional texturing, call \%\f3glEnable\fP -and \%\f3glDisable\fP with argument \%\f3GL_TEXTURE_2D\fP. -.P -\%\f3glTexSubImage2D\fP redefines a contiguous subregion of an existing two-dimensional -texture image. -The texels referenced by \f2pixels\fP replace the portion of the -existing texture array with x indices \f2xoffset\fP and $"xoffset"~+~"width"~-~1$, -inclusive, -and y indices \f2yoffset\fP and $"yoffset"~+~"height"~-~1$, inclusive. -This region may not include any texels outside the range of the -texture array as it was originally specified. -It is not an error to specify a subtexture with zero width or height, but -such a specification has no effect. -.SH NOTES -\%\f3glTexSubImage2D\fP is available only if the GL version is 1.1 or greater. -.P -Texturing has no effect in color index mode. -.P -\%\f3glPixelStore\fP and \%\f3glPixelTransfer\fP modes affect texture images -in exactly the way they affect \%\f3glDrawPixels\fP. -.P -Formats \%\f3GL_BGR\fP, and \%\f3GL_BGRA\fP and types -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP are available only if the GL version -is 1.2 or greater. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, \%\f3glTexSubImage2D\fP -specifies a two-dimensional sub texture for the current texture unit, -specified with \%\f3glActiveTextureARB\fP. -.P -When the \%\f3GL_ARB_imaging\fP extension is supported, the RGBA components -specified in \f2pixels\fP may be processed by the imaging pipeline. See -\%\f3glTexImage1D\fP for specific details. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not \%\f3GL_TEXTURE_2D\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if the texture array has not -been defined by a previous \%\f3glTexImage2D\fP operation. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2level\fP is less than 0. -.P -\%\f3GL_INVALID_VALUE\fP may be generated if \f2level\fP is greater -than $log sub 2$\f2max\fP, -where \f2max\fP is the returned value of \%\f3GL_MAX_TEXTURE_SIZE\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if $"xoffset" ~<~ ~-b$, -$("xoffset"~+~"width") ~>~ (w~-~b)$, -$"yoffset" ~<~ ~-b$, or $("yoffset" ~+~ "height") ~>~ (h~-~b)$, -where $w$ is the \%\f3GL_TEXTURE_WIDTH\fP, -$h$ is the \%\f3GL_TEXTURE_HEIGHT\fP, and $b$ is the border width -of the texture image being modified. -Note that $w$ and $h$ include twice the border width. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2width\fP or \f2height\fP is less than 0. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2format\fP is not an accepted - constant. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not a type constant. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is \%\f3GL_BITMAP\fP and -\f2format\fP is not \%\f3GL_COLOR_INDEX\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glTexSubImage2D\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, or -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.SH ASSOCIATED GETS -\%\f3glGetTexImage\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_TEXTURE_2D\fP -.SH SEE ALSO -\%\f3glActiveTextureARB(3G)\fP, -\%\f3glCopyTexImage1D(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glCopyTexSubImage1D(3G)\fP, -\%\f3glCopyTexSubImage2D(3G)\fP, -\%\f3glCopyTexSubImage3D(3G)\fP, -\%\f3glDrawPixels(3G)\fP, -\%\f3glPixelStore(3G)\fP, -\%\f3glPixelTransfer(3G)\fP, -\%\f3glTexEnv(3G)\fP, -\%\f3glTexGen(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexImage3D(3G)\fP, -\%\f3glTexSubImage1D(3G)\fP, -\%\f3glTexSubImage3D(3G)\fP, -\%\f3glTexParameter(3G)\fP - diff --git a/doc/gl-docs/GL/gl/texsubimage3d.3gl b/doc/gl-docs/GL/gl/texsubimage3d.3gl deleted file mode 100644 index 72dad17a..00000000 --- a/doc/gl-docs/GL/gl/texsubimage3d.3gl +++ /dev/null @@ -1,227 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 texsubima -.ds Xs 43161 9 texsubimage3d.gl -.TH GLTEXSUBIMAGE3D 3G -.SH NAME -.B "glTexSubImage3D -\- specify a three-dimensional texture subimage - -.SH C SPECIFICATION -void \f3glTexSubImage3D\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3void \fPglTexSubImage3D( 'u - GLint \fIlevel\fP, - GLint \fIxoffset\fP, - GLint \fIyoffset\fP, - GLint \fIzoffset\fP, - GLsizei \fIwidth\fP, - GLsizei \fIheight\fP, - GLsizei \fIdepth\fP, - GLenum \fIformat\fP, - GLenum \fItype\fP, - const GLvoid \fI*pixels\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIxoffset\fP\ \ 'u -\f2target\fP -Specifies the target texture. -Must be \%\f3GL_TEXTURE_3D\fP. -.TP -\f2level\fP -Specifies the level-of-detail number. -Level 0 is the base image level. -Level \f2n\fP is the \f2n\fPth mipmap reduction image. -.TP -\f2xoffset\fP -Specifies a texel offset in the x direction within the texture array. -.TP -\f2yoffset\fP -Specifies a texel offset in the y direction within the texture array. -.TP -\f2zoffset\fP -Specifies a texel offset in the z direction within the texture array. -.TP -\f2width\fP -Specifies the width of the texture subimage. -.TP -\f2height\fP -Specifies the height of the texture subimage. -.TP -\f2depth\fP -Specifies the depth of the texture subimage. -.TP -\f2format\fP -Specifies the of the pixel data. -The following symbolic values are accepted: -\%\f3GL_COLOR_INDEX\fP, -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_BGR\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, and -\%\f3GL_LUMINANCE_ALPHA\fP. -.TP -\f2type\fP -Specifies the data type of the pixel data. -The following symbolic values are accepted: -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP. -.TP -\f2pixels\fP -Specifies a pointer to the image data in memory. -.SH DESCRIPTION -Texturing maps a portion of a specified texture image -onto each graphical primitive for which texturing is enabled. -To enable and disable three-dimensional texturing, call \%\f3glEnable\fP -and \%\f3glDisable\fP with argument \%\f3GL_TEXTURE_3D\fP. -.P -\%\f3glTexSubImage3D\fP redefines a contiguous subregion of an existing three-dimensional -texture image. -The texels referenced by \f2pixels\fP replace the portion of the -existing texture array with x indices \f2xoffset\fP and -$"xoffset" ~+~ "width" ~-~ 1$, inclusive, -y indices \f2yoffset\fP and $"yoffset" ~+~ "height" ~-~ 1$, inclusive, -and z indices \f2zoffset\fP and $"zoffset" ~+~ "depth" ~-~ 1$, inclusive. -This region may not include any texels outside the range of the -texture array as it was originally specified. -It is not an error to specify a subtexture with zero width, height, or -depth but such a specification has no effect. -.SH NOTES -\%\f3glTexSubImage3D\fP is available only if the GL version is 1.2 or greater. -.P -Texturing has no effect in color index mode. -.P -\%\f3glPixelStore\fP and \%\f3glPixelTransfer\fP modes affect texture images -in exactly the way they affect \%\f3glDrawPixels\fP. -.P -Formats \%\f3GL_BGR\fP, and \%\f3GL_BGRA\fP and types -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP are available only if the GL version -is 1.2 or greater. -.P -When the \%\f3GL_ARB_multitexture\fP extension is supported, \%\f3glTexSubImage3D\fP -specifies a three-dimensional sub texture for the current texture unit, -specified with \%\f3glActiveTextureARB\fP. -.P -When the \%\f3GL_ARB_imaging\fP extension is supported, the RGBA components -specified in \f2pixels\fP may be processed by the imaging pipeline. See -\%\f3glTexImage3D\fP for specific details. -.SH ERRORS -\%\f3GL_INVALID_ENUM\fP is generated if \f2target\fP is not \%\f3GL_TEXTURE_3D\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if the texture array has not -been defined by a previous \%\f3glTexImage3D\fP operation. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2level\fP is less than 0. -.P -\%\f3GL_INVALID_VALUE\fP may be generated if \f2level\fP is greater -than $log sub 2$\f2max\fP, -where \f2max\fP is the returned value of \%\f3GL_MAX_TEXTURE_SIZE\fP. -.P -\%\f3GL_INVALID_VALUE\fP is generated if $"xoffset" ~<~ ~-b$, -$("xoffset" ~+~ "width") ~>~ (w~-~b)$, -$"yoffset" ~<~ ~-b$, or $("yoffset" ~+~ "height") ~>~ (h~-~b)$, -or $"zoffset" ~<~ ~-b$, or $("zoffset" ~+~ "depth") ~>~ (d~-~b)$, -where $w$ is the \%\f3GL_TEXTURE_WIDTH\fP, -$h$ is the \%\f3GL_TEXTURE_HEIGHT\fP, $d$ is the \%\f3GL_TEXTURE_DEPTH\fP -and $b$ is the border width of the texture image being modified. -Note that $w$, $h$, and $d$ include twice the border width. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2width\fP, \f2height\fP, or \f2depth\fP -is less than 0. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2format\fP is not an accepted - constant. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is not a type constant. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is \%\f3GL_BITMAP\fP and -\f2format\fP is not \%\f3GL_COLOR_INDEX\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glTexSubImage3D\fP is executed -between the execution of \%\f3glBegin\fP and the corresponding -execution of \%\f3glEnd\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, or -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \f2type\fP is one of -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.SH ASSOCIATED GETS -\%\f3glGetTexImage\fP -.br -\%\f3glIsEnabled\fP with argument \%\f3GL_TEXTURE_3D\fP -.SH SEE ALSO -\%\f3glActiveTextureARB(3G)\fP, -\%\f3glCopyTexImage1D(3G)\fP, -\%\f3glCopyTexImage2D(3G)\fP, -\%\f3glCopyTexSubImage1D(3G)\fP, -\%\f3glCopyTexSubImage2D(3G)\fP, -\%\f3glCopyTexSubImage3D(3G)\fP, -\%\f3glDrawPixels(3G)\fP, -\%\f3glPixelStore(3G)\fP, -\%\f3glPixelTransfer(3G)\fP, -\%\f3glTexEnv(3G)\fP, -\%\f3glTexGen(3G)\fP, -\%\f3glTexImage1D(3G)\fP, -\%\f3glTexImage2D(3G)\fP, -\%\f3glTexImage3D(3G)\fP, -\%\f3glTexSubImage1D(3G)\fP, -\%\f3glTexSubImage2D(3G)\fP, -\%\f3glTexParameter(3G)\fP - diff --git a/doc/gl-docs/GL/gl/translate.3gl b/doc/gl-docs/GL/gl/translate.3gl deleted file mode 100644 index c70232a2..00000000 --- a/doc/gl-docs/GL/gl/translate.3gl +++ /dev/null @@ -1,87 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 translate -.ds Xs 47827 4 translate.gl -.TH GLTRANSLATE 3G -.SH NAME -.B "glTranslated, glTranslatef -\- multiply the current matrix by a translation matrix - -.SH C SPECIFICATION -void \f3glTranslated\fP( -GLdouble \fIx\fP, -.nf -.ta \w'\f3void \fPglTranslated( 'u - GLdouble \fIy\fP, - GLdouble \fIz\fP ) -.fi -void \f3glTranslatef\fP( -GLfloat \fIx\fP, -.nf -.ta \w'\f3void \fPglTranslatef( 'u - GLfloat \fIy\fP, - GLfloat \fIz\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2x\fP\ \f2y\fP\ \f2z\fP\ \ 'u -\f2x\fP, \f2y\fP, \f2z\fP -Specify the \f2x\fP, \f2y\fP, and \f2z\fP coordinates of a translation vector. -.SH DESCRIPTION -\%\f3glTranslate\fP produces a translation by -$("x","y","z")$. -The current matrix -(see -.br -\%\f3glMatrixMode\fP) -is multiplied by this translation matrix, -with the product replacing the current matrix, as if -\%\f3glMultMatrix\fP were called with the following matrix -for its argument: -.sp -.ce -.EQ -left ( ~ down 20 matrix { - ccol { 1~~ above 0~~ above 0~~ above 0~~ } - ccol { 0~~ above 1~~ above 0~~ above 0~~ } - ccol { 0~~ above 0~~ above 1~~ above 0~~ } - ccol { "x"~ above "y"~ above "z"~ above 1} -} ~~right ) -.EN -.sp -.RE -If the matrix mode is either \%\f3GL_MODELVIEW\fP or \%\f3GL_PROJECTION\fP, -all objects drawn after a call to \%\f3glTranslate\fP are translated. -.P -Use \%\f3glPushMatrix\fP and -\%\f3glPopMatrix\fP to save and restore -the untranslated coordinate system. -.SH ERRORS -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glTranslate\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.bp -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_MATRIX_MODE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_COLOR_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MODELVIEW_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_PROJECTION_MATRIX\fP -.br -\%\f3glGet\fP with argument \%\f3GL_TEXTURE_MATRIX\fP -.SH SEE ALSO -\%\f3glMatrixMode(3G)\fP, -\%\f3glMultMatrix(3G)\fP, -\%\f3glPushMatrix(3G)\fP, -\%\f3glRotate(3G)\fP, -\%\f3glScale(3G)\fP diff --git a/doc/gl-docs/GL/gl/vertex.3gl b/doc/gl-docs/GL/gl/vertex.3gl deleted file mode 100644 index b5ad5ab6..00000000 --- a/doc/gl-docs/GL/gl/vertex.3gl +++ /dev/null @@ -1,189 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 vertex.gl -.ds Xs 13679 4 vertex.gl -.TH GLVERTEX 3G -.SH NAME -.B "glVertex2d, glVertex2f, glVertex2i, glVertex2s, glVertex3d, glVertex3f, glVertex3i, glVertex3s, glVertex4d, glVertex4f, glVertex4i, glVertex4s, glVertex2dv, glVertex2fv, glVertex2iv, glVertex2sv, glVertex3dv, glVertex3fv, glVertex3iv, glVertex3sv, glVertex4dv, glVertex4fv, glVertex4iv, glVertex4sv -\- specify a vertex - -.SH C SPECIFICATION -void \f3glVertex2d\fP( -GLdouble \fIx\fP, -.nf -.ta \w'\f3void \fPglVertex2d( 'u - GLdouble \fIy\fP ) -.fi -void \f3glVertex2f\fP( -GLfloat \fIx\fP, -.nf -.ta \w'\f3void \fPglVertex2f( 'u - GLfloat \fIy\fP ) -.fi -void \f3glVertex2i\fP( -GLint \fIx\fP, -.nf -.ta \w'\f3void \fPglVertex2i( 'u - GLint \fIy\fP ) -.fi -void \f3glVertex2s\fP( -GLshort \fIx\fP, -.nf -.ta \w'\f3void \fPglVertex2s( 'u - GLshort \fIy\fP ) -.fi -void \f3glVertex3d\fP( -GLdouble \fIx\fP, -.nf -.ta \w'\f3void \fPglVertex3d( 'u - GLdouble \fIy\fP, - GLdouble \fIz\fP ) -.fi -void \f3glVertex3f\fP( -GLfloat \fIx\fP, -.nf -.ta \w'\f3void \fPglVertex3f( 'u - GLfloat \fIy\fP, - GLfloat \fIz\fP ) -.fi -void \f3glVertex3i\fP( -GLint \fIx\fP, -.nf -.ta \w'\f3void \fPglVertex3i( 'u - GLint \fIy\fP, - GLint \fIz\fP ) -.fi -void \f3glVertex3s\fP( -GLshort \fIx\fP, -.nf -.ta \w'\f3void \fPglVertex3s( 'u - GLshort \fIy\fP, - GLshort \fIz\fP ) -.fi -void \f3glVertex4d\fP( -GLdouble \fIx\fP, -.nf -.ta \w'\f3void \fPglVertex4d( 'u - GLdouble \fIy\fP, - GLdouble \fIz\fP, - GLdouble \fIw\fP ) -.fi -void \f3glVertex4f\fP( -GLfloat \fIx\fP, -.nf -.ta \w'\f3void \fPglVertex4f( 'u - GLfloat \fIy\fP, - GLfloat \fIz\fP, - GLfloat \fIw\fP ) -.fi -void \f3glVertex4i\fP( -GLint \fIx\fP, -.nf -.ta \w'\f3void \fPglVertex4i( 'u - GLint \fIy\fP, - GLint \fIz\fP, - GLint \fIw\fP ) -.fi -void \f3glVertex4s\fP( -GLshort \fIx\fP, -.nf -.ta \w'\f3void \fPglVertex4s( 'u - GLshort \fIy\fP, - GLshort \fIz\fP, - GLshort \fIw\fP ) -.fi - -.SH PARAMETERS -.TP \w'\f2x\fP\ \f2y\fP\ \f2z\fP\ \f2w\fP\ \ 'u -\f2x\fP, \f2y\fP, \f2z\fP, \f2w\fP -Specify \f2x\fP, \f2y\fP, \f2z\fP, and \f2w\fP coordinates of a vertex. -Not all parameters are present in all forms of the command. -.SH C SPECIFICATION -void \f3glVertex2dv\fP( -const GLdouble \fI*v\fP ) -.nf -.fi -void \f3glVertex2fv\fP( -const GLfloat \fI*v\fP ) -.nf -.fi -void \f3glVertex2iv\fP( -const GLint \fI*v\fP ) -.nf -.fi -void \f3glVertex2sv\fP( -const GLshort \fI*v\fP ) -.nf -.fi -void \f3glVertex3dv\fP( -const GLdouble \fI*v\fP ) -.nf -.fi -void \f3glVertex3fv\fP( -const GLfloat \fI*v\fP ) -.nf -.fi -void \f3glVertex3iv\fP( -const GLint \fI*v\fP ) -.nf -.fi -void \f3glVertex3sv\fP( -const GLshort \fI*v\fP ) -.nf -.fi -void \f3glVertex4dv\fP( -const GLdouble \fI*v\fP ) -.nf -.fi -void \f3glVertex4fv\fP( -const GLfloat \fI*v\fP ) -.nf -.fi -void \f3glVertex4iv\fP( -const GLint \fI*v\fP ) -.nf -.fi -void \f3glVertex4sv\fP( -const GLshort \fI*v\fP ) -.nf -.fi - -.SH PARAMETERS -.TP -\f2v\fP -Specifies a pointer to an array of two, three, or four elements. -The elements of a two-element array are \f2x\fP and \f2y\fP; -of a three-element array, \f2x\fP, \f2y\fP, and \f2z\fP; -and of a four-element array, \f2x\fP, \f2y\fP, \f2z\fP, and \f2w\fP. -.SH DESCRIPTION -\%\f3glVertex\fP commands are used within \%\f3glBegin\fP/\%\f3glEnd\fP pairs to specify -point, line, and polygon vertices. -The current color, -normal, -and texture coordinates are associated with the vertex when \%\f3glVertex\fP is called. -.P -When only \f2x\fP and \f2y\fP are specified, -\f2z\fP defaults to 0 and \f2w\fP defaults to 1. -When \f2x, y,\fP and \f2z\fP are specified, -\f2w\fP defaults to 1. -.SH NOTES -Invoking \%\f3glVertex\fP outside of a \%\f3glBegin\fP/\%\f3glEnd\fP pair -results in undefined behavior. -.SH SEE ALSO -\%\f3glBegin(3G)\fP, -\%\f3glCallList(3G)\fP, -\%\f3glColor(3G)\fP, -\%\f3glEdgeFlag(3G)\fP, -\%\f3glEvalCoord(3G)\fP, -\%\f3glIndex(3G)\fP, -\%\f3glMaterial(3G)\fP, -.br -\%\f3glNormal(3G)\fP, -\%\f3glRect(3G)\fP, -\%\f3glTexCoord(3G)\fP, -\%\f3glVertexPointer(3G)\fP diff --git a/doc/gl-docs/GL/gl/vertexpointer.3gl b/doc/gl-docs/GL/gl/vertexpointer.3gl deleted file mode 100644 index f60631f0..00000000 --- a/doc/gl-docs/GL/gl/vertexpointer.3gl +++ /dev/null @@ -1,124 +0,0 @@ -'\" te -'\"! tbl|eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 vertexpoi -.ds Xs 51670 6 vertexpointer.gl -.TH GLVERTEXPOINTER 3G -.SH NAME -.B "glVertexPointer -\- define an array of vertex data - -.SH C SPECIFICATION -void \f3glVertexPointer\fP( -GLint \fIsize\fP, -.nf -.ta \w'\f3void \fPglVertexPointer( 'u - GLenum \fItype\fP, - GLsizei \fIstride\fP, - const GLvoid \fI*ptr\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIstride\fP\ \ 'u -\f2size\fP -Specifies the number of coordinates per vertex; must be 2, 3, or -4. The initial value is 4. -.TP -\f2type\fP -Specifies the data type of each coordinate in the array. -Symbolic constants -\%\f3GL_SHORT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -and \%\f3GL_DOUBLE\fP -are accepted. The initial value is \%\f3GL_FLOAT\fP. -.TP -\f2stride\fP -Specifies the byte offset between consecutive -vertices. If \f2stride\fP is 0, the vertices are understood to be tightly packed in -the array. The initial value -is 0. -.TP -\f2ptr\fP -Specifies a pointer to the first coordinate of the first vertex in the -array. The initial value is 0. -.SH DESCRIPTION -\%\f3glVertexPointer\fP specifies the location and data of an array of vertex coordinates -to use when rendering. -\f2size\fP specifies the number of coordinates per vertex and -\f2type\fP the data type of -the coordinates. \f2stride\fP specifies the byte stride from one -vertex to the next allowing vertices and attributes -to be packed into a single array or stored in separate arrays. -(Single-array storage may be more efficient on some implementations; -see \%\f3glInterleavedArrays\fP.) -When a vertex array is -specified, \f2size\fP, \f2type\fP, \f2stride\fP, and \f2ptr\fP are saved as client-side -state. -.P -To enable and disable the vertex array, call \%\f3glEnableClientState\fP and -.br -\%\f3glDisableClientState\fP with the argument \%\f3GL_VERTEX_ARRAY\fP. If -enabled, the vertex array is used when -\%\f3glDrawArrays\fP, \%\f3glDrawElements\fP, or \%\f3glArrayElement\fP is called. -.P -Use \%\f3glDrawArrays\fP to construct a sequence of primitives (all of -the same type) -from prespecified vertex and vertex attribute arrays. -Use \%\f3glArrayElement\fP to specify primitives -by indexing vertices and vertex attributes and \%\f3glDrawElements\fP to -construct a sequence of primitives by indexing vertices and vertex attributes. -.SH NOTES -\%\f3glVertexPointer\fP is available only if the GL version is 1.1 or greater. -.P -The vertex array is initially disabled and isn't accessed when -\%\f3glArrayElement\fP, \%\f3glDrawElements\fP or \%\f3glDrawArrays\fP is called. -.P -Execution of \%\f3glVertexPointer\fP is not allowed between the execution of -\%\f3glBegin\fP and the corresponding execution of \%\f3glEnd\fP, -but an error may or may not be generated. If no error is generated, -the operation is undefined. -.P -\%\f3glVertexPointer\fP is typically implemented on the client side. -.P -Vertex array parameters are client-side state and are therefore not -saved or restored by \%\f3glPushAttrib\fP and \%\f3glPopAttrib\fP. -Use \%\f3glPushClientAttrib\fP and \%\f3glPopClientAttrib\fP instead. -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if \f2size\fP is not 2, 3, or 4. -.P -\%\f3GL_INVALID_ENUM\fP is generated if \f2type\fP is is not an accepted value. -.P -\%\f3GL_INVALID_VALUE\fP is generated if \f2stride\fP is negative. -.SH ASSOCIATED GETS -\%\f3glIsEnabled\fP with argument \%\f3GL_VERTEX_ARRAY\fP -.br -\%\f3glGet\fP with argument \%\f3GL_VERTEX_ARRAY_SIZE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_VERTEX_ARRAY_TYPE\fP -.br -\%\f3glGet\fP with argument \%\f3GL_VERTEX_ARRAY_STRIDE\fP -.br -\%\f3glGetPointerv\fP with argument \%\f3GL_VERTEX_ARRAY_POINTER\fP -.SH SEE ALSO -\%\f3glArrayElement(3G)\fP, -\%\f3glColorPointer(3G)\fP, -\%\f3glDrawArrays(3G)\fP, -\%\f3glDrawElements(3G)\fP, -\%\f3glDrawRangeElements(3G)\fP, -\%\f3glEdgeFlagPointer(3G)\fP, -\%\f3glEnable(3G)\fP, -\%\f3glGetPointerv(3G)\fP, -\%\f3glIndexPointer(3G)\fP, -\%\f3glInterleavedArrays(3G)\fP, -\%\f3glNormalPointer(3G)\fP, -\%\f3glPopClientAttrib(3G)\fP, -\%\f3glPushClientAttrib(3G)\fP, -\%\f3glTexCoordPointer(3G)\fP diff --git a/doc/gl-docs/GL/gl/viewport.3gl b/doc/gl-docs/GL/gl/viewport.3gl deleted file mode 100644 index 1636ee1f..00000000 --- a/doc/gl-docs/GL/gl/viewport.3gl +++ /dev/null @@ -1,72 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 24 September 1999 -.ds Re Release 1.2.1 -.ds Dp Jan 14 18:30 -.ds Dm 01 viewport. -.ds Xs 35742 4 viewport.gl -.TH GLVIEWPORT 3G -.SH NAME -.B "glViewport -\- set the viewport - -.SH C SPECIFICATION -void \f3glViewport\fP( -GLint \fIx\fP, -.nf -.ta \w'\f3void \fPglViewport( 'u - GLint \fIy\fP, - GLsizei \fIwidth\fP, - GLsizei \fIheight\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2x\fP\ \f2y\fP\ \ 'u -\f2x\fP, \f2y\fP -Specify the lower left corner of the viewport rectangle, -in pixels. The initial value is (0,0). -.TP -\f2width\fP, \f2height\fP -Specify the width and height -of the viewport. -When a GL context is first attached to a window, -\f2width\fP and \f2height\fP are set to the dimensions of that window. -.SH DESCRIPTION -\%\f3glViewport\fP specifies the affine transformation of $x$ and $y$ from -normalized device coordinates to window coordinates. -Let ($x sub nd$, $y sub nd$) be normalized device coordinates. -Then the window coordinates ($x sub w$, $y sub w$) are computed as follows: -.sp -.ce -.EQ -x sub w ~=~ ( x sub nd ~+~ 1 ) left ( "width" over 2 right ) ~+~ "x" -.EN -.sp -.ce -.EQ -y sub w ~=~ ( y sub nd ~+~ 1 ) left ( "height" over 2 right ) ~+~ "y" -.EN -.RE -.P -Viewport width and height are silently clamped -to a range that depends on the implementation. -To query this range, call \%\f3glGet\fP with argument -\%\f3GL_MAX_VIEWPORT_DIMS\fP. -.SH ERRORS -\%\f3GL_INVALID_VALUE\fP is generated if either \f2width\fP or \f2height\fP is negative. -.P -\%\f3GL_INVALID_OPERATION\fP is generated if \%\f3glViewport\fP -is executed between the execution of \%\f3glBegin\fP -and the corresponding execution of \%\f3glEnd\fP. -.bp -.SH ASSOCIATED GETS -\%\f3glGet\fP with argument \%\f3GL_VIEWPORT\fP -.br -\%\f3glGet\fP with argument \%\f3GL_MAX_VIEWPORT_DIMS\fP -.SH SEE ALSO -\%\f3glDepthRange(3G)\fP diff --git a/doc/gl-docs/GL/glx/Imakefile b/doc/gl-docs/GL/glx/Imakefile deleted file mode 100644 index 8cb90eb4..00000000 --- a/doc/gl-docs/GL/glx/Imakefile +++ /dev/null @@ -1,77 +0,0 @@ -XCOMM The contents of this file are subject to the GLX Public License Version 1.0 -XCOMM (the "License"). You may not use this file except in compliance with the -XCOMM License. You may obtain a copy of the License at Silicon Graphics, Inc., -XCOMM attn: Legal Services, 2011 N. Shoreline Blvd., Mountain View, CA 94043 -XCOMM or at http://www.sgi.com/software/opensource/glx/license.html. -XCOMM -XCOMM Software distributed under the License is distributed on an "AS IS" -XCOMM basis. ALL WARRANTIES ARE DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY -XCOMM IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR -XCOMM PURPOSE OR OF NON- INFRINGEMENT. See the License for the specific -XCOMM language governing rights and limitations under the License. -XCOMM -XCOMM The Original Software is GLX version 1.2 source code, released February, -XCOMM 1999. The developer of the Original Software is Silicon Graphics, Inc. -XCOMM Those portions of the Subject Software created by Silicon Graphics, Inc. -XCOMM are Copyright (c) 1991-9 Silicon Graphics, Inc. All Rights Reserved. -XCOMM -XCOMM $XFree86: xc/doc/man/GL/glx/Imakefile,v 1.3 1999/03/07 14:23:30 dawes Exp $ - -MANDIR = $(LIBMANDIR) -MANSUFFIX = $(LIBMANSUFFIX) -MSUFF = man - -InstallManPage(glXChooseVisual,$(MANDIR)) -InstallManPage(glXCopyContext,$(MANDIR)) -InstallManPage(glXCreateContext,$(MANDIR)) -InstallManPage(glXCreateGLXPixmap,$(MANDIR)) -InstallManPage(glXDestroyContext,$(MANDIR)) -InstallManPage(glXDestroyGLXPixmap,$(MANDIR)) -InstallManPage(glXFreeContextEXT,$(MANDIR)) -InstallManPage(glXGetClientString,$(MANDIR)) -InstallManPage(glXGetConfig,$(MANDIR)) -InstallManPage(glXGetContextIDEXT,$(MANDIR)) -InstallManPage(glXGetCurrentContext,$(MANDIR)) -InstallManPage(glXGetCurrentDisplay,$(MANDIR)) -InstallManPage(glXGetCurrentDrawable,$(MANDIR)) -InstallManPage(glXImportContextEXT,$(MANDIR)) -InstallManPage(glXIntro,$(MANDIR)) -InstallManPage(glXIsDirect,$(MANDIR)) -InstallManPage(glXMakeCurrent,$(MANDIR)) -InstallManPage(glXQueryContextInfoEXT,$(MANDIR)) -InstallManPage(glXQueryExtension,$(MANDIR)) -InstallManPage(glXQueryExtensionsString,$(MANDIR)) -InstallManPage(glXQueryServerString,$(MANDIR)) -InstallManPage(glXQueryVersion,$(MANDIR)) -InstallManPage(glXSwapBuffers,$(MANDIR)) -InstallManPage(glXUseXFont,$(MANDIR)) -InstallManPage(glXWaitGL,$(MANDIR)) -InstallManPage(glXWaitX,$(MANDIR)) - -LinkFile(glXChooseVisual.$(MSUFF), xchoosevisual.3gl) -LinkFile(glXCopyContext.$(MSUFF), xcopycontext.3gl) -LinkFile(glXCreateContext.$(MSUFF), xcreatecontext.3gl) -LinkFile(glXCreateGLXPixmap.$(MSUFF), xcreateglxpixmap.3gl) -LinkFile(glXDestroyContext.$(MSUFF), xdestroycontext.3gl) -LinkFile(glXDestroyGLXPixmap.$(MSUFF), xdestroyglxpixmap.3gl) -LinkFile(glXFreeContextEXT.$(MSUFF), xfreecontextext.3gl) -LinkFile(glXGetClientString.$(MSUFF), xgetclientstring.3gl) -LinkFile(glXGetConfig.$(MSUFF), xgetconfig.3gl) -LinkFile(glXGetContextIDEXT.$(MSUFF), xgetcontextidext.3gl) -LinkFile(glXGetCurrentContext.$(MSUFF), xgetcurrentcontext.3gl) -LinkFile(glXGetCurrentDisplay.$(MSUFF), xgetcurrentdisplay.3gl) -LinkFile(glXGetCurrentDrawable.$(MSUFF), xgetcurrentdrawable.3gl) -LinkFile(glXImportContextEXT.$(MSUFF), ximportcontextext.3gl) -LinkFile(glXIntro.$(MSUFF), xintro.3gl) -LinkFile(glXIsDirect.$(MSUFF), xisdirect.3gl) -LinkFile(glXMakeCurrent.$(MSUFF), xmakecurrent.3gl) -LinkFile(glXQueryContextInfoEXT.$(MSUFF), xquerycontextinfoext.3gl) -LinkFile(glXQueryExtension.$(MSUFF), xqueryextension.3gl) -LinkFile(glXQueryExtensionsString.$(MSUFF), xqueryextensionsstring.3gl) -LinkFile(glXQueryServerString.$(MSUFF), xqueryserverstring.3gl) -LinkFile(glXQueryVersion.$(MSUFF), xqueryversion.3gl) -LinkFile(glXSwapBuffers.$(MSUFF), xswapbuffers.3gl) -LinkFile(glXUseXFont.$(MSUFF), xusexfont.3gl) -LinkFile(glXWaitGL.$(MSUFF), xwaitgl.3gl) -LinkFile(glXWaitX.$(MSUFF), xwaitx.3gl) - diff --git a/doc/gl-docs/GL/glx/Makefile b/doc/gl-docs/GL/glx/Makefile deleted file mode 100644 index 35ae034a..00000000 --- a/doc/gl-docs/GL/glx/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# $OpenBSD: Makefile,v 1.1 2012/08/07 21:10:35 matthieu Exp $ - -X11BASE?= /usr/X11R6 -MANDIR?= ${X11BASE}/man/man - -MAN += glXChooseVisual.3 xchoosevisual.3gl -MAN += glXCopyContext.3 xcopycontext.3gl -MAN += glXCreateContext.3 xcreatecontext.3gl -MAN += glXCreateGLXPixmap.3 xcreateglxpixmap.3gl -MAN += glXDestroyContext.3 xdestroycontext.3gl -MAN += glXDestroyGLXPixmap.3 xdestroyglxpixmap.3gl -MAN += glXFreeContextEXT.3 xfreecontextext.3gl -MAN += glXGetClientString.3 xgetclientstring.3gl -MAN += glXGetConfig.3 xgetconfig.3gl -MAN += glXGetContextIDEXT.3 xgetcontextidext.3gl -MAN += glXGetCurrentContext.3 xgetcurrentcontext.3gl -MAN += glXGetCurrentDisplay.3 xgetcurrentdisplay.3gl -MAN += glXGetCurrentDrawable.3 xgetcurrentdrawable.3gl -MAN += glXImportContextEXT.3 ximportcontextext.3gl -MAN += glXIntro.3 xintro.3gl -MAN += glXIsDirect.3 xisdirect.3gl -MAN += glXMakeCurrent.3 xmakecurrent.3gl -MAN += glXQueryContextInfoEXT.3 xquerycontextinfoext.3gl -MAN += glXQueryExtension.3 xqueryextension.3gl -MAN += glXQueryExtensionsString.3 xqueryextensionsstring.3gl -MAN += glXQueryServerString.3 xqueryserverstring.3gl -MAN += glXQueryVersion.3 xqueryversion.3gl -MAN += glXSwapBuffers.3 xswapbuffers.3gl -MAN += glXUseXFont.3 xusexfont.3gl -MAN += glXWaitGL.3 xwaitgl.3gl -MAN += glXWaitX.3 xwaitx.3gl - -.include "../../Makefile.inc" -.include diff --git a/doc/gl-docs/GL/glx/xchoosevisual.3gl b/doc/gl-docs/GL/glx/xchoosevisual.3gl deleted file mode 100644 index 28b2ebb3..00000000 --- a/doc/gl-docs/GL/glx/xchoosevisual.3gl +++ /dev/null @@ -1,225 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 58988 14 xchoosevisual.gl -.TH GLXCHOOSEVISUAL 3 -.SH NAME -glXChooseVisual -\- return a visual that matches specified attributes - -.SH C SPECIFICATION -XVisualInfo* \f3glXChooseVisual\fP( -Display \fI*dpy\fP, -.nf -.ta \w'\f3XVisualInfo* \fPglXChooseVisual( 'u - int \fIscreen\fP, - int \fI*attribList\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIattribList\fP\ \ 'u -\f2dpy\fP -Specifies the connection to the X server. -.TP -\f2screen\fP -Specifies the screen number. -.TP -\f2attribList\fP -Specifies a list of boolean attributes and integer attribute/value pairs. -The last attribute must be \f3None\fP. -.SH DESCRIPTION -\f3glXChooseVisual\fP returns a pointer to an XVisualInfo structure describing the visual -that best meets a minimum specification. -The boolean GLX attributes of the visual that is returned will match the -specified values, -and the integer GLX attributes will meet or exceed the specified -minimum values. -If all other attributes are equivalent, then TrueColor and PseudoColor -visuals have priority over DirectColor and StaticColor visuals, -respectively. -If no conforming visual exists, \f3NULL\fP is returned. -To free the data returned by this function, use \f3XFree\fP. -.P -All boolean GLX attributes default to \f3False\fP -except \f3GLX_USE_GL\fP, -which defaults to \f3True\fP. -All integer GLX attributes default to zero. -Default specifications are superseded by attributes included in \f2attribList\fP. -Boolean attributes included in \f2attribList\fP are understood to be \f3True\fP. -Integer attributes and enumerated type attributes are followed immediately -by the corresponding desired or -minimum value. -The list must be terminated with \f3None\fP. -.P -The interpretations of the various GLX visual attributes are as follows: -.TP 22 -\f3GLX_USE_GL\fP -Ignored. -Only visuals that can be rendered with GLX are considered. -.TP -\f3GLX_BUFFER_SIZE\fP -Must be followed by a nonnegative integer that indicates the desired -color index buffer size. -The smallest index buffer of at least the specified size is preferred. -Ignored if \f3GLX_RGBA\fP is asserted. -.BP -.TP -\f3GLX_LEVEL\fP -Must be followed by an integer buffer-level specification. -This specification is honored exactly. -Buffer level zero corresponds to the main frame buffer of the display. -Buffer level one is the first overlay frame buffer, level two the second -overlay frame buffer, and so on. -Negative buffer levels correspond to underlay frame buffers. -.TP -\f3GLX_RGBA\fP -If present, -only TrueColor and DirectColor visuals are considered. -Otherwise, -only PseudoColor and StaticColor visuals are considered. -.TP -\f3GLX_DOUBLEBUFFER\fP -If present, -only double-buffered visuals are considered. -.BR -Otherwise, -only single-buffered visuals are considered. -.TP -\f3GLX_STEREO\fP -If present, -only stereo visuals are considered. -Otherwise, -only monoscopic visuals are considered. -.TP -\f3GLX_AUX_BUFFERS\fP -Must be followed by a nonnegative integer that indicates the desired -number of auxiliary buffers. -Visuals with the -.BR -smallest number of auxiliary buffers that meets or exceeds -the specified number are preferred. -.TP -\f3GLX_RED_SIZE\fP -Must be followed by a nonnegative minimum size specification. -If this value is zero, -the smallest available red buffer is preferred. -Otherwise, the largest available red buffer of at least the minimum size -is preferred. -.TP -\f3GLX_GREEN_SIZE\fP -Must be followed by a nonnegative minimum size specification. -If this value is zero, -the smallest available green buffer is preferred. -Otherwise, the largest available green buffer of at least the minimum size -is preferred. -.TP -\f3GLX_BLUE_SIZE\fP -Must be followed by a nonnegative minimum size specification. -If this value is zero, -the smallest available blue buffer is preferred. -Otherwise, the largest available blue buffer of at least the minimum size -is preferred. -.TP -\f3GLX_ALPHA_SIZE\fP -Must be followed by a nonnegative minimum size specification. -If this value is zero, -the smallest available alpha buffer is preferred. -Otherwise, the largest available alpha buffer of at least the minimum size -is preferred. -.TP -\f3GLX_DEPTH_SIZE\fP -Must be followed by a nonnegative minimum size specification. -If this value is zero, -visuals with no depth buffer are preferred. -Otherwise, the largest available depth buffer of at least the minimum size -is preferred. -.TP -\f3GLX_STENCIL_SIZE\fP -Must be followed by a nonnegative integer that indicates the desired -number of stencil bitplanes. -The smallest stencil buffer of at least the specified size is preferred. -If the desired value is zero, -visuals with no stencil buffer are preferred. -.TP -\f3GLX_ACCUM_RED_SIZE\fP -Must be followed by a nonnegative minimum size specification. -If this value is zero, -visuals with no red accumulation buffer are preferred. -Otherwise, the largest possible red accumulation buffer -of at least the minimum size is preferred. -.TP -\f3GLX_ACCUM_GREEN_SIZE\fP -Must be followed by a nonnegative minimum size specification. -If this value is zero, -visuals with no green accumulation buffer are preferred. -Otherwise, the largest possible green accumulation buffer -of at least the minimum size is preferred. -.TP -\f3GLX_ACCUM_BLUE_SIZE\fP -Must be followed by a nonnegative minimum size specification. -If this value is zero, -visuals with no blue accumulation buffer are preferred. -Otherwise, the largest possible blue accumulation buffer -of at least the minimum size is preferred. -.TP -\f3GLX_ACCUM_ALPHA_SIZE\fP -Must be followed by a nonnegative minimum size specification. -If this value is zero, -visuals with no alpha accumulation buffer are preferred. -Otherwise, the largest possible alpha accumulation buffer -of at least the minimum size is preferred. -.TE -.SH EXAMPLES -.TP 12 -\f2attribList\fP = -{\f3GLX_RGBA\fP, -\f3GLX_RED_SIZE\fP, 4, -\f3GLX_GREEN_SIZE\fP, 4, -\f3GLX_BLUE_SIZE\fP, 4, -\f3None\fP}; -.P -Specifies a single-buffered RGB visual in the normal frame buffer, -not an overlay or underlay buffer. -The returned visual supports at least four bits each of red, -green, and blue, -and possibly no bits of alpha. -It does not support color index mode, -double-buffering, or stereo display. -It may or may not have one or more auxiliary color buffers, -a depth buffer, -a stencil buffer, -or an accumulation buffer. -.SH NOTES -\f3XVisualInfo\fP is defined in \f2Xutil.h.\fP -It is a structure that includes \f2visual\fP, \f2visualID\fP, \f2screen\fP, and -\f2depth\fP elements. -.P -\f3glXChooseVisual\fP is implemented as a client-side utility using only \f3XGetVisualInfo\fP -and \f3glXGetConfig\fP. -Calls to these two routines can be used to implement selection algorithms -other than the generic one implemented by \f3glXChooseVisual\fP. -.P -GLX implementers are strongly discouraged, -but not proscribed, -from changing the selection algorithm used by \f3glXChooseVisual\fP. -Therefore, selections may change from release to release -of the client-side library. -.P -There is no direct filter for picking only visuals that -support GLXPixmaps. -GLXPixmaps are supported for visuals whose -\f3GLX_BUFFER_SIZE\fP -is one of the pixmap depths supported by the X server. -.SH ERRORS -\f3NULL\fP is returned if an undefined GLX attribute is encountered in -\f2attribList\fP. -.SH SEE ALSO -\f3glXCreateContext\fP, -\f3glXGetConfig\fP diff --git a/doc/gl-docs/GL/glx/xcopycontext.3gl b/doc/gl-docs/GL/glx/xcopycontext.3gl deleted file mode 100644 index 8e18ccee..00000000 --- a/doc/gl-docs/GL/glx/xcopycontext.3gl +++ /dev/null @@ -1,98 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 49166 6 xcopycontext.gl -.TH GLXCOPYCONTEXT 3 -.SH NAME -glXCopyContext -\- copy state from one rendering context to another - -.SH C SPECIFICATION -void \f3glXCopyContext\fP( -Display \fI*dpy\fP, -.nf -.ta \w'\f3void \fPglXCopyContext( 'u - GLXContext \fIsrc\fP, - GLXContext \fIdst\fP, - unsigned long \fImask\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fImask\fP\ \ 'u -\f2dpy\fP -Specifies the connection to the X server. -.TP -\f2src\fP -Specifies the source context. -.TP -\f2dst\fP -Specifies the destination context. -.TP -\f2mask\fP -Specifies which portions of \f2src\fP state are to be copied to \f2dst\fP. -.SH DESCRIPTION -\f3glXCopyContext\fP copies selected groups of state variables from \f2src\fP to \f2dst\fP. -\f2mask\fP indicates which groups of state variables are to be copied. -\f2mask\fP contains the bitwise OR of the same symbolic names that are -passed to the GL command \f3glPushAttrib\fP. -The single symbolic constant \f3GL_ALL_ATTRIB_BITS\fP can be used to -copy the maximum possible portion of rendering state. -.P -The copy can be done only if the renderers named by \f2src\fP and \f2dst\fP -share an address space. -Two rendering contexts share an address space if both are nondirect -using the same server, -or if both are direct and owned by a single process. -Note that in the nondirect case it is not necessary for the calling -threads to share an address space, -only for their related rendering contexts to share an address space. -.P -Not all values for GL state can be copied. -For example, -pixel pack and unpack state, -render mode state, -and select and feedback state are not copied. -The state that can be copied is exactly the state that is manipulated -by the GL command -.br -\f3glPushAttrib\fP. -.P -An implicit \f3glFlush\fP is done by \f3glXCopyContext\fP if \f2src\fP is the current -context for the calling thread. -.SH NOTES -.P -A \f2process\fP is a single execution environment, -implemented in a single address space, -consisting of one or more threads. -.P -A \f2thread\fP is one of a set of subprocesses that share -a single address space, -but maintain separate program counters, -stack spaces, -and other related global data. -A \f2thread\fP that is the only member of its subprocess group -is equivalent to a \f2process\fP. -.SH ERRORS -\f3BadMatch\fP is generated if rendering contexts \f2src\fP and \f2dst\fP -do not share an address space -or were not created with respect to the same screen. -.P -\f3BadAccess\fP is generated if \f2dst\fP is current to any thread -(including the calling thread) at the time \f3glXCopyContext\fP is called. -.P -\f3GLXBadCurrentWindow\fP is generated if \f2src\fP is the current -context and the current drawable is a window that is no longer valid. -.P -\f3GLXBadContext\fP is generated if either \f2src\fP or \f2dst\fP is not -a valid GLX context. -.SH SEE ALSO -\f3glPushAttrib\fP, -\f3glXCreateContext\fP, -\f3glXIsDirect\fP diff --git a/doc/gl-docs/GL/glx/xcreatecontext.3gl b/doc/gl-docs/GL/glx/xcreatecontext.3gl deleted file mode 100644 index c49bcf5d..00000000 --- a/doc/gl-docs/GL/glx/xcreatecontext.3gl +++ /dev/null @@ -1,117 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 16965 8 xcreatecontext.gl -.TH GLXCREATECONTEXT 3 -.SH NAME -glXCreateContext -\- create a new GLX rendering context - -.SH C SPECIFICATION -GLXContext \f3glXCreateContext\fP( -Display \fI*dpy\fP, -.nf -.ta \w'\f3GLXContext \fPglXCreateContext( 'u - XVisualInfo \fI*vis\fP, - GLXContext \fIshareList\fP, - Bool \fIdirect\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIshareList\fP\ \ 'u -\f2dpy\fP -Specifies the connection to the X server. -.TP -\f2vis\fP -Specifies the visual that defines the frame buffer resources available to -the rendering context. -It is a pointer to an \f3XVisualInfo\fP structure, -not a visual ID or a pointer to a \f3Visual\fP. -.TP -\f2shareList\fP -Specifies the context with which to share display lists. -\f3NULL\fP indicates that no sharing is to take place. -.TP -\f2direct\fP -Specifies whether rendering is to be done with a direct connection -to the graphics system if possible (\f3True\fP) -or through the X server (\f3False\fP). -.SH DESCRIPTION -\f3glXCreateContext\fP creates a GLX rendering context and returns its handle. -This context can be used to render into both windows and GLX pixmaps. -If \f3glXCreateContext\fP fails to create a rendering context, -\f3NULL\fP is returned. -.P -If \f2direct\fP is \f3True\fP, -then a direct rendering context is created if the -implementation supports direct rendering, if the connection is to an X -server that is local, and if a direct rendering context is available. (An implementation may return an indirect context when \f2direct\fP is \f3True\fP). -If \f2direct\fP is \f3False\fP, -then a rendering context that renders through the X server is always created. -Direct rendering provides a performance advantage in some implementations. -However, direct rendering contexts cannot be shared outside a single process, -and they may be unable to render to GLX pixmaps. -.P -If \f2shareList\fP is not \f3NULL\fP, -then all display-list indexes and definitions are shared by -context \f2shareList\fP and by the newly created context. -An arbitrary number of contexts can share a single display-list space. -However, -all rendering contexts that share a single display-list space must -themselves exist in the same address space. -Two rendering contexts share an address space if both are nondirect -using the same server, -or if both are direct and owned by a single process. -Note that in the nondirect case, it is not necessary for the calling -threads to share an address space, -only for their related rendering contexts to share an address space. -.P -If the GL version is 1.1 or greater, -then all texture objects except object 0, -are shared by any contexts that share display lists. -.SH NOTES -\f3XVisualInfo\fP is defined in \f2Xutil.h.\fP -It is a structure that includes \f2visual\fP, \f2visualID\fP, \f2screen\fP, and -\f2depth\fP elements. -.P -A \f2process\fP is a single execution environment, -implemented in a single address space, -consisting of one or more threads. -.P -A \f2thread\fP is one of a set of subprocesses that share -a single address space, -but maintain separate program counters, -stack spaces, -and other related global data. -A \f2thread\fP that is the only member of its subprocess group -is equivalent to a \f2process\fP. -.P -It may not be possible to render to a GLX pixmap with a direct rendering -context. -.SH ERRORS -\f3NULL\fP is returned if execution fails on the client side. -.P -\f3BadMatch\fP is generated if the context to be created would not -share the address space or the screen of the context specified by \f2shareList\fP. -.P -\f3BadValue\fP is generated if \f2vis\fP is not a valid visual (for -example, if a particular GLX implementation does not support it). -.P -\f3GLXBadContext\fP is generated if \f2shareList\fP is not a GLX context -and is not \f3NULL\fP. -.P -\f3BadAlloc\fP is generated if the server does not have enough -resources to allocate the new context. -.SH SEE ALSO -\f3glXDestroyContext\fP, -\f3glXGetConfig\fP, -\f3glXIsDirect\fP, -\f3glXMakeCurrent\fP - diff --git a/doc/gl-docs/GL/glx/xcreateglxpixmap.3gl b/doc/gl-docs/GL/glx/xcreateglxpixmap.3gl deleted file mode 100644 index b37bdbb5..00000000 --- a/doc/gl-docs/GL/glx/xcreateglxpixmap.3gl +++ /dev/null @@ -1,76 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 62493 5 xcreateglxpixmap.gl -.TH GLXCREATEGLXPIXMAP 3 -.SH NAME -glXCreateGLXPixmap -\- create an off-screen GLX rendering area - -.SH C SPECIFICATION -GLXPixmap \f3glXCreateGLXPixmap\fP( -Display \fI*dpy\fP, -.nf -.ta \w'\f3GLXPixmap \fPglXCreateGLXPixmap( 'u - XVisualInfo \fI*vis\fP, - Pixmap \fIpixmap\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIpixmap\fP\ \ 'u -\f2dpy\fP -Specifies the connection to the X server. -.TP -\f2vis\fP -Specifies the visual that defines the structure of the rendering area. -It is a pointer to an \f3XVisualInfo\fP structure, -not a visual ID or a pointer to a \f3Visual\fP. -.TP -\f2pixmap\fP -Specifies the X pixmap that will be used as the front left color buffer -of the off-screen rendering area. -.SH DESCRIPTION -\f3glXCreateGLXPixmap\fP creates an off-screen rendering area and returns its XID. -Any GLX rendering context that was created with respect to \f2vis\fP -can be used to render into this off-screen area. -Use \f3glXMakeCurrent\fP to associate the rendering area with a GLX -rendering context. -.P -The X pixmap identified by \f2pixmap\fP is used as the front left buffer of the -resulting off-screen rendering area. -All other buffers specified by \f2vis\fP, -including color buffers other than the front left buffer, -are created without externally visible names. -GLX pixmaps with double-buffering are supported. -However, \f3glXSwapBuffers\fP is ignored by these pixmaps. -.P -Some implementations may not support GLX pixmaps with direct rendering -contexts. -.SH NOTES -\f3XVisualInfo\fP is defined in \f2Xutil.h.\fP -It is a structure that includes \f2visual\fP, \f2visualID\fP, \f2screen\fP, and -\f2depth\fP elements. -.SH ERRORS -\f3BadMatch\fP is generated if the depth of \f2pixmap\fP does not match -the depth value reported by core X11 for \f2vis\fP, -or if \f2pixmap\fP was not created with respect to the same screen as \f2vis\fP. -.P -\f3BadValue\fP is generated -if \f2vis\fP is not a valid XVisualInfo pointer (for example, if a -particular GLX implementation does not support this visual). -.P -\f3BadPixmap\fP is generated if \f2pixmap\fP is not a valid pixmap. -.P -\f3BadAlloc\fP is generated if the server cannot allocate the GLX -pixmap. -.SH SEE ALSO -\f3glXCreateContext\fP, -\f3glXIsDirect\fP, -\f3glXMakeCurrent\fP diff --git a/doc/gl-docs/GL/glx/xdestroycontext.3gl b/doc/gl-docs/GL/glx/xdestroycontext.3gl deleted file mode 100644 index 2809fae1..00000000 --- a/doc/gl-docs/GL/glx/xdestroycontext.3gl +++ /dev/null @@ -1,44 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 5532 2 xdestroycontext.gl -.TH GLXDESTROYCONTEXT 3 -.SH NAME -glXDestroyContext -\- destroy a GLX context - -.SH C SPECIFICATION -void \f3glXDestroyContext\fP( -Display \fI*dpy\fP, -.nf -.ta \w'\f3void \fPglXDestroyContext( 'u - GLXContext \fIctx\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2dpy\fP\ \ 'u -\f2dpy\fP -Specifies the connection to the X server. -.TP -\f2ctx\fP -Specifies the GLX context to be destroyed. -.SH DESCRIPTION -If the GLX rendering context \f2ctx\fP is not current to any thread, -\f3glXDestroyContext\fP -destroys it immediately. -Otherwise, -\f2ctx\fP is destroyed when it becomes not current to any thread. -In either case, the resource ID -referenced by \f2ctx\fP is freed immediately. -.SH ERRORS -\f3GLXBadContext\fP is generated if \f2ctx\fP is not a valid GLX context. -.SH SEE ALSO -\f3glXCreateContext\fP, -\f3glXMakeCurrent\fP diff --git a/doc/gl-docs/GL/glx/xdestroyglxpixmap.3gl b/doc/gl-docs/GL/glx/xdestroyglxpixmap.3gl deleted file mode 100644 index 409062e8..00000000 --- a/doc/gl-docs/GL/glx/xdestroyglxpixmap.3gl +++ /dev/null @@ -1,43 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 2275 2 xdestroyglxpixmap.gl -.TH GLXDESTROYGLXPIXMAP 3 -.SH NAME -glXDestroyGLXPixmap -\- destroy a GLX pixmap - -.SH C SPECIFICATION -void \f3glXDestroyGLXPixmap\fP( -Display \fI*dpy\fP, -.nf -.ta \w'\f3void \fPglXDestroyGLXPixmap( 'u - GLXPixmap \fIpix\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2dpy\fP\ \ 'u -\f2dpy\fP -Specifies the connection to the X server. -.TP -\f2pix\fP -Specifies the GLX pixmap to be destroyed. -.SH DESCRIPTION -If the GLX pixmap \f2pix\fP is not current to any client, -\f3glXDestroyGLXPixmap\fP destroys it immediately. -Otherwise, -\f2pix\fP is destroyed when it becomes not current to any client. -In either case, the resource ID -is freed immediately. -.SH ERRORS -\f3GLXBadPixmap\fP is generated if \f2pix\fP is not a valid GLX pixmap. -.SH SEE ALSO -\f3glXCreateGLXPixmap\fP, -\f3glXMakeCurrent\fP diff --git a/doc/gl-docs/GL/glx/xfreecontextext.3gl b/doc/gl-docs/GL/glx/xfreecontextext.3gl deleted file mode 100644 index 550f1bf7..00000000 --- a/doc/gl-docs/GL/glx/xfreecontextext.3gl +++ /dev/null @@ -1,54 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 37853 3 xfreecontextext.gl -.TH GLXFREECONTEXTEXT 3 -.SH NAME -glXFreeContextEXT -\- free client-side memory for imported context - -.SH C SPECIFICATION -void \f3glXFreeContextEXT\fP( -Display \fI*dpy\fP, -.nf -.ta \w'\f3void \fPglXFreeContextEXT( 'u - GLXContext \fIctx\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2dpy\fP\ \ 'u -\f2dpy\fP -Specifies the connection to the X server. - -.TP -\f2ctx\fP -Specifies a GLX rendering context. - -.SH DESCRIPTION -\f3glXFreeContextEXT\fP frees the client-side part of a GLXContext that -was created with \f3glXImportContext\fP. \f3glXFreeContextEXT\fP does not -free the server-side context information or the XID -associated with the server-side context. -.P -\f3glXFreeContextEXT\fP is part of the \f3EXT_import_context\fP extension, -not part of the core GLX command set. If \f3GLX_EXT_import_context\fP -is included in the string returned by \f3glXQueryExtensionsString\fP, -when called with argument \f3GLX_EXTENSIONS\fP, -extension \f3EXT_vertex_array\fP is supported. - -.SH ERRORS -\f3GLXBadContext\fP is generated if \f2ctx\fP does not -refer to a valid context. - -.SH SEE ALSO -\f3glXCreateContext\fP, -\f3glXQueryVersion\fP, -\f3glXQueryExtensionsString\fP, -\f3glXImportContextEXT\fP diff --git a/doc/gl-docs/GL/glx/xgetclientstring.3gl b/doc/gl-docs/GL/glx/xgetclientstring.3gl deleted file mode 100644 index f4c9c87a..00000000 --- a/doc/gl-docs/GL/glx/xgetclientstring.3gl +++ /dev/null @@ -1,64 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 29851 4 xgetclientstring.gl -.TH GLXGETCLIENTSTRING 3 -.SH NAME -glXGetClientString -\- return a string describing the client - -.SH C SPECIFICATION -const char * \f3glXGetClientString\fP( -Display \fI*dpy\fP, -.nf -.ta \w'\f3const char * \fPglXGetClientString( 'u - int \fIname\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIname\fP\ \ 'u -\f2dpy\fP -Specifies the connection to the X server. -.TP -\f2name\fP -Specifies which string is returned. -One of \f3GLX_VENDOR\fP, \f3GLX_VERSION\fP, or \f3GLX_EXTENSIONS\fP. -.SH DESCRIPTION -\f3glXGetClientString\fP returns a string -describing some aspect of the client library. The possible values for \f2name\fP -are \f3GLX_VENDOR\fP, \f3GLX_VERSION\fP, and -\f3GLX_EXTENSIONS\fP. If \f2name\fP -is not set to one of these values, \f3glXGetClientString\fP returns \f3NULL\fP. -The format and contents of the vendor string is implementation dependent. -.P -The extensions string is null-terminated and contains a -space-separated list of extension names. (The extension names never -contain spaces.) -If there are no extensions to GLX, then the empty string is returned. -.P -The version string is laid out as follows: -.sp - -.sp -Both the major and minor portions of the version number are of arbitrary -length. The vendor-specific information is optional. However, if it is -present, the format and contents are implementation specific. -.SH NOTES -\f3glXGetClientString\fP is available only if the GLX version is 1.1 or greater. -.P -If the GLX version is 1.1 or 1.0, the GL version must be 1.0. -If the GLX version is 1.2, then the GL version must be 1.1. -.P -\f3glXGetClientString\fP only returns information about GLX extensions supported by the client. -Call \f3glGetString\fP to get a list of GL extensions supported by the server. -.SH SEE ALSO -\f3glXQueryVersion\fP, -\f3glXQueryExtensionsString\fP, -\f3glXQueryServerString\fP diff --git a/doc/gl-docs/GL/glx/xgetconfig.3gl b/doc/gl-docs/GL/glx/xgetconfig.3gl deleted file mode 100644 index 297620c5..00000000 --- a/doc/gl-docs/GL/glx/xgetconfig.3gl +++ /dev/null @@ -1,177 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 60987 10 xgetconfig.gl -.TH GLXGETCONFIG 3 -.SH NAME -glXGetConfig -\- return information about GLX visuals - -.SH C SPECIFICATION -int \f3glXGetConfig\fP( -Display \fI*dpy\fP, -.nf -.ta \w'\f3int \fPglXGetConfig( 'u - XVisualInfo \fI*vis\fP, - int \fIattrib\fP, - int \fI*value\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIattrib\fP\ \ 'u -\f2dpy\fP -Specifies the connection to the X server. -.TP -\f2vis\fP -Specifies the visual to be queried. -It is a pointer to an \f3XVisualInfo\fP structure, -not a visual ID or a pointer to a \f3Visual\fP. -.TP -\f2attrib\fP -Specifies the visual attribute to be returned. -.TP -\f2value\fP -Returns the requested value. -.SH DESCRIPTION -\f3glXGetConfig\fP sets \f2value\fP to the \f2attrib\fP value of windows or GLX pixmaps -created with respect to \f2vis\fP. -\f3glXGetConfig\fP returns an error code if it fails for any reason. -Otherwise, zero is returned. -.P -\f2attrib\fP is one of the following: -.P -.TP 22 -\f3GLX_USE_GL\fP -\f3True\fP if OpenGL rendering is supported by this visual, -\f3False\fP otherwise. -.TP -\f3GLX_BUFFER_SIZE\fP -Number of bits per color buffer. -For RGBA visuals, \f3GLX_BUFFER_SIZE\fP is the sum of -\f3GLX_RED_SIZE\fP, -\f3GLX_GREEN_SIZE\fP, -\f3GLX_BLUE_SIZE\fP, and -\f3GLX_ALPHA_SIZE\fP. -For color index visuals, \f3GLX_BUFFER_SIZE\fP is the size of the -color indexes. -.TP -\f3GLX_LEVEL\fP -Frame buffer level of the visual. -Level zero is the default frame buffer. -Positive levels correspond to frame buffers that overlay the default buffer, -and negative levels correspond to frame buffers that underlay the default -buffer. -.TP -\f3GLX_RGBA\fP -\f3True\fP if color buffers store red, green, blue, and alpha values. -\f3False\fP if they store color indexes. -.TP -\f3GLX_DOUBLEBUFFER\fP -\f3True\fP if color buffers exist in front/back pairs that can be swapped, -\f3False\fP otherwise. -.TP -\f3GLX_STEREO\fP -\f3True\fP if color buffers exist in left/right pairs, -\f3False\fP otherwise. -.TP -\f3GLX_AUX_BUFFERS\fP -Number of auxiliary color buffers that are available. -Zero indicates that no auxiliary color buffers exist. -.TP -\f3GLX_RED_SIZE\fP -Number of bits of red stored in each color buffer. -Undefined if \f3GLX_RGBA\fP is \f3False\fP. -.TP -\f3GLX_GREEN_SIZE\fP -Number of bits of green stored in each color buffer. -Undefined if \f3GLX_RGBA\fP is \f3False\fP. -.TP -\f3GLX_BLUE_SIZE\fP -Number of bits of blue stored in each color buffer. -Undefined if \f3GLX_RGBA\fP is \f3False\fP. -.TP -\f3GLX_ALPHA_SIZE\fP -Number of bits of alpha stored in each color buffer. -Undefined if \f3GLX_RGBA\fP is \f3False\fP. -.TP -\f3GLX_DEPTH_SIZE\fP -Number of bits in the depth buffer. -.TP -\f3GLX_STENCIL_SIZE\fP -Number of bits in the stencil buffer. -.TP -\f3GLX_ACCUM_RED_SIZE\fP -Number of bits of red stored in the accumulation buffer. -.TP -\f3GLX_ACCUM_GREEN_SIZE\fP -Number of bits of green stored in the accumulation buffer. -.TP -\f3GLX_ACCUM_BLUE_SIZE\fP -Number of bits of blue stored in the accumulation buffer. -.TP -\f3GLX_ACCUM_ALPHA_SIZE\fP -Number of bits of alpha stored in the accumulation buffer. -.TE -.P -The X protocol allows a single visual ID to be instantiated with -different numbers of bits per pixel. -Windows or GLX pixmaps that will be rendered with OpenGL, however, -must be instantiated with a color buffer depth of \f3GLX_BUFFER_SIZE\fP. -.P -Although a GLX implementation can export many visuals that support GL -rendering, -it must support -at least one RGBA visual. This visual must have at -least one color buffer, -a stencil buffer of at least 1 bit, -a depth buffer of at least 12 bits, -and an accumulation buffer. -Alpha bitplanes are optional in this visual. -However, -its color buffer size must be as great as that of the -deepest \f3TrueColor\fP, \f3DirectColor\fP, -\f3PseudoColor\fP, or \f3StaticColor\fP visual supported on level zero, -and it must itself be made available on level zero. -.P -In addition, if the X server exports a \f3PseudoColor\fP -or \f3StaticColor\fP visual on framebuffer level 0, a color index -visual is also required on that level. -It must have -at least one color buffer, -a stencil buffer of at least 1 bit, -and a depth buffer of at least 12 bits. -This visual must -have as many -color bitplanes as the deepest -\f3PseudoColor\fP or \f3StaticColor\fP visual supported on level 0. -.P -Applications are best written to select the visual that most closely -meets their requirements. -Creating windows or GLX pixmaps with unnecessary buffers can result in -reduced rendering performance as well as poor resource allocation. -.SH NOTES -\f3XVisualInfo\fP is defined in \f2Xutil.h.\fP -It is a structure that includes \f2visual\fP, \f2visualID\fP, \f2screen\fP, and -\f2depth\fP elements. -.SH ERRORS -\f3GLX_NO_EXTENSION\fP is returned if \f2dpy\fP does not support the GLX -extension. -.P -\f3GLX_BAD_SCREEN\fP is returned if the screen of \f2vis\fP does not correspond -to a screen. -.P -\f3GLX_BAD_ATTRIBUTE\fP is returned if \f2attrib\fP is not a valid GLX attribute. -.P -\f3GLX_BAD_VISUAL\fP is returned if \f2vis\fP doesn't support GLX and an -attribute other than \f3GLX_USE_GL\fP is requested. -.SH SEE ALSO -\f3glXChooseVisual\fP, -\f3glXCreateContext\fP - diff --git a/doc/gl-docs/GL/glx/xgetcontextidext.3gl b/doc/gl-docs/GL/glx/xgetcontextidext.3gl deleted file mode 100644 index 863ac5a1..00000000 --- a/doc/gl-docs/GL/glx/xgetcontextidext.3gl +++ /dev/null @@ -1,47 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 25633 3 xgetcontextidext.gl -.TH GLXGETCONTEXTIDEXT 3 -.SH NAME -glXGetContextIDEXT -\- get the XID for a context. - -.SH C SPECIFICATION -GLXContextID \f3glXGetContextIDEXT\fP( -const GLXContext \fIctx\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2ctx\fP\ \ 'u -\f2ctx\fP -Specifies a GLX rendering context. - -.SH DESCRIPTION -\f3glXGetContextIDEXT\fP returns the XID associated with a GLXContext. -.P -No round trip is forced to the server; unlike most X calls that -return a value, \f3glXGetContextIDEXT\fP does not flush any pending events. -.P -\f3glXGetContextIDEXT\fP is part of the \f3EXT_import_context\fP extension, -not part of the core GLX command set. If \f3GLX_EXT_import_context\fP -is included in the string returned by \f3glXQueryExtensionsString\fP, -when called with argument \f3GLX_EXTENSIONS\fP, -extension \f3EXT_import_context\fP is supported. - -.SH ERRORS -\f3GLXBadContext\fP is generated if \f2ctx\fP does not -refer to a valid context. - -.SH SEE ALSO -\f3glXCreateContext\fP, -\f3glXQueryVersion\fP, -\f3glXQueryExtensionsString\fP diff --git a/doc/gl-docs/GL/glx/xgetcurrentcontext.3gl b/doc/gl-docs/GL/glx/xgetcurrentcontext.3gl deleted file mode 100644 index 2a67ae38..00000000 --- a/doc/gl-docs/GL/glx/xgetcurrentcontext.3gl +++ /dev/null @@ -1,30 +0,0 @@ -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 49308 2 xgetcurrentcontext.gl -.TH GLXGETCURRENTCONTEXT 3 -.SH NAME -glXGetCurrentContext -\- return the current context - -.SH C SPECIFICATION -GLXContext \f3glXGetCurrentContext\fP( void ) -.nf -.fi - - -.SH DESCRIPTION -\f3glXGetCurrentContext\fP returns the current context, -as specified by \f3glXMakeCurrent\fP. -If there is no current context, -\f3NULL\fP is returned. - -\f3glXGetCurrentContext\fP returns client-side information. -It does not make a round trip to the server. - -.SH SEE ALSO -\f3glXCreateContext\fP, -\f3glXMakeCurrent\fP diff --git a/doc/gl-docs/GL/glx/xgetcurrentdisplay.3gl b/doc/gl-docs/GL/glx/xgetcurrentdisplay.3gl deleted file mode 100644 index dbe44998..00000000 --- a/doc/gl-docs/GL/glx/xgetcurrentdisplay.3gl +++ /dev/null @@ -1,33 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 59497 2 xgetcurrentdisplay.gl -.TH GLXGETCURRENTDISPLAY 3 -.SH NAME -glXGetCurrentDisplay -\- get display for current context - -.SH C SPECIFICATION -Display * \f3glXGetCurrentDisplay\fP( void ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH DESCRIPTION -\f3glXGetCurrentDisplay\fP returns the display for the current context. If no -context is current, NULL is returned. -.P -\f3glXGetCurrentDisplay\fP returns client-side information. It does not make a round trip -to the server, and therefore does not flush any pending events. -.SH NOTES -\f3glXGetCurrentDisplay\fP is only supported if the GLX version is 1.2 or greater. -.SH SEE ALSO -\f3glXQueryVersion\fP, -\f3glXQueryExtensionsString\fP - diff --git a/doc/gl-docs/GL/glx/xgetcurrentdrawable.3gl b/doc/gl-docs/GL/glx/xgetcurrentdrawable.3gl deleted file mode 100644 index 38212ad8..00000000 --- a/doc/gl-docs/GL/glx/xgetcurrentdrawable.3gl +++ /dev/null @@ -1,28 +0,0 @@ -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 49921 2 xgetcurrentdrawable.gl -.TH GLXGETCURRENTDRAWABLE 3 -.SH NAME -glXGetCurrentDrawable -\- return the current drawable - -.SH C SPECIFICATION -GLXDrawable \f3glXGetCurrentDrawable\fP( void ) -.nf -.fi - -.SH DESCRIPTION -\f3glXGetCurrentDrawable\fP returns the current drawable, -as specified by \f3glXMakeCurrent\fP. -If there is no current drawable, -\f3None\fP is returned. -.P -\f3glXGetCurrentDrawable\fP returns client-side information. -It does not make a round trip to the server. -.SH SEE ALSO -\f3glXCreateGLXPixmap\fP, -\f3glXMakeCurrent\fP diff --git a/doc/gl-docs/GL/glx/ximportcontextext.3gl b/doc/gl-docs/GL/glx/ximportcontextext.3gl deleted file mode 100644 index f0798c1f..00000000 --- a/doc/gl-docs/GL/glx/ximportcontextext.3gl +++ /dev/null @@ -1,71 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 38402 4 ximportcontextext.gl -.TH GLXIMPORTCONTEXTEXT 3 -.SH NAME -glXImportContextEXT -\- import another process's indirect rendering context. - -.SH C SPECIFICATION -GLXContext \f3glXImportContextEXT\fP( -Display \fI*dpy\fP, -.nf -.ta \w'\f3GLXContext \fPglXImportContextEXT( 'u - GLXContextID \fIcontextID\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIcontextID\fP\ \ 'u -\f2dpy\fP -Specifies the connection to the X server. - -.TP -\f2contextID\fP -Specifies a GLX rendering context. - -.SH DESCRIPTION -\f3glXImportContextEXT\fP creates a GLXContext given the XID of an existing GLXContext. -It may be used in place of \f3glXCreateContext\fP, -to share another process's indirect rendering context. -.P -Only the server-side context information can be shared between -X clients; client-side state, such as pixel storage modes, -cannot be shared. Thus, \f3glXImportContextEXT\fP must allocate memory to store -client-side information. This memory is freed by calling -\f3glXFreeContextEXT\fP. -.P -This call does not create a new XID. It merely makes an -existing object available to the importing client (Display *). -Like any XID, it goes away when the creating client drops its -connection or the ID is explicitly deleted. Note that this is -when the XID goes away. The object goes away when the XID -goes away AND the context is not current to any thread. -.P -If \f2contextID\fP refers to a -direct rendering context then no error is generated but -\f3glXImportContextEXT\fP returns NULL. -.P -\f3glXImportContextEXT\fP is part of the \f3EXT_import_context\fP extension, -not part of the core GLX command set. If \f3GLX_EXT_import_context\fP -is included in the string returned by \f3glXQueryExtensionsString\fP, -when called with argument \f3GLX_EXTENSIONS\fP, -extension \f3EXT_import_context\fP is supported. - -.SH ERRORS -\f3GLXBadContext\fP is generated if \f2contextID\fP does not -refer to a valid context. - -.SH SEE ALSO -\f3glXCreateContext\fP, -\f3glXQueryVersion\fP, -\f3glXQueryExtensionsString\fP, -\f3glXGetContextIDEXT\fP, -\f3glXFreeContextEXT\fP diff --git a/doc/gl-docs/GL/glx/xintro.3gl b/doc/gl-docs/GL/glx/xintro.3gl deleted file mode 100644 index 2018b436..00000000 --- a/doc/gl-docs/GL/glx/xintro.3gl +++ /dev/null @@ -1,239 +0,0 @@ -.\" $XFree86$ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 32008 15 xintro.gl -.TH GLXINTRO 3 -.SH NAME -glXIntro -\- Introduction to OpenGL in the X window system - -.SH OVERVIEW -OpenGL (called GL in other pages) is a high-performance 3D-oriented renderer. -It is available in the X window system through the GLX extension. -To determine whether the GLX extension is supported by an X server, -and if so, what version is supported, call \f3glXQueryExtension\fP -and \f3glXQueryVersion\fP. -.P -GLX extended servers make a subset of their visuals available -for OpenGL rendering. -Drawables created with these visuals can also be rendered using -the core X renderer -and with the renderer of any other X extension that is compatible -with all core X visuals. -.P -GLX extends drawables with several buffers other than -the standard color buffer. -These buffers include back and auxiliary color buffers, -a depth buffer, -a stencil buffer, -and a color accumulation buffer. -Some or all are included in each X visual that supports OpenGL. -.P -To render using OpenGL into an X drawable, -you must first choose a visual that defines the required OpenGL buffers. -\f3glXChooseVisual\fP can be used to simplify selecting a compatible visual. -If more control of the selection process is required, -use \f3XGetVisualInfo\fP and \f3glXGetConfig\fP to select among -all the available visuals. -.P -Use the selected visual to create both a GLX context and an X -drawable. -GLX contexts are created with \f3glXCreateContext\fP, -and drawables are created with either \f3XCreateWindow\fP or -\f3glXCreateGLXPixmap\fP. -Finally, -bind the context and the drawable together using \f3glXMakeCurrent\fP. -This context/drawable pair becomes the current context and current -drawable, -and it is used by all OpenGL commands until \f3glXMakeCurrent\fP is -called with different arguments. -.P -Both core X and OpenGL commands can be used to operate on the -current drawable. -The X and OpenGL command streams are not synchronized, -however, -except at explicitly created boundaries generated by calling -\f3glXWaitGL\fP, \f3glXWaitX\fP, \f3XSync\fP, and \f3glFlush\fP. -.SH EXAMPLES -Below is the minimum code required to create an RGBA-format, -X window that's compatible with OpenGL and to clear it to yellow. -The code is correct, -but it does not include any error checking. -Return values \f2dpy\fP, -\f2vi\fP, -\f2cx\fP, -\f2cmap\fP, and -\f2win\fP should all be tested. -.P -.Ex -\&#include -\&#include -\&#include - -static int attributeListSgl[] = { - GLX_RGBA, - GLX_RED_SIZE, 1, /*get the deepest buffer with 1 red bit*/ - GLX_GREEN_SIZE, 1, - GLX_BLUE_SIZE, 1, - None }; - -static int attributeListDbl[] = { - GLX_RGBA, - GLX_DOUBLE_BUFFER, /*In case single buffering is not supported*/ - GLX_RED_SIZE, 1, - GLX_GREEN_SIZE, 1, - GLX_BLUE_SIZE, 1, - None }; - - -static Bool WaitForNotify(Display *d, XEvent *e, char *arg) { - return (e->type == MapNotify) && (e->xmap.window == (Window)arg); -} - -int main(int argc, char **argv) { - Display *dpy; - XVisualInfo *vi; - Colormap cmap; - XSetWindowAttributes swa; - Window win; - GLXContext cx; - XEvent event; - int swap_flag = FALSE; - - - /* get a connection */ - dpy = XOpenDisplay(0); - - /* get an appropriate visual */ - vi = glXChooseVisual(dpy, DefaultScreen(dpy), attributeListSgl); - if (vi == NULL) { - vi = glXChooseVisual(dpy, DefaultScreen(dpy), attributeListDbl); - swap_flag = TRUE; - } - - /* create a GLX context */ - cx = glXCreateContext(dpy, vi, 0, GL_TRUE); - - /* create a color map */ - cmap = XCreateColormap(dpy, RootWindow(dpy, vi->screen), - vi->visual, AllocNone); - - /* create a window */ - swa.colormap = cmap; - swa.border_pixel = 0; - swa.event_mask = StructureNotifyMask; - win = XCreateWindow(dpy, RootWindow(dpy, vi->screen), 0, 0, 100, 100, - 0, vi->depth, InputOutput, vi->visual, - CWBorderPixel|CWColormap|CWEventMask, &swa); - XMapWindow(dpy, win); - XIfEvent(dpy, &event, WaitForNotify, (char*)win); - - /* connect the context to the window */ - glXMakeCurrent(dpy, win, cx); - - /* clear the buffer */ - glClearColor(1,1,0,1); - glClear(GL_COLOR_BUFFER_BIT); - glFlush(); - if (swap_flag) glXSwapBuffers(dpy,win); - - /* wait a while */ - sleep(10); -} -.Ee -.SH NOTES -A color map must be created and passed to \f3XCreateWindow\fP. -See the preceding example code. -.P -A GLX context must be created and attached to an X drawable before -OpenGL commands can be executed. -OpenGL commands issued while no context/drawable pair is current -result in undefined behavior. -.P -Exposure events indicate that \f2all\fP buffers associated with the -specified window may be damaged and should be repainted. -Although certain buffers of some visuals on some systems -may never require repainting -(the depth buffer, for example), -it is incorrect to write a program assuming that these buffers will -not be damaged. -.P -GLX commands manipulate XVisualInfo structures rather than pointers to -visuals or visual IDs. -XVisualInfo structures contain \f2visual\fP, -\f2visualID\fP, -\f2screen\fP, and -\f2depth\fP elements, -as well as other X-specific information. -.SH USING GLX EXTENSIONS -All supported GLX extensions will have a corresponding definition in glx.h -and a token in the extension string returned by \f3glXQueryExtensionsString\fP. -For example, if the \f3EXT_visual_info\fP extension is supported, -then this token will be defined in glx.h and \f3EXT_visual_info\fP -will appear in the extension -string returned by \f3glXQueryExtensionsString\fP. The definitions in glx.h -can be used at compile time to determine if procedure calls corresponding -to an extension exist in the library. -.P -OpenGL itself has also been extended. Refer to \f3glIntro\fP for more -information. -.P -.SH GLX 1.1 and GLX 1.2 -GLX 1.2 is now supported. It is backward compatible with GLX 1.1 and -GLX 1.0. -.P -GLX 1.2 corresponds to OpenGL version 1.1 and introduces the following -new call: \f3glGetCurrentDisplay\fP. -.P -GLX 1.1 corresponds to OpenGL version 1.0 and introduces the -following new calls: -\f3glXQueryExtensionsString\fP, \f3glXQueryServerString\fP, and -\f3glXGetClientString\fP. -.P -Call \f3glQueryVersion\fP -to determine at runtime what version of GLX is available. \f3glQueryVersion\fP -returns the version that is supported on the connection. Thus -if 1.2 is returned, both the client and server support GLX 1.2. -You can also check the GLX version at compile time: GLX_VERSION_1_1 -will be defined in glx.h if GLX 1.1 calls are supported and -GLX_VERSION_1_2 will be defined if GLX 1.2 calls are supported. -.SH SEE ALSO -\f3glIntro\fP, -\f3glFinish\fP, -\f3glFlush\fP, -\f3glXChooseVisual\fP, -\f3glXCopyContext\fP, -.br -\f3glXCreateContext\fP, -\f3glXCreateGLXPixmap\fP, -\f3glXDestroyContext\fP, -.br -\f3glXGetClientString\fP, -\f3glXGetConfig\fP, -\f3glXIsDirect\fP, -\f3glXMakeCurrent\fP, -.br -\f3glXQueryExtension\fP, -\f3glXQueryExtensionsString\fP, -\f3glXQueryServerString\fP, -\f3glXQueryVersion\fP, -\f3glXSwapBuffers\fP, -\f3glXUseXFont\fP, -\f3glXWaitGL\fP, -\f3glXWaitX\fP, -\f3XCreateColormap\fP, -\f3XCreateWindow\fP, -\f3XSync\fP - - - - - - - - diff --git a/doc/gl-docs/GL/glx/xisdirect.3gl b/doc/gl-docs/GL/glx/xisdirect.3gl deleted file mode 100644 index 6a6d8f96..00000000 --- a/doc/gl-docs/GL/glx/xisdirect.3gl +++ /dev/null @@ -1,42 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 12384 2 xisdirect.gl -.TH GLXISDIRECT 3 -.SH NAME -glXIsDirect -\- indicate whether direct rendering is enabled - -.SH C SPECIFICATION -Bool \f3glXIsDirect\fP( -Display \fI*dpy\fP, -.nf -.ta \w'\f3Bool \fPglXIsDirect( 'u - GLXContext \fIctx\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2dpy\fP\ \ 'u -\f2dpy\fP -Specifies the connection to the X server. -.TP -\f2ctx\fP -Specifies the GLX context that is being queried. -.SH DESCRIPTION -\f3glXIsDirect\fP returns \f3True\fP if \f2ctx\fP is a direct rendering context, -\f3False\fP otherwise. -Direct rendering contexts pass rendering commands directly from the calling -process's address space to the rendering system, -bypassing the X server. -Nondirect rendering contexts pass all rendering commands to the X server. -.SH ERRORS -\f3GLXBadContext\fP is generated if \f2ctx\fP is not a valid GLX context. -.SH SEE ALSO -\f3glXCreateContext\fP diff --git a/doc/gl-docs/GL/glx/xmakecurrent.3gl b/doc/gl-docs/GL/glx/xmakecurrent.3gl deleted file mode 100644 index 2cbb6166..00000000 --- a/doc/gl-docs/GL/glx/xmakecurrent.3gl +++ /dev/null @@ -1,107 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 28564 7 xmakecurrent.gl -.TH GLXMAKECURRENT 3 -.SH NAME -glXMakeCurrent -\- attach a GLX context to a window or a GLX pixmap - -.SH C SPECIFICATION -Bool \f3glXMakeCurrent\fP( -Display \fI*dpy\fP, -.nf -.ta \w'\f3Bool \fPglXMakeCurrent( 'u - GLXDrawable \fIdrawable\fP, - GLXContext \fIctx\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIdrawable\fP\ \ 'u -\f2dpy\fP -Specifies the connection to the X server. -.TP -\f2drawable\fP -Specifies a GLX drawable. -Must be either an X window ID or a GLX pixmap ID. -.TP -\f2ctx\fP -Specifies a GLX rendering context that is to be attached to \f2drawable\fP. -.SH DESCRIPTION -\f3glXMakeCurrent\fP does two things: -It makes \f2ctx\fP the current GLX rendering context of the calling thread, -replacing the previously current context if there was one, -and it attaches \f2ctx\fP to a GLX drawable, -either a window or a GLX pixmap. -As a result of these two actions, -subsequent GL rendering calls -use rendering context \f2ctx\fP to modify GLX drawable \f2drawable\fP. -Because \f3glXMakeCurrent\fP always replaces the current rendering context with \f2ctx\fP, -there can be only one current context per thread. -.P -Pending commands to the -previous context, if any, are flushed before it is released. -.P -The first time \f2ctx\fP is made current to any thread, -its viewport is set to the full size of \f2drawable\fP. -Subsequent calls by any thread to \f3glXMakeCurrent\fP with \f2ctx\fP -have no effect on its viewport. -.P -To release the current context without assigning a new one, -call \f3glXMakeCurrent\fP with \f2drawable\fP set \f3None\fP and \f2ctx\fP -set to \f3NULL\fP -.P -\f3glXMakeCurrent\fP returns \f3True\fP if it is successful, -\f3False\fP otherwise. -If \f3False\fP is returned, the previously current rendering context -and drawable (if any) remain unchanged. -.SH NOTES -A \f2process\fP is a single-execution environment, -implemented in a single address space, -consisting of one or more threads. -.P -A \f2thread\fP is one of a set of subprocesses that share -a single address space, -but maintain separate program counters, -stack spaces, -and other related global data. -A \f2thread\fP that is the only member of its subprocess group -is equivalent to a \f2process\fP. -.SH ERRORS -\f3BadMatch\fP is generated if \f2drawable\fP was not -created with the same X screen and visual as \f2ctx\fP. -It is also generated if \f2drawable\fP is \f3None\fP and \f2ctx\fP is not -\f3NULL\fP. -.P -\f3BadAccess\fP is generated if \f2ctx\fP was current to another thread -at the time \f3glXMakeCurrent\fP was called. -.P -\f3GLXBadDrawable\fP is generated if \f2drawable\fP is not a valid GLX drawable. -.P -\f3GLXBadContext\fP is generated if \f2ctx\fP is not a valid GLX context. -.P -\f3GLXBadContextState\fP is generated if \f3glXMakeCurrent\fP is executed between -the execution of \f3glBegin\fP and the corresponding execution of \f3glEnd\fP. -.P -\f3GLXBadContextState\fP is also generated if the rendering context current -to the calling thread has GL renderer state \f3GL_FEEDBACK\fP or -\f3GL_SELECT\fP. -.P -\f3GLXBadCurrentWindow\fP is generated if there are pending GL -commands for the previous context and the current drawable is -a window that is no longer valid. -.P -\f3BadAlloc\fP may be generated if the server has delayed allocation -of ancillary buffers until \f3glXMakeCurrent\fP is called, only to find that it has -insufficient resources to complete the allocation. -.SH SEE ALSO -\f3glXCreateContext\fP, -\f3glXCreateGLXPixmap\fP - diff --git a/doc/gl-docs/GL/glx/xquerycontextinfoext.3gl b/doc/gl-docs/GL/glx/xquerycontextinfoext.3gl deleted file mode 100644 index 855c17dc..00000000 --- a/doc/gl-docs/GL/glx/xquerycontextinfoext.3gl +++ /dev/null @@ -1,67 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 51469 3 xquerycontextinfoext.gl -.TH GLXQUERYCONTEXTINFOEXT 3 -.SH NAME -glXQueryContextInfoEXT -\- query context information - -.SH C SPECIFICATION -int \f3glXQueryContextInfoEXT\fP( -Display \fI*dpy\fP, -.nf -.ta \w'\f3int \fPglXQueryContextInfoEXT( 'u - GLXContext \fIctx\fP, - int \fIattribute\fP, - int \fI*value\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIattribute\fP\ \ 'u -\f2dpy\fP -Specifies the connection to the X server. - -.TP -\f2ctx\fP -Specifies a GLX rendering context. - -.TP -\f2attribute\fP -The visual ID that the context was created with. - -.TP -\f2value\fP -The X screen the the context was created for. - -.TP -_param5 -The context with which this context shares display lists. -or \f3NULL\fP if this context does not share display lists. - -.SH DESCRIPTION -\f3glXQueryContextInfoEXT\fP returns the the visual id, screen number, and share list -of \f2ctx\fP. This call may cause a round trip to the server. -.P -\f3glXQueryContextInfoEXT\fP is part of the \f3EXT_import_context\fP extension, -not part of the core GLX command set. If \f3GLX_EXT_import_context\fP -is included in the string returned by \f3glXQueryExtensionsString\fP, -when called with argument \f3GLX_EXTENSIONS\fP, -extension \f3EXT_import_context\fP is supported. - -.SH ERRORS -\f3GLXBadContext\fP is generated if \f2ctx\fP does not -refer to a valid context. - -.SH SEE ALSO -\f3glXCreateContext\fP, -\f3glXQueryVersion\fP, -\f3glXQueryExtensionsString\fP - diff --git a/doc/gl-docs/GL/glx/xqueryextension.3gl b/doc/gl-docs/GL/glx/xqueryextension.3gl deleted file mode 100644 index e5396a11..00000000 --- a/doc/gl-docs/GL/glx/xqueryextension.3gl +++ /dev/null @@ -1,52 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 25267 2 xqueryextension.gl -.TH GLXQUERYEXTENSION 3 -.SH NAME -glXQueryExtension -\- indicate whether the GLX extension is supported - -.SH C SPECIFICATION -Bool \f3glXQueryExtension\fP( -Display \fI*dpy\fP, -.nf -.ta \w'\f3Bool \fPglXQueryExtension( 'u - int \fI*errorBase\fP, - int \fI*eventBase\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIerrorBase\fP\ \ 'u -\f2dpy\fP -Specifies the connection to the X server. -.TP -\f2errorBase\fP -Returns the base error code of the GLX server extension. -.TP -\f2eventBase\fP -Returns the base event code of the GLX server extension. -.SH DESCRIPTION -\f3glXQueryExtension\fP returns \f3True\fP if the X server of -connection \f2dpy\fP supports the GLX extension, -\f3False\fP otherwise. -If \f3True\fP is returned, -then \f2errorBase\fP and \f2eventBase\fP return the error base and event base of -the GLX extension. -Otherwise, \f2errorBase\fP and \f2eventBase\fP are unchanged. -.P -\f2errorBase\fP and \f2eventBase\fP do not return values if they are specified -as \f3NULL\fP. -.SH NOTES -\f2eventBase\fP is included for future extensions. -GLX does not currently define any events. -.SH SEE ALSO -\f3glXQueryVersion\fP - diff --git a/doc/gl-docs/GL/glx/xqueryextensionsstring.3gl b/doc/gl-docs/GL/glx/xqueryextensionsstring.3gl deleted file mode 100644 index f9813756..00000000 --- a/doc/gl-docs/GL/glx/xqueryextensionsstring.3gl +++ /dev/null @@ -1,48 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 26309 3 xqueryextensionsstring.gl -.TH GLXQUERYEXTENSIONSSTRING 3 -.SH NAME -glXQueryExtensionsString -\- return list of supported extensions - -.SH C SPECIFICATION -const char * \f3glXQueryExtensionsString\fP( -Display \fI*dpy\fP, -.nf -.ta \w'\f3const char * \fPglXQueryExtensionsString( 'u - int \fIscreen\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIscreen\fP\ \ 'u -\f2dpy\fP -Specifies the connection to the X server. -.TP -\f2screen\fP -Specifies the screen. -.SH DESCRIPTION -\f3glXQueryExtensionsString\fP returns a pointer to a string describing -which GLX extensions are supported on the connection. The string -is null-terminated and contains a space-separated list of -extension names. (The extension names themselves never contain -spaces.) If there are no extensions to GLX, then the empty string is -returned. -.SH NOTES -\f3glXQueryExtensionsString\fP is available only if the GLX version is 1.1 or greater. -.P -\f3glXQueryExtensionsString\fP only returns information about GLX extensions. Call -\f3glGetString\fP to get a list of GL extensions. -.SH SEE ALSO -\f3glGetString\fP, -\f3glXQueryVersion\fP, -\f3glXQueryServerString\fP, -\f3glXGetClientString\fP diff --git a/doc/gl-docs/GL/glx/xqueryserverstring.3gl b/doc/gl-docs/GL/glx/xqueryserverstring.3gl deleted file mode 100644 index 3201a714..00000000 --- a/doc/gl-docs/GL/glx/xqueryserverstring.3gl +++ /dev/null @@ -1,58 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 52600 3 xqueryserverstring.gl -.TH GLXQUERYSERVERSTRING 3 -.SH NAME -glXQueryServerString -\- return string describing the server - -.SH C SPECIFICATION -const char * \f3glXQueryServerString\fP( -Display \fI*dpy\fP, -.nf -.ta \w'\f3const char * \fPglXQueryServerString( 'u - int \fIscreen\fP, - int \fIname\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIscreen\fP\ \ 'u -\f2dpy\fP -Specifies the connection to the X server. -.TP -\f2screen\fP -Specifies the screen number. -.TP -\f2name\fP -Specifies which string is returned. -One of \f3GLX_VENDOR\fP, \f3GLX_VERSION\fP, or \f3GLX_EXTENSIONS\fP. -.SH DESCRIPTION -\f3glXQueryServerString\fP -returns a pointer to a static, null-terminated string -describing some aspect of the server's GLX extension. The possible values for -\f2name\fP and the format of the strings is the same as for -\f3glXGetClientString\fP. If \f2name\fP is not set to a recognized value, -\f3NULL\fP is returned. -.SH NOTES -\f3glXQueryServerString\fP is available only if the GLX version is 1.1 or greater. -.P -If the GLX version is 1.1 or 1.0, the GL version must be 1.0. -If the GLX version is 1.2, the GL version must be 1.1. -.P -\f3glXQueryServerString\fP only returns information about GLX extensions supported by the server. -Call \f3glGetString\fP to get a list of GL extensions. -Call \f3glXGetClientString\fP to get a list of GLX extensions supported by the -client. -.SH SEE ALSO -\f3glXQueryVersion\fP, -\f3glXGetClientString\fP, -\f3glXQueryExtensionsString\fP - diff --git a/doc/gl-docs/GL/glx/xqueryversion.3gl b/doc/gl-docs/GL/glx/xqueryversion.3gl deleted file mode 100644 index 47c95b57..00000000 --- a/doc/gl-docs/GL/glx/xqueryversion.3gl +++ /dev/null @@ -1,51 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 36423 3 xqueryversion.gl -.TH GLXQUERYVERSION 3 -.SH NAME -glXQueryVersion -\- return the version numbers of the GLX extension - -.SH C SPECIFICATION -Bool \f3glXQueryVersion\fP( -Display \fI*dpy\fP, -.nf -.ta \w'\f3Bool \fPglXQueryVersion( 'u - int \fI*major\fP, - int \fI*minor\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fImajor\fP\ \ 'u -\f2dpy\fP -Specifies the connection to the X server. -.TP -\f2major\fP -Returns the major version number of the GLX server extension. -.TP -\f2minor\fP -Returns the minor version number of the GLX server extension. -.SH DESCRIPTION -\f3glXQueryVersion\fP returns the major and minor version numbers of the GLX extension -implemented by the server associated with connection \f2dpy\fP. -Implementations with the same major version number are upward compatible, -meaning that the implementation with the higher minor number is a superset -of the version with the lower minor number. -.P -\f2major\fP and \f2minor\fP do not return values if they are specified as -\f3NULL\fP. -.SH ERRORS -\f3glXQueryVersion\fP returns \f3False\fP if it fails, -\f3True\fP otherwise. -.P -\f2major\fP and \f2minor\fP are not updated when \f3False\fP is returned. -.SH SEE ALSO -\f3glXQueryExtension\fP diff --git a/doc/gl-docs/GL/glx/xswapbuffers.3gl b/doc/gl-docs/GL/glx/xswapbuffers.3gl deleted file mode 100644 index 9675b79c..00000000 --- a/doc/gl-docs/GL/glx/xswapbuffers.3gl +++ /dev/null @@ -1,72 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:56 -.ds Dm Feb 10 17:2 -.ds Xs 58040 5 xswapbuffers.gl -.TH GLXSWAPBUFFERS 3 -.SH NAME -glXSwapBuffers -\- exchange front and back buffers - -.SH C SPECIFICATION -void \f3glXSwapBuffers\fP( -Display \fI*dpy\fP, -.nf -.ta \w'\f3void \fPglXSwapBuffers( 'u - GLXDrawable \fIdrawable\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIdrawable\fP\ \ 'u -\f2dpy\fP -Specifies the connection to the X server. -.TP -\f2drawable\fP -Specifies the drawable whose buffers are to be swapped. -.SH DESCRIPTION -\f3glXSwapBuffers\fP promotes the contents of the back buffer of \f2drawable\fP to become -the contents of the front buffer of \f2drawable\fP. -The contents of the back buffer then become undefined. -The update typically takes place during the vertical retrace of -the monitor, -rather than immediately after \f3glXSwapBuffers\fP is called. -.P -\f3glXSwapBuffers\fP performs an implicit \f3glFlush\fP before it returns. -Subsequent OpenGL commands may be issued immediately after calling \f3glXSwapBuffers\fP, -but are not executed until the buffer exchange is completed. -.P -If \f2drawable\fP was not created with respect to a double-buffered visual, -\f3glXSwapBuffers\fP has no effect, -and no error is generated. -.SH NOTES -The contents of the back buffer become undefined after -a swap. Note that this applies to pbuffers as well as windows. -.P -All GLX rendering contexts share the same notion of which are front buffers -and which are back buffers. -One consequence is that when multiple clients are rendering to the same -double-buffered window, -all of them should finish rendering before one of them issues the command -to swap buffers. -The clients are responsible for implementing this synchronization. -Typically this is accomplished by executing \f3glFinish\fP and then -using a semaphore in shared memory to rendezvous before swapping. -.SH ERRORS -\f3GLXBadDrawable\fP is generated if \f2drawable\fP is not a valid GLX drawable. -.P -\f3GLXBadCurrentWindow\fP is generated if \f2dpy\fP and \f2drawable\fP are -respectively the display and drawable associated with the current -context of the calling thread, and \f2drawable\fP identifies a window that -is no longer valid. -.SH SEE ALSO -\f3glFlush\fP, -\f3glXBindSwapBarrierSGIX\fP, -\f3glXJoinSwapGroupSGIX\fP, -\f3glXSwapIntervalSGI\fP - diff --git a/doc/gl-docs/GL/glx/xusexfont.3gl b/doc/gl-docs/GL/glx/xusexfont.3gl deleted file mode 100644 index b48af5cb..00000000 --- a/doc/gl-docs/GL/glx/xusexfont.3gl +++ /dev/null @@ -1,76 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:57 -.ds Dm Feb 10 17:2 -.ds Xs 55673 5 xusexfont.gl -.TH GLXUSEXFONT 3 -.SH NAME -glXUseXFont -\- create bitmap display lists from an X font - -.SH C SPECIFICATION -void \f3glXUseXFont\fP( -Font \fIfont\fP, -.nf -.ta \w'\f3void \fPglXUseXFont( 'u - int \fIfirst\fP, - int \fIcount\fP, - int \fIlistBase\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIlistBase\fP\ \ 'u -\f2font\fP -Specifies the font from which character glyphs are to be taken. -.TP -\f2first\fP -Specifies the index of the first glyph to be taken. -.TP -\f2count\fP -Specifies the number of glyphs to be taken. -.TP -\f2listBase\fP -Specifies the index of the first display list to be generated. -.SH DESCRIPTION -\f3glXUseXFont\fP generates \f2count\fP display lists, -named \f2listBase\fP through \f2listBase\fP\&+\&\f2count\fP\&\-\&1, -each containing a single \f3glBitmap\fP command. -The parameters of the \f3glBitmap\fP command of display list \f2listBase\fP\&+\f2i\fP -are derived from glyph \f2first\fP\&+\f2i\fP. -Bitmap parameters \f2xorig, yorig, width,\fP and \f2height\fP -are computed from font metrics as -\f2descent\-1, \-lbearing,\fP -\f2rbearing\-lbearing,\fP and \f2ascent+descent\fP, respectively. -\f2xmove\fP is taken from the glyph's \f2width\fP metric, -and \f2ymove\fP is set to zero. -Finally, -the glyph's image is converted to the appropriate format for \f3glBitmap\fP. -.P -Using \f3glXUseXFont\fP may be more efficient than accessing the X font and generating -the display lists explicitly, -both because the display lists are created on the server without requiring -a round trip of the glyph data, -and because the server may choose to delay the creation of each -bitmap until it is accessed. -.P -Empty display lists are created for all glyphs that are requested and -are not defined in \f2font\fP. -\f3glXUseXFont\fP is ignored if there is no current GLX context. -.SH ERRORS -\f3BadFont\fP is generated if \f2font\fP is not a valid font. -.P -\f3GLXBadContextState\fP is generated if the current GLX context is -in display-list construction mode. -.P -\f3GLXBadCurrentWindow\fP is generated if the drawable associated -with the current context of the calling thread is a window, and that -window is no longer valid. -.SH SEE ALSO -\f3glBitmap\fP, -\f3glXMakeCurrent\fP diff --git a/doc/gl-docs/GL/glx/xwaitgl.3gl b/doc/gl-docs/GL/glx/xwaitgl.3gl deleted file mode 100644 index 4111c80e..00000000 --- a/doc/gl-docs/GL/glx/xwaitgl.3gl +++ /dev/null @@ -1,42 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:57 -.ds Dm Feb 10 17:2 -.ds Xs 20224 2 xwaitgl.gl -.TH GLXWAITGL 3 -.SH NAME -glXWaitGL -\- complete GL execution prior to subsequent X calls - -.SH C SPECIFICATION -void \f3glXWaitGL\fP( void ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH DESCRIPTION -GL rendering calls made prior to \f3glXWaitGL\fP are guaranteed to be -executed before X rendering calls made after \f3glXWaitGL\fP. -Although this same result can be achieved using \f3glFinish\fP, -\f3glXWaitGL\fP does not require a round trip to the server, -and it is therefore more efficient in cases where client and server -are on separate machines. -.P -\f3glXWaitGL\fP is ignored if there is no current GLX context. -.SH NOTES -\f3glXWaitGL\fP may or may not flush the X stream. -.SH ERRORS -\f3GLXBadCurrentWindow\fP is generated if the drawable associated -with the current context of the calling thread is a window, and that -window is no longer valid. -.SH SEE ALSO -\f3glFinish\fP, -\f3glFlush\fP, -\f3glXWaitX\fP, -\f3XSync\fP - diff --git a/doc/gl-docs/GL/glx/xwaitx.3gl b/doc/gl-docs/GL/glx/xwaitx.3gl deleted file mode 100644 index af4ea219..00000000 --- a/doc/gl-docs/GL/glx/xwaitx.3gl +++ /dev/null @@ -1,42 +0,0 @@ -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp Feb 16 02:57 -.ds Dm Feb 10 17:2 -.ds Xs 20029 2 xwaitx.gl -.TH GLXWAITX 3 -.SH NAME -glXWaitX -\- complete X execution prior to subsequent GL calls - -.SH C SPECIFICATION -void \f3glXWaitX\fP( void ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH DESCRIPTION -X rendering calls made prior to \f3glXWaitX\fP are guaranteed to be -executed before GL rendering calls made after \f3glXWaitX\fP. -Although the same result can be achieved using \f3XSync\fP, -\f3glXWaitX\fP does not require a round trip to the server, -and it is therefore more efficient in cases where client and server -are on separate machines. -.P -\f3glXWaitX\fP is ignored if there is no current GLX context. -.SH NOTES -\f3glXWaitX\fP may or may not flush the GL stream. -.SH ERRORS -\f3GLXBadCurrentWindow\fP is generated if the drawable associated -with the current context of the calling thread is a window, and that -window is no longer valid. -.SH SEE ALSO -\f3glFinish\fP, -\f3glFlush\fP, -\f3glXWaitGL\fP, -\f3XSync\fP - diff --git a/doc/gl-docs/GLU/Imakefile b/doc/gl-docs/GLU/Imakefile deleted file mode 100644 index 567dcafe..00000000 --- a/doc/gl-docs/GLU/Imakefile +++ /dev/null @@ -1,150 +0,0 @@ -XCOMM $XFree86: xc/doc/man/GLU/Imakefile,v 1.2 2001/01/16 02:23:46 dawes Exp $ - -XCOMM License Applicability. Except to the extent portions of this file are -XCOMM made subject to an alternative license as permitted in the SGI Free -XCOMM Software License B, Version 1.1 (the "License"), the contents of this -XCOMM file are subject only to the provisions of the License. You may not use -XCOMM this file except in compliance with the License. You may obtain a copy -XCOMM of the License at Silicon Graphics, Inc., attn: Legal Services, 1600 -XCOMM Amphitheatre Parkway, Mountain View, CA 94043-1351, or at: -XCOMM -XCOMM http://oss.sgi.com/projects/FreeB -XCOMM -XCOMM Note that, as provided in the License, the Software is distributed on an -XCOMM "AS IS" basis, with ALL EXPRESS AND IMPLIED WARRANTIES AND CONDITIONS -XCOMM DISCLAIMED, INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTIES AND -XCOMM CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY, FITNESS FOR A -XCOMM PARTICULAR PURPOSE, AND NON-INFRINGEMENT. -XCOMM -XCOMM Original Code. The Original Code is: OpenGL Sample Implementation, -XCOMM Version 1.2.1, released January 26, 2000, developed by Silicon Graphics, -XCOMM Inc. The Original Code is Copyright (c) 1991-2000 Silicon Graphics, Inc. -XCOMM Copyright in any portions created by third parties is as indicated -XCOMM elsewhere herein. All Rights Reserved. -XCOMM -XCOMM Additional Notice Provisions: The application programming interfaces -XCOMM established by SGI in conjunction with the Original Code are The -XCOMM OpenGL(R) Graphics System: A Specification (Version 1.2.1), released -XCOMM April 1, 1999; The OpenGL(R) Graphics System Utility Library (Version -XCOMM 1.3), released November 4, 1998; and OpenGL(R) Graphics with the X -XCOMM Window System(R) (Version 1.3), released October 19, 1998. This software -XCOMM was created using the OpenGL(R) version 1.2.1 Sample Implementation -XCOMM published by SGI, but has not been independently verified as being -XCOMM compliant with the OpenGL(R) version 1.2.1 Specification. -XCOMM - -MANDIR = $(LIBMANDIR) -MANSUFFIX = $(LIBMANSUFFIX) -MSUFF = man - -InstallManPage(gluBeginCurve,$(MANDIR)) -InstallManPageAliases(gluBeginCurve,$(MANDIR),gluEndCurve) -InstallManPage(gluBeginPolygon,$(MANDIR)) -InstallManPageAliases(gluBeginPolygon,$(MANDIR),gluEndPolygon) -InstallManPage(gluBeginSurface,$(MANDIR)) -InstallManPageAliases(gluBeginSurface,$(MANDIR),gluEndSurface) -InstallManPage(gluBeginTrim,$(MANDIR)) -InstallManPageAliases(gluBeginTrim,$(MANDIR),gluEndTrim) -InstallManPage(gluBuild1DMipmaps,$(MANDIR)) -InstallManPage(gluBuild2DMipmaps,$(MANDIR)) -InstallManPage(gluCylinder,$(MANDIR)) -InstallManPage(gluDeleteNurbsRenderer,$(MANDIR)) -InstallManPage(gluDeleteQuadric,$(MANDIR)) -InstallManPage(gluDeleteTess,$(MANDIR)) -InstallManPage(gluDisk,$(MANDIR)) -InstallManPage(gluErrorString,$(MANDIR)) -InstallManPage(gluGetNurbsProperty,$(MANDIR)) -InstallManPage(gluGetString,$(MANDIR)) -InstallManPage(gluGetTessProperty,$(MANDIR)) -InstallManPage(gluLoadSamplingMatrices,$(MANDIR)) -InstallManPage(gluLookAt,$(MANDIR)) -InstallManPage(gluNewNurbsRenderer,$(MANDIR)) -InstallManPage(gluNewQuadric,$(MANDIR)) -InstallManPage(gluNewTess,$(MANDIR)) -InstallManPage(gluNextContour,$(MANDIR)) -InstallManPage(gluNurbsCallback,$(MANDIR)) -InstallManPage(gluNurbsCallbackDataEXT,$(MANDIR)) -InstallManPage(gluNurbsCurve,$(MANDIR)) -InstallManPage(gluNurbsProperty,$(MANDIR)) -InstallManPage(gluNurbsSurface,$(MANDIR)) -InstallManPage(gluOrtho2D,$(MANDIR)) -InstallManPage(gluPartialDisk,$(MANDIR)) -InstallManPage(gluPerspective,$(MANDIR)) -InstallManPage(gluPickMatrix,$(MANDIR)) -InstallManPage(gluProject,$(MANDIR)) -InstallManPage(gluPwlCurve,$(MANDIR)) -InstallManPage(gluQuadricCallback,$(MANDIR)) -InstallManPage(gluQuadricDrawStyle,$(MANDIR)) -InstallManPage(gluQuadricNormals,$(MANDIR)) -InstallManPage(gluQuadricOrientation,$(MANDIR)) -InstallManPage(gluQuadricTexture,$(MANDIR)) -InstallManPage(gluScaleImage,$(MANDIR)) -InstallManPage(gluSphere,$(MANDIR)) -InstallManPage(gluTessBeginContour,$(MANDIR)) -InstallManPageAliases(gluTessBeginContour,$(MANDIR),gluTessEndContour) -InstallManPage(gluTessBeginPolygon,$(MANDIR)) -InstallManPage(gluTessCallback,$(MANDIR)) -InstallManPage(gluTessEndPolygon,$(MANDIR)) -InstallManPage(gluTessNormal,$(MANDIR)) -InstallManPage(gluTessProperty,$(MANDIR)) -InstallManPage(gluTessVertex,$(MANDIR)) -InstallManPage(gluUnProject,$(MANDIR)) - - -#if 0 -GLUMANDIR = $(OGLSAMPLESRCDIR)/main/doc/man/manglu/standard -GLUSUFFIX = gl -#else -GLUMANDIR = . -GLUSUFFIX = 3gl -#endif - - -LinkFile(gluBeginCurve.$(MSUFF), $(GLUMANDIR)/begincurve.$(GLUSUFFIX)) -LinkFile(gluBeginPolygon.$(MSUFF), $(GLUMANDIR)/beginpolygon.$(GLUSUFFIX)) -LinkFile(gluBeginSurface.$(MSUFF), $(GLUMANDIR)/beginsurface.$(GLUSUFFIX)) -LinkFile(gluBeginTrim.$(MSUFF), $(GLUMANDIR)/begintrim.$(GLUSUFFIX)) -LinkFile(gluBuild1DMipmaps.$(MSUFF), $(GLUMANDIR)/build1dmipmaps.$(GLUSUFFIX)) -LinkFile(gluBuild2DMipmaps.$(MSUFF), $(GLUMANDIR)/build2dmipmaps.$(GLUSUFFIX)) -LinkFile(gluCylinder.$(MSUFF), $(GLUMANDIR)/cylinder.$(GLUSUFFIX)) -LinkFile(gluDeleteNurbsRenderer.$(MSUFF), $(GLUMANDIR)/deletenurbsrenderer.$(GLUSUFFIX)) -LinkFile(gluDeleteQuadric.$(MSUFF), $(GLUMANDIR)/deletequadric.$(GLUSUFFIX)) -LinkFile(gluDeleteTess.$(MSUFF), $(GLUMANDIR)/deletetess.$(GLUSUFFIX)) -LinkFile(gluDisk.$(MSUFF), $(GLUMANDIR)/disk.$(GLUSUFFIX)) -LinkFile(gluErrorString.$(MSUFF), $(GLUMANDIR)/errorstring.$(GLUSUFFIX)) -LinkFile(gluGetNurbsProperty.$(MSUFF), $(GLUMANDIR)/getnurbsproperty.$(GLUSUFFIX)) -LinkFile(gluGetString.$(MSUFF), $(GLUMANDIR)/getstring.$(GLUSUFFIX)) -LinkFile(gluGetTessProperty.$(MSUFF), $(GLUMANDIR)/gettessproperty.$(GLUSUFFIX)) -LinkFile(gluLoadSamplingMatrices.$(MSUFF), $(GLUMANDIR)/loadsamplingmatrices.$(GLUSUFFIX)) -LinkFile(gluLookAt.$(MSUFF), $(GLUMANDIR)/lookat.$(GLUSUFFIX)) -LinkFile(gluNewNurbsRenderer.$(MSUFF), $(GLUMANDIR)/newnurbsrenderer.$(GLUSUFFIX)) -LinkFile(gluNewQuadric.$(MSUFF), $(GLUMANDIR)/newquadric.$(GLUSUFFIX)) -LinkFile(gluNewTess.$(MSUFF), $(GLUMANDIR)/newtess.$(GLUSUFFIX)) -LinkFile(gluNextContour.$(MSUFF), $(GLUMANDIR)/nextcontour.$(GLUSUFFIX)) -LinkFile(gluNurbsCallback.$(MSUFF), $(GLUMANDIR)/nurbscallback.$(GLUSUFFIX)) -LinkFile(gluNurbsCallbackDataEXT.$(MSUFF), $(GLUMANDIR)/nurbscallbackdataext.$(GLUSUFFIX)) -LinkFile(gluNurbsCurve.$(MSUFF), $(GLUMANDIR)/nurbscurve.$(GLUSUFFIX)) -LinkFile(gluNurbsProperty.$(MSUFF), $(GLUMANDIR)/nurbsproperty.$(GLUSUFFIX)) -LinkFile(gluNurbsSurface.$(MSUFF), $(GLUMANDIR)/nurbssurface.$(GLUSUFFIX)) -LinkFile(gluOrtho2D.$(MSUFF), $(GLUMANDIR)/ortho2d.$(GLUSUFFIX)) -LinkFile(gluPartialDisk.$(MSUFF), $(GLUMANDIR)/partialdisk.$(GLUSUFFIX)) -LinkFile(gluPerspective.$(MSUFF), $(GLUMANDIR)/perspective.$(GLUSUFFIX)) -LinkFile(gluPickMatrix.$(MSUFF), $(GLUMANDIR)/pickmatrix.$(GLUSUFFIX)) -LinkFile(gluProject.$(MSUFF), $(GLUMANDIR)/project.$(GLUSUFFIX)) -LinkFile(gluPwlCurve.$(MSUFF), $(GLUMANDIR)/pwlcurve.$(GLUSUFFIX)) -LinkFile(gluQuadricCallback.$(MSUFF), $(GLUMANDIR)/quadriccallback.$(GLUSUFFIX)) -LinkFile(gluQuadricDrawStyle.$(MSUFF), $(GLUMANDIR)/quadricdrawstyle.$(GLUSUFFIX)) -LinkFile(gluQuadricNormals.$(MSUFF), $(GLUMANDIR)/quadricnormals.$(GLUSUFFIX)) -LinkFile(gluQuadricOrientation.$(MSUFF), $(GLUMANDIR)/quadricorientation.$(GLUSUFFIX)) -LinkFile(gluQuadricTexture.$(MSUFF), $(GLUMANDIR)/quadrictexture.$(GLUSUFFIX)) -LinkFile(gluScaleImage.$(MSUFF), $(GLUMANDIR)/scaleimage.$(GLUSUFFIX)) -LinkFile(gluSphere.$(MSUFF), $(GLUMANDIR)/sphere.$(GLUSUFFIX)) -LinkFile(gluTessBeginContour.$(MSUFF), $(GLUMANDIR)/tessbegincontour.$(GLUSUFFIX)) -LinkFile(gluTessBeginPolygon.$(MSUFF), $(GLUMANDIR)/tessbeginpolygon.$(GLUSUFFIX)) -LinkFile(gluTessCallback.$(MSUFF), $(GLUMANDIR)/tesscallback.$(GLUSUFFIX)) -LinkFile(gluTessEndPolygon.$(MSUFF), $(GLUMANDIR)/tessendpolygon.$(GLUSUFFIX)) -LinkFile(gluTessNormal.$(MSUFF), $(GLUMANDIR)/tessnormal.$(GLUSUFFIX)) -LinkFile(gluTessProperty.$(MSUFF), $(GLUMANDIR)/tessproperty.$(GLUSUFFIX)) -LinkFile(gluTessVertex.$(MSUFF), $(GLUMANDIR)/tessvertex.$(GLUSUFFIX)) -LinkFile(gluUnProject.$(MSUFF), $(GLUMANDIR)/unproject.$(GLUSUFFIX)) - diff --git a/doc/gl-docs/GLU/Makefile b/doc/gl-docs/GLU/Makefile deleted file mode 100644 index db0ffdb7..00000000 --- a/doc/gl-docs/GLU/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -# $OpenBSD: Makefile,v 1.1 2012/08/07 21:10:35 matthieu Exp $ - -X11BASE?= /usr/X11R6 -MANDIR?= ${X11BASE}/man/man - -MAN += gluBeginCurve.3 begincurve.3gl -MAN += gluBeginPolygon.3 beginpolygon.3gl -MAN += gluBeginSurface.3 beginsurface.3gl -MAN += gluBeginTrim.3 begintrim.3gl -MAN += gluBuild1DMipmaps.3 build1dmipmaps.3gl -MAN += gluBuild2DMipmaps.3 build2dmipmaps.3gl -MAN += gluCylinder.3 cylinder.3gl -MAN += gluDeleteNurbsRenderer.3 deletenurbsrenderer.3gl -MAN += gluDeleteQuadric.3 deletequadric.3gl -MAN += gluDeleteTess.3 deletetess.3gl -MAN += gluDisk.3 disk.3gl -MAN += gluErrorString.3 errorstring.3gl -MAN += gluGetNurbsProperty.3 getnurbsproperty.3gl -MAN += gluGetString.3 getstring.3gl -MAN += gluGetTessProperty.3 gettessproperty.3gl -MAN += gluLoadSamplingMatrices.3 loadsamplingmatrices.3gl -MAN += gluLookAt.3 lookat.3gl -MAN += gluNewNurbsRenderer.3 newnurbsrenderer.3gl -MAN += gluNewQuadric.3 newquadric.3gl -MAN += gluNewTess.3 newtess.3gl -MAN += gluNextContour.3 nextcontour.3gl -MAN += gluNurbsCallback.3 nurbscallback.3gl -MAN += gluNurbsCallbackDataEXT.3 nurbscallbackdataext.3gl -MAN += gluNurbsCurve.3 nurbscurve.3gl -MAN += gluNurbsProperty.3 nurbsproperty.3gl -MAN += gluNurbsSurface.3 nurbssurface.3gl -MAN += gluOrtho2D.3 ortho2d.3gl -MAN += gluPartialDisk.3 partialdisk.3gl -MAN += gluPerspective.3 perspective.3gl -MAN += gluPickMatrix.3 pickmatrix.3gl -MAN += gluProject.3 project.3gl -MAN += gluPwlCurve.3 pwlcurve.3gl -MAN += gluQuadricCallback.3 quadriccallback.3gl -MAN += gluQuadricDrawStyle.3 quadricdrawstyle.3gl -MAN += gluQuadricNormals.3 quadricnormals.3gl -MAN += gluQuadricOrientation.3 quadricorientation.3gl -MAN += gluQuadricTexture.3 quadrictexture.3gl -MAN += gluScaleImage.3 scaleimage.3gl -MAN += gluSphere.3 sphere.3gl -MAN += gluTessBeginContour.3 tessbegincontour.3gl -MAN += gluTessBeginPolygon.3 tessbeginpolygon.3gl -MAN += gluTessCallback.3 tesscallback.3gl -MAN += gluTessEndPolygon.3 tessendpolygon.3gl -MAN += gluTessNormal.3 tessnormal.3gl -MAN += gluTessProperty.3 tessproperty.3gl -MAN += gluTessVertex.3 tessvertex.3gl -MAN += gluUnProject.3 unproject.3gl - - -LINKS += gluBeginCurve.3 gluEndCurve.3 -LINKS += gluBeginPolygon.3 gluEndPolygon.3 -LINKS += gluBeginSurface.3 gluEndSurface.3 -LINKS += gluBeginTrim.3 gluEndTrim.3 -LINKS += gluTessBeginContour.3 gluTessEndContour.3 - -.include "../Makefile.inc" -.include diff --git a/doc/gl-docs/GLU/begincurve.3gl b/doc/gl-docs/GLU/begincurve.3gl deleted file mode 100644 index 6956baf6..00000000 --- a/doc/gl-docs/GLU/begincurve.3gl +++ /dev/null @@ -1,65 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 begincurv -.ds Xs 19309 4 begincurve.gl -.TH GLUBEGINCURVE 3G -.SH NAME -.B "gluBeginCurve, gluEndCurve -\- delimit a NURBS curve definition - -.SH C SPECIFICATION -void \f3gluBeginCurve\fP( -GLUnurbs* \fInurb\fP ) -.nf -.fi - -void \f3gluEndCurve\fP( -GLUnurbs* \fInurb\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2nurb\fP\ \ 'u -\f2nurb\fP -Specifies the NURBS object (created with \%\f3gluNewNurbsRenderer\fP). -.SH DESCRIPTION -Use \%\f3gluBeginCurve\fP to mark the beginning of a NURBS -curve definition. -After -calling \%\f3gluBeginCurve\fP, make one or more calls to -\%\f3gluNurbsCurve\fP to define the attributes of the curve. -Exactly one of the calls to \%\f3gluNurbsCurve\fP must have -a curve type of \%\f3GL_MAP1_VERTEX_3\fP or \%\f3GL_MAP1_VERTEX_4\fP. -To mark the end of the NURBS curve definition, call \%\f3gluEndCurve\fP. -.P -GL evaluators are used to render the NURBS curve as a series of line -segments. -Evaluator state is preserved during rendering -with \f3glPushAttrib\fP(\%\f3GL_EVAL_BIT\fP) and -\f3glPopAttrib\fP(). -See the \f3glPushAttrib\fP reference page for details on exactly what state -these calls preserve. -.SH EXAMPLE -The following commands render a textured NURBS curve with normals; -texture coordinates and normals are also specified as NURBS curves: -.sp -.Ex -gluBeginCurve(nobj); - gluNurbsCurve(nobj, ..., GL_MAP1_TEXTURE_COORD_2); - gluNurbsCurve(nobj, ..., GL_MAP1_NORMAL); - gluNurbsCurve(nobj, ..., GL_MAP1_VERTEX_4); -gluEndCurve(nobj); -.Ee -.SH SEE ALSO -\%\f3gluBeginSurface(3G)\fP, \%\f3gluBeginTrim(3G)\fP, \%\f3gluNewNurbsRenderer(3G)\fP, -\%\f3gluNurbsCurve(3G)\fP, -\f3glPopAttrib(3G)\fP, \f3glPushAttrib(3G)\fP - diff --git a/doc/gl-docs/GLU/beginpolygon.3gl b/doc/gl-docs/GLU/beginpolygon.3gl deleted file mode 100644 index 6e8e50d9..00000000 --- a/doc/gl-docs/GLU/beginpolygon.3gl +++ /dev/null @@ -1,76 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 beginpoly -.ds Xs 33625 4 beginpolygon.gl -.TH GLUBEGINPOLYGON 3G -.SH NAME -.B "gluBeginPolygon, gluEndPolygon -\- delimit a polygon description - -.SH C SPECIFICATION -void \f3gluBeginPolygon\fP( -GLUtesselator* \fItess\fP ) -.nf -.fi - -void \f3gluEndPolygon\fP( -GLUtesselator* \fItess\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2tess\fP\ \ 'u -\f2tess\fP -Specifies the tessellation object (created with \%\f3gluNewTess\fP). -.SH DESCRIPTION -\%\f3gluBeginPolygon\fP and \%\f3gluEndPolygon\fP delimit the definition of a -nonconvex polygon. -To define such a polygon, first call \%\f3gluBeginPolygon\fP. -Then define the contours of the polygon -by calling -\%\f3gluTessVertex\fP for each vertex -and \%\f3gluNextContour\fP to start each new contour. -Finally, call \%\f3gluEndPolygon\fP -to signal the end of the definition. -See the \%\f3gluTessVertex\fP and -\%\f3gluNextContour\fP reference pages for more details. -.P -Once \%\f3gluEndPolygon\fP is called, the polygon is tessellated, and the -resulting triangles are described through callbacks. -See \%\f3gluTessCallback\fP for descriptions of the callback functions. -.SH NOTES -This command is obsolete and is provided for backward compatibility -only. Calls to \%\f3gluBeginPolygon\fP are mapped to -\%\f3gluTessBeginPolygon\fP -followed by -\%\f3gluTessBeginContour\fP. Calls to \%\f3gluEndPolygon\fP are mapped -to \%\f3gluTessEndContour\fP followed by \%\f3gluTessEndPolygon\fP. -.SH EXAMPLE -A quadrilateral with a triangular hole in it can be described like this: -.sp -.Ex -gluBeginPolygon(tobj); - gluTessVertex(tobj, v1, v1); - gluTessVertex(tobj, v2, v2); - gluTessVertex(tobj, v3, v3); - gluTessVertex(tobj, v4, v4); -gluNextContour(tobj, GLU_INTERIOR); - gluTessVertex(tobj, v5, v5); - gluTessVertex(tobj, v6, v6); - gluTessVertex(tobj, v7, v7); -gluEndPolygon(tobj); -.Ee -.SH SEE ALSO -\%\f3gluNewTess(3G)\fP, \%\f3gluNextContour(3G)\fP, \%\f3gluTessCallback(3G)\fP, \%\f3gluTessVertex(3G)\fP, -\%\f3gluTessBeginPolygon(3G)\fP, \%\f3gluTessBeginContour(3G)\fP - - - diff --git a/doc/gl-docs/GLU/beginsurface.3gl b/doc/gl-docs/GLU/beginsurface.3gl deleted file mode 100644 index 4a7ff6b1..00000000 --- a/doc/gl-docs/GLU/beginsurface.3gl +++ /dev/null @@ -1,70 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 beginsurf -.ds Xs 47264 4 beginsurface.gl -.TH GLUBEGINSURFACE 3G -.SH NAME -.B "gluBeginSurface, gluEndSurface -\- delimit a NURBS surface definition - -.SH C SPECIFICATION -void \f3gluBeginSurface\fP( -GLUnurbs* \fInurb\fP ) -.nf -.fi - -void \f3gluEndSurface\fP( -GLUnurbs* \fInurb\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2nurb\fP\ \ 'u -\f2nurb\fP -Specifies the NURBS object (created with \%\f3gluNewNurbsRenderer\fP). -.SH DESCRIPTION -Use \%\f3gluBeginSurface\fP to mark the beginning of a NURBS -surface definition. After -calling \%\f3gluBeginSurface\fP, make one or more calls to -\%\f3gluNurbsSurface\fP to define the attributes of the surface. -Exactly one of these calls to \%\f3gluNurbsSurface\fP must have a -surface type of \%\f3GL_MAP2_VERTEX_3\fP or \%\f3GL_MAP2_VERTEX_4\fP. -To mark the end of the NURBS surface definition, call -\%\f3gluEndSurface\fP. -.P -Trimming of NURBS surfaces is supported with \%\f3gluBeginTrim\fP, -\%\f3gluPwlCurve\fP, \%\f3gluNurbsCurve\fP, and \%\f3gluEndTrim\fP. See the -\%\f3gluBeginTrim\fP reference page for details. -.P -GL evaluators are used to render the NURBS surface as a set of polygons. -Evaluator state is preserved during rendering -with \f3glPushAttrib\fP(\%\f3GL_EVAL_BIT\fP) and -\f3glPopAttrib\fP(). -See the \f3glPushAttrib\fP reference page for details on exactly what state -these calls preserve. -.SH EXAMPLE -The following commands render a textured NURBS surface with normals; -the texture coordinates and normals are also described as NURBS surfaces: -.sp -.Ex -gluBeginSurface(nobj); - gluNurbsSurface(nobj, ..., GL_MAP2_TEXTURE_COORD_2); - gluNurbsSurface(nobj, ..., GL_MAP2_NORMAL); - gluNurbsSurface(nobj, ..., GL_MAP2_VERTEX_4); -gluEndSurface(nobj); -.Ee -.sp -.SH SEE ALSO -\%\f3gluBeginCurve(3G)\fP, \%\f3gluBeginTrim(3G)\fP, \%\f3gluNewNurbsRenderer(3G)\fP, -\%\f3gluNurbsCurve(3G)\fP, \%\f3gluNurbsSurface(3G)\fP, \%\f3gluPwlCurve(3G)\fP - - - diff --git a/doc/gl-docs/GLU/begintrim.3gl b/doc/gl-docs/GLU/begintrim.3gl deleted file mode 100644 index 028fcd1a..00000000 --- a/doc/gl-docs/GLU/begintrim.3gl +++ /dev/null @@ -1,106 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 begintrim -.ds Xs 15822 6 begintrim.gl -.TH GLUBEGINTRIM 3G -.SH NAME -.B "gluBeginTrim, gluEndTrim -\- delimit a NURBS trimming loop definition - -.SH C SPECIFICATION -void \f3gluBeginTrim\fP( -GLUnurbs* \fInurb\fP ) -.nf -.fi - -void \f3gluEndTrim\fP( -GLUnurbs* \fInurb\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2nurb\fP\ \ 'u -\f2nurb\fP -Specifies the NURBS object (created with \%\f3gluNewNurbsRenderer\fP). -.SH DESCRIPTION -Use \%\f3gluBeginTrim\fP to mark the beginning of a -trimming loop, and \%\f3gluEndTrim\fP to mark the end -of a trimming loop. A trimming loop is -a set of oriented curve segments (forming a closed curve) that -define boundaries of a NURBS surface. You include these -trimming loops in the definition of a NURBS -surface, between calls to \%\f3gluBeginSurface\fP and \%\f3gluEndSurface\fP. -.P -The definition for a NURBS surface can contain many -trimming loops. For example, if you wrote a definition -for a NURBS surface that resembled a rectangle with -a hole punched out, the definition would contain two -trimming loops. One loop would define the outer edge -of the rectangle; the other would define -the hole punched out of the rectangle. The definitions -of each of these trimming loops would be bracketed by a -\%\f3gluBeginTrim\fP/\%\f3gluEndTrim\fP pair. -.P -The definition of a single closed trimming loop can consist -of multiple curve segments, each described as a piecewise -linear curve (see \%\f3gluPwlCurve\fP) or as a single NURBS -curve (see \%\f3gluNurbsCurve\fP), or as a combination of -both in any order. The only library calls that can -appear in a trimming loop definition (between the calls -to \%\f3gluBeginTrim\fP and \%\f3gluEndTrim\fP) are -\%\f3gluPwlCurve\fP and \%\f3gluNurbsCurve\fP. -.P -The area of the NURBS surface that is displayed is the -region in the domain to the left of the trimming curve -as the curve parameter increases. Thus, the retained -region of the NURBS surface is inside a -counterclockwise trimming loop and outside a clockwise -trimming loop. For the rectangle mentioned earlier, -the trimming loop for the outer edge of the rectangle runs -counterclockwise, while the trimming loop for the punched-out hole -runs clockwise. -.P -If you use more than one curve to define a single trimming -loop, the curve segments must form a closed loop (that is, -the endpoint of each curve must be the starting point of the -next curve, and the endpoint of the final curve must -be the starting point of the first curve). If the -endpoints of the curve are sufficiently close together -but not exactly coincident, they will be coerced to match. -If the endpoints are not sufficiently close, an error results -(see \%\f3gluNurbsCallback\fP). -.P -If a trimming loop definition contains multiple curves, -the direction of the curves must be consistent (that is, the -inside must be to the left of all of the curves). Nested -trimming loops are legal as long as the curve orientations -alternate correctly. -If trimming curves are self-intersecting, -or intersect one another, an error results. -.P -If no trimming information is given -for a NURBS surface, the entire surface is drawn. -.SH EXAMPLE -This code fragment defines a trimming loop that consists of one -piecewise linear curve, and two NURBS curves: -.sp -.Ex -gluBeginTrim(nobj); - gluPwlCurve(..., GLU_MAP1_TRIM_2); - gluNurbsCurve(..., GLU_MAP1_TRIM_2); - gluNurbsCurve(..., GLU_MAP1_TRIM_3); -gluEndTrim(nobj); -.Ee -.SH SEE ALSO -\%\f3gluBeginSurface(3G)\fP, \%\f3gluNewNurbsRenderer(3G)\fP, \%\f3gluNurbsCallback(3G)\fP, -\%\f3gluNurbsCurve(3G)\fP, \%\f3gluPwlCurve(3G)\fP - - diff --git a/doc/gl-docs/GLU/build1dmipmaplevels.3gl b/doc/gl-docs/GLU/build1dmipmaplevels.3gl deleted file mode 100644 index 06a32827..00000000 --- a/doc/gl-docs/GLU/build1dmipmaplevels.3gl +++ /dev/null @@ -1,228 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 build1dmi -.ds Xs 15416 9 build1dmipmaplevels.gl -.TH GLUBUILD1DMIPMAPLEVELS 3G -.SH NAME -.B "gluBuild1DMipmapLevels -\- builds a subset of one-dimensional mipmap levels - -.SH C SPECIFICATION -GLint \f3gluBuild1DMipmapLevels\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3GLint \fPgluBuild1DMipmapLevels( 'u - GLint \fIinternalFormat\fP, - GLsizei \fIwidth\fP, - GLenum \fIformat\fP, - GLenum \fItype\fP, - GLint \fIlevel\fP, - GLint \fIbase\fP, - GLint \fImax\fP, - const void \fI*data\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIinternalFormat\fP\ \ 'u -\f2target\fP -Specifies the target texture. Must be \%\f3GL_TEXTURE_1D\fP. -.TP -\f2internalFormat\fP -Requests the internal storage of the texture image. The most -current version of the SGI implementation of GLU does not check this -value for validity before passing it on to the underlying OpenGL -implementation. A value that is not accepted by the OpenGL -implementation will lead to an OpenGL error. The benefit of not -checking this value at the GLU level is that OpenGL extensions can add -new internal texture formats without requiring a revision of the GLU -implementation. Older implementations of GLU check this value and -raise a GLU error if it is not 1, 2, 3, or 4 or one of the following -symbolic constants: -\%\f3GL_ALPHA\fP, -\%\f3GL_ALPHA4\fP, -\%\f3GL_ALPHA8\fP, -\%\f3GL_ALPHA12\fP, -\%\f3GL_ALPHA16\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE4\fP, -\%\f3GL_LUMINANCE8\fP, -\%\f3GL_LUMINANCE12\fP, -\%\f3GL_LUMINANCE16\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_LUMINANCE4_ALPHA4\fP, -\%\f3GL_LUMINANCE6_ALPHA2\fP, -\%\f3GL_LUMINANCE8_ALPHA8\fP, -\%\f3GL_LUMINANCE12_ALPHA4\fP, -\%\f3GL_LUMINANCE12_ALPHA12\fP, -\%\f3GL_LUMINANCE16_ALPHA16\fP, -\%\f3GL_INTENSITY\fP, -\%\f3GL_INTENSITY4\fP, -\%\f3GL_INTENSITY8\fP, -\%\f3GL_INTENSITY12\fP, -\%\f3GL_INTENSITY16\fP, -\%\f3GL_RGB\fP, -\%\f3GL_R3_G3_B2\fP, -\%\f3GL_RGB4\fP, -\%\f3GL_RGB5\fP, -\%\f3GL_RGB8\fP, -\%\f3GL_RGB10\fP, -\%\f3GL_RGB12\fP, -\%\f3GL_RGB16\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_RGBA2\fP, -\%\f3GL_RGBA4\fP, -\%\f3GL_RGB5_A1\fP, -\%\f3GL_RGBA8\fP, -\%\f3GL_RGB10_A2\fP, -\%\f3GL_RGBA12\fP or -\%\f3GL_RGBA16\fP. -.TP -\f2width\fP -Specifies the width in pixels of the texture image. -This should be a power of 2. -.TP -\f2format\fP -Specifies the of the pixel data. -Must be one of: -\%\f3GL_COLOR_INDEX\fP, -\%\f3GL_DEPTH_COMPONENT\fP, -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGR\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, or -\%\f3GL_LUMINANCE_ALPHA\fP. -.TP -\f2type\fP -Specifies the data type for \f2data\fP. -Must be one of: \%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP. -.TP -\f2level\fP -Specifies the mipmap level of the image data. -.TP -\f2base\fP -Specifies the minimum mipmap level to pass to \f3glTexImage1D\fP. -.TP -\f2max\fP -Specifies the maximum mipmap level to pass to \f3glTexImage1D\fP. -.TP -\f2data\fP -Specifies a pointer to the image data in memory. -.SH DESCRIPTION -\%\f3gluBuild1DMipmapLevels\fP builds a subset of prefiltered one-dimensional texture maps of decreasing -resolutions called a mipmap. This is used for the antialiasing of -texture mapped primitives. -.P -A return value of zero indicates success, otherwise a GLU error code is -returned (see \%\f3gluErrorString\fP). -.P -A series of mipmap levels from \f2base\fP to \f2max\fP is built by decimating -\f2data\fP in half -until size $1 ~times~ 1$ is reached. At each level, each texel in the -halved mipmap level is an average of the corresponding two texels in the larger -mipmap level. -\f3glTexImage1D\fP is called to load these mipmap levels from \f2base\fP -to \f2max\fP. If \f2max\fP is larger than the highest mipmap level for the -texture of the specified size, then a GLU error code is returned (see -\%\f3gluErrorString\fP) and nothing is loaded. -.P -For example, if \f2level\fP is 2 and \f2width\fP is 16, the -following levels are possible: $16 ~times~ 1$, $8 ~times~ 1$, $4 ~times~ 1$, -$2 ~times~ 1$, $1 ~times~ 1$. These correspond -to levels 2 through 6 respectively. -If \f2base\fP is 3 and \f2max\fP is 5, then only mipmap levels $8 ~times~ 1$, -$4 ~times~ 1$ and $2 ~times~ 1$ are -loaded. However, if \f2max\fP is 7 then an error is returned and nothing is -loaded since \f2max\fP is larger than the highest mipmap level which is, in -this case, 6. -.P -The highest mipmap level can be derived from the formula -${log sub 2} (\f2width\fP^{2 sup \f2level\fP})$. -.P -See the \f3glTexImage1D\fP reference page for a description of the -acceptable values for \f2type\fP parameter. See the \f3glDrawPixels\fP -reference page for a description of the acceptable values -for \f2level\fP parameter. -.bp -.SH NOTES -\%\f3gluBuild1DMipmapLevels\fP is only available if the GLU version is 1.3 or greater. -.P -Formats \%\f3GL_BGR\fP, and \%\f3GL_BGRA\fP, and types -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP are only available if the GL version -is 1.2 or greater. -.SH ERRORS -\%\f3GLU_INVALID_VALUE\fP is returned if \f2level\fP > \f2base\fP, \f2base\fP < 0, -\f2max\fP < \f2base\fP or \f2max\fP is > the highest mipmap level for \f2data\fP. -.P -\%\f3GLU_INVALID_VALUE\fP is returned if \f2width\fP is < 1. -.P -\%\f3GLU_INVALID_ENUM\fP is returned if \f2internalFormat\fP, \f2format\fP, or \f2type\fP are not -legal. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_BYTE_3_3_2\fP or \%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_SHORT_5_6_5\fP or \%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP or \%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP or \%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_INT_8_8_8_8\fP or \%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_INT_10_10_10_2\fP or \%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.SH SEE ALSO -\f3glDrawPixels(3G)\fP, \f3glTexImage1D(3G)\fP, \f3glTexImage2D(3G)\fP, -\f3glTexImage3D(3G)\fP, -\%\f3gluBuild1DMipmaps(3G)\fP, \%\f3gluBuild2DMipmaps(3G)\fP, \%\f3gluBuild3DMipmaps(3G)\fP, -\%\f3gluErrorString(3G)\fP, -\f3glGetTexImage(3G)\fP, -\f3glGetTexLevelParameter(3G)\fP, -\%\f3gluBuild2DMipmapLevels(3G)\fP, \%\f3gluBuild3DMipmapLevels(3G)\fP diff --git a/doc/gl-docs/GLU/build1dmipmaps.3gl b/doc/gl-docs/GLU/build1dmipmaps.3gl deleted file mode 100644 index 22577b19..00000000 --- a/doc/gl-docs/GLU/build1dmipmaps.3gl +++ /dev/null @@ -1,228 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 build1dmi -.ds Xs 40806 9 build1dmipmaps.gl -.TH GLUBUILD1DMIPMAPS 3G -.SH NAME -.B "gluBuild1DMipmaps -\- builds a one-dimensional mipmap - -.SH C SPECIFICATION -GLint \f3gluBuild1DMipmaps\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3GLint \fPgluBuild1DMipmaps( 'u - GLint \fIinternalFormat\fP, - GLsizei \fIwidth\fP, - GLenum \fIformat\fP, - GLenum \fItype\fP, - const void \fI*data\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIinternalFormat\fP\ \ 'u -\f2target\fP -Specifies the target texture. Must be \%\f3GL_TEXTURE_1D\fP. -.TP -\f2internalFormat\fP -Requests the internal storage of the texture image. The most -current version of the SGI implementation of GLU does not check this -value for validity before passing it on to the underlying OpenGL -implementation. A value that is not accepted by the OpenGL -implementation will lead to an OpenGL error. The benefit of not -checking this value at the GLU level is that OpenGL extensions can add -new internal texture formats without requiring a revision of the GLU -implementation. Older implementations of GLU check this value and -raise a GLU error if it is not 1, 2, 3, or 4 or one of the following -symbolic constants: -\%\f3GL_ALPHA\fP, -\%\f3GL_ALPHA4\fP, -\%\f3GL_ALPHA8\fP, -\%\f3GL_ALPHA12\fP, -\%\f3GL_ALPHA16\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE4\fP, -\%\f3GL_LUMINANCE8\fP, -\%\f3GL_LUMINANCE12\fP, -\%\f3GL_LUMINANCE16\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_LUMINANCE4_ALPHA4\fP, -\%\f3GL_LUMINANCE6_ALPHA2\fP, -\%\f3GL_LUMINANCE8_ALPHA8\fP, -\%\f3GL_LUMINANCE12_ALPHA4\fP, -\%\f3GL_LUMINANCE12_ALPHA12\fP, -\%\f3GL_LUMINANCE16_ALPHA16\fP, -\%\f3GL_INTENSITY\fP, -\%\f3GL_INTENSITY4\fP, -\%\f3GL_INTENSITY8\fP, -\%\f3GL_INTENSITY12\fP, -\%\f3GL_INTENSITY16\fP, -\%\f3GL_RGB\fP, -\%\f3GL_R3_G3_B2\fP, -\%\f3GL_RGB4\fP, -\%\f3GL_RGB5\fP, -\%\f3GL_RGB8\fP, -\%\f3GL_RGB10\fP, -\%\f3GL_RGB12\fP, -\%\f3GL_RGB16\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_RGBA2\fP, -\%\f3GL_RGBA4\fP, -\%\f3GL_RGB5_A1\fP, -\%\f3GL_RGBA8\fP, -\%\f3GL_RGB10_A2\fP, -\%\f3GL_RGBA12\fP, or -\%\f3GL_RGBA16\fP. -.TP -\f2width\fP -Specifies the width, in pixels, of the texture image. -.TP -\f2format\fP -Specifies the of the pixel data. -Must be one of -\%\f3GL_COLOR_INDEX\fP, -\%\f3GL_DEPTH_COMPONENT\fP, -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGR\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE_ALPHA\fP. -.TP -\f2type\fP -Specifies the data type for \f2data\fP. -Must be one of -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP. -.TP -\f2data\fP -Specifies a pointer to the image data in memory. -.SH DESCRIPTION -\%\f3gluBuild1DMipmaps\fP builds a series of prefiltered one-dimensional texture maps of decreasing -resolutions called a mipmap. This is used for the antialiasing of -texture mapped primitives. -.P -A return value of zero indicates success, otherwise a GLU error code is -returned (see \%\f3gluErrorString\fP). -.P -Initially, the \f2width\fP of \f2data\fP is checked to see if it is -a power of 2. If not, a copy of \f2data\fP is scaled up or down to the -nearest power of 2. (If \f2width\fP is exactly between powers of 2, then -the copy of \f2data\fP will scale upwards.) This copy will be used for -subsequent mipmapping operations described below. -For example, if \f2width\fP is 57 then a copy of \f2data\fP -will scale up to 64 before mipmapping -takes place. -.P -Then, proxy textures (see \f3glTexImage1D\fP) are used to determine if -the implementation can fit the requested texture. If not, \f2width\fP is -continually halved until it fits. -.P -Next, a series of mipmap levels is built by decimating a copy of -\f2data\fP in half -until size $1 ~times~ 1$ is reached. At each level, each texel in the -halved mipmap level is an average of the corresponding two texels in the larger -mipmap level. -.P -\f3glTexImage1D\fP is called to load each of these mipmap levels. -Level 0 is a copy of \f2data\fP. -The highest level is ${log sub 2}(\f2width\fP)$. -For example, if \f2width\fP is 64 and the implementation can store a texture of -this size, the following mipmap levels are -built: $64 ~times~ 1$, $32 ~times~ 1$, $16 ~times~ 1$, $8 ~times~ 1$, -$4 ~times~ 1$, $2 ~times~ 1$ and $1 ~times~ 1$. These correspond to -levels 0 through 6, respectively. -.P -See the \f3glTexImage1D\fP reference page for a description of the -acceptable values for the \f2type\fP parameter. See the \f3glDrawPixels\fP -reference page for a description of the acceptable values -for the \f2data\fP parameter. -.SH NOTES -Note that there is no direct way of querying the maximum level. This can -be derived indirectly via \f3glGetTexLevelParameter\fP. First, query -for the -width actually used at level 0. -(The width may not be equal to \f2width\fP since -proxy textures might have scaled it to fit the implementation.) -Then the maximum -level can be derived from the formula ${log sub 2}(\f2width\fP)$. -.P -Formats \%\f3GL_BGR\fP, and \%\f3GL_BGRA\fP, and types -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP are only available if the GL version -is 1.2 or greater, and if the GLU version is 1.3 or greater. -.SH ERRORS -\%\f3GLU_INVALID_VALUE\fP is returned if \f2width\fP is < 1. -.P -\%\f3GLU_INVALID_ENUM\fP is returned if \f2format\fP or \f2type\fP are not legal. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_BYTE_3_3_2\fP or \%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_SHORT_5_6_5\fP or \%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP or \%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP or \%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_INT_8_8_8_8\fP or \%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_INT_10_10_10_2\fP or \%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.SH SEE ALSO -\f3glDrawPixels(3G)\fP, -\f3glTexImage1D(3G)\fP, -\f3glTexImage2D(3G)\fP, -\f3glTexImage3D(3G)\fP, -\%\f3gluBuild2DMipmaps(3G)\fP, -\%\f3gluBuild3DMipmaps(3G)\fP, -\%\f3gluErrorString(3G)\fP, -\f3glGetTexImage(3G)\fP, -\f3glGetTexLevelParameter(3G)\fP, -\%\f3gluBuild1DMipmapLevels(3G)\fP, -\%\f3gluBuild2DMipmapLevels(3G)\fP, -\%\f3gluBuild3DMipmapLevels(3G)\fP diff --git a/doc/gl-docs/GLU/build2dmipmaplevels.3gl b/doc/gl-docs/GLU/build2dmipmaplevels.3gl deleted file mode 100644 index 37cdf02b..00000000 --- a/doc/gl-docs/GLU/build2dmipmaplevels.3gl +++ /dev/null @@ -1,234 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 build2dmi -.ds Xs 35570 9 build2dmipmaplevels.gl -.TH GLUBUILD2DMIPMAPLEVELS 3G -.SH NAME -.B "gluBuild2DMipmapLevels -\- builds a subset of two-dimensional mipmap levels - -.SH C SPECIFICATION -GLint \f3gluBuild2DMipmapLevels\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3GLint \fPgluBuild2DMipmapLevels( 'u - GLint \fIinternalFormat\fP, - GLsizei \fIwidth\fP, - GLsizei \fIheight\fP, - GLenum \fIformat\fP, - GLenum \fItype\fP, - GLint \fIlevel\fP, - GLint \fIbase\fP, - GLint \fImax\fP, - const void \fI*data\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIinternalFormat\fP\ \ 'u -\f2target\fP -Specifies the target texture. Must be \%\f3GL_TEXTURE_2D\fP. -.TP -\f2internalFormat\fP -Requests the internal storage of the texture image. The most -current version of the SGI implementation of GLU does not check this -value for validity before passing it on to the underlying OpenGL -implementation. A value that is not accepted by the OpenGL -implementation will lead to an OpenGL error. The benefit of not -checking this value at the GLU level is that OpenGL extensions can add -new internal texture formats without requiring a revision of the GLU -implementation. Older implementations of GLU check this value and -raise a GLU error if it is not 1, 2, 3, or 4 or one of the following -symbolic constants: -\%\f3GL_ALPHA\fP, -\%\f3GL_ALPHA4\fP, -\%\f3GL_ALPHA8\fP, -\%\f3GL_ALPHA12\fP, -\%\f3GL_ALPHA16\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE4\fP, -\%\f3GL_LUMINANCE8\fP, -\%\f3GL_LUMINANCE12\fP, -\%\f3GL_LUMINANCE16\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_LUMINANCE4_ALPHA4\fP, -\%\f3GL_LUMINANCE6_ALPHA2\fP, -\%\f3GL_LUMINANCE8_ALPHA8\fP, -\%\f3GL_LUMINANCE12_ALPHA4\fP, -\%\f3GL_LUMINANCE12_ALPHA12\fP, -\%\f3GL_LUMINANCE16_ALPHA16\fP, -\%\f3GL_INTENSITY\fP, -\%\f3GL_INTENSITY4\fP, -\%\f3GL_INTENSITY8\fP, -\%\f3GL_INTENSITY12\fP, -\%\f3GL_INTENSITY16\fP, -\%\f3GL_RGB\fP, -\%\f3GL_R3_G3_B2\fP, -\%\f3GL_RGB4\fP, -\%\f3GL_RGB5\fP, -\%\f3GL_RGB8\fP, -\%\f3GL_RGB10\fP, -\%\f3GL_RGB12\fP, -\%\f3GL_RGB16\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_RGBA2\fP, -\%\f3GL_RGBA4\fP, -\%\f3GL_RGB5_A1\fP, -\%\f3GL_RGBA8\fP, -\%\f3GL_RGB10_A2\fP, -\%\f3GL_RGBA12\fP or -\%\f3GL_RGBA16\fP. -.TP -\f2width\fP, \f2height\fP -Specifies the width and height, respectively, in pixels of the texture image. -These should be a power of 2. -.TP -\f2format\fP -Specifies the of the pixel data. -Must be one of -\%\f3GL_COLOR_INDEX\fP, -\%\f3GL_DEPTH_COMPONENT\fP, -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGR\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, or -\%\f3GL_LUMINANCE_ALPHA\fP. -.TP -\f2type\fP -Specifies the data type for \f2data\fP. -Must be one of -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP. -.TP -\f2level\fP -Specifies the mipmap level of the image data. -.TP -\f2base\fP -Specifies the minimum mipmap level to pass to \f3glTexImage2D\fP. -.TP -\f2max\fP -Specifies the maximum mipmap level to pass to \f3glTexImage2D\fP. -.TP -\f2data\fP -Specifies a pointer to the image data in memory. -.SH DESCRIPTION -\%\f3gluBuild2DMipmapLevels\fP builds a subset of prefiltered two-dimensional texture maps of decreasing -resolutions called a mipmap. This is used for the antialiasing of -texture mapped primitives. -.P -A return value of zero indicates success, otherwise a GLU error code is -returned (see \%\f3gluErrorString\fP). -.P -A series of mipmap levels from \f2base\fP to \f2max\fP is built by decimating -\f2data\fP in half along -both dimensions until size $1 ~times~ 1$ is reached. At each level, each texel in the -halved mipmap level is an average of the corresponding four texels in the larger -mipmap level. (In the case of rectangular images, the decimation will ultimately -reach an $N ~times~ 1$ or $1 ~times~ N$ configuration. Here, two texels are -averaged instead.) -\f3glTexImage2D\fP is called to load these mipmap levels from \f2base\fP -to \f2max\fP. If \f2max\fP is larger than the highest mipmap level for the -texture of the specified size, then a GLU error code is returned (see -\%\f3gluErrorString\fP) and nothing is loaded. -.P -For example, if \f2level\fP is 2 and \f2width\fP is 16 and \f2height\fP is 8, the -following levels are possible: $16 ~times~ 8$, $8 ~times~ 4$, $4 ~times~ 2$, -$2 ~times~ 1$, $1 ~times~ 1$. These correspond to levels 2 through 6 -respectively. If \f2base\fP is 3 and \f2max\fP is 5, then only mipmap levels -$8 ~times~ 4$, $4 ~times~ 2$ and $2 ~times~ 1$ are loaded. However, if \f2max\fP -is 7 then an error is returned and nothing is loaded since \f2max\fP is -larger than the highest mipmap level which is, in this case, 6. -.P -The highest mipmap level can be derived from the formula -log2(max(\f2width\fP,\f2height\fP)*(2^\f2level\fP)). -.P -See the \f3glTexImage1D\fP reference page for a description of the -acceptable values for \f2format\fP parameter. See the \f3glDrawPixels\fP -reference page for a description of the acceptable values -for \f2type\fP parameter. -.SH NOTES -\%\f3gluBuild2DMipmapLevels\fP is only available if the GLU version is 1.3 or greater. -.P -Formats \%\f3GL_BGR\fP, and \%\f3GL_BGRA\fP, and types -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP are only available if the GL version -is 1.2 or greater. -.SH ERRORS -\%\f3GLU_INVALID_VALUE\fP is returned if \f2level\fP > \f2base\fP, \f2base\fP < 0, -\f2max\fP < \f2base\fP or \f2max\fP is > the highest mipmap level for \f2data\fP. -.P -\%\f3GLU_INVALID_VALUE\fP is returned if \f2width\fP or \f2height\fP is < 1. -.P -\%\f3GLU_INVALID_ENUM\fP is returned if \f2internalFormat\fP, \f2format\fP, or \f2type\fP is not -legal. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_BYTE_3_3_2\fP or \%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_SHORT_5_6_5\fP or \%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP or \%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP or \%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_INT_8_8_8_8\fP or \%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_INT_10_10_10_2\fP or \%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.SH SEE ALSO -\f3glDrawPixels(3G)\fP, -\f3glTexImage1D(3G)\fP, -\f3glTexImage2D(3G)\fP, -\f3glTexImage3D(3G)\fP, -\%\f3gluBuild1DMipmaps(3G)\fP, -\%\f3gluBuild2DMipmaps(3G)\fP, -\%\f3gluBuild3DMipmaps(3G)\fP, -\%\f3gluErrorString(3G)\fP, -\f3glGetTexImage(3G)\fP, -\f3glGetTexLevelParameter(3G)\fP, -\%\f3gluBuild1DMipmapLevels(3G)\fP, -\%\f3gluBuild3DMipmapLevels(3G)\fP diff --git a/doc/gl-docs/GLU/build2dmipmaps.3gl b/doc/gl-docs/GLU/build2dmipmaps.3gl deleted file mode 100644 index e7d970c6..00000000 --- a/doc/gl-docs/GLU/build2dmipmaps.3gl +++ /dev/null @@ -1,236 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 build2dmi -.ds Xs 21901 10 build2dmipmaps.gl -.TH GLUBUILD2DMIPMAPS 3G -.SH NAME -.B "gluBuild2DMipmaps -\- builds a two-dimensional mipmap - -.SH C SPECIFICATION -GLint \f3gluBuild2DMipmaps\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3GLint \fPgluBuild2DMipmaps( 'u - GLint \fIinternalFormat\fP, - GLsizei \fIwidth\fP, - GLsizei \fIheight\fP, - GLenum \fIformat\fP, - GLenum \fItype\fP, - const void \fI*data\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIinternalFormat\fP\ \ 'u -\f2target\fP -Specifies the target texture. Must be \%\f3GL_TEXTURE_2D\fP. -.TP -\f2internalFormat\fP -Requests the internal storage of the texture image. The most -current version of the SGI implementation of GLU does not check this -value for validity before passing it on to the underlying OpenGL -implementation. A value that is not accepted by the OpenGL -implementation will lead to an OpenGL error. The benefit of not -checking this value at the GLU level is that OpenGL extensions can add -new internal texture formats without requiring a revision of the GLU -implementation. Older implementations of GLU check this value and -raise a GLU error if it is not 1, 2, 3, or 4 or one of the following -symbolic constants: -\%\f3GL_ALPHA\fP, -\%\f3GL_ALPHA4\fP, -\%\f3GL_ALPHA8\fP, -\%\f3GL_ALPHA12\fP, -\%\f3GL_ALPHA16\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE4\fP, -\%\f3GL_LUMINANCE8\fP, -\%\f3GL_LUMINANCE12\fP, -\%\f3GL_LUMINANCE16\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_LUMINANCE4_ALPHA4\fP, -\%\f3GL_LUMINANCE6_ALPHA2\fP, -\%\f3GL_LUMINANCE8_ALPHA8\fP, -\%\f3GL_LUMINANCE12_ALPHA4\fP, -\%\f3GL_LUMINANCE12_ALPHA12\fP, -\%\f3GL_LUMINANCE16_ALPHA16\fP, -\%\f3GL_INTENSITY\fP, -\%\f3GL_INTENSITY4\fP, -\%\f3GL_INTENSITY8\fP, -\%\f3GL_INTENSITY12\fP, -\%\f3GL_INTENSITY16\fP, -\%\f3GL_RGB\fP, -\%\f3GL_R3_G3_B2\fP, -\%\f3GL_RGB4\fP, -\%\f3GL_RGB5\fP, -\%\f3GL_RGB8\fP, -\%\f3GL_RGB10\fP, -\%\f3GL_RGB12\fP, -\%\f3GL_RGB16\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_RGBA2\fP, -\%\f3GL_RGBA4\fP, -\%\f3GL_RGB5_A1\fP, -\%\f3GL_RGBA8\fP, -\%\f3GL_RGB10_A2\fP, -\%\f3GL_RGBA12\fP or -\%\f3GL_RGBA16\fP. -.TP -\f2width\fP, \f2height\fP -Specifies in pixels the width and height, respectively, of the texture image. -.TP -\f2format\fP -Specifies the of the pixel data. -Must be one of -\%\f3GL_COLOR_INDEX\fP, -\%\f3GL_DEPTH_COMPONENT\fP, -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGR\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, or -\%\f3GL_LUMINANCE_ALPHA\fP. -.TP -\f2type\fP -Specifies the data type for \f2data\fP. -Must be one of -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP. -.TP -\f2data\fP -Specifies a pointer to the image data in memory. - - -.SH DESCRIPTION -\%\f3gluBuild2DMipmaps\fP builds a series of prefiltered two-dimensional texture maps of decreasing -resolutions called a mipmap. This is used for the antialiasing of -texture-mapped primitives. -.P -A return value of zero indicates success, otherwise a GLU error code is -returned (see \%\f3gluErrorString\fP). -.P -Initially, the \f2width\fP and \f2height\fP of \f2data\fP are checked to see if they -are a power of 2. If not, a copy of \f2data\fP (not \f2data\fP), is scaled up -or down to the nearest power of 2. This copy will be used for subsequent -mipmapping operations described below. (If \f2width\fP or \f2height\fP is exactly -between powers of 2, then the copy of \f2data\fP will scale upwards.) For -example, if \f2width\fP is 57 and \f2height\fP is 23 then a copy of \f2data\fP will -scale up to 64 in \f2width\fP and down to 16 in depth, before mipmapping takes -place. -.P -Then, proxy textures (see \f3glTexImage2D\fP) are used to determine if -the implementation can fit the requested texture. If not, both dimensions -are continually halved until it fits. (If the OpenGL version is \(<= 1.0, -both maximum texture dimensions are clamped to the value returned -by \f3glGetIntegerv\fP with the argument \%\f3GL_MAX_TEXTURE_SIZE\fP.) -.P -Next, a series of mipmap levels is built by decimating a copy of \f2data\fP -in half along both dimensions until size $1 ~times~ 1$ is reached. At -each level, -each texel in the halved mipmap level is an average of the corresponding -four texels in the larger mipmap level. (In the case of rectangular -images, the decimation will ultimately reach an $N ~times~ 1$ or -$1 ~times~ N$ configuration. Here, two texels are averaged instead.) -.P -\f3glTexImage2D\fP is called to load each of these mipmap levels. -Level 0 is a copy of \f2data\fP. The highest level is -${log sub 2} ( max ("width","height"))$. For example, -if \f2width\fP is 64 and \f2height\fP is 16 -and the implementation can store a texture of this size, the following -mipmap levels are built: $64 ~times~ 16$, $32 ~times~ 8$, $16 ~times~ 4$, -$8 ~times~ 2$, $4 ~times~ 1$, $2 ~times~ 1$ and $1 ~times~ 1$. These correspond to -levels 0 through 6, respectively. -.P -See the \f3glTexImage1D\fP reference page for a description of the -acceptable values for \f2format\fP parameter. See the \f3glDrawPixels\fP -reference page for a description of the acceptable values -for \f2type\fP parameter. -.SH NOTES - -Note that there is no direct way of querying the maximum level. This can -be derived indirectly via \f3glGetTexLevelParameter\fP. First, query -for the width and height actually used at level 0. (The width and -height may not be equal to \f2width\fP and \f2height\fP respectively since proxy -textures might have scaled them to fit the implementation.) Then the -maximum level can be derived from the formula -${log sub 2}( max (\f2width\fP,\f2height\fP))$. -.SH NOTES -Formats \%\f3GL_BGR\fP, and \%\f3GL_BGRA\fP, and types -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP are only available if the GL version -is 1.2 or greater and if the GLU version is 1.3 or greater. -.SH ERRORS -\%\f3GLU_INVALID_VALUE\fP is returned if \f2width\fP, or \f2height\fP is < 1. -.P -\%\f3GLU_INVALID_ENUM\fP is returned if \f2internalFormat\fP, \f2format\fP, or \f2type\fP is not -legal. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_BYTE_3_3_2\fP or \%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_SHORT_5_6_5\fP or \%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP or \%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP or \%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_INT_8_8_8_8\fP or \%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_INT_10_10_10_2\fP or \%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.SH SEE ALSO -\f3glDrawPixels(3G)\fP, -\f3glTexImage1D(3G)\fP, -\f3glTexImage2D(3G)\fP, -\f3glTexImage3D(3G)\fP, -\%\f3gluBuild1DMipmaps(3G)\fP, -\%\f3gluBuild3DMipmaps(3G)\fP, -\%\f3gluErrorString(3G)\fP, -\f3glGetTexImage(3G)\fP, -\f3glGetTexLevelParameter(3G)\fP, -\%\f3gluBuild1DMipmapLevels(3G)\fP, -\%\f3gluBuild2DMipmapLevels(3G)\fP, -\%\f3gluBuild3DMipmapLevels(3G)\fP diff --git a/doc/gl-docs/GLU/build3dmipmaplevels.3gl b/doc/gl-docs/GLU/build3dmipmaplevels.3gl deleted file mode 100644 index 76839834..00000000 --- a/doc/gl-docs/GLU/build3dmipmaplevels.3gl +++ /dev/null @@ -1,237 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 build3dmi -.ds Xs 53966 9 build3dmipmaplevels.gl -.TH GLUBUILD3DMIPMAPLEVELS 3G -.SH NAME -.B "gluBuild3DMipmapLevels -\- builds a subset of three-dimensional mipmap levels - -.SH C SPECIFICATION -GLint \f3gluBuild3DMipmapLevels\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3GLint \fPgluBuild3DMipmapLevels( 'u - GLint \fIinternalFormat\fP, - GLsizei \fIwidth\fP, - GLsizei \fIheight\fP, - GLsizei \fIdepth\fP, - GLenum \fIformat\fP, - GLenum \fItype\fP, - GLint \fIlevel\fP, - GLint \fIbase\fP, - GLint \fImax\fP, - const void \fI*data\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIinternalFormat\fP\ \ 'u -\f2target\fP -Specifies the target texture. Must be \%\f3GL_TEXTURE_3D\fP. -.TP -\f2internalFormat\fP -Requests the internal storage of the texture image. The most -current version of the SGI implementation of GLU does not check this -value for validity before passing it on to the underlying OpenGL -implementation. A value that is not accepted by the OpenGL -implementation will lead to an OpenGL error. The benefit of not -checking this value at the GLU level is that OpenGL extensions can add -new internal texture formats without requiring a revision of the GLU -implementation. Older implementations of GLU check this value and -raise a GLU error if it is not 1, 2, 3, or 4 or one of the following -symbolic constants: -\%\f3GL_ALPHA\fP, -\%\f3GL_ALPHA4\fP, -\%\f3GL_ALPHA8\fP, -\%\f3GL_ALPHA12\fP, -\%\f3GL_ALPHA16\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE4\fP, -\%\f3GL_LUMINANCE8\fP, -\%\f3GL_LUMINANCE12\fP, -\%\f3GL_LUMINANCE16\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_LUMINANCE4_ALPHA4\fP, -\%\f3GL_LUMINANCE6_ALPHA2\fP, -\%\f3GL_LUMINANCE8_ALPHA8\fP, -\%\f3GL_LUMINANCE12_ALPHA4\fP, -\%\f3GL_LUMINANCE12_ALPHA12\fP, -\%\f3GL_LUMINANCE16_ALPHA16\fP, -\%\f3GL_INTENSITY\fP, -\%\f3GL_INTENSITY4\fP, -\%\f3GL_INTENSITY8\fP, -\%\f3GL_INTENSITY12\fP, -\%\f3GL_INTENSITY16\fP, -\%\f3GL_RGB\fP, -\%\f3GL_R3_G3_B2\fP, -\%\f3GL_RGB4\fP, -\%\f3GL_RGB5\fP, -\%\f3GL_RGB8\fP, -\%\f3GL_RGB10\fP, -\%\f3GL_RGB12\fP, -\%\f3GL_RGB16\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_RGBA2\fP, -\%\f3GL_RGBA4\fP, -\%\f3GL_RGB5_A1\fP, -\%\f3GL_RGBA8\fP, -\%\f3GL_RGB10_A2\fP, -\%\f3GL_RGBA12\fP, or -\%\f3GL_RGBA16\fP. -.TP -\f2width\fP, \f2height\fP, \f2depth\fP -Specifies in pixels the width, height and depth respectively, of the texture -image. These should be a power of 2. -.TP -\f2format\fP -Specifies the of the pixel data. -Must be one of -\%\f3GL_COLOR_INDEX\fP, -\%\f3GL_DEPTH_COMPONENT\fP, -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGR\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, or -\%\f3GL_LUMINANCE_ALPHA\fP. -.TP -\f2type\fP -Specifies the data type for \f2data\fP. -Must be one of -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP. -.TP -\f2level\fP -Specifies the mipmap level of the image data. -.TP -\f2base\fP -Specifies the minimum mipmap level to pass to \f3glTexImage3D\fP. -.TP -\f2max\fP -Specifies the maximum mipmap level to pass to \f3glTexImage3D\fP. -.TP -\f2data\fP -Specifies a pointer to the image data in memory. -.SH DESCRIPTION -\%\f3gluBuild3DMipmapLevels\fP builds a subset of prefiltered three-dimensional texture maps of -decreasing resolutions called a mipmap. This is used for the antialiasing of -texture mapped primitives. -.P -A return value of zero indicates success, otherwise a GLU error code is -returned (see \%\f3gluErrorString\fP). -.P -A series of mipmap levels from \f2base\fP to \f2max\fP is built by -decimating \f2data\fP in half along both dimensions until size $1 ~times~ 1 -~times~ 1$ is reached. At each level, each texel in the halved mipmap -level is an average of the corresponding eight texels in the larger -mipmap level. (If exactly one of the dimensions is 1, four texels are -averaged. If exactly two of the dimensions are 1, two texels are -averaged.) \f3glTexImage3D\fP is called to load these mipmap levels -from \f2base\fP to \f2max\fP. If \f2max\fP is larger than the highest mipmap -level for the texture of the specified size, then a GLU error code is -returned (see \%\f3gluErrorString\fP) and nothing is loaded. -.P -For example, if \f2level\fP is 2 and \f2width\fP is 16, \f2height\fP is 8 and \f2depth\fP -is 4, the following levels are possible: $16 ~times~ 8 ~times~ 4$, $8 ~times~ -4 ~times~ 2$, $4 ~times~ 2 ~times~ 1$, $2 ~times~ 1 ~times~ 1$, -$1 ~times~ 1 ~times~ 1$. -These correspond to levels 2 through 6 respectively. If \f2base\fP is -3 and \f2max\fP is 5, then only mipmap levels $8 ~times~ 4 ~times~ 2$, $4 -~times~ 2 ~times~ 1$ and $2 ~times~ 1 ~times~ 1$ are loaded. However, if -\f2max\fP is 7 then an error is returned and nothing is loaded, since -\f2max\fP is larger than the highest mipmap level which is, in this case, -6. -.P -The highest mipmap level can be derived from the formula -${log sub 2} ( max ("width","height","depth")^{2 sup "level"})$. -.P -See the \f3glTexImage1D\fP reference page for a description of the -acceptable values for \f2format\fP parameter. See the \f3glDrawPixels\fP -reference page for a description of the acceptable values -for \f2type\fP parameter. -.SH NOTES -\%\f3gluBuild3DMipmapLevels\fP is only available if the GLU version is 1.3 or greater. -.P -Formats \%\f3GL_BGR\fP, and \%\f3GL_BGRA\fP, and types -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP are only available if the GL version -is 1.2 or greater. -.SH ERRORS -\%\f3GLU_INVALID_VALUE\fP is returned if \f2level\fP > \f2base\fP, \f2base\fP < 0, -\f2max\fP < \f2base\fP or \f2max\fP is > the highest mipmap level for \f2data\fP. -.P -\%\f3GLU_INVALID_VALUE\fP is returned if \f2width\fP, \f2height\fP, or \f2depth\fP is < 1. -.P -\%\f3GLU_INVALID_ENUM\fP is returned if \f2internalFormat\fP, \f2format\fP, or \f2type\fP is not -legal. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_BYTE_3_3_2\fP or \%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_SHORT_5_6_5\fP or \%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP or \%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP or \%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_INT_8_8_8_8\fP or \%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_INT_10_10_10_2\fP or \%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.SH SEE ALSO -\f3glDrawPixels(3G)\fP, -\f3glTexImage1D(3G)\fP, -\f3glTexImage2D(3G)\fP, -\f3glTexImage3D(3G)\fP, -\%\f3gluBuild1DMipmaps(3G)\fP, -\%\f3gluBuild2DMipmaps(3G)\fP, -\%\f3gluBuild3DMipmaps(3G)\fP, -\%\f3gluErrorString(3G)\fP, -\f3glGetTexImage(3G)\fP, -\f3glGetTexLevelParameter(3G)\fP, -\%\f3gluBuild1DMipmapLevels(3G)\fP, -\%\f3gluBuild2DMipmapLevels(3G)\fP diff --git a/doc/gl-docs/GLU/build3dmipmaps.3gl b/doc/gl-docs/GLU/build3dmipmaps.3gl deleted file mode 100644 index 7df39c2c..00000000 --- a/doc/gl-docs/GLU/build3dmipmaps.3gl +++ /dev/null @@ -1,238 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 build3dmi -.ds Xs 62292 10 build3dmipmaps.gl -.TH GLUBUILD3DMIPMAPS 3G -.SH NAME -.B "gluBuild3DMipmaps -\- builds a three-dimensional mipmap - -.SH C SPECIFICATION -GLint \f3gluBuild3DMipmaps\fP( -GLenum \fItarget\fP, -.nf -.ta \w'\f3GLint \fPgluBuild3DMipmaps( 'u - GLint \fIinternalFormat\fP, - GLsizei \fIwidth\fP, - GLsizei \fIheight\fP, - GLsizei \fIdepth\fP, - GLenum \fIformat\fP, - GLenum \fItype\fP, - const void \fI*data\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIinternalFormat\fP\ \ 'u -\f2target\fP -Specifies the target texture. Must be \%\f3GL_TEXTURE_3D\fP. -.TP -\f2internalFormat\fP -Requests the internal storage of the texture image. The most -current version of the SGI implementation of GLU does not check this -value for validity before passing it on to the underlying OpenGL -implementation. A value that is not accepted by the OpenGL -implementation will lead to an OpenGL error. The benefit of not -checking this value at the GLU level is that OpenGL extensions can add -new internal texture formats without requiring a revision of the GLU -implementation. Older implementations of GLU check this value and -raise a GLU error if it is not 1, 2, 3, or 4 or one of the following -symbolic constants: -\%\f3GL_ALPHA\fP, -\%\f3GL_ALPHA4\fP, -\%\f3GL_ALPHA8\fP, -\%\f3GL_ALPHA12\fP, -\%\f3GL_ALPHA16\fP, -\%\f3GL_LUMINANCE\fP, -\%\f3GL_LUMINANCE4\fP, -\%\f3GL_LUMINANCE8\fP, -\%\f3GL_LUMINANCE12\fP, -\%\f3GL_LUMINANCE16\fP, -\%\f3GL_LUMINANCE_ALPHA\fP, -\%\f3GL_LUMINANCE4_ALPHA4\fP, -\%\f3GL_LUMINANCE6_ALPHA2\fP, -\%\f3GL_LUMINANCE8_ALPHA8\fP, -\%\f3GL_LUMINANCE12_ALPHA4\fP, -\%\f3GL_LUMINANCE12_ALPHA12\fP, -\%\f3GL_LUMINANCE16_ALPHA16\fP, -\%\f3GL_INTENSITY\fP, -\%\f3GL_INTENSITY4\fP, -\%\f3GL_INTENSITY8\fP, -\%\f3GL_INTENSITY12\fP, -\%\f3GL_INTENSITY16\fP, -\%\f3GL_RGB\fP, -\%\f3GL_R3_G3_B2\fP, -\%\f3GL_RGB4\fP, -\%\f3GL_RGB5\fP, -\%\f3GL_RGB8\fP, -\%\f3GL_RGB10\fP, -\%\f3GL_RGB12\fP, -\%\f3GL_RGB16\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_RGBA2\fP, -\%\f3GL_RGBA4\fP, -\%\f3GL_RGB5_A1\fP, -\%\f3GL_RGBA8\fP, -\%\f3GL_RGB10_A2\fP, -\%\f3GL_RGBA12\fP, or -\%\f3GL_RGBA16\fP. -.TP -\f2width\fP, \f2height\fP, \f2depth\fP -Specifies in pixels the width, height and depth respectively, in pixels -of the texture image. -.TP -\f2format\fP -Specifies the of the pixel data. -Must be one of -\%\f3GL_COLOR_INDEX\fP, -\%\f3GL_DEPTH_COMPONENT\fP, -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGR\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, or -\%\f3GL_LUMINANCE_ALPHA\fP. -.TP -\f2type\fP -Specifies the data type for \f2data\fP. -Must be one of: -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP. -.TP -\f2data\fP -Specifies a pointer to the image data in memory. -.SH DESCRIPTION -\%\f3gluBuild3DMipmaps\fP builds a series of prefiltered three-dimensional texture maps of -decreasing resolutions called a mipmap. This is used for the antialiasing of -texture-mapped primitives. -.P -A return value of zero indicates success, otherwise a GLU error code is -returned (see \%\f3gluErrorString\fP). -.P -Initially, the \f2width\fP, \f2height\fP and \f2depth\fP of \f2data\fP are checked to -see if they are a power of 2. If not, a copy of \f2data\fP (not \f2data\fP), -is scaled up or down to the nearest power of 2. (If \f2width\fP, \f2height\fP or -\f2depth\fP is exactly between powers of 2, then the copy of \f2data\fP will -scale upwards.) This copy will be used for subsequent mipmapping -operations described below. For example, if \f2width\fP is 57, \f2height\fP is -23 and \f2depth\fP is 24 then a copy of \f2data\fP will scale up to 64 in -width, down to 16 in height and up to 32 in depth, before mipmapping -takes place. -.P -Then, proxy textures (see \f3glTexImage3D\fP) are used to determine if -the implementation can fit the requested texture. If not, all three dimensions -are continually halved until it fits. -.P -Next, a series of mipmap levels is built by decimating a copy of \f2data\fP -in half along all three dimensions until size $1 ~times~ 1 ~times~ 1$ is -reached. At each level, each texel in the halved mipmap level is an -average of the corresponding eight texels in the larger mipmap -level. (If exactly one of the dimensions is 1, four texels are averaged. -If exactly two of the dimensions are 1, two texels are averaged.) -.P -\f3glTexImage3D\fP is called to load each of these mipmap levels. -Level 0 is a copy of \f2data\fP. The highest level is -${log sub 2} ( max ("width","height","depth"))$. -For example, if \f2width\fP is 64, \f2height\fP is -16 and \f2depth\fP is 32, and the implementation can store a texture of this -size, the following mipmap levels are built: $64 ~times~ 16 ~times~ 32$, -$32 ~times~ 8 ~times~ 16$, $16 ~times~ 4 ~times~ 8$, -$8 ~times~ 2 ~times~ 4$, $4 ~times~ 1 ~times~ 2$, -$2 ~times~ 1 ~times~ 1$ -and $1 ~times~ 1 ~times~ 1$. These correspond -to levels 0 through 6, respectively. -.P -See the \f3glTexImage1D\fP reference page for a description of the -acceptable values for \f2format\fP parameter. See the \f3glDrawPixels\fP -reference page for a description of the acceptable values -for \f2type\fP parameter. -.SH NOTES -Note that there is no direct way of querying the maximum level. This can -be derived indirectly via \f3glGetTexLevelParameter\fP. First, query -for the width, height and depth actually used at level 0. (The width, -height and depth may not be equal to \f2width\fP, \f2height\fP and \f2depth\fP -respectively since proxy textures might have scaled them to fit the -implementation.) Then the maximum level can be derived from the formula -${log sub 2} ( max ("width","height","depth"))$. -.P -\%\f3gluBuild3DMipmaps\fP is only available if the GLU version is 1.3 or greater. -.P -Formats \%\f3GL_BGR\fP, and \%\f3GL_BGRA\fP, and types -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP are only available if the GL version -is 1.2 or greater. -.SH ERRORS -\%\f3GLU_INVALID_VALUE\fP is returned if \f2width\fP, \f2height\fP, or \f2depth\fP is < 1. -.P -\%\f3GLU_INVALID_ENUM\fP is returned if \f2internalFormat\fP, \f2format\fP, or \f2type\fP is not -legal. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_BYTE_3_3_2\fP or \%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_SHORT_5_6_5\fP or \%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP or \%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP or \%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_INT_8_8_8_8\fP or \%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2type\fP is \%\f3GL_UNSIGNED_INT_10_10_10_2\fP or \%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.SH SEE ALSO -\f3glDrawPixels(3G)\fP, -\f3glTexImage1D(3G)\fP, -\f3glTexImage2D(3G)\fP, -\f3glTexImage3D(3G)\fP, -\%\f3gluBuild1DMipmaps(3G)\fP, -\%\f3gluBuild3DMipmaps(3G)\fP, -\%\f3gluErrorString(3G)\fP, -\f3glGetTexImage(3G)\fP, -\f3glGetTexLevelParameter(3G)\fP, -\%\f3gluBuild1DMipmapLevels(3G)\fP, -\%\f3gluBuild2DMipmapLevels(3G)\fP, -\%\f3gluBuild3DMipmapLevels(3G)\fP diff --git a/doc/gl-docs/GLU/checkextension.3gl b/doc/gl-docs/GLU/checkextension.3gl deleted file mode 100644 index da57be3e..00000000 --- a/doc/gl-docs/GLU/checkextension.3gl +++ /dev/null @@ -1,53 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 checkexte -.ds Xs 16492 4 checkextension.gl -.TH GLUCHECKEXTENSION 3G -.SH NAME -.B "gluCheckExtension -\- determines if an extension name is supported - -.SH C SPECIFICATION -GLboolean \f3gluCheckExtension\fP( -const GLubyte \fI*extName\fP, -.nf -.ta \w'\f3GLboolean \fPgluCheckExtension( 'u - const GLubyte \fI*extString\fP ) -.fi - -.SH PARAMETERS -.TP \w'\fIextString\fP\ \ 'u -\f2extName\fP -Specifies an extension name. -.TP -\f2extString\fP -Specifies a space-separated list of extension names supported. -.SH DESCRIPTION -\%\f3gluCheckExtension\fP returns \%\f3GL_TRUE\fP if \f2extName\fP is supported otherwise -\%\f3GL_FALSE\fP is returned. -.P -This is used to check for the presence for OpenGL, GLU or GLX extension names -by passing the extension strings returned by \f3glGetString\fP, -\%\f3gluGetString\fP, \f3glXGetClientString\fP, -\f3glXQueryExtensionsString\fP, or \f3glXQueryServerString\fP, -respectively, as \f2extString\fP. -.SH NOTES -Cases where one extension name is a substring of another are -correctly handled. -.P -There may or may not be leading or trailing blanks in \f2extString\fP. -.P -Extension names should not contain embedded spaces. -.P -All strings are null-terminated. -.SH SEE ALSO -\f3glGetString(3G)\fP, -\%\f3gluGetString(3G)\fP, -\f3glXGetClientString(3G)\fP, -\f3glXQueryExtensionsString(3G)\fP, -\f3glXQueryServerString(3G)\fP diff --git a/doc/gl-docs/GLU/cylinder.3gl b/doc/gl-docs/GLU/cylinder.3gl deleted file mode 100644 index af9ed0ac..00000000 --- a/doc/gl-docs/GLU/cylinder.3gl +++ /dev/null @@ -1,70 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 cylinder. -.ds Xs 15544 4 cylinder.gl -.TH GLUCYLINDER 3G -.SH NAME -.B "gluCylinder -\- draw a cylinder - -.SH C SPECIFICATION -void \f3gluCylinder\fP( -GLUquadric* \fIquad\fP, -.nf -.ta \w'\f3void \fPgluCylinder( 'u - GLdouble \fIbase\fP, - GLdouble \fItop\fP, - GLdouble \fIheight\fP, - GLint \fIslices\fP, - GLint \fIstacks\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIheight\fP\ \ 'u -\f2quad\fP -Specifies the quadrics object (created with \%\f3gluNewQuadric\fP). -.TP -\f2base\fP -Specifies the radius of the cylinder at \f2z\fP = 0. -.TP -\f2top\fP -Specifies the radius of the cylinder at \f2z\fP = \f2height\fP. -.TP -\f2height\fP -Specifies the height of the cylinder. -.TP -\f2slices\fP -Specifies the number of subdivisions around the \f2z\fP axis. -.TP -\f2stacks\fP -Specifies the number of subdivisions along the \f2z\fP axis. -.SH DESCRIPTION -\%\f3gluCylinder\fP draws a cylinder oriented along the \f2z\fP axis. The base of the cylinder -is placed at \f2z\fP = 0, and the top at $ z ~=~ "height" $. Like a sphere, -a cylinder is subdivided around the \f2z\fP axis into slices, and along the -\f2z\fP axis into stacks. -.P -Note that if \f2top\fP is set to 0.0, this routine generates a cone. -.P -If the orientation is set to \%\f3GLU_OUTSIDE\fP -(with \%\f3gluQuadricOrientation\fP), then any generated normals -point away from the \f2z\fP axis. Otherwise, they point toward the -\f2z\fP axis. -.P -If texturing is turned on (with \%\f3gluQuadricTexture\fP), then texture -coordinates are generated so that \f2t\fP ranges linearly from 0.0 -at \f2z\fP = 0 to 1.0 at \f2z\fP = \f2height\fP, and \f2s\fP -ranges from 0.0 at the +\f2y\fP axis, to 0.25 at the +\f2x\fP axis, -to 0.5 at the -\f2y\fP axis, to 0.75 at the \-\f2x\fP axis, -and back to 1.0 at the +\f2y\fP axis. -.SH SEE ALSO -\%\f3gluDisk(3G)\fP, \%\f3gluNewQuadric(3G)\fP, \%\f3gluPartialDisk(3G)\fP, \%\f3gluQuadricTexture(3G)\fP, -\%\f3gluSphere(3G)\fP diff --git a/doc/gl-docs/GLU/deletenurbsrenderer.3gl b/doc/gl-docs/GLU/deletenurbsrenderer.3gl deleted file mode 100644 index 13823fb1..00000000 --- a/doc/gl-docs/GLU/deletenurbsrenderer.3gl +++ /dev/null @@ -1,34 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 deletenur -.ds Xs 47695 3 deletenurbsrenderer.gl -.TH GLUDELETENURBSRENDERER 3G -.SH NAME -.B "gluDeleteNurbsRenderer -\- destroy a NURBS object - -.SH C SPECIFICATION -void \f3gluDeleteNurbsRenderer\fP( -GLUnurbs* \fInurb\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2nurb\fP\ \ 'u -\f2nurb\fP -Specifies the NURBS object to be destroyed. -.SH DESCRIPTION -\%\f3gluDeleteNurbsRenderer\fP destroys the NURBS object (which was created with -\%\f3gluNewNurbsRenderer\fP) and frees any memory it uses. -Once -\%\f3gluDeleteNurbsRenderer\fP has been called, \f2nurb\fP cannot be used again. -.SH SEE ALSO -\%\f3gluNewNurbsRenderer(3G)\fP diff --git a/doc/gl-docs/GLU/deletequadric.3gl b/doc/gl-docs/GLU/deletequadric.3gl deleted file mode 100644 index 610d6d80..00000000 --- a/doc/gl-docs/GLU/deletequadric.3gl +++ /dev/null @@ -1,34 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 deletequa -.ds Xs 13251 3 deletequadric.gl -.TH GLUDELETEQUADRIC 3G -.SH NAME -.B "gluDeleteQuadric -\- destroy a quadrics object - -.SH C SPECIFICATION -void \f3gluDeleteQuadric\fP( -GLUquadric* \fIquad\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2quad\fP\ \ 'u -\f2quad\fP -Specifies the quadrics object to be destroyed. -.SH DESCRIPTION -\%\f3gluDeleteQuadric\fP destroys the quadrics object (created with \%\f3gluNewQuadric\fP) -and frees any memory it uses. -Once \%\f3gluDeleteQuadric\fP has been called, \f2quad\fP cannot be used again. -.SH SEE ALSO -\%\f3gluNewQuadric(3G)\fP - diff --git a/doc/gl-docs/GLU/deletetess.3gl b/doc/gl-docs/GLU/deletetess.3gl deleted file mode 100644 index 5d4325b2..00000000 --- a/doc/gl-docs/GLU/deletetess.3gl +++ /dev/null @@ -1,33 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 deletetes -.ds Xs 7423 3 deletetess.gl -.TH GLUDELETETESS 3G -.SH NAME -.B "gluDeleteTess -\- destroy a tessellation object - -.SH C SPECIFICATION -void \f3gluDeleteTess\fP( -GLUtesselator* \fItess\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2tess\fP\ \ 'u -\f2tess\fP -Specifies the tessellation object to destroy. -.SH DESCRIPTION -\%\f3gluDeleteTess\fP destroys the indicated tessellation object (which was created -with \%\f3gluNewTess\fP) and frees any memory that it used. -.SH SEE ALSO -\%\f3gluBeginPolygon(3G)\fP, \%\f3gluNewTess(3G)\fP, \%\f3gluTessCallback(3G)\fP - diff --git a/doc/gl-docs/GLU/disk.3gl b/doc/gl-docs/GLU/disk.3gl deleted file mode 100644 index 843d5a83..00000000 --- a/doc/gl-docs/GLU/disk.3gl +++ /dev/null @@ -1,70 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 disk.gl - -.ds Xs 8360 4 disk.gl -.TH GLUDISK 3G -.SH NAME -.B "gluDisk -\- draw a disk - -.SH C SPECIFICATION -void \f3gluDisk\fP( -GLUquadric* \fIquad\fP, -.nf -.ta \w'\f3void \fPgluDisk( 'u - GLdouble \fIinner\fP, - GLdouble \fIouter\fP, - GLint \fIslices\fP, - GLint \fIloops\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIslices\fP\ \ 'u -\f2quad\fP -Specifies the quadrics object (created with \%\f3gluNewQuadric\fP). -.TP -\f2inner\fP -Specifies the inner radius of the disk (may be 0). -.TP -\f2outer\fP -Specifies the outer radius of the disk. -.TP -\f2slices\fP -Specifies the number of subdivisions around the \f2z\fP axis. -.TP -\f2loops\fP -Specifies the number of concentric rings about the origin into which -the disk is subdivided. -.SH DESCRIPTION -\%\f3gluDisk\fP renders a disk on the \f2z\fP = 0 plane. The disk has a radius of -\f2outer\fP, and contains a concentric circular hole with a radius -of \f2inner\fP. If \f2inner\fP is 0, then no hole is generated. The disk is -subdivided around the \f2z\fP axis into slices (like pizza slices), and also -about the \f2z\fP axis into rings -(as specified by \f2slices\fP and \f2loops\fP, respectively). -.P -With respect to orientation, the +\f2z\fP side of the disk is considered to be -"outside" (see \%\f3gluQuadricOrientation\fP). -This means that if the -orientation is set to \%\f3GLU_OUTSIDE\fP, then any normals generated -point along the +\f2z\fP axis. Otherwise, they point along the \-\f2z\fP -axis. -.P -If texturing has been turned on (with \%\f3gluQuadricTexture\fP), -texture coordinates are generated -linearly such that where $ r ~=~ "outer" $, the value at (\f2r\fP, 0, 0) is -(1, 0.5), at (0, \f2r\fP, 0) it is (0.5, 1), at (\-\f2r\fP, 0, 0) -it is (0, 0.5), and -at (0, \-\f2r\fP, 0) it is (0.5, 0). -.SH SEE ALSO -\%\f3gluCylinder(3G)\fP, \%\f3gluNewQuadric(3G)\fP, \%\f3gluPartialDisk(3G)\fP, -\%\f3gluQuadricOrientation(3G)\fP, -\%\f3gluQuadricTexture(3G)\fP, \%\f3gluSphere(3G)\fP diff --git a/doc/gl-docs/GLU/errorstring.3gl b/doc/gl-docs/GLU/errorstring.3gl deleted file mode 100644 index 31207ae7..00000000 --- a/doc/gl-docs/GLU/errorstring.3gl +++ /dev/null @@ -1,47 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 errorstri -.ds Xs 24940 3 errorstring.gl -.TH GLUERRORSTRING 3G -.SH NAME -.B "gluErrorString -\- produce an error string from a GL or GLU error code - -.SH C SPECIFICATION -const GLubyte * \f3gluErrorString\fP( -GLenum \fIerror\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2error\fP\ \ 'u -\f2error\fP -Specifies a GL or GLU error code. -.SH DESCRIPTION -\%\f3gluErrorString\fP produces an error string from a GL or GLU error code. The string -is in ISO Latin 1 . For example, -\%\f3gluErrorString\fP(\%\f3GL_OUT_OF_MEMORY\fP) returns the string -\f2out of memory\fP. -.P -The standard GLU error codes are \%\f3GLU_INVALID_ENUM\fP, -\%\f3GLU_INVALID_VALUE\fP, -and \%\f3GLU_OUT_OF_MEMORY\fP. -Certain other GLU functions can return specialized error codes -through callbacks. -See the \f3glGetError\fP reference page for the list of -GL error codes. -.SH ERRORS -\%\f3NULL\fP is returned if \f2error\fP is not a valid GL or GLU error code. -.SH SEE ALSO -\f3glGetError(3G)\fP, -\%\f3gluNurbsCallback(3G)\fP, -\%\f3gluQuadricCallback(3G)\fP, -\%\f3gluTessCallback(3G)\fP diff --git a/doc/gl-docs/GLU/getnurbsproperty.3gl b/doc/gl-docs/GLU/getnurbsproperty.3gl deleted file mode 100644 index 44f4bfd0..00000000 --- a/doc/gl-docs/GLU/getnurbsproperty.3gl +++ /dev/null @@ -1,55 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 getnurbsp -.ds Xs 29302 3 getnurbsproperty.gl -.TH GLUGETNURBSPROPERTY 3G -.SH NAME -.B "gluGetNurbsProperty -\- get a NURBS property - -.SH C SPECIFICATION -void \f3gluGetNurbsProperty\fP( -GLUnurbs* \fInurb\fP, -.nf -.ta \w'\f3void \fPgluGetNurbsProperty( 'u - GLenum \fIproperty\fP, - GLfloat* \fIdata\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIproperty\fP\ \ 'u -\f2nurb\fP -Specifies the NURBS object (created with \%\f3gluNewNurbsRenderer\fP). -.TP -\f2property\fP -Specifies the property whose value is to be fetched. Valid values are -\%\f3GLU_CULLING\fP, -\%\f3GLU_SAMPLING_TOLERANCE\fP, -\%\f3GLU_DISPLAY_MODE\fP, -\%\f3GLU_AUTO_LOAD_MATRIX\fP, -\%\f3GLU_PARAMETRIC_TOLERANCE\fP, -\%\f3GLU_SAMPLING_METHOD\fP, -\%\f3GLU_U_STEP\fP, -\%\f3GLU_V_STEP\fP and -\%\f3GLU_NURBS_MODE\fP. -.TP -\f2data\fP -Specifies a pointer to the location into which the value of the -named property is written. -.SH DESCRIPTION -\%\f3gluGetNurbsProperty\fP retrieves properties stored in a NURBS object. These -properties affect the way that NURBS curves and surfaces -are rendered. See the -\%\f3gluNurbsProperty\fP reference page for information about what the -properties are and what they do. -.SH SEE ALSO -\%\f3gluNewNurbsRenderer(3G)\fP, -\%\f3gluNurbsProperty(3G)\fP diff --git a/doc/gl-docs/GLU/getstring.3gl b/doc/gl-docs/GLU/getstring.3gl deleted file mode 100644 index 3eb4b1c4..00000000 --- a/doc/gl-docs/GLU/getstring.3gl +++ /dev/null @@ -1,65 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 getstring -.ds Xs 20129 4 getstring.gl -.TH GLUGETSTRING 3G -.SH NAME -.B "gluGetString -\- return a string describing the GLU version or GLU extensions - -.SH C SPECIFICATION -const GLubyte * \f3gluGetString\fP( -GLenum \fIname\fP ) -.nf -.fi - -.SH PARAMETERS -.TP \w'\f2name\fP\ \ 'u -\f2name\fP -Specifies a symbolic constant, one of -\%\f3GLU_VERSION\fP, or \%\f3GLU_EXTENSIONS\fP. -.SH DESCRIPTION -\%\f3gluGetString\fP returns a pointer to a static string describing the -GLU version or the GLU extensions that are supported. -.P -The version number is one of the following -forms: -.P -\f2major_number.minor_number\fP -.br -\f2major_number.minor_number.release_number\fP. -.P -The version string is of the following form: -.P -\f2version numbervendor-specific information\fP -.P -Vendor-specific information is optional. -Its and contents depend on the implementation. -.P -The standard GLU contains a basic set of features and capabilities. -If a company or group of companies wish to support other features, -these may be included as extensions to the GLU. -If \f2name\fP is -\%\f3GLU_EXTENSIONS\fP, then \%\f3gluGetString\fP -returns a space-separated list of names of supported GLU extensions. -(Extension names never contain spaces.) -.P -All strings are null-terminated. -.SH NOTES -\%\f3gluGetString\fP only returns information about GLU extensions. Call -\f3glGetString\fP to get a list of GL extensions. -.P -\%\f3gluGetString\fP is an initialization routine. Calling it after -a \f3glNewList\fP results in undefined behavior. -.SH ERRORS -NULL is returned if \f2name\fP is not -\%\f3GLU_VERSION\fP or \%\f3GLU_EXTENSIONS\fP. -.P -.SH SEE ALSO -\f3glGetString(3G)\fP - diff --git a/doc/gl-docs/GLU/gettessproperty.3gl b/doc/gl-docs/GLU/gettessproperty.3gl deleted file mode 100644 index eb69f5c0..00000000 --- a/doc/gl-docs/GLU/gettessproperty.3gl +++ /dev/null @@ -1,50 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 gettesspr -.ds Xs 26656 3 gettessproperty.gl -.TH GLUGETTESSPROPERTY 3G -.SH NAME -.B "gluGetTessProperty -\- get a tessellation object property - -.SH C SPECIFICATION -void \f3gluGetTessProperty\fP( -GLUtesselator* \fItess\fP, -.nf -.ta \w'\f3void \fPgluGetTessProperty( 'u - GLenum \fIwhich\fP, - GLdouble* \fIdata\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIwhich\fP\ \ 'u -\f2tess\fP -Specifies the tessellation object (created with \%\f3gluNewTess\fP). -.TP -\f2which\fP -Specifies the property whose value is to be fetched. Valid values are -\%\f3GLU_TESS_WINDING_RULE\fP, -\%\f3GLU_TESS_BOUNDARY_ONLY\fP, and -\%\f3GLU_TESS_TOLERANCE\fP. -.TP -\f2data\fP -Specifies a pointer to the location into which the value of the -named property is written. -.SH DESCRIPTION -\%\f3gluGetTessProperty\fP retrieves properties stored in a tessellation object. These -properties affect the way that tessellation objects -are interpreted and rendered. See the -\%\f3gluTessProperty\fP reference page for information about the -properties and what they do. -.SH SEE ALSO -\%\f3gluNewTess(3G)\fP, -\%\f3gluTessProperty(3G)\fP - diff --git a/doc/gl-docs/GLU/loadsamplingmatrices.3gl b/doc/gl-docs/GLU/loadsamplingmatrices.3gl deleted file mode 100644 index 54b3f284..00000000 --- a/doc/gl-docs/GLU/loadsamplingmatrices.3gl +++ /dev/null @@ -1,60 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm :37 loadsamp -.ds Xs 25465 4 loadsamplingmatrices.gl -.TH GLULOADSAMPLINGMATRICES 3G -.SH NAME -.B "gluLoadSamplingMatrices -\- load NURBS sampling and culling matrices - -.SH C SPECIFICATION -void \f3gluLoadSamplingMatrices\fP( -GLUnurbs* \fInurb\fP, -.nf -.ta \w'\f3void \fPgluLoadSamplingMatrices( 'u - const GLfloat \fI*model\fP, - const GLfloat \fI*perspective\fP, - const GLint \fI*view\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIperspective\fP\ \ 'u -\f2nurb\fP -Specifies the NURBS object (created with \%\f3gluNewNurbsRenderer\fP). -.TP -\f2model\fP -Specifies a modelview matrix (as from a \f3glGetFloatv\fP call). -.TP -\f2perspective\fP -Specifies a projection matrix (as from a \f3glGetFloatv\fP call). -.TP -\f2view\fP -Specifies a viewport (as from a \f3glGetIntegerv\fP call). -.SH DESCRIPTION -\%\f3gluLoadSamplingMatrices\fP uses \f2model\fP, \f2perspective\fP, and \f2view\fP to recompute the sampling and culling -matrices stored in \f2nurb\fP. -The sampling matrix determines how finely a NURBS curve or surface -must be tessellated to satisfy the sampling tolerance (as determined by the -\%\f3GLU_SAMPLING_TOLERANCE\fP property). -The culling matrix is used in deciding if a NURBS curve or surface -should be culled before -rendering (when the \%\f3GLU_CULLING\fP property is turned on). -.P -\%\f3gluLoadSamplingMatrices\fP is necessary only if the \%\f3GLU_AUTO_LOAD_MATRIX\fP property is turned -off (see \%\f3gluNurbsProperty\fP). -Although it can be convenient to leave the \%\f3GLU_AUTO_LOAD_MATRIX\fP -property turned on, there can be a performance penalty for doing so. -(A round trip to the GL server is needed to fetch the current values -of the modelview matrix, projection matrix, and viewport.) -.SH SEE ALSO -\%\f3gluGetNurbsProperty(3G)\fP, -\%\f3gluNewNurbsRenderer(3G)\fP, -\%\f3gluNurbsProperty(3G)\fP diff --git a/doc/gl-docs/GLU/lookat.3gl b/doc/gl-docs/GLU/lookat.3gl deleted file mode 100644 index e4a10d48..00000000 --- a/doc/gl-docs/GLU/lookat.3gl +++ /dev/null @@ -1,101 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 lookat.gl -.ds Xs 1014 4 lookat.gl -.TH GLULOOKAT 3G -.SH NAME -.B "gluLookAt -\- define a viewing transformation - -.SH C SPECIFICATION -void \f3gluLookAt\fP( -GLdouble \fIeyeX\fP, -.nf -.ta \w'\f3void \fPgluLookAt( 'u - GLdouble \fIeyeY\fP, - GLdouble \fIeyeZ\fP, - GLdouble \fIcenterX\fP, - GLdouble \fIcenterY\fP, - GLdouble \fIcenterZ\fP, - GLdouble \fIupX\fP, - GLdouble \fIupY\fP, - GLdouble \fIupZ\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2eyeX\fP\ \f2eyeY\fP\ \f2eyeZ\fP\ \ 'u -\f2eyeX\fP, \f2eyeY\fP, \f2eyeZ\fP -Specifies the position of the eye point. -.TP -\f2centerX\fP, \f2centerY\fP, \f2centerZ\fP -Specifies the position of the reference point. -.TP -\f2upX\fP, \f2upY\fP, \f2upZ\fP -Specifies the direction of the \f2up\fP vector. -.SH DESCRIPTION -\%\f3gluLookAt\fP creates a viewing matrix derived from an eye point, a reference -point indicating the center of the scene, and an \f2UP\fP vector. -.P -The matrix -maps the reference point to the negative \f2z\fP axis and the -eye point to the origin. -When a typical projection matrix is used, -the center of the scene therefore maps to the center of the viewport. -Similarly, the direction described by the \f2UP\fP -vector projected onto the viewing plane is mapped to the positive \f2y\fP -axis so that it points upward in the viewport. -The \f2UP\fP vector must not be parallel to the line of sight from the -eye point to the reference point. -.P -Let -.sp -.EQ -F ~=~ left ( down 20 { ~ matrix { - ccol {"centerX" above "centerY" above "centerZ"} - ccol { ~-~ above ~-~ above ~-~} - ccol {"eyeX" above "eyeY" above "eyeZ"} -} } ~~ right ) - -.EN - -.sp -Let \f2UP\fP be the vector $("upX", "upY", "upZ")$. -.P -Then normalize as follows: -.EQ -f ~=~ F over {|| F ||} -.EN -.P -.EQ -UP sup prime ~=~ UP over {|| UP ||} -.EN -.sp -.P -Finally, let $s ~=~ f ~times~ UP sup prime$, and $u ~=~ s ~times~ f$. -.P -.sp -M is then constructed as follows: -.EQ -M ~=~ left ( matrix { - ccol { ~s[0] above ~u[0] above -f[0] above 0 } - ccol { ~s[1] above ~u[1] above -f[1] above 0 } - ccol { ~s[2] above ~u[2] above -f[2] above 0 } - ccol { 0 above 0 above 0 above 1 } -} ~~right ) -.EN -.P -and \%\f3gluLookAt\fP is equivalent to -.Ex -glMultMatrixf(M); -glTranslated (-eyex, -eyey, -eyez); -.Ee -.SH SEE ALSO -\f3glFrustum(3G)\fP, \%\f3gluPerspective(3G)\fP diff --git a/doc/gl-docs/GLU/newnurbsrenderer.3gl b/doc/gl-docs/GLU/newnurbsrenderer.3gl deleted file mode 100644 index f9a8a519..00000000 --- a/doc/gl-docs/GLU/newnurbsrenderer.3gl +++ /dev/null @@ -1,31 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 newnurbsr -.ds Xs 53296 3 newnurbsrenderer.gl -.TH GLUNEWNURBSRENDERER 3G -.SH NAME -.B "gluNewNurbsRenderer -\- create a NURBS object - -.SH C SPECIFICATION -GLUnurbs* \f3gluNewNurbsRenderer\fP( void ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH DESCRIPTION -\%\f3gluNewNurbsRenderer\fP creates and returns a pointer to -a new NURBS object. -This object must be referred to when calling -NURBS rendering and control functions. A return value of -0 means that there is not enough memory to allocate the object. -.SH SEE ALSO -\%\f3gluBeginCurve(3G)\fP, \%\f3gluBeginSurface(3G)\fP, \%\f3gluBeginTrim(3G)\fP, \%\f3gluDeleteNurbsRenderer(3G)\fP, \%\f3gluNurbsCallback(3G)\fP, \%\f3gluNurbsProperty(3G)\fP - diff --git a/doc/gl-docs/GLU/newquadric.3gl b/doc/gl-docs/GLU/newquadric.3gl deleted file mode 100644 index 68cd7a51..00000000 --- a/doc/gl-docs/GLU/newquadric.3gl +++ /dev/null @@ -1,33 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 newquadri -.ds Xs 35023 3 newquadric.gl -.TH GLUNEWQUADRIC 3G -.SH NAME -.B "gluNewQuadric -\- create a quadrics object - -.SH C SPECIFICATION -GLUquadric* \f3gluNewQuadric\fP( void ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH DESCRIPTION -\%\f3gluNewQuadric\fP creates and returns a pointer to -a new quadrics object. This object must be referred to when -calling quadrics rendering and control functions. A return value of -0 means that there is not enough memory to allocate the object. -.SH SEE ALSO -\%\f3gluCylinder(3G)\fP, \%\f3gluDeleteQuadric(3G)\fP, \%\f3gluDisk(3G)\fP, -\%\f3gluPartialDisk(3G)\fP, \%\f3gluQuadricCallback(3G)\fP, \%\f3gluQuadricDrawStyle(3G)\fP, -\%\f3gluQuadricNormals(3G)\fP, \%\f3gluQuadricOrientation(3G)\fP, -\%\f3gluQuadricTexture(3G)\fP, -\%\f3gluSphere(3G)\fP diff --git a/doc/gl-docs/GLU/newtess.3gl b/doc/gl-docs/GLU/newtess.3gl deleted file mode 100644 index 8f57025a..00000000 --- a/doc/gl-docs/GLU/newtess.3gl +++ /dev/null @@ -1,30 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 newtess.g -.ds Xs 16871 3 newtess.gl -.TH GLUNEWTESS 3G -.SH NAME -.B "gluNewTess -\- create a tessellation object - -.SH C SPECIFICATION -GLUtesselator* \f3gluNewTess\fP( void ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH DESCRIPTION -\%\f3gluNewTess\fP creates and returns a pointer to a new tessellation object. -This object must be referred to when calling -tessellation functions. A return value of -0 means that there is not enough memory to allocate the object. -.SH SEE ALSO -\%\f3gluTessBeginPolygon(3G)\fP, \%\f3gluDeleteTess(3G)\fP, \%\f3gluTessCallback(3G)\fP - diff --git a/doc/gl-docs/GLU/nextcontour.3gl b/doc/gl-docs/GLU/nextcontour.3gl deleted file mode 100644 index 6640a6a7..00000000 --- a/doc/gl-docs/GLU/nextcontour.3gl +++ /dev/null @@ -1,102 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 nextconto -.ds Xs 37451 5 nextcontour.gl -.TH GLUNEXTCONTOUR 3G -.SH NAME -.B "gluNextContour -\- mark the beginning of another contour - -.SH C SPECIFICATION -void \f3gluNextContour\fP( -GLUtesselator* \fItess\fP, -.nf -.ta \w'\f3void \fPgluNextContour( 'u - GLenum \fItype\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2tess\fP\ \ 'u -\f2tess\fP -Specifies the tessellation object (created with \%\f3gluNewTess\fP). -.TP -\f2type\fP -Specifies the type of the contour being defined. Valid values are -\%\f3GLU_EXTERIOR\fP, -\%\f3GLU_INTERIOR\fP, -\%\f3GLU_UNKNOWN\fP, -\%\f3GLU_CCW\fP, and -\%\f3GLU_CW\fP. -.SH DESCRIPTION -\%\f3gluNextContour\fP is used in describing polygons with multiple contours. After the first -contour has been described through a series of \%\f3gluTessVertex\fP calls, -a \%\f3gluNextContour\fP call indicates that the previous contour is complete and that the -next contour is about to begin. -Another series of \%\f3gluTessVertex\fP calls is then used to describe the new -contour. This process can be repeated until all contours have been described. -.P -\f2type\fP defines what type of contour follows. -The legal contour types are as follows: -.TP 18 -\%\f3GLU_EXTERIOR\fP -An exterior contour defines an exterior boundary of the polygon. -.TP -\%\f3GLU_INTERIOR\fP -An interior contour defines an interior boundary of the polygon (such as -a hole). -.TP -\%\f3GLU_UNKNOWN\fP -An unknown contour is analyzed by the library to determine if it is interior -or exterior. -.TP -\%\f3GLU_CCW\fP, -.TP -\%\f3GLU_CW\fP -The first \%\f3GLU_CCW\fP or \%\f3GLU_CW\fP contour defined is considered to -be exterior. All other contours are considered to be exterior if they -are oriented in the same direction (clockwise or counterclockwise) as -the first contour, and interior if they are not. -.P -If one contour is of type \%\f3GLU_CCW\fP or \%\f3GLU_CW\fP, then all -contours must be of the same type (if they are not, then all \%\f3GLU_CCW\fP -and \%\f3GLU_CW\fP contours will be changed to \%\f3GLU_UNKNOWN\fP). -.P -Note that there is no real difference between the \%\f3GLU_CCW\fP and -\%\f3GLU_CW\fP contour types. -.P -Before the first contour is described, \%\f3gluNextContour\fP can be called to -define the type of the first contour. -If \%\f3gluNextContour\fP is not called before the first contour, then the first contour is -marked \%\f3GLU_EXTERIOR\fP. -.P -This command is obsolete and is provided for backward compatibility -only. Calls to \%\f3gluNextContour\fP are mapped to \%\f3gluTessEndContour\fP -followed by -\%\f3gluTessBeginContour\fP. -.SH EXAMPLE -A quadrilateral with a triangular hole in it can be described as follows: -.sp -.Ex -gluBeginPolygon(tobj); - gluTessVertex(tobj, v1, v1); - gluTessVertex(tobj, v2, v2); - gluTessVertex(tobj, v3, v3); - gluTessVertex(tobj, v4, v4); -gluNextContour(tobj, GLU_INTERIOR); - gluTessVertex(tobj, v5, v5); - gluTessVertex(tobj, v6, v6); - gluTessVertex(tobj, v7, v7); -gluEndPolygon(tobj); -.Ee -.SH SEE ALSO -\%\f3gluBeginPolygon(3G)\fP, \%\f3gluNewTess(3G)\fP, \%\f3gluTessCallback(3G)\fP, \%\f3gluTessVertex(3G)\fP, -\%\f3gluTessBeginContour(3G)\fP - diff --git a/doc/gl-docs/GLU/nurbscallback.3gl b/doc/gl-docs/GLU/nurbscallback.3gl deleted file mode 100644 index d418fa55..00000000 --- a/doc/gl-docs/GLU/nurbscallback.3gl +++ /dev/null @@ -1,228 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 nurbscall -.ds Xs 14092 10 nurbscallback.gl -.TH GLUNURBSCALLBACK 3G -.SH NAME -.B "gluNurbsCallback -\- define a callback for a NURBS object - -.SH C SPECIFICATION -void \f3gluNurbsCallback\fP( -GLUnurbs* \fInurb\fP, -.nf -.ta \w'\f3void \fPgluNurbsCallback( 'u - GLenum \fIwhich\fP, - _GLUfuncptr \fICallBackFunc\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fICallBackFunc\fP\ \ 'u -\f2nurb\fP -Specifies the NURBS object (created with \%\f3gluNewNurbsRenderer\fP). -.TP -\f2which\fP -Specifies the callback being defined. -Valid values are \%\f3GLU_NURBS_BEGIN\fP, \%\f3GLU_NURBS_VERTEX\fP, \%\f3GLU_NURBS_NORMAL\fP, \%\f3GLU_NURBS_COLOR\fP, \%\f3GLU_NURBS_TEXTURE_COORD\fP, \%\f3GLU_NURBS_END\fP, \%\f3GLU_NURBS_BEGIN_DATA\fP, \%\f3GLU_NURBS_VERTEX_DATA\fP, \%\f3GLU_NURBS_NORMAL_DATA\fP, \%\f3GLU_NURBS_COLOR_DATA\fP, \%\f3GLU_NURBS_TEXTURE_COORD_DATA\fP, \%\f3GLU_NURBS_END_DATA\fP, and \%\f3GLU_NURBS_ERROR\fP. -.TP -\f2CallBackFunc\fP -Specifies the function that the callback calls. -.SH DESCRIPTION -\%\f3gluNurbsCallback\fP is used to define a callback to be used by a NURBS -object. -If the specified callback is already defined, then it is replaced. If -\f2CallBackFunc\fP is NULL, then this callback will not get -invoked and the related data, if any, will be lost. -.P -Except the error callback, these callbacks are used by NURBS tessellator (when \%\f3GLU_NURBS_MODE\fP is set to be \%\f3GLU_NURBS_TESSELLATOR\fP) to return back the OpenGL -polygon primitives resulting from the tessellation. Note that there are two -versions of each callback: one with a user data pointer and one without. If both versions for a particular callback are specified then the callback with -the user data pointer will be used. Note that ``userData'' is a copy of the pointer that was specified at the last call to \%\f3gluNurbsCallbackData\fP. -.P -The error callback function is effective no matter which value that -\%\f3GLU_NURBS_MODE\fP is set to. -All other callback functions are effective only when \%\f3GLU_NURBS_MODE\fP -is set to \%\f3GLU_NURBS_TESSELLATOR\fP. -.P -The legal callbacks are as follows: -.TP 10 -\%\f3GLU_NURBS_BEGIN\fP -The begin callback indicates the start of a primitive. The function -takes a single argument of type GLenum, which can be one of -\%\f3GL_LINES\fP, \%\f3GL_LINE_STRIP\fP, \%\f3GL_TRIANGLE_FAN\fP, \%\f3GL_TRIANGLE_STRIP\fP, \%\f3GL_TRIANGLES\fP, or \%\f3GL_QUAD_STRIP\fP. The -default begin callback function is NULL. The function prototype -for this callback looks like: -.RS -.Ex -void begin ( GLenum type ); -.Ee -.RE -.TP -\%\f3GLU_NURBS_BEGIN_DATA\fP -The same as the \%\f3GLU_NURBS_BEGIN\fP callback except that it takes an -additional pointer argument. This pointer is a copy of the pointer that -was specified at the last call to \%\f3gluNurbsCallbackData\fP. The -default callback function is NULL. The function prototype for this -callback function looks like: -.RS -.Ex -void beginData (GLenum type, void *userData); -.Ee -.RE -.TP -\%\f3GLU_NURBS_VERTEX\fP -The vertex callback indicates a vertex of the primitive. The -coordinates of the vertex are stored in the parameter ``vertex''. All -the generated vertices have dimension 3, that is, homogeneous -coordinates have been transformed into affine coordinates. The default -vertex callback function is NULL. The function prototype for this -callback function looks like: -.RS -.Ex -void vertex ( GLfloat *vertex ); -.Ee -.RE -.TP -\%\f3GLU_NURBS_VERTEX_DATA\fP -This is the same as the \%\f3GLU_NURBS_VERTEX\fP callback, except that -it takes an additional pointer argument. This pointer is a copy of the -pointer that was specified at the last call to -\%\f3gluNurbsCallbackData\fP. The default callback function is NULL. The -function prototype for this callback function looks like: -.RS -.Ex -void vertexData ( GLfloat *vertex, void *userData ); -.Ee -.RE -.TP -\%\f3GLU_NURBS_NORMAL\fP -The normal callback is invoked as the vertex normal is generated. -The components of the normal are stored in the parameter ``normal''. -In the case of a NURBS curve, the callback function is effective only when -the user provides a normal map (\%\f3GL_MAP1_NORMAL\fP). -In the case of a NURBS surface, if a normal map (\%\f3GL_MAP2_NORMAL\fP) is provided, then the generated normal is computed from the normal map. -If a normal map is not provided then a surface normal is computed in -a manner similar to that described for evaluators when \%\f3GL_AUTO_NORMAL\fP -is enabled. -.bp -The default normal callback function is NULL. The function -prototype for this callback function looks like: -.RS -.Ex -void normal ( GLfloat *normal ); -.Ee -.RE -.TP -\%\f3GLU_NURBS_NORMAL_DATA\fP -The same as the \%\f3GLU_NURBS_NORMAL\fP callback except that it -takes an additional pointer argument. This pointer is a copy of the pointer -that was specified at the last call to \%\f3gluNurbsCallbackData\fP. The default callback function is NULL. The function prototype for this callback function looks like: -.RS -.Ex -void normalData ( GLfloat *normal, void *userData ); -.Ee -.RE -.TP -\%\f3GLU_NURBS_COLOR\fP -The color callback is invoked as the color of a vertex is generated. -The components of the color are stored in the parameter ``color''. -This callback is effective only when the user provides a color map -(\%\f3GL_MAP1_COLOR_4\fP or \%\f3GL_MAP2_COLOR_4\fP). ``color'' contains four components: R,G,B,A. The default color callback function is NULL. The prototype for -this callback function looks like: -.RS -.Ex -void color ( GLfloat *color ); -.Ee -.RE -.TP -\%\f3GLU_NURBS_COLOR_DATA\fP -The same as the \%\f3GLU_NURBS_COLOR\fP callback except that it -takes an additional pointer argument. This pointer is a copy of the pointer -that was specified at the last call to \%\f3gluNurbsCallbackData\fP. The default callback function is NULL. The function prototype for this callback function looks like: -.RS -.Ex -void colorData ( GLfloat *color, void *userData ); -.Ee -.RE -.TP -\%\f3GLU_NURBS_TEXTURE_COORD\fP -The texture callback is invoked as the texture coordinates -of a vertex are generated. These coordinates are stored in the parameter -``texCoord''. The number of texture coordinates can be 1, 2, 3, or 4 depending -on which type of texture map is specified -(\%\f3GL_MAP1_TEXTURE_COORD_1\fP, -\%\f3GL_MAP1_TEXTURE_COORD_2\fP, -\%\f3GL_MAP1_TEXTURE_COORD_3\fP, -\%\f3GL_MAP1_TEXTURE_COORD_4\fP, -\%\f3GL_MAP2_TEXTURE_COORD_1\fP, -\%\f3GL_MAP2_TEXTURE_COORD_2\fP, -\%\f3GL_MAP2_TEXTURE_COORD_3\fP, -\%\f3GL_MAP2_TEXTURE_COORD_4\fP). -If no texture map is specified, this callback function will not be called. -.bp -The default texture callback function is NULL. The function prototype -for this callback function looks like: -.RS -.Ex -void texCoord ( GLfloat *texCoord ); -.Ee -.RE -.TP - \%\f3GLU_NURBS_TEXTURE_COORD_DATA\fP -This is the same as the \%\f3GLU_NURBS_TEXTURE_COORD\fP callback, except that it -takes an additional pointer argument. This pointer is a copy of the pointer -that was specified at the last call to \%\f3gluNurbsCallbackData\fP. The default callback function is NULL. The function prototype for this callback function looks like: -.RS -.Ex -void texCoordData (GLfloat *texCoord, void *userData); -.Ee -.RE -.TP -\%\f3GLU_NURBS_END\fP -The end callback is invoked at the end of a primitive. The default end callback function is NULL. The function prototype for this callback function looks like: -.RS -.Ex -void end ( void ); -.Ee -.RE -.TP -\%\f3GLU_NURBS_END_DATA\fP -This is the same as the \%\f3GLU_NURBS_END\fP callback, except that it -takes an additional pointer argument. This pointer is a copy of the pointer -that was specified at the last call to \%\f3gluNurbsCallbackData\fP. The default callback function is NULL. The function prototype for this callback function looks like: -.RS -.Ex -void endData ( void *userData ); -.Ee -.RE -.TP -\%\f3GLU_NURBS_ERROR\fP -The error function is called when an error is encountered. -Its single argument -is of type GLenum, and it indicates the specific error that occurred. -There are 37 errors unique to NURBS named -\%\f3GLU_NURBS_ERROR1\fP through \%\f3GLU_NURBS_ERROR37\fP. -Character strings describing these errors can be retrieved with -\%\f3gluErrorString\fP. -.bp -.SH NOTES -\%\f3gluNurbsCallback\fP is available only if the GLU version is 1.2 or greater. -.P -GLU version 1.2 supports only the \%\f3GLU_ERROR\fP parameter for -\f2which\fP. The \%\f3GLU_ERROR\fP value is deprecated in GLU version 1.3 in -favor of \%\f3GLU_NURBS_ERROR\fP. All other accepted values for \f2CallBackFunc\fP -are available only if the GLU version is 1.3 or greater. -.SH SEE ALSO -\%\f3gluErrorString(3G)\fP, -\%\f3gluNewNurbsRenderer(3G)\fP, -\%\f3gluNurbsCallbackData(3G)\fP, -\%\f3gluNurbsProperty(3G)\fP - diff --git a/doc/gl-docs/GLU/nurbscallbackdata.3gl b/doc/gl-docs/GLU/nurbscallbackdata.3gl deleted file mode 100644 index a0a45f2d..00000000 --- a/doc/gl-docs/GLU/nurbscallbackdata.3gl +++ /dev/null @@ -1,41 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 nurbscall -.ds Xs 16331 3 nurbscallbackdata.gl -.TH GLUNURBSCALLBACKDATA 3G -.SH NAME -.B "gluNurbsCallbackData -\- set a user data pointer - -.SH C SPECIFICATION -void \f3gluNurbsCallbackData\fP( -GLUnurbs* \fInurb\fP, -.nf -.ta \w'\f3void \fPgluNurbsCallbackData( 'u - GLvoid* \fIuserData\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIuserData\fP\ \ 'u -\f2nurb\fP -Specifies the NURBS object (created with \%\f3gluNewNurbsRenderer\fP). -.TP -\f2userData\fP -Specifies a pointer to the user's data. -.SH DESCRIPTION -\%\f3gluNurbsCallbackData\fP is used to pass a pointer to the application's data to NURBS -tessellator. A copy of this pointer will be passed by the tessellator -in the NURBS callback functions (set by \%\f3gluNurbsCallback\fP). -.SH NOTES -\%\f3gluNurbsCallbackData\fP is available only if the GLU version is 1.3 or greater. -.SH SEE ALSO -\%\f3gluNewNurbsRenderer(3G)\fP, -\%\f3gluNurbsCallback(3G)\fP diff --git a/doc/gl-docs/GLU/nurbscallbackdataext.3gl b/doc/gl-docs/GLU/nurbscallbackdataext.3gl deleted file mode 100644 index 8ff424ea..00000000 --- a/doc/gl-docs/GLU/nurbscallbackdataext.3gl +++ /dev/null @@ -1,38 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm :37 nurbscal -.ds Xs 36770 3 nurbscallbackdataext.gl -.TH GLUNURBSCALLBACKDATAEXT 3G -.SH NAME -.B "gluNurbsCallbackDataEXT -\- set a user data pointer - -.SH C SPECIFICATION -void \f3gluNurbsCallbackDataEXT\fP( -GLUnurbs* \fInurb\fP, -.nf -.ta \w'\f3void \fPgluNurbsCallbackDataEXT( 'u - GLvoid* \fIuserData\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIuserData\fP\ \ 'u -\f2nurb\fP -Specifies the NURBS object (created with \%\f3gluNewNurbsRenderer\fP). -.TP -\f2userData\fP -Specifies a pointer to the user's data. -.SH DESCRIPTION -\%\f3gluNurbsCallbackDataEXT\fP is used to pass a pointer to the application's data to NURBS -tessellator. A copy of this pointer will be passed by the tessellator -in the NURBS callback functions (set by \%\f3gluNurbsCallback\fP). -.SH SEE ALSO -\%\f3gluNurbsCallback(3G)\fP diff --git a/doc/gl-docs/GLU/nurbscurve.3gl b/doc/gl-docs/GLU/nurbscurve.3gl deleted file mode 100644 index b528cbbb..00000000 --- a/doc/gl-docs/GLU/nurbscurve.3gl +++ /dev/null @@ -1,99 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 nurbscurv -.ds Xs 25594 5 nurbscurve.gl -.TH GLUNURBSCURVE 3G -.SH NAME -.B "gluNurbsCurve -\- define the shape of a NURBS curve - -.SH C SPECIFICATION -void \f3gluNurbsCurve\fP( -GLUnurbs* \fInurb\fP, -.nf -.ta \w'\f3void \fPgluNurbsCurve( 'u - GLint \fIknotCount\fP, - GLfloat \fI*knots\fP, - GLint \fIstride\fP, - GLfloat \fI*control\fP, - GLint \fIorder\fP, - GLenum \fItype\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIknotCount\fP\ \ 'u -\f2nurb\fP -Specifies the NURBS object (created with \%\f3gluNewNurbsRenderer\fP). -.TP -\f2knotCount\fP -Specifies the number of knots in \f2knots\fP. -\f2knotCount\fP equals the number of control points plus the order. -.TP -\f2knots\fP -Specifies an array of \f2knotCount\fP nondecreasing knot values. -.TP -\f2stride\fP -Specifies the offset (as a number of single-precision floating-point values) -between successive curve control points. -.TP -\f2control\fP -Specifies a pointer to an array of control points. The coordinates must -agree with \f2type\fP, specified below. -.TP -\f2order\fP -Specifies the order of the NURBS curve. \f2order\fP equals degree + 1, hence -a cubic curve has an order of 4. -.TP -\f2type\fP -Specifies the type of the curve. If this curve is defined within a -\%\f3gluBeginCurve\fP/\%\f3gluEndCurve\fP pair, then -the type can be any of the valid -one-dimensional evaluator types (such as \%\f3GL_MAP1_VERTEX_3\fP or -\%\f3GL_MAP1_COLOR_4\fP). Between a \%\f3gluBeginTrim\fP/\%\f3gluEndTrim\fP pair, -the only valid types are \%\f3GLU_MAP1_TRIM_2\fP and \%\f3GLU_MAP1_TRIM_3\fP. -.SH DESCRIPTION -Use \%\f3gluNurbsCurve\fP to describe a NURBS curve. -.P -When \%\f3gluNurbsCurve\fP appears between a \%\f3gluBeginCurve\fP/\%\f3gluEndCurve\fP pair, it is -used to describe a curve to be rendered. -Positional, texture, and color coordinates are associated -by presenting each as a separate \%\f3gluNurbsCurve\fP between a -\%\f3gluBeginCurve\fP/\%\f3gluEndCurve\fP pair. No more than -one call to \%\f3gluNurbsCurve\fP for each of color, position, and texture -data can be made within a single \%\f3gluBeginCurve\fP/\%\f3gluEndCurve\fP -pair. Exactly one call must be made to describe the position of the -curve (a \f2type\fP of \%\f3GL_MAP1_VERTEX_3\fP or \%\f3GL_MAP1_VERTEX_4\fP). -.P -When \%\f3gluNurbsCurve\fP appears between a \%\f3gluBeginTrim\fP/\%\f3gluEndTrim\fP pair, it is -used to describe a trimming curve on a NURBS surface. If \f2type\fP is -\%\f3GLU_MAP1_TRIM_2\fP, then it describes a curve in two-dimensional (\f2u\fP -and \f2v\fP) -parameter space. If it is \%\f3GLU_MAP1_TRIM_3\fP, then it describes a -curve in two-dimensional homogeneous (\f2u\fP, \f2v\fP, and \f2w\fP) -parameter space. -See the \%\f3gluBeginTrim\fP reference page for more discussion about trimming -curves. -.SH EXAMPLE -The following commands render a textured NURBS curve with normals: -.sp -.Ex -gluBeginCurve(nobj); - gluNurbsCurve(nobj, ..., GL_MAP1_TEXTURE_COORD_2); - gluNurbsCurve(nobj, ..., GL_MAP1_NORMAL); - gluNurbsCurve(nobj, ..., GL_MAP1_VERTEX_4); -gluEndCurve(nobj); -.Ee -.sp -.SH NOTES -To define trim curves which stitch well, use \%\f3gluPwlCurve\fP. -.SH SEE ALSO -\%\f3gluBeginCurve(3G)\fP, \%\f3gluBeginTrim(3G)\fP, \%\f3gluNewNurbsRenderer(3G)\fP, \%\f3gluPwlCurve(3G)\fP - diff --git a/doc/gl-docs/GLU/nurbsproperty.3gl b/doc/gl-docs/GLU/nurbsproperty.3gl deleted file mode 100644 index eec82105..00000000 --- a/doc/gl-docs/GLU/nurbsproperty.3gl +++ /dev/null @@ -1,202 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 nurbsprop -.ds Xs 47701 10 nurbsproperty.gl -.TH GLUNURBSPROPERTY 3G -.SH NAME -.B "gluNurbsProperty -\- set a NURBS property - -.SH C SPECIFICATION -void \f3gluNurbsProperty\fP( -GLUnurbs* \fInurb\fP, -.nf -.ta \w'\f3void \fPgluNurbsProperty( 'u - GLenum \fIproperty\fP, - GLfloat \fIvalue\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIproperty\fP\ \ 'u -\f2nurb\fP -Specifies the NURBS object (created with \%\f3gluNewNurbsRenderer\fP). -.TP -\f2property\fP -Specifies the property to be set. Valid values are -\%\f3GLU_SAMPLING_TOLERANCE\fP, -\%\f3GLU_DISPLAY_MODE\fP, -\%\f3GLU_CULLING\fP, -\%\f3GLU_AUTO_LOAD_MATRIX\fP, -\%\f3GLU_PARAMETRIC_TOLERANCE\fP, -\%\f3GLU_SAMPLING_METHOD\fP, -\%\f3GLU_U_STEP\fP, -\%\f3GLU_V_STEP\fP, or -\%\f3GLU_NURBS_MODE\fP. -.TP -\f2value\fP -Specifies the value of the indicated property. -It may be a numeric value, or one of -\%\f3GLU_OUTLINE_POLYGON\fP, -\%\f3GLU_FILL\fP, -\%\f3GLU_OUTLINE_PATCH\fP, -\%\f3GL_TRUE\fP, -\%\f3GL_FALSE\fP, -\%\f3GLU_PATH_LENGTH\fP, -\%\f3GLU_PARAMETRIC_ERROR\fP, -\%\f3GLU_DOMAIN_DISTANCE\fP, -\%\f3GLU_NURBS_RENDERER\fP, or -\%\f3GLU_NURBS_TESSELLATOR\fP. -.SH DESCRIPTION -\%\f3gluNurbsProperty\fP is used to control properties stored in a NURBS object. These -properties affect the way that a NURBS curve is rendered. The accepted -values for \f2property\fP are as follows: -.TP 15 -\%\f3GLU_NURBS_MODE\fP -\f2value\fP should be set to be either \%\f3GLU_NURBS_RENDERER\fP or -\%\f3GLU_NURBS_TESSELLATOR\fP. When set to \%\f3GLU_NURBS_RENDERER\fP, NURBS objects -are tessellated into OpenGL primitives and sent to the pipeline for -rendering. When set to \%\f3GLU_NURBS_TESSELLATOR\fP, NURBS objects are -tessellated into OpenGL primitives but the vertices, normals, colors, and/or textures are -retrieved back through a callback interface (see \%\f3gluNurbsCallback\fP). This allows the user to cache the -tessellated results for further processing. -The initial value is \%\f3GLU_NURBS_RENDERER\fP. -.TP -\%\f3GLU_SAMPLING_METHOD\fP -Specifies how a NURBS surface should be -tessellated. -\f2value\fP may be one of \%\f3GLU_PATH_LENGTH\fP, -\%\f3GLU_PARAMETRIC_ERROR\fP, \%\f3GLU_DOMAIN_DISTANCE\fP, -\%\f3GLU_OBJECT_PATH_LENGTH\fP, or -\%\f3GLU_OBJECT_PARAMETRIC_ERROR\fP. -When set to \%\f3GLU_PATH_LENGTH\fP, the surface is rendered so that -the maximum length, in -pixels, of the edges of the tessellation polygons is no greater than -what is specified by \%\f3GLU_SAMPLING_TOLERANCE\fP. -.IP -\%\f3GLU_PARAMETRIC_ERROR\fP specifies that the surface is rendered in such a -way that the value specified by \%\f3GLU_PARAMETRIC_TOLERANCE\fP describes the -maximum distance, in pixels, between the tessellation polygons and the -surfaces they approximate. -.IP -\%\f3GLU_DOMAIN_DISTANCE\fP allows users to specify, in parametric coordinates, -how many sample points per unit length are taken in \f2u\fP, \f2v\fP -direction. -.IP -\%\f3GLU_OBJECT_PATH_LENGTH\fP is similar to \%\f3GLU_PATH_LENGTH\fP -except that it is view independent, that is, the surface is rendered so that the maximum length, in object space, of edges of the tessellation polygons is no greater than what is specified by \%\f3GLU_SAMPLING_TOLERANCE\fP. -.IP -\%\f3GLU_OBJECT_PARAMETRIC_ERROR\fP is similar to \%\f3GLU_PARAMETRIC_ERROR\fP except that it is view independent, that is, the surface is rendered in such a way that the value specified by \%\f3GLU_PARAMETRIC_TOLERANCE\fP describes the maximum distance, in object space, between the tessellation polygons and the surfaces they approximate. -.IP -The initial value of \%\f3GLU_SAMPLING_METHOD\fP is \%\f3GLU_PATH_LENGTH\fP. -.TP -\%\f3GLU_SAMPLING_TOLERANCE\fP -Specifies the maximum length, in pixels or in object space length unit, -to use when the sampling method is set to \%\f3GLU_PATH_LENGTH\fP or -\%\f3GLU_OBJECT_PATH_LENGTH\fP. -The NURBS code is conservative when rendering a curve -or surface, so the actual length can be somewhat shorter. The initial -value is 50.0 pixels. -.TP -\%\f3GLU_PARAMETRIC_TOLERANCE\fP -Specifies the maximum distance, in pixels or in object space length unit, -to use when the sampling method is \%\f3GLU_PARAMETRIC_ERROR\fP or -\%\f3GLU_OBJECT_PARAMETRIC_ERROR\fP. -The initial value is 0.5. -.TP -\%\f3GLU_U_STEP\fP -Specifies the number of sample points per unit length taken -along the \f2u\fP axis in parametric coordinates. It is needed when -\%\f3GLU_SAMPLING_METHOD\fP is set to \%\f3GLU_DOMAIN_DISTANCE\fP. -The initial value is 100. -.TP -\%\f3GLU_V_STEP\fP -Specifies the number of sample points per unit length taken -along the \f2v\fP axis in parametric coordinate. It is needed when -\%\f3GLU_SAMPLING_METHOD\fP is set to \%\f3GLU_DOMAIN_DISTANCE\fP. The initial -value is 100. -.TP -\%\f3GLU_DISPLAY_MODE\fP -\f2value\fP can be set to -\%\f3GLU_OUTLINE_POLYGON\fP, \%\f3GLU_FILL\fP, or -\%\f3GLU_OUTLINE_PATCH\fP. -When \%\f3GLU_NURBS_MODE\fP is set to be \%\f3GLU_NURBS_RENDERER\fP, -\f2value\fP defines how a NURBS surface should be rendered. -When \f2value\fP is set to \%\f3GLU_FILL\fP, the surface is rendered as a -set of polygons. When \f2value\fP is set to -\%\f3GLU_OUTLINE_POLYGON\fP, the NURBS library draws only the outlines -of the polygons created by tessellation. When \f2value\fP is set to -\%\f3GLU_OUTLINE_PATCH\fP just the outlines of patches and trim -curves defined by the user are drawn. -.IP -When \%\f3GLU_NURBS_MODE\fP is set to be \%\f3GLU_NURBS_TESSELLATOR\fP, -\f2value\fP defines how a NURBS surface should be tessellated. -When \%\f3GLU_DISPLAY_MODE\fP is set to \%\f3GLU_FILL\fP or -\%\f3GLU_OUTLINE_POLYGON\fP, -the NURBS surface is tessellated into OpenGL triangle primitives which can be -retrieved back through callback functions. If \%\f3GLU_DISPLAY_MODE\fP is set to -\%\f3GLU_OUTLINE_PATCH\fP, only the outlines of the patches and trim curves are generated as a sequence of line strips which can be retrieved back through callback functions. -.IP -The initial value is \%\f3GLU_FILL\fP. -.TP -\%\f3GLU_CULLING\fP -\f2value\fP is a boolean value that, when set to \%\f3GL_TRUE\fP, indicates that -a NURBS curve should be discarded prior to tessellation if its control points -lie outside the current viewport. The initial value is \%\f3GL_FALSE\fP. -.TP -\%\f3GLU_AUTO_LOAD_MATRIX\fP -\f2value\fP is a boolean value. When set to \%\f3GL_TRUE\fP, the NURBS code -downloads the projection matrix, the modelview matrix, and the -viewport from the GL server to compute sampling and -culling -matrices for each NURBS curve that is rendered. Sampling and culling matrices -are required to determine the tessellation of a NURBS surface into line segments -or polygons and to cull a NURBS surface if it lies outside the viewport. -.IP -If this mode is set to \%\f3GL_FALSE\fP, then the program needs -to provide a projection matrix, a modelview matrix, and a viewport -for the NURBS renderer to use to construct sampling and culling matrices. -This can be done with the \%\f3gluLoadSamplingMatrices\fP function. -This mode is initially set to \%\f3GL_TRUE\fP. -Changing it from \%\f3GL_TRUE\fP to \%\f3GL_FALSE\fP does not affect -the sampling and culling matrices until -\%\f3gluLoadSamplingMatrices\fP -is called. -.SH NOTES -If \%\f3GLU_AUTO_LOAD_MATRIX\fP is true, sampling and culling may be -executed incorrectly if NURBS routines are compiled into a display list. -.P -A \f2property\fP of -\%\f3GLU_PARAMETRIC_TOLERANCE\fP, -\%\f3GLU_SAMPLING_METHOD\fP, -\%\f3GLU_U_STEP\fP, or -\%\f3GLU_V_STEP\fP, -or a \f2value\fP of -\%\f3GLU_PATH_LENGTH\fP, -\%\f3GLU_PARAMETRIC_ERROR\fP, -\%\f3GLU_DOMAIN_DISTANCE\fP -are only available if the GLU version is 1.1 or greater. They are not -valid parameters in GLU 1.0. -.P -\%\f3gluGetString\fP can -be used to determine the GLU version. -.P -\%\f3GLU_NURBS_MODE\fP is only availble if the GLU version is 1.3 or -greater. -.P -The \%\f3GLU_OBJECT_PATH_LENGTH\fP and \%\f3GLU_OBJECT_PARAMETRIC_ERROR\fP -values for the \%\f3GLU_SAMPLING_METHOD\fP property are only available if -the GLU version is 1.3 or greater. -.SH SEE ALSO -\%\f3gluGetNurbsProperty(3G)\fP, -\%\f3gluLoadSamplingMatrices(3G)\fP, -\%\f3gluNewNurbsRenderer(3G)\fP, -\%\f3gluGetString(3G)\fP, -\%\f3gluNurbsCallback(3G)\fP diff --git a/doc/gl-docs/GLU/nurbssurface.3gl b/doc/gl-docs/GLU/nurbssurface.3gl deleted file mode 100644 index 6199f88f..00000000 --- a/doc/gl-docs/GLU/nurbssurface.3gl +++ /dev/null @@ -1,124 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 nurbssurf -.ds Xs 28728 6 nurbssurface.gl -.TH GLUNURBSSURFACE 3G -.SH NAME -.B "gluNurbsSurface -\- define the shape of a NURBS surface - -.SH C SPECIFICATION -void \f3gluNurbsSurface\fP( -GLUnurbs* \fInurb\fP, -.nf -.ta \w'\f3void \fPgluNurbsSurface( 'u - GLint \fIsKnotCount\fP, - GLfloat* \fIsKnots\fP, - GLint \fItKnotCount\fP, - GLfloat* \fItKnots\fP, - GLint \fIsStride\fP, - GLint \fItStride\fP, - GLfloat* \fIcontrol\fP, - GLint \fIsOrder\fP, - GLint \fItOrder\fP, - GLenum \fItype\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIsKnotCount\fP\ \ 'u -\f2nurb\fP -Specifies the NURBS object (created with \%\f3gluNewNurbsRenderer\fP). -.TP -\f2sKnotCount\fP -Specifies the number of knots in the parametric \f2u\fP direction. -.TP -\f2sKnots\fP -Specifies an array of \f2sKnotCount\fP nondecreasing knot values in the parametric -\f2u\fP direction. -.TP -\f2tKnotCount\fP -Specifies the number of knots in the parametric \f2v\fP direction. -.TP -\f2tKnots\fP -Specifies an array of \f2tKnotCount\fP nondecreasing knot values in the parametric -\f2v\fP direction. -.TP -\f2sStride\fP -Specifies the offset (as a number of single-precision floating point values) -between successive control points in the parametric \f2u\fP direction -in \f2control\fP. -.TP -\f2tStride\fP -Specifies the offset (in single-precision floating-point values) -between successive control points in the parametric \f2v\fP direction -in \f2control\fP. -.TP -\f2control\fP -Specifies an array containing control points for the NURBS surface. -The offsets between successive control points in the parametric \f2u\fP -and \f2v\fP directions are given by \f2sStride\fP and \f2tStride\fP. -.TP -\f2sOrder\fP -Specifies the order of the NURBS surface in the parametric \f2u\fP -direction. The order is one more than the degree, hence -a surface that is cubic in \f2u\fP has a \f2u\fP order of 4. -.TP -\f2tOrder\fP -Specifies the order of the NURBS surface in the parametric \f2v\fP -direction. The order is one more than the degree, hence -a surface that is cubic in \f2v\fP has a \f2v\fP order of 4. -.TP -\f2type\fP -Specifies type of the surface. \f2type\fP can be any of the valid -two-dimensional evaluator types (such as \%\f3GL_MAP2_VERTEX_3\fP or -\%\f3GL_MAP2_COLOR_4\fP). -.SH DESCRIPTION -Use \%\f3gluNurbsSurface\fP within a NURBS (Non-Uniform Rational B-Spline) surface -definition to describe the shape of a NURBS surface (before -any trimming). To mark the beginning of -a NURBS surface definition, use the \%\f3gluBeginSurface\fP command. -To mark the end of a NURBS surface definition, use the -\%\f3gluEndSurface\fP command. Call \%\f3gluNurbsSurface\fP within a NURBS -surface definition only. -.P -Positional, texture, and color coordinates are associated -with a surface by presenting each as a separate \%\f3gluNurbsSurface\fP between a -\%\f3gluBeginSurface\fP/\%\f3gluEndSurface\fP pair. No more than -one call to \%\f3gluNurbsSurface\fP for each of color, position, and texture -data can be made within a single \%\f3gluBeginSurface\fP/\%\f3gluEndSurface\fP -pair. Exactly one call must be made to describe the position of the -surface (a \f2type\fP of \%\f3GL_MAP2_VERTEX_3\fP or \%\f3GL_MAP2_VERTEX_4\fP). -.P -A NURBS surface can be trimmed by using the commands -\%\f3gluNurbsCurve\fP and \%\f3gluPwlCurve\fP between calls to -\%\f3gluBeginTrim\fP and \%\f3gluEndTrim\fP. -.P -Note that a \%\f3gluNurbsSurface\fP with \f2sKnotCount\fP knots in the \f2u\fP direction -and \f2tKnotCount\fP knots in the \f2v\fP direction with orders -\f2sOrder\fP and \f2tOrder\fP must have -(\f2sKnotCount\fP - \f2sOrder\fP) $times$ (\f2tKnotCount\fP - \f2tOrder\fP) control points. -.SH EXAMPLE -The following commands render a textured NURBS surface with normals; -the texture coordinates and normals are also NURBS surfaces: -.sp -.Ex -gluBeginSurface(nobj); - gluNurbsSurface(nobj, ..., GL_MAP2_TEXTURE_COORD_2); - gluNurbsSurface(nobj, ..., GL_MAP2_NORMAL); - gluNurbsSurface(nobj, ..., GL_MAP2_VERTEX_4); -gluEndSurface(nobj); -.Ee -.sp -.SH SEE ALSO -\%\f3gluBeginSurface(3G)\fP, \%\f3gluBeginTrim(3G)\fP, \%\f3gluNewNurbsRenderer(3G)\fP, -\%\f3gluNurbsCurve(3G)\fP, -\%\f3gluPwlCurve(3G)\fP - diff --git a/doc/gl-docs/GLU/ortho2d.3gl b/doc/gl-docs/GLU/ortho2d.3gl deleted file mode 100644 index 02c38a9e..00000000 --- a/doc/gl-docs/GLU/ortho2d.3gl +++ /dev/null @@ -1,41 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 ortho2d.g -.ds Xs 62574 3 ortho2d.gl -.TH GLUORTHO2D 3G -.SH NAME -.B "gluOrtho2D -\- define a 2D orthographic projection matrix - -.SH C SPECIFICATION -void \f3gluOrtho2D\fP( -GLdouble \fIleft\fP, -.nf -.ta \w'\f3void \fPgluOrtho2D( 'u - GLdouble \fIright\fP, - GLdouble \fIbottom\fP, - GLdouble \fItop\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2left\fP\ \f2right\fP\ \ 'u -\f2left\fP, \f2right\fP -Specify the coordinates for the left and right vertical clipping planes. -.TP -\f2bottom\fP, \f2top\fP -Specify the coordinates for the bottom and top horizontal clipping planes. -.SH DESCRIPTION -\%\f3gluOrtho2D\fP sets up a two-dimensional orthographic viewing region. -This is equivalent to calling \f3glOrtho\fP with $ near ~=~ -1 $ and -$ far ~=~ 1 $. -.SH SEE ALSO -\f3glOrtho(3G)\fP, \%\f3gluPerspective(3G)\fP - diff --git a/doc/gl-docs/GLU/partialdisk.3gl b/doc/gl-docs/GLU/partialdisk.3gl deleted file mode 100644 index 3794081e..00000000 --- a/doc/gl-docs/GLU/partialdisk.3gl +++ /dev/null @@ -1,87 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 partialdi -.ds Xs 56621 5 partialdisk.gl -.TH GLUPARTIALDISK 3G -.SH NAME -.B "gluPartialDisk -\- draw an arc of a disk - -.SH C SPECIFICATION -void \f3gluPartialDisk\fP( -GLUquadric* \fIquad\fP, -.nf -.ta \w'\f3void \fPgluPartialDisk( 'u - GLdouble \fIinner\fP, - GLdouble \fIouter\fP, - GLint \fIslices\fP, - GLint \fIloops\fP, - GLdouble \fIstart\fP, - GLdouble \fIsweep\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIslices\fP\ \ 'u -\f2quad\fP -Specifies a quadrics object (created with \%\f3gluNewQuadric\fP). -.TP -\f2inner\fP -Specifies the inner radius of the partial disk (can be 0). -.TP -\f2outer\fP -Specifies the outer radius of the partial disk. -.TP -\f2slices\fP -Specifies the number of subdivisions around the \f2z\fP axis. -.TP -\f2loops\fP -Specifies the number of concentric rings about the origin into which -the partial disk is subdivided. -.TP -\f2start\fP -Specifies the starting angle, in degrees, of the disk portion. -.TP -\f2sweep\fP -Specifies the sweep angle, in degrees, of the disk portion. -.SH DESCRIPTION -\%\f3gluPartialDisk\fP renders a partial disk on the $ z ~=~ 0 $ plane. A partial disk is -similar to a full disk, except that only the subset of the disk from -\f2start\fP through \f2start\fP + \f2sweep\fP is included (where 0 degrees is along the -+\f2y\f axis, -90 degrees along the +\f2x\fP axis, 180 degrees along the \-\f2y\fP axis, and -270 degrees along the \-\f2x\fP axis). -.P -The partial disk has a radius of -\f2outer\fP, and contains a concentric circular hole with a radius -of \f2inner\fP. If \f2inner\fP is 0, then no hole is generated. The partial disk is -subdivided around the \f2z\fP axis into slices (like pizza slices), and also -about the \f2z\fP axis into rings -(as specified by \f2slices\fP and \f2loops\fP, respectively). -.P -With respect to orientation, the +\f2z\fP -side of the partial disk is considered to -be outside (see \%\f3gluQuadricOrientation\fP). -This means that if the -orientation is set to \%\f3GLU_OUTSIDE\fP, then any normals generated -point along the +\f2z\fP axis. Otherwise, they point along the \-\f2z\fP -axis. -.P -If texturing is turned on (with \%\f3gluQuadricTexture\fP), texture -coordinates are generated -linearly such that where $ r ~=~ "outer" $, the value at (\f2r\fP, 0, 0) is -(1.0, 0.5), at (0, \f2r\fP, 0) it is (0.5, 1.0), at (\-\f2r\fP, 0, 0) -it is (0.0, 0.5), and -at (0, \-\f2r\fP, 0) it is (0.5, 0.0). -.SH SEE ALSO -\%\f3gluCylinder(3G)\fP, \%\f3gluDisk(3G)\fP, \%\f3gluNewQuadric(3G)\fP, \%\f3gluQuadricOrientation(3G)\fP, -\%\f3gluQuadricTexture(3G)\fP, -\%\f3gluSphere(3G)\fP - diff --git a/doc/gl-docs/GLU/perspective.3gl b/doc/gl-docs/GLU/perspective.3gl deleted file mode 100644 index e3df546e..00000000 --- a/doc/gl-docs/GLU/perspective.3gl +++ /dev/null @@ -1,96 +0,0 @@ -.\" $XFree86$ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 perspecti -.ds Xs 14699 5 perspective.gl -.TH GLUPERSPECTIVE 3G -.SH NAME -.B "gluPerspective -\- set up a perspective projection matrix - -.SH C SPECIFICATION -void \f3gluPerspective\fP( -GLdouble \fIfovy\fP, -.nf -.ta \w'\f3void \fPgluPerspective( 'u - GLdouble \fIaspect\fP, - GLdouble \fIzNear\fP, - GLdouble \fIzFar\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIaspect\fP\ \ 'u -\f2fovy\fP -Specifies the field of view angle, in degrees, in the \f2y\fP direction. -.TP -\f2aspect\fP -Specifies the aspect ratio that determines -the field of view in the \f2x\fP direction. -The aspect ratio is the ratio of \f2x\fP (width) to \f2y\fP (height). -.TP -\f2zNear\fP -Specifies the distance from the viewer to the near clipping plane -(always positive). -.TP -\f2zFar\fP -Specifies the distance from the viewer to the far clipping plane -(always positive). -.SH DESCRIPTION -\%\f3gluPerspective\fP specifies a viewing frustum into the world coordinate system. -In general, the aspect ratio in \%\f3gluPerspective\fP should match the aspect ratio -of the associated viewport. For example, $ "aspect" ~=~ 2.0 $ means -the viewer's -angle of view is twice as wide in \f2x\fP as it is in \f2y\fP. -If the viewport is -twice as wide as it is tall, it displays the image without distortion. -.P -The matrix generated by \%\f3gluPerspective\fP is multiplied by the current matrix, -just as if \f3glMultMatrix\fP were called with the generated matrix. -To load the perspective matrix onto the current matrix stack instead, -precede the call to \%\f3gluPerspective\fP with a call to \f3glLoadIdentity\fP. -.P -Given \f2f\fP defined as follows: -.sp -.ce -.EQ -f ~=~ cotangent"("{"fovy" over 2}")" -.EN -.bp -The generated matrix is -.sp -.ce -.EQ -left ( ~~ down 130 { matrix { - ccol { {f over "aspect"} above 0 above 0 above 0 } - ccol { 0 above f above 0 above 0 } - ccol { 0 above 0 above {{"zFar" + "zNear"} over {"zNear" - "zFar"}} above -1 } - ccol { 0 above 0 above {{2 * "zFar" * "zNear"} over {"zNear" - "zFar"}} above 0} -}} ~~~ right ) -.EN - -.SH NOTES -Depth buffer precision is affected by the values specified for -\f2zNear\fP and \f2zFar\fP. -The greater the ratio of \f2zFar\fP to \f2zNear\fP is, -the less effective the depth buffer will be at distinguishing between -surfaces that are near each other. -If -.sp -.ce -$r ~=~ "zFar" over "zNear"$ -.sp -.P -roughly $log sub 2 r$ bits of depth buffer precision are lost. -Because $r$ approaches infinity as \f2zNear\fP approaches 0, -\f2zNear\fP must never be set to 0. -.SH SEE ALSO -\f3glFrustum(3G)\fP, \f3glLoadIdentity(3G)\fP, -\f3glMultMatrix(3G)\fP, \%\f3gluOrtho2D(3G)\fP diff --git a/doc/gl-docs/GLU/pickmatrix.3gl b/doc/gl-docs/GLU/pickmatrix.3gl deleted file mode 100644 index 3b5a1501..00000000 --- a/doc/gl-docs/GLU/pickmatrix.3gl +++ /dev/null @@ -1,94 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 pickmatri -.ds Xs 64359 5 pickmatrix.gl -.TH GLUPICKMATRIX 3G -.SH NAME -.B "gluPickMatrix -\- define a picking region - -.SH C SPECIFICATION -void \f3gluPickMatrix\fP( -GLdouble \fIx\fP, -.nf -.ta \w'\f3void \fPgluPickMatrix( 'u - GLdouble \fIy\fP, - GLdouble \fIdelX\fP, - GLdouble \fIdelY\fP, - GLint \fI*viewport\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2x\fP\ \f2y\fP\ \ 'u -\f2x\fP, \f2y\fP -Specify the center of a picking region in window coordinates. -.TP -\f2delX\fP, \f2delY\fP -Specify the width and height, respectively, of the picking region in window -coordinates. -.TP -\f2viewport\fP -Specifies the current viewport (as from a \f3glGetIntegerv\fP call). -.SH DESCRIPTION -\%\f3gluPickMatrix\fP creates a projection matrix that can be used to restrict drawing -to a small region of the viewport. -This is typically useful to -determine what objects are being drawn near the cursor. -Use \%\f3gluPickMatrix\fP to -restrict drawing to a small region around the cursor. -Then, -enter selection mode (with \f3glRenderMode\fP) and rerender the scene. -All primitives that would have been drawn near -the cursor are identified and stored in the selection buffer. -.P -The matrix created by \%\f3gluPickMatrix\fP is multiplied by the current matrix just -as if \f3glMultMatrix\fP is called with the generated matrix. -To effectively use the generated pick matrix for picking, -first call \f3glLoadIdentity\fP to load an identity matrix onto the -perspective matrix stack. -Then call \%\f3gluPickMatrix\fP, -and finally, call a command (such as \%\f3gluPerspective\fP) -to multiply the perspective matrix by the pick matrix. -.P -When using \%\f3gluPickMatrix\fP to pick NURBS, be careful to turn off the NURBS -property -\%\f3GLU_AUTO_LOAD_MATRIX\fP. If \%\f3GLU_AUTO_LOAD_MATRIX\fP is not -turned off, then any NURBS surface rendered is subdivided differently with -the pick matrix than the way it was subdivided without the pick matrix. -.bp -.SH EXAMPLE -When rendering a scene as follows: -.sp -.Ex -glMatrixMode(GL_PROJECTION); -glLoadIdentity(); -gluPerspective(...); -glMatrixMode(GL_MODELVIEW); -/* Draw the scene */ -.Ee -.sp -a portion of the viewport can be selected as a pick region like this: -.sp -.Ex -glMatrixMode(GL_PROJECTION); -glLoadIdentity(); -gluPickMatrix(x, y, width, height, viewport); -gluPerspective(...); -glMatrixMode(GL_MODELVIEW); -/* Draw the scene */ -.Ee -.SH SEE ALSO -\f3glGet(3G)\fP, -\f3glLoadIndentity(3G)\fP, -\f3glMultMatrix(3G)\fP, -\f3glRenderMode(3G)\fP, -\%\f3gluPerspective(3G)\fP - diff --git a/doc/gl-docs/GLU/project.3gl b/doc/gl-docs/GLU/project.3gl deleted file mode 100644 index 2f6267c9..00000000 --- a/doc/gl-docs/GLU/project.3gl +++ /dev/null @@ -1,88 +0,0 @@ -.\" $XFree86$ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 project.g -.ds Xs 21974 4 project.gl -.TH GLUPROJECT 3G -.SH NAME -.B "gluProject -\- map object coordinates to window coordinates - -.SH C SPECIFICATION -GLint \f3gluProject\fP( -GLdouble \fIobjX\fP, -.nf -.ta \w'\f3GLint \fPgluProject( 'u - GLdouble \fIobjY\fP, - GLdouble \fIobjZ\fP, - const GLdouble \fI*model\fP, - const GLdouble \fI*proj\fP, - const GLint \fI*view\fP, - GLdouble* \fIwinX\fP, - GLdouble* \fIwinY\fP, - GLdouble* \fIwinZ\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2objX\fP\ \f2objY\fP\ \f2objZ\fP\ \ 'u -\f2objX\fP, \f2objY\fP, \f2objZ\fP -Specify the object coordinates. -.TP -\f2model\fP -Specifies the current modelview matrix (as from a \f3glGetDoublev\fP call). -.TP -\f2proj\fP -Specifies the current projection matrix (as from a \f3glGetDoublev\fP call). -.TP -\f2view\fP -Specifies the current viewport (as from a \f3glGetIntegerv\fP call). -.TP -\f2winX\fP, \f2winY\fP, \f2winZ\fP -Return the computed window coordinates. -.SH DESCRIPTION -\%\f3gluProject\fP transforms the specified object coordinates into window coordinates -using \f2model\fP, \f2proj\fP, and \f2view\fP. The result is stored -in \f2winX\fP, \f2winY\fP, and \f2winZ\fP. A return value of -\%\f3GL_TRUE\fP indicates success, a return value of \%\f3GL_FALSE\fP -indicates failure. -.P -To compute the coordinates, -let $v ~=~ ("objX", "objY", "objZ", 1.0)$ -represented as a matrix with 4 rows and 1 column. -Then \%\f3gluProject\fP computes $v sup prime$ -as follows: -.sp -.EQ -v sup prime ~=~ P ~times~ M ~times~ v -.EN -.sp -where $P$ is the current projection matrix \f2proj\fP, $M$ is the current -modelview matrix \f2model\fP (both represented as -$4 times 4$ matrices in column-major order) and '$times$' represents -matrix multiplication. -.P -The window coordinates are then computed as follows: -.sp -.EQ -"winX" ~=~ "view" (0) ~+~ "view" (2) ~*~ (v sup prime (0) ~+~ 1)~/~2 -.EN -.sp -.EQ -"winY" ~=~ "view" (1) ~+~ "view" (3)~*~(v sup prime (1) ~+~ 1)~/~2 -.EN -.sp -.EQ -"winZ" ~=~ (v sup prime (2) ~+~ 1)~/~ 2 -.EN -.sp -.SH SEE ALSO -\f3glGet(3G)\fP, \%\f3gluUnProject(3G)\fP - diff --git a/doc/gl-docs/GLU/pwlcurve.3gl b/doc/gl-docs/GLU/pwlcurve.3gl deleted file mode 100644 index a30b7726..00000000 --- a/doc/gl-docs/GLU/pwlcurve.3gl +++ /dev/null @@ -1,69 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 pwlcurve. -.ds Xs 35475 4 pwlcurve.gl -.TH GLUPWLCURVE 3G -.SH NAME -.B "gluPwlCurve -\- describe a piecewise linear NURBS trimming curve - -.SH C SPECIFICATION -void \f3gluPwlCurve\fP( -GLUnurbs* \fInurb\fP, -.nf -.ta \w'\f3void \fPgluPwlCurve( 'u - GLint \fIcount\fP, - GLfloat* \fIdata\fP, - GLint \fIstride\fP, - GLenum \fItype\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIstride\fP\ \ 'u -\f2nurb\fP -Specifies the NURBS object (created with \%\f3gluNewNurbsRenderer\fP). -.TP -\f2count\fP -Specifies the number of points on the curve. -.TP -\f2data\fP -Specifies an array containing the curve points. -.TP -\f2stride\fP -Specifies the offset (a number of single-precision floating-point values) -between points on the curve. -.TP -\f2type\fP -Specifies the type of curve. -Must be either \%\f3GLU_MAP1_TRIM_2\fP or \%\f3GLU_MAP1_TRIM_3\fP. -.SH DESCRIPTION -\%\f3gluPwlCurve\fP describes a piecewise linear trimming curve for a NURBS surface. -A piecewise linear curve consists of a list of -coordinates of points in the parameter space for the -NURBS surface to be trimmed. These points are connected -with line segments to form a curve. If the curve is -an approximation to a curve that is not piecewise linear, -the points should be close enough in parameter space that the -resulting path appears curved at the resolution used in the application. -.P -If \f2type\fP is -\%\f3GLU_MAP1_TRIM_2\fP, then it describes a curve in two-dimensional (\f2u\fP -and \f2v\fP) parameter space. If it is \%\f3GLU_MAP1_TRIM_3\fP, then it -describes a curve in two-dimensional homogeneous (\f2u\fP, \f2v\fP, -and \f2w\fP) parameter space. -See the \%\f3gluBeginTrim\fP reference page for more information -about trimming curves. -.SH NOTES -To describe a trim curve that closely follows the contours of a NURBS -surface, call \%\f3gluNurbsCurve\fP. -.SH SEE ALSO -\%\f3gluBeginCurve(3G)\fP, \%\f3gluBeginTrim(3G)\fP, \%\f3gluNewNurbsRenderer(3G)\fP, \%\f3gluNurbsCurve(3G)\fP - diff --git a/doc/gl-docs/GLU/quadriccallback.3gl b/doc/gl-docs/GLU/quadriccallback.3gl deleted file mode 100644 index 3976acf6..00000000 --- a/doc/gl-docs/GLU/quadriccallback.3gl +++ /dev/null @@ -1,51 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 quadricca -.ds Xs 46833 3 quadriccallback.gl -.TH GLUQUADRICCALLBACK 3G -.SH NAME -.B "gluQuadricCallback -\- define a callback for a quadrics object - -.SH C SPECIFICATION -void \f3gluQuadricCallback\fP( -GLUquadric* \fIquad\fP, -.nf -.ta \w'\f3void \fPgluQuadricCallback( 'u - GLenum \fIwhich\fP, - _GLUfuncptr \fICallBackFunc\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fICallBackFunc\fP\ \ 'u -\f2quad\fP -Specifies the quadrics object (created with \%\f3gluNewQuadric\fP). -.TP -\f2which\fP -Specifies the callback being defined. -The only valid value is \%\f3GLU_ERROR\fP. -.TP -\f2CallBackFunc\fP -Specifies the function to be called. -.SH DESCRIPTION -\%\f3gluQuadricCallback\fP is used to define a new callback to be used by a quadrics object. -If the specified callback is already defined, then it is replaced. If -\f2CallBackFunc\fP is NULL, then any existing callback is erased. -.P -The one legal callback is \%\f3GLU_ERROR\fP: -.TP 15 -\%\f3GLU_ERROR\fP -The function is called when an error is encountered. Its single argument -is of type GLenum, and it indicates the specific error that occurred. -Character strings describing these errors can be retrieved with the -\%\f3gluErrorString\fP call. -.SH SEE ALSO -\%\f3gluErrorString(3G)\fP, \%\f3gluNewQuadric(3G)\fP diff --git a/doc/gl-docs/GLU/quadricdrawstyle.3gl b/doc/gl-docs/GLU/quadricdrawstyle.3gl deleted file mode 100644 index 6fa2a342..00000000 --- a/doc/gl-docs/GLU/quadricdrawstyle.3gl +++ /dev/null @@ -1,57 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 quadricdr -.ds Xs 39695 4 quadricdrawstyle.gl -.TH GLUQUADRICDRAWSTYLE 3G -.SH NAME -.B "gluQuadricDrawStyle -\- specify the draw style desired for quadrics - -.SH C SPECIFICATION -void \f3gluQuadricDrawStyle\fP( -GLUquadric* \fIquad\fP, -.nf -.ta \w'\f3void \fPgluQuadricDrawStyle( 'u - GLenum \fIdraw\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2quad\fP\ \ 'u -\f2quad\fP -Specifies the quadrics object (created with \%\f3gluNewQuadric\fP). -.TP -\f2draw\fP -Specifies the desired draw style. Valid values are -\%\f3GLU_FILL\fP, -\%\f3GLU_LINE\fP, -\%\f3GLU_SILHOUETTE\fP, and -\%\f3GLU_POINT\fP. -.SH DESCRIPTION -\%\f3gluQuadricDrawStyle\fP specifies the draw style for quadrics rendered with -\f2quad\fP. The legal values are as follows: -.TP 15 -\%\f3GLU_FILL\fP -Quadrics are rendered with polygon primitives. The polygons -are drawn in a counterclockwise fashion with respect to their -normals (as defined with \%\f3gluQuadricOrientation\fP). -.TP -\%\f3GLU_LINE\fP -Quadrics are rendered as a set of lines. -.TP -\%\f3GLU_SILHOUETTE\fP -Quadrics are rendered as a set of lines, except that edges separating -coplanar faces will not be drawn. -.TP -\%\f3GLU_POINT\fP -Quadrics are rendered as a set of points. -.SH SEE ALSO -\%\f3gluNewQuadric(3G)\fP, \%\f3gluQuadricNormals(3G)\fP, \%\f3gluQuadricOrientation(3G)\fP, -\%\f3gluQuadricTexture(3G)\fP diff --git a/doc/gl-docs/GLU/quadricnormals.3gl b/doc/gl-docs/GLU/quadricnormals.3gl deleted file mode 100644 index 9e09fd43..00000000 --- a/doc/gl-docs/GLU/quadricnormals.3gl +++ /dev/null @@ -1,51 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 quadricno -.ds Xs 40719 3 quadricnormals.gl -.TH GLUQUADRICNORMALS 3G -.SH NAME -.B "gluQuadricNormals -\- specify what kind of normals are desired for quadrics - -.SH C SPECIFICATION -void \f3gluQuadricNormals\fP( -GLUquadric* \fIquad\fP, -.nf -.ta \w'\f3void \fPgluQuadricNormals( 'u - GLenum \fInormal\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fInormal\fP\ \ 'u -\f2quad\fP -Specifes the quadrics object (created with \%\f3gluNewQuadric\fP). -.TP -\f2normal\fP -Specifies the desired type of normals. Valid values are -\%\f3GLU_NONE\fP, -\%\f3GLU_FLAT\fP, and -\%\f3GLU_SMOOTH\fP. -.SH DESCRIPTION -\%\f3gluQuadricNormals\fP specifies what kind of normals are desired for quadrics rendered with -\f2quad\fP. The legal values are as follows: -.TP 15 -\%\f3GLU_NONE\fP -No normals are generated. -.TP -\%\f3GLU_FLAT\fP -One normal is generated for every facet of a quadric. -.TP -\%\f3GLU_SMOOTH\fP -One normal is generated for every vertex of a quadric. This is the -initial value. -.SH SEE ALSO -\%\f3gluNewQuadric(3G)\fP, \%\f3gluQuadricDrawStyle(3G)\fP, \%\f3gluQuadricOrientation(3G)\fP, -\%\f3gluQuadricTexture(3G)\fP diff --git a/doc/gl-docs/GLU/quadricorientation.3gl b/doc/gl-docs/GLU/quadricorientation.3gl deleted file mode 100644 index 1de2ad22..00000000 --- a/doc/gl-docs/GLU/quadricorientation.3gl +++ /dev/null @@ -1,49 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 quadricor -.ds Xs 27503 3 quadricorientation.gl -.TH GLUQUADRICORIENTATION 3G -.SH NAME -.B "gluQuadricOrientation -\- specify inside/outside orientation for quadrics - -.SH C SPECIFICATION -void \f3gluQuadricOrientation\fP( -GLUquadric* \fIquad\fP, -.nf -.ta \w'\f3void \fPgluQuadricOrientation( 'u - GLenum \fIorientation\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIorientation\fP\ \ 'u -\f2quad\fP -Specifies the quadrics object (created with \%\f3gluNewQuadric\fP). -.TP -\f2orientation\fP -Specifies the desired orientation. Valid values are -\%\f3GLU_OUTSIDE\fP and -\%\f3GLU_INSIDE\fP. -.SH DESCRIPTION -\%\f3gluQuadricOrientation\fP specifies what kind of orientation is desired for quadrics rendered -with \f2quad\fP. The \f2orientation\fP values are as follows: -.TP 15 -\%\f3GLU_OUTSIDE\fP -Quadrics are drawn with normals pointing outward (the initial value). -.TP -\%\f3GLU_INSIDE\fP -Quadrics are drawn with normals pointing inward. -.P -Note that the interpretation of \f2outward\fP and \f2inward\fP depends on the -quadric being drawn. -.SH SEE ALSO -\%\f3gluNewQuadric(3G)\fP, \%\f3gluQuadricDrawStyle(3G)\fP, \%\f3gluQuadricNormals(3G)\fP, -\%\f3gluQuadricTexture(3G)\fP diff --git a/doc/gl-docs/GLU/quadrictexture.3gl b/doc/gl-docs/GLU/quadrictexture.3gl deleted file mode 100644 index 3f5c77f5..00000000 --- a/doc/gl-docs/GLU/quadrictexture.3gl +++ /dev/null @@ -1,45 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 quadricte -.ds Xs 18441 3 quadrictexture.gl -.TH GLUQUADRICTEXTURE 3G -.SH NAME -.B "gluQuadricTexture -\- specify if texturing is desired for quadrics - -.SH C SPECIFICATION -void \f3gluQuadricTexture\fP( -GLUquadric* \fIquad\fP, -.nf -.ta \w'\f3void \fPgluQuadricTexture( 'u - GLboolean \fItexture\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fItexture\fP\ \ 'u -\f2quad\fP -Specifies the quadrics object (created with \%\f3gluNewQuadric\fP). -.TP -\f2texture\fP -Specifies a flag indicating if texture coordinates should be generated. -.SH DESCRIPTION -\%\f3gluQuadricTexture\fP specifies if texture coordinates should be generated -for quadrics rendered with \f2quad\fP. -If the value of \f2texture\fP is \%\f3GL_TRUE\fP, then texture coordinates -are generated, and if \f2texture\fP is \%\f3GL_FALSE\fP, they are not. The -initial value is \%\f3GL_FALSE\fP. -.P -The manner in which texture coordinates are generated depends -upon the specific quadric rendered. -.SH SEE ALSO -\%\f3gluNewQuadric(3G)\fP, \%\f3gluQuadricDrawStyle(3G)\fP, \%\f3gluQuadricNormals(3G)\fP, -\%\f3gluQuadricOrientation(3G)\fP - diff --git a/doc/gl-docs/GLU/scaleimage.3gl b/doc/gl-docs/GLU/scaleimage.3gl deleted file mode 100644 index e71e1ab0..00000000 --- a/doc/gl-docs/GLU/scaleimage.3gl +++ /dev/null @@ -1,172 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 scaleimag -.ds Xs 38480 7 scaleimage.gl -.TH GLUSCALEIMAGE 3G -.SH NAME -.B "gluScaleImage -\- scale an image to an arbitrary size - -.SH C SPECIFICATION -GLint \f3gluScaleImage\fP( -GLenum \fIformat\fP, -.nf -.ta \w'\f3GLint \fPgluScaleImage( 'u - GLsizei \fIwIn\fP, - GLsizei \fIhIn\fP, - GLenum \fItypeIn\fP, - const void \fI*dataIn\fP, - GLsizei \fIwOut\fP, - GLsizei \fIhOut\fP, - GLenum \fItypeOut\fP, - GLvoid* \fIdataOut\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fItypeOut\fP\ \ 'u -\f2format\fP -Specifies the of the pixel data. -The following symbolic values are valid: -\%\f3GL_COLOR_INDEX\fP, -\%\f3GL_STENCIL_INDEX\fP, -\%\f3GL_DEPTH_COMPONENT\fP, -\%\f3GL_RED\fP, -\%\f3GL_GREEN\fP, -\%\f3GL_BLUE\fP, -\%\f3GL_ALPHA\fP, -\%\f3GL_RGB\fP, -\%\f3GL_RGBA\fP, -\%\f3GL_BGR\fP, -\%\f3GL_BGRA\fP, -\%\f3GL_LUMINANCE\fP, and -\%\f3GL_LUMINANCE_ALPHA\fP. -.TP -\f2wIn\fP, \f2hIn\fP -Specify in pixels the width and height, respectively, of the source image. -.TP -\f2typeIn\fP -Specifies the data type for \f2dataIn\fP. Must be one of -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP. -.TP -\f2dataIn\fP -Specifies a pointer to the source image. -.TP -\f2wOut\fP, \f2hOut\fP -Specify the width and height, respectively, in pixels of the destination image. -.TP -\f2typeOut\fP -Specifies the data type for \f2dataOut\fP. Must be one of -\%\f3GL_UNSIGNED_BYTE\fP, -\%\f3GL_BYTE\fP, -\%\f3GL_BITMAP\fP, -\%\f3GL_UNSIGNED_SHORT\fP, -\%\f3GL_SHORT\fP, -\%\f3GL_UNSIGNED_INT\fP, -\%\f3GL_INT\fP, -\%\f3GL_FLOAT\fP, -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, or -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP. -.TP -\f2dataOut\fP -Specifies a pointer to the destination image. -.SH DESCRIPTION -\%\f3gluScaleImage\fP scales a pixel image using the appropriate pixel store modes to -unpack data from the source image and pack data into the destination image. -.P -When shrinking an image, \%\f3gluScaleImage\fP uses a box filter to sample the source image -and create pixels for the destination image. When magnifying an image, -the pixels from the source image are linearly interpolated to create the -destination image. -.P -A return value of zero indicates success, otherwise a GLU error code is returned (see \%\f3gluErrorString\fP). -.P -See the \f3glReadPixels\fP reference page for a description of -the acceptable values for the \f2format\fP, \f2typeIn\fP, and \f2typeOut\fP parameters. -.SH NOTES -Formats \%\f3GL_BGR\fP, and \%\f3GL_BGRA\fP, and types -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP, -\%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP, -\%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP, -\%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP, -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP, -\%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP, -\%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP, -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP, and -\%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP are only available if the GL version -is 1.2 or greater. -.SH ERRORS -\%\f3GLU_INVALID_VALUE\fP is returned if \f2wIn\fP, \f2hIn\fP, \f2wOut\fP, or \f2hOut\fP -is negative. -.P -\%\f3GLU_INVALID_ENUM\fP is returned if \f2format\fP, \f2typeIn\fP, or \f2typeOut\fP is not -legal. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2typeIn\fP or \f2typeOut\fP is -\%\f3GL_UNSIGNED_BYTE_3_3_2\fP or \%\f3GL_UNSIGNED_BYTE_2_3_3_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2typeIn\fP or \f2typeOut\fP is -\%\f3GL_UNSIGNED_SHORT_5_6_5\fP or \%\f3GL_UNSIGNED_SHORT_5_6_5_REV\fP -and \f2format\fP is not \%\f3GL_RGB\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2typeIn\fP or \f2typeOut\fP is -\%\f3GL_UNSIGNED_SHORT_4_4_4_4\fP or \%\f3GL_UNSIGNED_SHORT_4_4_4_4_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2typeIn\fP or \f2typeOut\fP is -\%\f3GL_UNSIGNED_SHORT_5_5_5_1\fP or \%\f3GL_UNSIGNED_SHORT_1_5_5_5_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2typeIn\fP or \f2typeOut\fP is -\%\f3GL_UNSIGNED_INT_8_8_8_8\fP or \%\f3GL_UNSIGNED_INT_8_8_8_8_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.P -\%\f3GLU_INVALID_OPERATION\fP is returned if \f2typeIn\fP or \f2typeOut\fP is -\%\f3GL_UNSIGNED_INT_10_10_10_2\fP or \%\f3GL_UNSIGNED_INT_2_10_10_10_REV\fP -and \f2format\fP is neither \%\f3GL_RGBA\fP nor \%\f3GL_BGRA\fP. -.SH SEE ALSO -\f3glDrawPixels(3G)\fP, \f3glReadPixels(3G)\fP, \%\f3gluBuild1DMipmaps(3G)\fP, \%\f3gluBuild2DMipmaps(3G)\fP, -\%\f3gluBuild3DMipmaps(3G)\fP, -.BR -\%\f3gluErrorString(3G)\fP - diff --git a/doc/gl-docs/GLU/sphere.3gl b/doc/gl-docs/GLU/sphere.3gl deleted file mode 100644 index 229cee65..00000000 --- a/doc/gl-docs/GLU/sphere.3gl +++ /dev/null @@ -1,66 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 sphere.gl -.ds Xs 36748 4 sphere.gl -.TH GLUSPHERE 3G -.SH NAME -.B "gluSphere -\- draw a sphere - -.SH C SPECIFICATION -void \f3gluSphere\fP( -GLUquadric* \fIquad\fP, -.nf -.ta \w'\f3void \fPgluSphere( 'u - GLdouble \fIradius\fP, - GLint \fIslices\fP, - GLint \fIstacks\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIradius\fP\ \ 'u -\f2quad\fP -Specifies the quadrics object (created with \%\f3gluNewQuadric\fP). -.TP -\f2radius\fP -Specifies the radius of the sphere. -.TP -\f2slices\fP -Specifies the number of subdivisions around the \f2z\fP axis -(similar to lines of longitude). -.TP -\f2stacks\fP -Specifies the number of subdivisions along the \f2z\fP axis -(similar to lines of latitude). -.SH DESCRIPTION -\%\f3gluSphere\fP draws a sphere of the given radius centered around the origin. The -sphere is subdivided around the \f2z\fP axis into slices and along the -\f2z\fP axis -into stacks (similar to lines of longitude and latitude). -.P -If the orientation is set to \%\f3GLU_OUTSIDE\fP -(with \%\f3gluQuadricOrientation\fP), then any normals generated -point away from the center of the sphere. -Otherwise, they point toward the center of the sphere. -.P -If texturing is turned on (with \%\f3gluQuadricTexture\fP), then texture -coordinates are -generated so that \f2t\fP ranges from 0.0 at $ z ~=~ -^"radius" $ to 1.0 at -$ z ~=~ "radius" $ (\f2t\fP increases linearly along longitudinal -lines), -and \f2s\fP ranges from 0.0 at the +\f2y\fP axis, to 0.25 at the -+\f2x\fP axis, -to 0.5 at the \-\f2y\fP axis, to 0.75 at the \-\f2x\fP axis, and back to 1.0 -at the +\f2y\fP axis. -.SH SEE ALSO -\%\f3gluCylinder(3G)\fP, \%\f3gluDisk(3G)\fP, \%\f3gluNewQuadric(3G)\fP, -\%\f3gluPartialDisk(3G)\fP, \%\f3gluQuadricOrientation(3G)\fP, -\%\f3gluQuadricTexture(3G)\fP diff --git a/doc/gl-docs/GLU/tessbegincontour.3gl b/doc/gl-docs/GLU/tessbegincontour.3gl deleted file mode 100644 index 0f0b7f07..00000000 --- a/doc/gl-docs/GLU/tessbegincontour.3gl +++ /dev/null @@ -1,44 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 tessbegin -.ds Xs 52199 3 tessbegincontour.gl -.TH GLUTESSBEGINCONTOUR 3G -.SH NAME -.B "gluTessBeginContour, gluTessEndContour -\- delimit a contour description - -.SH C SPECIFICATION -void \f3gluTessBeginContour\fP( -GLUtesselator* \fItess\fP ) -.nf -.fi - -void \f3gluTessEndContour\fP( -GLUtesselator* \fItess\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2tess\fP\ \ 'u -\f2tess\fP -Specifies the tessellation object (created with \%\f3gluNewTess\fP). -.SH DESCRIPTION -\%\f3gluTessBeginContour\fP and \%\f3gluTessEndContour\fP delimit the definition of a -polygon contour. Within each \%\f3gluTessBeginContour\fP/\%\f3gluTessEndContour\fP -pair, there can be zero or more calls to \%\f3gluTessVertex\fP. The vertices -specify a closed contour (the last vertex of each contour is automatically linked -to the first). See the \%\f3gluTessVertex\fP reference page for more details. -\%\f3gluTessBeginContour\fP can only be called between \%\f3gluTessBeginPolygon\fP and \%\f3gluTessEndPolygon\fP. -.SH SEE ALSO -\%\f3gluNewTess(3G)\fP, \%\f3gluTessBeginPolygon(3G)\fP, \%\f3gluTessVertex(3G)\fP, -\%\f3gluTessCallback(3G)\fP, -\%\f3gluTessProperty(3G)\fP, \%\f3gluTessNormal(3G)\fP, -\%\f3gluTessEndPolygon\fP diff --git a/doc/gl-docs/GLU/tessbeginpolygon.3gl b/doc/gl-docs/GLU/tessbeginpolygon.3gl deleted file mode 100644 index 8adf8550..00000000 --- a/doc/gl-docs/GLU/tessbeginpolygon.3gl +++ /dev/null @@ -1,73 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 tessbegin -.ds Xs 55678 4 tessbeginpolygon.gl -.TH GLUTESSBEGINPOLYGON 3G -.SH NAME -.B "gluTessBeginPolygon -\- delimit a polygon description - -.SH C SPECIFICATION -void \f3gluTessBeginPolygon\fP( -GLUtesselator* \fItess\fP, -.nf -.ta \w'\f3void \fPgluTessBeginPolygon( 'u - GLvoid* \fIdata\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2tess\fP\ \ 'u -\f2tess\fP -Specifies the tessellation object (created with \%\f3gluNewTess\fP). -.TP -\f2data\fP -Specifies a pointer to user polygon data. -.SH DESCRIPTION -\%\f3gluTessBeginPolygon\fP and \%\f3gluTessEndPolygon\fP delimit the definition of a -convex, concave or self-intersecting polygon. Within each \%\f3gluTessBeginPolygon\fP/\%\f3gluTessEndPolygon\fP -pair, there must be one or more calls to \%\f3gluTessBeginContour\fP/\%\f3gluTessEndContour\fP. -Within each contour, there are zero or more calls to \%\f3gluTessVertex\fP. The vertices -specify a closed contour (the last vertex of each contour is automatically linked -to the first). See the \%\f3gluTessVertex\fP, \%\f3gluTessBeginContour\fP, and -\%\f3gluTessEndContour\fP reference pages for more details. -.P -\f2data\fP is a pointer to a user-defined data structure. If the appropriate callback(s) -are specified (see \%\f3gluTessCallback\fP), then this pointer is returned to the -callback function(s). Thus, it is a convenient way to store per-polygon information. -.P -Once \%\f3gluTessEndPolygon\fP is called, the polygon is tessellated, and the -resulting triangles are described through callbacks. -See \%\f3gluTessCallback\fP for descriptions of the callback functions. -.SH EXAMPLE -A quadrilateral with a triangular hole in it can be described as follows: -.sp -.Ex -gluTessBeginPolygon(tobj, NULL); - gluTessBeginContour(tobj); - gluTessVertex(tobj, v1, v1); - gluTessVertex(tobj, v2, v2); - gluTessVertex(tobj, v3, v3); - gluTessVertex(tobj, v4, v4); - gluTessEndContour(tobj); -.bp - gluTessBeginContour(tobj); - gluTessVertex(tobj, v5, v5); - gluTessVertex(tobj, v6, v6); - gluTessVertex(tobj, v7, v7); - gluTessEndContour(tobj); -gluTessEndPolygon(tobj); -.Ee -.sp -.SH SEE ALSO -\%\f3gluNewTess(3G)\fP, \%\f3gluTessBeginContour(3G)\fP, \%\f3gluTessVertex(3G)\fP, -\%\f3gluTessCallback(3G)\fP, -\%\f3gluTessProperty(3G)\fP, \%\f3gluTessNormal(3G)\fP, -\%\f3gluTessEndPolygon(3G)\fP diff --git a/doc/gl-docs/GLU/tesscallback.3gl b/doc/gl-docs/GLU/tesscallback.3gl deleted file mode 100644 index 67325f6d..00000000 --- a/doc/gl-docs/GLU/tesscallback.3gl +++ /dev/null @@ -1,294 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 tesscallb -.ds Xs 14825 12 tesscallback.gl -.TH GLUTESSCALLBACK 3G -.SH NAME -.B "gluTessCallback -\- define a callback for a tessellation object - -.SH C SPECIFICATION -void \f3gluTessCallback\fP( -GLUtesselator* \fItess\fP, -.nf -.ta \w'\f3void \fPgluTessCallback( 'u - GLenum \fIwhich\fP, - _GLUfuncptr \fICallBackFunc\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fICallBackFunc\fP\ \ 'u -\f2tess\fP -Specifies the tessellation object (created with \%\f3gluNewTess\fP). -.TP -\f2which\fP -Specifies the callback being defined. The following values are valid: -\%\f3GLU_TESS_BEGIN\fP, -\%\f3GLU_TESS_BEGIN_DATA\fP, -\%\f3GLU_TESS_EDGE_FLAG\fP, -\%\f3GLU_TESS_EDGE_FLAG_DATA\fP, -\%\f3GLU_TESS_VERTEX\fP, -\%\f3GLU_TESS_VERTEX_DATA\fP, -\%\f3GLU_TESS_END\fP, -\%\f3GLU_TESS_END_DATA\fP, -\%\f3GLU_TESS_COMBINE\fP, -\%\f3GLU_TESS_COMBINE_DATA\fP, -\%\f3GLU_TESS_ERROR\fP, and -\%\f3GLU_TESS_ERROR_DATA\fP. -.TP -\f2CallBackFunc\fP -Specifies the function to be called. -.SH DESCRIPTION -\%\f3gluTessCallback\fP is used to indicate a callback to be used by a tessellation object. -If the specified callback is already defined, then it is replaced. If -\f2CallBackFunc\fP is NULL, then the existing callback becomes undefined. -.P -These callbacks are used by the tessellation object to describe how a -polygon specified by the user is broken into triangles. Note that there -are two versions of each callback: one with user-specified polygon data -and one without. If both versions of a particular callback are specified, -then the callback with user-specified polygon data will be used. Note -that the \f2polygon_data\fP parameter used by some of the functions is -a copy of the pointer that was specified when -\%\f3gluTessBeginPolygon\fP was called. The legal callbacks are as follows: -.TP 10 -\%\f3GLU_TESS_BEGIN\fP -The begin callback is invoked like \f3glBegin\fP to indicate the start of -a (triangle) primitive. The function takes a single argument of type -GLenum. If the \%\f3GLU_TESS_BOUNDARY_ONLY\fP property is set to -\%\f3GL_FALSE\fP, then the argument is set to either -\%\f3GL_TRIANGLE_FAN\fP, \%\f3GL_TRIANGLE_STRIP\fP, or \%\f3GL_TRIANGLES\fP. If -the \%\f3GLU_TESS_BOUNDARY_ONLY\fP property is set to \%\f3GL_TRUE\fP, -then the argument will be set to \%\f3GL_LINE_LOOP\fP. The function -prototype for this callback is: -.RS -.Ex -void begin ( GLenum type ); -.Ee -.RE -.TP -\%\f3GLU_TESS_BEGIN_DATA\fP -The same as the \%\f3GLU_TESS_BEGIN\fP callback except that it -takes an additional pointer argument. This pointer is identical to the -opaque pointer provided when -\%\f3gluTessBeginPolygon\fP was called. The function prototype for this callback -is: -.RS -.Ex -void beginData ( GLenum type, void *polygon_data ); -.Ee -.RE -.TP -\%\f3GLU_TESS_EDGE_FLAG\fP -The edge flag callback is similar to \f3glEdgeFlag\fP. The function -takes a single boolean flag that indicates which edges lie on the -polygon boundary. If the flag is \%\f3GL_TRUE\fP, then each vertex -that follows begins an edge that lies on the polygon boundary, that is, -an edge that separates an interior region from an exterior one. -If the flag is \%\f3GL_FALSE\fP, then each vertex that follows begins an edge -that lies in the polygon interior. The edge flag callback (if defined) is -invoked before the first vertex callback. -.IP -Since triangle fans and triangle strips do not support edge flags, the begin -callback is not called with \%\f3GL_TRIANGLE_FAN\fP or \%\f3GL_TRIANGLE_STRIP\fP -if a non-NULL edge flag callback is provided. (If the callback is -initialized to NULL, there is no impact on performance). Instead, the fans and -strips are converted to independent triangles. The function prototype -for this callback is: -.RS -.Ex -void edgeFlag ( GLboolean flag ); -.Ee -.RE -.TP -\%\f3GLU_TESS_EDGE_FLAG_DATA\fP -The same as the \%\f3GLU_TESS_EDGE_FLAG\fP callback except that it takes an additional pointer -argument. This pointer is identical to the opaque pointer provided when -\%\f3gluTessBeginPolygon\fP was called. The function prototype for this callback -is: -.RS -.Ex -void edgeFlagData ( GLboolean flag, void *polygon_data ); -.Ee -.RE -.TP -\%\f3GLU_TESS_VERTEX\fP -The vertex callback is invoked between the begin and end callbacks. -It is similar to \f3glVertex\fP, and it defines the vertices of the triangles -created by the tessellation process. The function -takes a pointer as its only argument. This pointer is identical to -the opaque pointer provided by the user when the vertex was described -(see \%\f3gluTessVertex\fP). The function prototype for this callback is: -.RS -.Ex -void vertex ( void *vertex_data ); -.Ee -.RE -.TP -\%\f3GLU_TESS_VERTEX_DATA\fP -The same as the \%\f3GLU_TESS_VERTEX\fP callback except that it takes an additional pointer -argument. This pointer is identical to the opaque pointer provided when -\%\f3gluTessBeginPolygon\fP was called. The function prototype for this callback -is: -.RS -.Ex -void vertexData ( void *vertex_data, void *polygon_data ); -.Ee -.RE -.TP -\%\f3GLU_TESS_END\fP -The end callback serves the same purpose as \f3glEnd\fP. It indicates the -end of a primitive and it takes no arguments. The function prototype for this -callback is: -.RS -.Ex -void end ( void ); -.Ee -.RE -.TP -\%\f3GLU_TESS_END_DATA\fP -The same as the \%\f3GLU_TESS_END\fP callback except that it takes an additional pointer -argument. This pointer is identical to the opaque pointer provided when -\%\f3gluTessBeginPolygon\fP was called. The function prototype for this callback -is: -.RS -.Ex -void endData ( void *polygon_data); -.Ee -.RE -.TP 10 -\%\f3GLU_TESS_COMBINE\fP -The combine callback is called to create a new vertex when the tessellation -detects an intersection, or wishes to merge features. The function takes -four arguments: an array of three elements each of type GLdouble, an array -of four pointers, an array of four elements each of type GLfloat, and a -pointer to a pointer. The prototype is: -.RS -.Ex -void combine( GLdouble coords[3], void *vertex_data[4], - GLfloat weight[4], void **outData ); -.Ee -.RE -.IP -The vertex is defined as a linear combination of up to four existing vertices, -stored in \f2vertex_data\fP. The coefficients of the linear -combination are given by \f2weight\fP; these weights always add up to 1. -All vertex pointers are valid even when some of the weights are 0. -\f2coords\fP gives the location of the new vertex. -.IP -The user must allocate another vertex, interpolate parameters using -\f2vertex_data\fP and \f2weight\fP, and return the new vertex pointer in -\f2outData\fP. This handle is supplied during rendering callbacks. -The user is responsible for freeing the memory some time after -\%\f3gluTessEndPolygon\fP is called. -.IP -For example, if the polygon lies in an arbitrary plane in 3-space, -and a color is associated with each vertex, the -\%\f3GLU_TESS_COMBINE\fP callback might look like this: -.RS -.Ex -void myCombine( GLdouble coords[3], VERTEX *d[4], - GLfloat w[4], VERTEX **dataOut ) -{ - VERTEX *new = new_vertex(); - - new->x = coords[0]; - new->y = coords[1]; - new->z = coords[2]; - new->r = w[0]*d[0]->r + w[1]*d[1]->r + w[2]*d[2]->r + w[3]*d[3]->r; - new->g = w[0]*d[0]->g + w[1]*d[1]->g + w[2]*d[2]->g + w[3]*d[3]->g; - new->b = w[0]*d[0]->b + w[1]*d[1]->b + w[2]*d[2]->b + w[3]*d[3]->b; - new->a = w[0]*d[0]->a + w[1]*d[1]->a + w[2]*d[2]->a + w[3]*d[3]->a; - *dataOut = new; -} -.Ee -.RE -.IP -If the tessellation detects an intersection, then the \%\f3GLU_TESS_COMBINE\fP or -\%\f3GLU_TESS_COMBINE_DATA\fP callback (see below) must be defined, and it must -write a non-NULL pointer into \f2dataOut\fP. Otherwise the -\%\f3GLU_TESS_NEED_COMBINE_CALLBACK\fP error occurs, and no -output is generated. -.TP -\%\f3GLU_TESS_COMBINE_DATA\fP -The same as the \%\f3GLU_TESS_COMBINE\fP callback except that it takes an additional pointer -argument. This pointer is identical to the opaque pointer provided when -\%\f3gluTessBeginPolygon\fP was called. The function prototype for this callback -is: -.RS -.Ex -void combineData ( GLdouble coords[3], void *vertex_data[4], - GLfloat weight[4], void **outData, - void *polygon_data ); -.Ee -.RE -.TP 10 -\%\f3GLU_TESS_ERROR\fP -The error callback is called when an error is encountered. The one argument -is of type GLenum; it indicates the specific error that occurred and will be -set to one of \%\f3GLU_TESS_MISSING_BEGIN_POLYGON\fP, \%\f3GLU_TESS_MISSING_END_POLYGON\fP, -\%\f3GLU_TESS_MISSING_BEGIN_CONTOUR\fP, \%\f3GLU_TESS_MISSING_END_CONTOUR\fP, -\%\f3GLU_TESS_COORD_TOO_LARGE\fP, \%\f3GLU_TESS_NEED_COMBINE_CALLBACK\fP or -\%\f3GLU_OUT_OF_MEMORY\fP. Character -strings describing these errors can be retrieved with the -\%\f3gluErrorString\fP call. The function prototype for this callback is: -.RS -.Ex -void error ( GLenum errno ); -.Ee -.RE -.IP -The GLU library will recover from the first four -errors by inserting the missing call(s). -\%\f3GLU_TESS_COORD_TOO_LARGE\fP indicates that some vertex coordinate exceeded -the predefined constant \%\f3GLU_TESS_MAX_COORD\fP in absolute value, and -that the value has been clamped. (Coordinate values must be small -enough so that two can be multiplied together without overflow.) -\%\f3GLU_TESS_NEED_COMBINE_CALLBACK\fP indicates that the tessellation -detected an intersection between two edges in the input data, and the -\%\f3GLU_TESS_COMBINE\fP or \%\f3GLU_TESS_COMBINE_DATA\fP callback was -not provided. No output is generated. \%\f3GLU_OUT_OF_MEMORY\fP indicates -that there is not enough memory so no output is generated. -.TP -\%\f3GLU_TESS_ERROR_DATA\fP -The same as the \%\f3GLU_TESS_ERROR\fP callback except that it takes an additional pointer -argument. This pointer is identical to the opaque pointer provided when -\%\f3gluTessBeginPolygon\fP was called. The function prototype for this callback -is: -.RS -.Ex -void errorData ( GLenum errno, void *polygon_data ); -.Ee -.RE -.SH EXAMPLE -Polygons tessellated can be rendered directly like this: -.sp -.Ex -gluTessCallback(tobj, GLU_TESS_BEGIN, glBegin); -gluTessCallback(tobj, GLU_TESS_VERTEX, glVertex3dv); -gluTessCallback(tobj, GLU_TESS_END, glEnd); -gluTessCallback(tobj, GLU_TESS_COMBINE, myCombine); -gluTessBeginPolygon(tobj, NULL); - gluTessBeginContour(tobj); - gluTessVertex(tobj, v, v); - ... - gluTessEndContour(tobj); -gluTessEndPolygon(tobj); -.Ee -.sp -Typically, the tessellated polygon should be stored in a display list so that -it does not need to be retessellated every time it is rendered. -.SH SEE ALSO -\f3glBegin(3G)\fP, \f3glEdgeFlag(3G)\fP, \f3glVertex(3G)\fP, \%\f3gluNewTess(3G)\fP, -\%\f3gluErrorString(3G)\fP, \%\f3gluTessVertex(3G)\fP, -\%\f3gluTessBeginPolygon(3G)\fP, -\%\f3gluTessBeginContour(3G)\fP, \%\f3gluTessProperty(3G)\fP, \%\f3gluTessNormal(3G)\fP - diff --git a/doc/gl-docs/GLU/tessendpolygon.3gl b/doc/gl-docs/GLU/tessendpolygon.3gl deleted file mode 100644 index e334e401..00000000 --- a/doc/gl-docs/GLU/tessendpolygon.3gl +++ /dev/null @@ -1,68 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 tessendpo -.ds Xs 16616 4 tessendpolygon.gl -.TH GLUTESSENDPOLYGON 3G -.SH NAME -.B "gluTessEndPolygon -\- delimit a polygon description - -.SH C SPECIFICATION -void \f3gluTessEndPolygon\fP( -GLUtesselator* \fItess\fP ) -.nf -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2tess\fP\ \ 'u -\f2tess\fP -Specifies the tessellation object (created with \%\f3gluNewTess\fP). -.SH DESCRIPTION -\%\f3gluTessBeginPolygon\fP and \%\f3gluTessEndPolygon\fP delimit the definition of a -convex, concave or self-intersecting polygon. Within each \%\f3gluTessBeginPolygon\fP/\%\f3gluTessEndPolygon\fP -pair, there must be one or more calls to \%\f3gluTessBeginContour\fP/\%\f3gluTessEndContour\fP. -Within each contour, there are zero or more calls to \%\f3gluTessVertex\fP. The vertices -specify a closed contour (the last vertex of each contour is automatically linked -to the first). See the \%\f3gluTessVertex\fP, \%\f3gluTessBeginContour\fP and -\%\f3gluTessEndContour\fP reference pages for more details. -.P -Once \%\f3gluTessEndPolygon\fP is called, the polygon is tessellated, and the -resulting triangles are described through callbacks. -See \%\f3gluTessCallback\fP for descriptions of the callback functions. -.SH EXAMPLE -A quadrilateral with a triangular hole in it can be described like this: -.sp -.Ex -gluTessBeginPolygon(tobj, NULL); - gluTessBeginContour(tobj); - gluTessVertex(tobj, v1, v1); - gluTessVertex(tobj, v2, v2); - gluTessVertex(tobj, v3, v3); - gluTessVertex(tobj, v4, v4); - gluTessEndContour(tobj); - gluTessBeginContour(tobj); - gluTessVertex(tobj, v5, v5); - gluTessVertex(tobj, v6, v6); - gluTessVertex(tobj, v7, v7); - gluTessEndContour(tobj); -gluTessEndPolygon(tobj); -.Ee -.bp -In the above example the pointers, $v1$ through $v7$, -should point to different -addresses, -since the values stored at these addresses will not be read by -the tesselator until \%\f3gluTessEndPolygon\fP is called. -.SH SEE ALSO -\%\f3gluNewTess(3G)\fP, \%\f3gluTessBeginContour(3G)\fP, \%\f3gluTessVertex(3G)\fP, -\%\f3gluTessCallback(3G)\fP, -\%\f3gluTessProperty(3G)\fP, \%\f3gluTessNormal(3G)\fP, -\%\f3gluTessBeginPolygon(3G)\fP diff --git a/doc/gl-docs/GLU/tessnormal.3gl b/doc/gl-docs/GLU/tessnormal.3gl deleted file mode 100644 index 4d98298b..00000000 --- a/doc/gl-docs/GLU/tessnormal.3gl +++ /dev/null @@ -1,67 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 tessnorma -.ds Xs 47097 4 tessnormal.gl -.TH GLUTESSNORMAL 3G -.SH NAME -.B "gluTessNormal -\- specify a normal for a polygon - -.SH C SPECIFICATION -void \f3gluTessNormal\fP( -GLUtesselator* \fItess\fP, -.nf -.ta \w'\f3void \fPgluTessNormal( 'u - GLdouble \fIvalueX\fP, - GLdouble \fIvalueY\fP, - GLdouble \fIvalueZ\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIvalueX\fP\ \ 'u -\f2tess\fP -Specifies the tessellation object (created with \%\f3gluNewTess\fP). -.TP -\f2valueX\fP -Specifies the first component of the normal. -.TP -\f2valueY\fP -Specifies the second component of the normal. -.TP -\f2valueZ\fP -Specifies the third component of the normal. -.SH DESCRIPTION -\%\f3gluTessNormal\fP describes a normal for a polygon that the program is defining. -All input data will be projected onto a plane perpendicular to one of -the three coordinate axes before tessellation and all output triangles -will be oriented CCW with -respect to the normal (CW orientation can be obtained by reversing the -sign of the supplied normal). For example, if you know that all polygons -lie in the x-y plane, call \%\f3gluTessNormal\fP(tess, 0.0, 0.0, 1.0) -before rendering any polygons. -.P -If the supplied normal is (0.0, 0.0, 0.0) (the initial value), the normal is -determined as follows. The direction of the normal, up to its sign, is -found by fitting a plane to the vertices, without regard to how the -vertices are connected. It is expected that the input data lies approximately -in the plane; otherwise, projection perpendicular to one of the three -coordinate axes may substantially change the geometry. The sign of the -normal is chosen so that the sum of the signed areas of all input -contours is nonnegative (where a CCW contour has positive area). -.P -The supplied normal persists until it is changed by another call to -\%\f3gluTessNormal\fP. -.SH SEE ALSO -\%\f3gluTessBeginPolygon(3G)\fP, -\%\f3gluTessEndPolygon(3G)\fP - - - diff --git a/doc/gl-docs/GLU/tessproperty.3gl b/doc/gl-docs/GLU/tessproperty.3gl deleted file mode 100644 index d5a34f9c..00000000 --- a/doc/gl-docs/GLU/tessproperty.3gl +++ /dev/null @@ -1,99 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 tessprope -.ds Xs 36693 6 tessproperty.gl -.TH GLUTESSPROPERTY 3G -.SH NAME -.B "gluTessProperty -\- set a tessellation object property - -.SH C SPECIFICATION -void \f3gluTessProperty\fP( -GLUtesselator* \fItess\fP, -.nf -.ta \w'\f3void \fPgluTessProperty( 'u - GLenum \fIwhich\fP, - GLdouble \fIdata\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIwhich\fP\ \ 'u -\f2tess\fP -Specifies the tessellation object (created with \%\f3gluNewTess\fP). -.TP -\f2which\fP -Specifies the property to be set. Valid values are -\%\f3GLU_TESS_WINDING_RULE\fP, -\%\f3GLU_TESS_BOUNDARY_ONLY\fP, -\%\f3GLU_TESS_TOLERANCE\fP. -.TP -\f2data\fP -Specifies the value of the indicated property. -.SH DESCRIPTION -\%\f3gluTessProperty\fP is used to control properties stored in a tessellation object. These -properties affect the way that the polygons are interpreted and rendered. -The legal values for \f2which\fP are as follows: -.TP 15 -\%\f3GLU_TESS_WINDING_RULE\fP -Determines which parts of the polygon are on the "interior". -\f2data\fP may be set to one of \%\f3GLU_TESS_WINDING_ODD\fP, -\%\f3GLU_TESS_WINDING_NONZERO\fP, \%\f3GLU_TESS_WINDING_POSITIVE\fP, or -\%\f3GLU_TESS_WINDING_NEGATIVE\fP, or \%\f3GLU_TESS_WINDING_ABS_GEQ_TWO\fP. -.IP -To understand how the winding rule works, consider that the input -contours partition the plane into regions. The winding rule determines which -of these regions are inside the polygon. -.IP -For a single contour C, the winding number of a point x is simply the signed -number of revolutions we make around x as we travel once around C -(where CCW is positive). When there are several contours, the individual -winding numbers are summed. This procedure associates a signed integer -value with each point x in the plane. Note that the winding number is the -same for all points in a single region. -.bp -.IP -The winding rule classifies a region as "inside" if its winding number -belongs to the chosen category (odd, nonzero, positive, negative, or -absolute value of at least two). The previous GLU tessellator (prior to -GLU 1.2) used the "odd" rule. The "nonzero" rule is another common way to -define the interior. The other three rules are useful for polygon CSG -operations. -.TP -\%\f3GLU_TESS_BOUNDARY_ONLY\fP -Is a boolean value ("value" should be set -to GL_TRUE or GL_FALSE). When set to GL_TRUE, a set of closed contours -separating the polygon interior and exterior are returned instead of a -tessellation. Exterior contours are oriented CCW with respect to the -normal; interior contours are oriented CW. The \%\f3GLU_TESS_BEGIN\fP -and \%\f3GLU_TESS_BEGIN_DATA\fP callbacks use the type GL_LINE_LOOP for -each contour. -.TP -\%\f3GLU_TESS_TOLERANCE\fP -Specifies a tolerance for merging features to reduce the size of the output. -For example, two vertices that are very close to each other might be -replaced by a single vertex. The tolerance is multiplied by the largest -coordinate magnitude of any input vertex; this specifies the maximum -distance that any feature can move as the result of a single merge -operation. If a single feature takes part in several merge operations, the -total distance moved could be larger. -.IP -Feature merging is completely optional; the tolerance is only a hint. -The implementation is free to merge in some cases and not in others, or to -never merge features at all. The initial tolerance is 0. -.IP -The current implementation merges vertices only if they are exactly -coincident, regardless of the current tolerance. A vertex is spliced into -an edge only if the implementation is unable to distinguish which side of -the edge the vertex lies on. Two edges are merged only when both endpoints -are identical. -.SH SEE ALSO -\%\f3gluGetTessProperty(3G)\fP, -\%\f3gluNewTess(3G)\fP diff --git a/doc/gl-docs/GLU/tessvertex.3gl b/doc/gl-docs/GLU/tessvertex.3gl deleted file mode 100644 index dcfce280..00000000 --- a/doc/gl-docs/GLU/tessvertex.3gl +++ /dev/null @@ -1,99 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 tessverte -.ds Xs 55990 5 tessvertex.gl -.TH GLUTESSVERTEX 3G -.SH NAME -.B "gluTessVertex -\- specify a vertex on a polygon - -.SH C SPECIFICATION -void \f3gluTessVertex\fP( -GLUtesselator* \fItess\fP, -.nf -.ta \w'\f3void \fPgluTessVertex( 'u - GLdouble \fI*location\fP, - GLvoid* \fIdata\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\fIlocation\fP\ \ 'u -\f2tess\fP -Specifies the tessellation object (created with \%\f3gluNewTess\fP). -.TP -\f2location\fP -Specifies the location of the vertex. -.TP -\f2data\fP -Specifies an opaque pointer passed back to the program with the vertex callback -(as specified by \%\f3gluTessCallback\fP). -.SH DESCRIPTION -\%\f3gluTessVertex\fP describes a vertex on a polygon that the program defines. Successive -\%\f3gluTessVertex\fP calls describe a closed contour. For example, -to describe a quadrilateral \%\f3gluTessVertex\fP should be called four times. -\%\f3gluTessVertex\fP can only be called between \%\f3gluTessBeginContour\fP and -\%\f3gluTessEndContour\fP. -.P -\f2data\fP normally points to a structure containing the vertex -location, as well as other per-vertex attributes such as color and normal. -This pointer is passed back to the user through the \%\f3GLU_TESS_VERTEX\fP -or \%\f3GLU_TESS_VERTEX_DATA\fP callback after tessellation -(see the \%\f3gluTessCallback\fP reference page). -.SH EXAMPLE -A quadrilateral with a triangular hole in it can be described as follows: -.sp -.Ex -gluTessBeginPolygon(tobj, NULL); - gluTessBeginContour(tobj); - gluTessVertex(tobj, v1, v1); - gluTessVertex(tobj, v2, v2); - gluTessVertex(tobj, v3, v3); - gluTessVertex(tobj, v4, v4); - gluTessEndContour(tobj); - gluTessBeginContour(tobj); - gluTessVertex(tobj, v5, v5); - gluTessVertex(tobj, v6, v6); - gluTessVertex(tobj, v7, v7); - gluTessEndContour(tobj); -gluTessEndPolygon(tobj); -.Ee -.sp -.SH NOTES -It is a common error to use a local variable for \f2location\fP or \f2data\fP and store -values into it as part of a loop. -For example: -.Ex -for (i = 0; i < NVERTICES; ++i) { - GLdouble data[3]; - data[0] = vertex[i][0]; - data[1] = vertex[i][1]; - data[2] = vertex[i][2]; - gluTessVertex(tobj, data, data); - } -.Ee -.P -This doesn't work. -Because the pointers specified by \f2location\fP and \f2data\fP might not be -dereferenced until \%\f3gluTessEndPolygon\fP is executed, -all the vertex coordinates but the very last set could be overwritten -before tessellation begins. -.P -Two common symptoms of this problem are consists of a single point -(when a local variable is used for \f2data\fP) and a -\%\f3GLU_TESS_NEED_COMBINE_CALLBACK\fP error (when a local variable is -used for \f2location\fP). -.SH SEE ALSO -\%\f3gluTessBeginPolygon(3G)\fP, \%\f3gluNewTess(3G)\fP, \%\f3gluTessBeginContour(3G)\fP, -\%\f3gluTessCallback(3G)\fP, -\%\f3gluTessProperty(3G)\fP, \%\f3gluTessNormal(3G)\fP, -\%\f3gluTessEndPolygon(3G)\fP - - diff --git a/doc/gl-docs/GLU/unproject.3gl b/doc/gl-docs/GLU/unproject.3gl deleted file mode 100644 index 8dafdcf6..00000000 --- a/doc/gl-docs/GLU/unproject.3gl +++ /dev/null @@ -1,78 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 unproject -.ds Xs 63442 4 unproject.gl -.TH GLUUNPROJECT 3G -.SH NAME -.B "gluUnProject -\- map window coordinates to object coordinates - -.SH C SPECIFICATION -GLint \f3gluUnProject\fP( -GLdouble \fIwinX\fP, -.nf -.ta \w'\f3GLint \fPgluUnProject( 'u - GLdouble \fIwinY\fP, - GLdouble \fIwinZ\fP, - const GLdouble \fI*model\fP, - const GLdouble \fI*proj\fP, - const GLint \fI*view\fP, - GLdouble* \fIobjX\fP, - GLdouble* \fIobjY\fP, - GLdouble* \fIobjZ\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2winX\fP\ \f2winY\fP\ \f2winZ\fP\ \ 'u -\f2winX\fP, \f2winY\fP, \f2winZ\fP -Specify the window coordinates to be mapped. -.TP -\f2model\fP -Specifies the modelview matrix (as from a \f3glGetDoublev\fP call). -.TP -\f2proj\fP -Specifies the projection matrix (as from a \f3glGetDoublev\fP call). -.TP -\f2view\fP -Specifies the viewport (as from a \f3glGetIntegerv\fP call). -.TP -\f2objX\fP, \f2objY\fP, \f2objZ\fP -Returns the computed object coordinates. -.SH DESCRIPTION -\%\f3gluUnProject\fP maps the specified window coordinates into object -coordinates using \f2model\fP, \f2proj\fP, and \f2view\fP. -The result is stored in \f2objX\fP, \f2objY\fP, and \f2objZ\fP. A return value of -\%\f3GL_TRUE\fP indicates success; a return value of \%\f3GL_FALSE\fP -indicates failure. -.P -To compute the coordinates (\f2objX\fP, \f2objY\fP, and \f2objZ\fP), -\%\f3gluUnProject\fP multiplies the normalized device coordinates by the inverse of -\f2model\fP*\f2proj\fP as follows: - -.P -.ce -.EQ -left ( down 70 {cpile { ~"objX" above ~"objY" above ~"objZ" -above ~W}} ~~ right ) ~=~ INV(P M) -left ( down 140 {cpile { -{ {2("winX" ~-~ "view"[0])} over {"view" [2]} ~-~ 1 } -above -{ {2("winY" ~-~ "view"[1])} over {"view"[3]} ~-~ 1 } -above -{ 2("winZ") ~-~ 1 } -above -1}} ~~ right ) -.EN -.bp -$INV()$ denotes matrix inversion. -W is an unused variable, included for consistent matrix notation. -.SH SEE ALSO -\f3glGet(3G)\fP, \%\f3gluProject(3G)\fP diff --git a/doc/gl-docs/GLU/unproject4.3gl b/doc/gl-docs/GLU/unproject4.3gl deleted file mode 100644 index 72e755d2..00000000 --- a/doc/gl-docs/GLU/unproject4.3gl +++ /dev/null @@ -1,103 +0,0 @@ -'\" e -'\"! eqn | mmdoc -'\"macro stdmacro -.ds Vn Version 1.2 -.ds Dt 6 March 1997 -.ds Re Release 1.2.0 -.ds Dp May 02 11:53 -.ds Dm 37 unproject -.ds Xs 13294 5 unproject4.gl -.TH GLUUNPROJECT4 3G -.SH NAME -.B "gluUnProject4 -\- map window and clip coordinates to object coordinates - -.SH C SPECIFICATION -GLint \f3gluUnProject4\fP( -GLdouble \fIwinX\fP, -.nf -.ta \w'\f3GLint \fPgluUnProject4( 'u - GLdouble \fIwinY\fP, - GLdouble \fIwinZ\fP, - GLdouble \fIclipW\fP, - const GLdouble \fI*model\fP, - const GLdouble \fI*proj\fP, - const GLint \fI*view\fP, - GLdouble \fInear\fP, - GLdouble \fIfar\fP, - GLdouble* \fIobjX\fP, - GLdouble* \fIobjY\fP, - GLdouble* \fIobjZ\fP, - GLdouble* \fIobjW\fP ) -.fi - -.EQ -delim $$ -.EN -.SH PARAMETERS -.TP \w'\f2winX\fP\ \f2winY\fP\ \f2winZ\fP\ \ 'u -\f2winX\fP, \f2winY\fP, \f2winZ\fP -Specify the window coordinates to be mapped. -.TP -\f2clipW\fP -Specify the clip w coordinate to be mapped. -.TP -\f2model\fP -Specifies the modelview matrix (as from a \f3glGetDoublev\fP call). -.TP -\f2proj\fP -Specifies the projection matrix (as from a \f3glGetDoublev\fP call). -.TP -\f2view\fP -Specifies the viewport (as from a \f3glGetIntegerv\fP call). -.TP -\f2near\fP, \f2far\fP -Specifies the near and far planes (as from a \f3glGetDoublev\fP call). -.TP -\f2objX\fP, \f2objY\fP, \f2objZ\fP, \f2objW\fP -Returns the computed object coordinates. -.SH DESCRIPTION -\%\f3gluUnProject4\fP maps the specified window coordinates \f2winX\fP, \f2winY\fP and \f2winZ\fP -and its clip w coordinate \f2clipW\fP -into object -coordinates (\f2objX\fP, \f2objY\fP, \f2objZ\fP, \f2objW\fP) -using \f2model\fP, \f2proj\fP and \f2view\fP. \f2clipW\fP can be other than -1 as for vertices in \f3glFeedbackBuffer\fP when data type -\%\f3GL_4D_COLOR_TEXTURE\fP is returned. -This also handles the case -where the \f2near\fP and \f2far\fP planes are different from the default, -0 and 1, respectively. -A return -value of \%\f3GL_TRUE\fP indicates success; a return value of \%\f3GL_FALSE\fP -indicates failure. -.P -To compute the coordinates (\f2objX\fP, \f2objY\fP, \f2objZ\fP and \f2objW\fP), -\%\f3gluUnProject4\fP multiplies the normalized device coordinates by the inverse of -\f2model\fP*\f2proj\fP as follows: - -.P -.ce -.EQ -left ( down 70 {cpile { ~"objX" above ~"objY" above ~"objZ" -above ~"objW"}} ~~ right ) ~=~ INV(P M) -left ( down 140 {cpile { -{ {2("winX" ~-~ "view"[0])} over {"view"[2]} ~-~ 1 } -above -{ {2("winY" ~-~ "view"[1])} over {"view"[3]} ~-~ 1 } -above -{ {2("winZ" ~-~ "near")} over {("far" ~-~ "near")} ~-~ 1 } -above -"clipW"}} ~~ right ) -.EN -.sp -$INV()$ denotes matrix inversion. -.P -\%\f3gluUnProject4\fP is equivalent to \%\f3gluUnProject\fP when \f2clipW\fP is 1, \f2near\fP is 0 and -\f2far\fP is 1. -.SH NOTES -\%\f3gluUnProject4\fP is available only if the GLU version is 1.3 or greater. -.SH SEE ALSO -\f3glGet(3G)\fP, -\f3glFeedbackBuffer(3G)\fP, -\%\f3gluProject(3G)\fP, -\%\f3gluUnProject(3G)\fP diff --git a/doc/gl-docs/GLw/Imakefile b/doc/gl-docs/GLw/Imakefile deleted file mode 100644 index 88f62cb6..00000000 --- a/doc/gl-docs/GLw/Imakefile +++ /dev/null @@ -1,25 +0,0 @@ -XCOMM $XFree86$ - -MANDIR = $(LIBMANDIR) -MANSUFFIX = $(LIBMANSUFFIX) - -#if ExpandManNames -InstallManPageLong(GLwCMDrA,$(MANDIR),GLwCreateMDrawingArea) -InstallManPageLong(GLwDrawA,$(MANDIR),GLwDrawingArea) -InstallManPageAliases(GLwDrawingArea,$(MANDIR),GLwMDrawingArea) -InstallManPageLong(GLwDrAMC,$(MANDIR),GLwDrawingAreaMakeCurrent) -InstallManPageLong(GLwDrASB,$(MANDIR),GLwDrawingAreaSwapBuffers) -#else -InstallManPage(GLwCMDrA,$(MANDIR)) -InstallManPage(GLwDrawA,$(MANDIR)) -InstallManPage(GLwDrAMC,$(MANDIR)) -InstallManPage(GLwDrASB,$(MANDIR)) -#endif - -GLWMANDIR = . - -LinkFile(GLwCMDrA.man, $(GLWMANDIR)/glwcreatemdrawingarea.gl) -LinkFile(GLwDrawA.man, $(GLWMANDIR)/glwdrawingarea.gl) -LinkFile(GLwDrAMC.man, $(GLWMANDIR)/glwdrawingareamakecurrent.gl) -LinkFile(GLwDrASB.man, $(GLWMANDIR)/glwdrawingareaswapbuffers.gl) - diff --git a/doc/gl-docs/GLw/Makefile b/doc/gl-docs/GLw/Makefile deleted file mode 100644 index 4f1fab8f..00000000 --- a/doc/gl-docs/GLw/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# $OpenBSD: Makefile,v 1.1 2012/08/07 21:10:35 matthieu Exp $ - -X11BASE?= /usr/X11R6 -MANDIR?= ${X11BASE}/man/man - -MAN += GLwCreateMDrawingArea.3 glwcreatemdrawingarea.gl -MAN += GLwDrawingArea.3 glwdrawingarea.gl -MAN += GLwDrawingAreaMakeCurrent.3 glwdrawingareamakecurrent.gl -MAN += GLwDrawingAreaSwapBuffers.3 glwdrawingareaswapbuffers.gl - -LINKS += GLwDrawingArea.3 GLwMDrawingArea.3 - -.include "../Makefile.inc" -.include diff --git a/doc/gl-docs/GLw/glwcreatemdrawingarea.gl b/doc/gl-docs/GLw/glwcreatemdrawingarea.gl deleted file mode 100644 index 54c3f277..00000000 --- a/doc/gl-docs/GLw/glwcreatemdrawingarea.gl +++ /dev/null @@ -1,50 +0,0 @@ -.\" ** -.\" ** (c) Copyright 1993, 1994, 1995, 1996 Silicon Graphics, Inc. -.\" ** -.\" ** (c) Copyright 1989, 1990, 1991 Open Software Foundation, Inc. -.\" ** All Rights Reserved. -.\" ** -.\" ** (c) Copyright 1987, 1988, 1989, by Hewlett-Packard Company -.\" ** -.\" ** (c) Copyright 1987, 1988 by Digital Equipment Corporation, -.\" ** Maynard, MA. All Rights Reserved. -.\" ** -.\" ** -.TH GLwCreateMDrawingArea 3X "" "" "" -.SH NAME -\fBGLwCreateMDrawingArea \(em Create a Motif/OpenGL Drawing Widget.\fP -.iX "GLwCreateMDrawingArea" -.iX "creation functions" -.sp 1 -.SH SYNOPSIS -\fB#include \fP -.br -Widget \fBGLwCreateMDrawingArea\fP( Widget \fIparent\fP, - String \fIname\fP, - ArgList \fIarglist\fP, - Cardinal \fIargcount\fP ) -.fi -\fP -.SH DESCRIPTION -\fBGLwCreateMDrawingArea\fP creates an instance of a GLwMDrawingArea -widget and returns the associated widget ID. -.sp 1 -.IP "\fIparent\fP" .95i -Specifies the parent widget ID -.IP "\fIname\fP" .95i -Specifies the name of the created widget -.IP "\fIarglist\fP" .95i -Specifies the argument list -.IP "\fIargcount\fP" .95i -Specifies the number of attribute/value pairs in the argument list -(\fIarglist\fP) -.sp 1 -.PP -For a complete definition of GLwMDrawingArea and its associated resources, see -\fBGLwDrawingArea(3X)\fP. -.sp 1 -.SH RETURN VALUE -Returns the GLwMDrawingArea widget ID. -.sp 1 -.SH SEE ALSO -\fBGLwDrawingArea(3X)\fP. diff --git a/doc/gl-docs/GLw/glwdrawingarea.gl b/doc/gl-docs/GLw/glwdrawingarea.gl deleted file mode 100644 index a7037229..00000000 --- a/doc/gl-docs/GLw/glwdrawingarea.gl +++ /dev/null @@ -1,485 +0,0 @@ -.\" ** -.\" ** (c) Copyright 1993, 1994, 1995, 1996 Silicon Graphics, Inc. -.\" ** -.\" ** (c) Copyright 1989, 1990, 1991 Open Software Foundation, Inc. -.\" ** All Rights Reserved. -.\" ** -.\" ** (c) Copyright 1987, 1988, 1989, by Hewlett-Packard Company -.\" ** -.\" ** (c) Copyright 1987, 1988 by Digital Equipment Corporation, -.\" ** Maynard, MA. All Rights Reserved. -.\" ** -.\" ** -.TH GLwDrawingArea 3X "" "" "" -.SH NAME -\fBGLwDrawingArea, GLwMDrawingArea \(em OpenGL drawing widgets.\fP -.iX "GLwDrawingArea" "GLwMDrawingArea" -.iX "widget class" "OpenGL" "Draw" -.sp 1 -.SH SYNOPSIS -\fB#include -.br -\fBld ... -lGLw -lGL -l -lXext -lXt -lX11 -lm -.sp -\fB#include -.br -\fBld ... -lGLw -lGL -lXm -lXext -lXt -lX11 -lm -.sp 1 -.SH DESCRIPTION -\fBGLwDrawingArea\fP and \fBGLwMDrawingArea\fP are widgets suitable -for OpenGL drawing. They -provide a window with the appropriate visual and colormaps needed for -OpenGL, based on supplied parameters. GLwDrawingArea and -GLwMDrawingArea also provide -callbacks for redraw, resize, input, and initialization. -.PP -GLwDrawingArea is not a part of any widget set, but depends only on Xt. -GLwDrawingArea can be used with any widget set. GLwMDrawingArea -is identical to -GLwDrawingArea except that it is a subclass of the Motif\(Tm widget -class XmPrimitive and -has resources and defaults suitable for use with Motif. For example, -GLwMDrawingArea provides the default Motif background and foreground colors -for resources, and deals better with keyboard traversal. Although the -GLwDrawingArea widget can be used in a Motif program, it is recommended that -GLwMDrawingArea be used instead. -.PP -Since both GLwDrawingArea and GLwMDrawingArea -widgets behave almost identically, the -remainder of this manual page will refer only to GLwDrawingArea, except when -the behaviors differ. Unless explicitly stated, all statements -about GLwDrawingArea also apply to GLwMDrawingArea. -.PP -Among the information provided when creating a GLwDrawingArea is -information necessary to determine the visual. This may be provided -in three ways, all of them through resources. A specific visualInfo -structure may be passed in. (This visualInfo must have been obtained -elsewhere; it is the application designer's responsibility to make -sure that it is compatible with the OpenGL rendering done by the -application). Alternatively, an attribute list may be provided. This -attribute list is formatted identically to that used for direct open -GL programming. Finally, each attribute can be specified as an -individual resource. The latter method is the simplest, and is the -only method that works from resource files. -.PP -In addition to allocating the visual, the GLwDrawingArea will also -allocate the colormap unless one is provided by the application. (If -one is provided it is the application writer's responsibility to -guarantee compatibility between the colormap and the visual). If -an application creates multiple GLwDrawingAreas with the same visual, -the same colormap will be used. (However the colormap -will not be shared among separate applications). -.PP -Creating the widget does not actually create the window until it is -realized, and consequently, the application should not perform any -OpenGL operations -to the window immediately after creation. Instead the application -must wait until after it has realized the window. Alternatively, the -\fBginit\fP callback may be used to indicate when the window has been -created. Upon receiving this callback, the application can perform -all OpenGL initialization for the window, and can subsequently perform -other operations on it. The initialization is discussed in more -detail below. -.PP -Applications select which GLwDrawingArea they are accessing using either -\fBglXMakeCurrent\fP or the convenience function -\fBGLwDrawingAreaMakeCurrent\fP which uses a widget instead of a -display and window. If there is only one GLwDrawingArea this need -only be called once, however if there is more than one GLwDrawingArea -it should be called at the start of each callback. -Callbacks in this case include not only -callbacks provided by the widget itself, but any other callback that -leads to GL activity such as a timeout or a workproc. -.PP -If an application is using double buffering, it may call -\fBGLwDrawingAreaSwapBuffers\fP instead of \fBglXSwapBuffers\fP. This -allows the use of the widget instead of the display and window. -.ne 5 -.SS "GLwDrawingArea Classes" -GLwDrawingArea inherits behavior and resources from the \fBCore\fP class. -.br -The class pointer is \fBglwDrawingAreaWidgetClass\fP. -.br -The class name is \fBGLwDrawingArea\fP. -.PP -.ne 5 -.SS "GLwMDrawingArea Classes" -GLwMDrawingArea inherits behavior and resources from the -\fBXmPrimitive\fP and \fBCore\fP classes. -.br -The class pointer is \fBglwMDrawingAreaWidgetClass\fP. -.br -The class name is \fBGLwMDrawingArea\fP. -.sp 1 -.SS "New Resources" -The following tables define a set of widget resources used by the programmer -to specify data. The programmer can also set the resource values for the -inherited classes to set attributes for this widget. To reference a -resource by name or by class in a .Xdefaults file, remove the \fBGLwN\fP or -\fBGLwC\fP prefix and use the remaining letters. -There are two tables included. The first table includes resources -that correspond directly to the attributes used by \fBglXChooseVisual\fP. -As with \fBglXChooseVisual\fP, all Boolean resources default to FALSE -and all integer resources default to 0, except redSize, greenSize and -blueSize which default to 1. These resources can all be -set only at creation time, and are used to determine the visual. If -either the \fIGLwNattribList\fP or \fIGLwNvisualInfo\fP resource is -set, these resources are ignored. The specific meaning of these -resources is discussed in the \fBglXChooseVisual\fP manual page and -will not be discussed here. -.sp 1 -.ne 18 -.TS -center allbox; -lBp8 lBp8 lBp8 lBp8 -lp8 lp8 lp8 lp8. -Name Class Type OpenGL attribute -GLwNbufferSize GLwCBufferSize int GLX_BUFFER_SIZE -GLwNlevel GLwCLevel int GLX_LEVEL -GLwNrgba GLwCRgba Boolean GLX_RGBA -GLwNdoublebuffer GLwCDoublebuffer Boolean GLX_DOUBLEBUFFER -GLwNstereo GLwCStereo Boolean GLX_STEREO -GLwNauxBuffers GLwCAuxBuffers Boolean GLX_AUX_BUFFERS -GLwNredSize GLwCColorSize int GLX_RED_SIZE -GLwNgreenSize GLwCColorSize int GLX_GREEN_SIZE -GLwNblueSize GLwCColorSize int GLX_BLUE_SIZE -GLwNalphaSize GLwCAlphaSize int GLX_ALPHA_SIZE -GLwNdepthSize GLwCDepthSize int GLX_DEPTH_SIZE -GLwNstencilSize GLwCStencilSize int GLX_STENCIL_SIZE -GLwNaccumRedSize GLwCAccumColorSize int GLX_ACCUM_RED_SIZE -GLwNaccumGreenSize GLwCAccumColorSize int GLX_ACCUM_GREEN_SIZE -GLwNaccumBlueSize GLwCAccumColorSize int GLX_ACCUM_BLUE_SIZE -GLwNaccumAlphaSize GLwCAccumAlphaSize int GLX_ACCUM_ALPHA_SIZE -.TE -.sp 1 -.PP -The following table lists other resources of the GLwDrawingArea -widget. each of these will be described subsequently. -The codes in the access column indicate if the given resource can be -set at creation time (\fBC\fP), -set by using \fBXtSetValues\fP (\fBS\fP), -retrieved by using \fBXtGetValues\fP (\fBG\fP), or is not applicable -(\fBN/A\fP). -.sp 1 -.ne 12 -.TS -center; -lp8B lp8B lp8B lp8B lp8B -lp8 lp8 lp8 lp8 lp8. -Name Class Type Def Acc -_ -GLwNallocateBackground GLwCAllocateColors Boolean F CG -GLwNallocateOtherColors GLwCAllocateColors Boolean F CG -GLwNattribList GLwCAttribList int * NULL CG -GLwNexposeCallback GLwCCallback XtCallbackList NULL C -GLwNginitCallback GLwCCallback XtCallbackList NULL C -GLwNinputCallback GLwCCallback XtCallbackList NULL C -GLwNinstallBackground GLwCInstallBackground Boolean T CG -GLwNinstallColormap GLwCInstallColormap Boolean T CG -GLwNresizeCallback GLwCCallback XtCallbackList NULL C -GLwNvisualInfo GLwCVisualInfo XVisualInfo* NULL CG -.TE -.sp 1 -.IP "\fBGLwNallocateBackground\fP" -If TRUE, the background pixel and pixmap will be allocated if -appropriate using the newly calculated colormap and visual. If FALSE, -they will retain values calculated using the parent's colormap and -visual. Applications which wish to have X clear their background for -them will usually set this to TRUE. Applications clearing their own -background will often set this to FALSE, although they may set this to -TRUE if they query the background for their own use. One reason to -leave this resource FALSE is that if color index mode is in use this -avoid using up a pixel from the newly allocated colormap. Also, on -hardware that supports only one colormap, the application may need to -do more careful color allocation to avoid flashing between the OpenGL -colormap and the default X colormap. -(Note that because of the way Xt works, the background colors -are originally calculated using the default colormap; if this resource -is set they can be recalculated correctly. If a colormap was -explicitly supplied to the widget rather than being dynamically -calculated, these resources are always calculated using that colormap.) -.IP "\fBGLwNallocateOtherColors\fP" -This is similar to \fBGLwNallocateBackground\fP, but allocates other -colors normally allocated by widgets. Although the GLwDrawingArea -and GLwMDrawingArea widget do not make use of these colors the -application may choose to query them. For the non-Motif -GLwDrawingArea widget there are no other colors allocated, so this -resource is a no-op. For the Motif GLwMDrawingArea are widget, the -XmPrimitive resources \fBXmNforeground\fP, \fBXmNhighlightColor\fP, -and \fBXmNhighlightPixmap\fP are calculated. -.IP "\fBGLwNattribList\fP" -Contains the list of attributes suitable for a call to -\fBglXChooseVisual\fP. If this resource is NULL, it is calculated -based on the attribute resources. If it is not NULL, the attribute -resources are ignored. -.IP "\fBGLwNexposeCallback\fP" -Specifies the list of callbacks that is -called when the widget receives an exposure event. -The callback reason is \fBGLwCR_EXPOSE\fP. -The callback structure also includes the exposure event. The -application will generally want to redraw the scene. -.IP "\fBGLwNginitCallback\fP" -Specifies the list of callbacks that is -called when the widget is first realized. Since no OpenGL operations can -be done before the widget is realized, this callback can be used to -perform any appropriate OpenGL initialization such as creating a context. -The callback reason is \fBGLwCR_GINIT\fP. -.IP "\fBGLwNinputCallback\fP" -Specifies the list of callbacks that is -called when the widget receives a keyboard -or mouse event. By default, the input callback is called on each key -press and key release, on each mouse button press and release, and -whenever the mouse is moved while a button is pressed. However this -can be changed by providing a different translation table. -The callback structure also includes the input event. -The callback reason is \fBGLwCR_INPUT\fP. -.IP "" -The input callback is provided as a programming convenience, as it -provides a convenient way to catch all input events. However, a more -modular program can often be obtained by providing specific actions and -translations in the application rather than using a single catch all -callback. Use of explicit translations can also provide for more -customization. -.IP "\fBGLwNinstallBackground\fP" -If set to TRUE, the background is installed on the window. If set to -FALSE, the window has no background. This resource has no effect -unless \fBGLwNallocateBackground\fP is also TRUE. -.IP "\fBGLwNinstallColormap\fP" -If set to TRUE, the widget will call \fIXSetWMColormapWindows\fP to -tell the window manager to install the colormap when the window's -shell has focus. If set to FALSE, this will not be called. For -applications with multiple GLwDrawingAreas sharing a single colormap, -it is most efficient to set this resource to TRUE for exactly one -GLwDrawingArea with each colormap. If an application needs -additional control over the order of colormaps, this resource can be -set to FALSE, with the application calling \fIXSetWMColormapWindows\fP -explicitly. -.IP "\fBGLwNresizeCallback\fP" -Specifies the list of callbacks that is -called when the GLwDrawingArea is resized. -The callback reason is \fBGLwCR_RESIZE\fP. -.IP "\fBGLwNvisualInfo\fP" -Contains a pointer to the window's visual info structure. If NULL, -the visualInfo is calculated at widget creation time based on the -\fIGLwNattributeList\fP resource (which is itself calculated from the -various resources). If \fBGLwNvisualInfo\fP is not NULL the -\fIGLwNattributList\fP and the attribute resources are ignored. -.sp 1 -.SS "Inherited Resources" -Both GLwDrawingArea and GLwMDrawingArea inherit behavior and resources -from the core superclass. Other than the behavior of the colormap and -background resources described previously, all defaults are the same as -for core. -.PP -In addition, the Motif version GLwMDrawingArea also inherits from XmPrimitive. -The behavior of the color resources has been described previously. -The \fITraversalOn\fP resource is disabled for this widget, but if -keyboard input is required it should be enabled. (Also, the -application should call \fBXmProcessTraversal(widget, XmTRAVERSE_CURRENT)\fP -whenever mouse button 1 is clicked in the widget. This is similar to -the requirements of the Motif Drawing area.) Because Motif gets -confused by having multiple visuals in one top level shell, -\fBXmNhighlightOnEnter\fP has been disabled, and -\fBXmNhighlightThickness\fP has been set to 0. -.SS "Callback Information" -A pointer to the following structure is passed to each callback: -.sp 1 -.ne 6 -.nf -.ta .25i 1.3i -\fBtypedef struct\fP -{ - \fBint\fP \fIreason\fP; - \fBXEvent\fP \fI*event\fP; - \fBDimension\fP \fIwidth, height\fP; -} \fBGLwDrawingAreaCallbackStruct\fP; -.fi -.sp 1 -.IP "\fIreason\fP" .75i -Indicates why the callback was invoked. Appropriate values are -stated in the above resource descriptions. For Motif programmers, the -values \fBGLwCR_EXPOSE\fP, \fBGLwCR_RESIZE\fP, and \fBGLwCR_INPUT\fP -are equal to \fBXmCR_EXPOSE\fP, \fBXmCR_RESIZE\fP, and -\fBXmCR_INPUT\fP respectively. \fBGLwCR_GINIT\fP does not have a -Motif equivalent. -.IP "\fIevent\fP" .75i -Points to the \fBXEvent\fP that triggered the callback. -This is NULL for \fBGLwNginitCallback and \fBGLwNresizeCallback\fP. -.IP "\fIwidth\fP and \fIheight\fP" .75i -Are set to the width and height of the window. -.br -.ne 10 -.sp 1 \"Adds space before the SS -.SS "Translations" -GLwDrawingArea has the translations listed below. -\fB -.nf -.ta 1.5i -.ne 5 -: glwInput() -: glwInput() -: glwInput() -: glwInput() -: glwInput() -.fi -.PP -GLwMDrawingArea has the following additional translation: -\fB -.nf -.ta 1.5i -osfHelp: PrimitiveHelp() -.fi -.PP -An application wishing to catch other events than these defaults can -do so by installing a different translation table. -\fP -.sp 1 \"Adds space before the SS -.SS "Action Routines" -The GLwDrawingArea has the following action routine: -.IP "\fBglwInput()\fP:" -Called whenever one of the above translations specifies that input has -occurred. Its sole purpose is to call the input callback. -.sp 1 -.SH INITIALIZATION -.PP -When the widget is initially created (e.g. through -\fBXtCreateWidget(3X)\fP) the associated window is not actually -created. Instead, window creation is delayed until the widget is -realized. However, \fBglXchooseVisual\fP is called immediately, so -information based on its results is available. -.PP -Between the time the widget is created and it is realized, -the following apply: -.TP -\(bu -No OpenGL operations can be done to the window -.TP -\(bu -No resize callbacks are generated. -.TP -\(bu -The normal window is available (XtWindow returns NULL). -.TP -\(bu -\fBGLwDrawingAreaMakeCurrent\fP (and \fBglXMakeCurrent\fP) should not -be called. -.PP -When the widget is realized, the following actions take place: -.PP -.TP -\(bu -The window is created. -.TP -\(bu -The \fBginit\fP callback is called. The user may use this callback to -perform any needed OpenGL initialization to the window. -.sp 1 -.SH NOTES -.PP -When using the input callback to receive keyboard input, the keycode -in the event must be converted to a KeySym. Use -\fBXLookupKeysym(3X)\fP or \fBXLookupString(3X)\fP to do the -conversion. Keyboard input can also be dealt using translations, in -which case no such conversion is required. -.PP -Motif programmers should keep in mind that OSF uses virtual -bindings and replaces some of the key bindings. As a common example, -if the ESC key is to be used to exit the program (as it often is in GL -programs), the translation should specify osfCancel instead of -Escape. -.PP -Motif programmers may also create a GLwMDrawingArea widget with the Motif -style \fBGLwCreateMDrawingArea\fP. -.sp 1 -.ne 10 -.SH EXAMPLE -Here are some code fragments that create a GLwDrawingArea widget, and manage -the appropriate callbacks. -.sp -.nf -\f(CW - #include - #include - static GLXContext glx_context; /* assume only one context */ - . . . - - main() - { - Arg args[10]; - int n; - - Widget parent; /* The parent of the gl widget */ - Widget glw; /* The GLwDrawingArea widget */ - . . . - - /* Create the widget using RGB mode. This can also be set - * in an X Defaults file - */ - n = 0; - XtSetArg(args[n], GLwNrgba, True); n++; - glw = XtCreateManagedWidget("glw", glwDrawingAreaWidgetClass, - parent, args, n); - XtAddCallback(glw, GLwNexposeCallback, exposeCB, NULL); - XtAddCallback(glw, GLwNresizeCallback, resizeCB, NULL); - XtAddCallback(glw, GLwNginitCallback, ginitCB, NULL); - /* Also add input callback if needed */ - . . . - } - - static void - exposeCB(Widget w, XtPointer client_data, - GLwDrawingAreaCallbackStruct *call_data) - { - GLwDrawingAreaMakeCurrent(w, glx_context); - /* redraw the display */ - } - - static void - resizeCB(Widget w, XtPointer client_data, - GLwDrawingAreaCallbackStruct *call_data) - { - GLwDrawingAreaMakeCurrent(w, glx_context); - /* perform any resize actions */ - } - - static void - ginitCB(Widget w, XtPointer client_data, - GLwDrawingAreaCallbackStruct *call_data) - { - Arg args[1]; - XVisualInfo *vi; - - XtSetArg(args[0], GLwNvisualInfo, &vi); - XtGetValues(w, args, 1); - - /* create a visual context */ - glx_context = glXCreateContext(XtDisplay(w), vi, - NULL, GL_FALSE); - GLwDrawingAreaMakeCurrent(w, glx_context); - /* Perform any necessary graphics initialization.*/ - } -\fP -.fi -.P -The Motif program need only differ by including -\fBGLwMDrawingArea.h\fP instead of \fBGLwDrawingArea.h\fP and by creating a widget of type -\fBGLwMDrawingAreaWidgetClass\fP instead of \fBGLwDrawingAreaWidgetClass\fP. As an -alternative, the Motif program could use \fBGLwCreateMDraw(3X)\fP instead. -.sp 1 -.SH WARNINGS -.PP -If a GLwDrawingArea widget is created as a child of an already realized -widget, the GLwDrawingArea widget will be created immediately, without giving -the user an opportunity to add the \fBginit\fP callback. In such a -case, initialization should be done immediately after creating the -widget rather than by using the callback. -.PP -If the non-Motif GLwDrawingArea widget is used in a Motif program and -keyboard traversal is attempted, the behavior is undefined if the user -traverses into the GLwDrawingArea widget. -.SH SEE ALSO -\fBglXChooseVisual(3G)\fP, \fBGLwDrawingAreaMakeCurrent(3X)\fP, -\fBglXMakeCurrent(3G)\fP, \fBGLwDrawingAreaSwapBuffers(3X)\fP -\fBGLwCreateMDraw(3X)\fP, \fBCore(3X)\fP, \fBXmPrimitive(3X)\fP, -\fBVirtualBindings(3X)\fP, \fBXSetWMColormapWindows(3X11)\fP -and the OpenGL spec. diff --git a/doc/gl-docs/GLw/glwdrawingareamakecurrent.gl b/doc/gl-docs/GLw/glwdrawingareamakecurrent.gl deleted file mode 100644 index 6484ecc7..00000000 --- a/doc/gl-docs/GLw/glwdrawingareamakecurrent.gl +++ /dev/null @@ -1,30 +0,0 @@ -.\" ** -.\" ** (c) Copyright 1993, 1994, 1995, 1996 Silicon Graphics, Inc. -.\" ** -.\" ** (c) Copyright 1989, 1990, 1991 Open Software Foundation, Inc. -.\" ** All Rights Reserved. -.\" ** -.\" ** (c) Copyright 1987, 1988, 1989, by Hewlett-Packard Company -.\" ** -.\" ** (c) Copyright 1987, 1988 by Digital Equipment Corporation, -.\" ** Maynard, MA. All Rights Reserved. -.\" ** -.\" ** -.TH GLwDrawingAreaMakeCurrent 3X "" "" "" -.SH NAME -\fBGLwDrawingAreaMakeCurrent \(em Make the current GLwDrawingArea current.\fP -.iX "GLwDrawingAreaMakeCurrent" -.iX "GLwDrawingArea" -.sp 1 -.SH SYNOPSIS -\fB#include \fP -.br -void \fBGLwDrawingAreaMakeCurrent\fP( Widget \fIw\fP, - GLXContext \fIctx\fP ) -.fi -.SH DESCRIPTION -\fBGLwDrawingAreaMakeCurrent\fP is a front end to \fBglXMakeCurrent\fP, -however instead of passing in a Display and a Window, a Widget is -passed in. -.SH SEE ALSO -\fBGLwMDrawingArea(3X)\fP, \fBglXMakeCurrent(3G)\fP. diff --git a/doc/gl-docs/GLw/glwdrawingareaswapbuffers.gl b/doc/gl-docs/GLw/glwdrawingareaswapbuffers.gl deleted file mode 100644 index cda0e8e0..00000000 --- a/doc/gl-docs/GLw/glwdrawingareaswapbuffers.gl +++ /dev/null @@ -1,30 +0,0 @@ -.\" ** -.\" ** (c) Copyright 1993, 1994, 1995, 1996 Silicon Graphics, Inc. -.\" ** -.\" ** (c) Copyright 1989, 1990, 1991 Open Software Foundation, Inc. -.\" ** All Rights Reserved. -.\" ** -.\" ** (c) Copyright 1987, 1988, 1989, by Hewlett-Packard Company -.\" ** -.\" ** (c) Copyright 1987, 1988 by Digital Equipment Corporation, -.\" ** Maynard, MA. All Rights Reserved. -.\" ** -.\" ** -.TH GLwDrawingAreaSwapBuffers 3X "" "" "" -.SH NAME -\fBGLwDrawingAreaSwapBuffers \(em Swap buffers in a GLwDrawingArea.\fP -.iX "GLwDrawingAreaSwapBuffers" -.iX "GLwDrawingArea" -.sp 1 -.SH SYNOPSIS -\fB#include \fP -.br -void \fBGLwDrawingAreaSwapBuffers\fP( Widget \fIw\fP ) -.br -.fi -.SH DESCRIPTION -\fBGLwDrawingAreaSwapBuffers\fP is a front end to \fBglXSwapBuffers\fP, -however instead of passing in a Display and a Window, a Widget is -passed in. -.SH SEE ALSO -\fBGLwMDrawingArea(3X)\fP, \fBglXSwapBuffers(3G)\fP. diff --git a/doc/gl-docs/Makefile b/doc/gl-docs/Makefile deleted file mode 100644 index 88718722..00000000 --- a/doc/gl-docs/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -# $OpenBSD: Makefile,v 1.2 2015/07/19 10:41:31 matthieu Exp $ - -SUBDIR= GL/gl GL/glx GLU GLw - -.include -.include diff --git a/doc/gl-docs/Makefile.inc b/doc/gl-docs/Makefile.inc deleted file mode 100644 index 6eefa770..00000000 --- a/doc/gl-docs/Makefile.inc +++ /dev/null @@ -1,28 +0,0 @@ -# $OpenBSD: Makefile.inc,v 1.1 2012/08/07 21:10:35 matthieu Exp $ - -all: - -cleandir: - -.SUFFIXES: .3 .3gl - -.for page source in $(MAN) -_INST_MAN = ${DESTDIR}${MANDIR}$(page:E)/$(page:T) -${_INST_MAN}: ${source} - ${INSTALL} ${INSTALL_COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \ - ${.ALLSRC} ${.TARGET} - -install: ${_INST_MAN} - -.PHONY: ${_INST_MAN} -.endfor - -install: -.for lnk file in $(LINKS) - @l=${DESTDIR}${MANDIR}${lnk:E}/${lnk}; \ - t=${DESTDIR}${MANDIR}${file:E}/${file}; \ - echo $$t -\> $$l; \ - rm -f $$t; ln $$l $$t; -.endfor - -NOOBJ= diff --git a/lib/libX11/COPYING b/lib/libX11/COPYING index b065516e..77d1ff78 100644 --- a/lib/libX11/COPYING +++ b/lib/libX11/COPYING @@ -13,8 +13,7 @@ to that file. Copyright (C) 2003-2006,2008 Jamey Sharp, Josh Triplett Copyright © 2009 Red Hat, Inc. -Copyright 1990-1992,1999,2000,2004,2009,2010 Oracle and/or its affiliates. -All rights reserved. +Copyright (c) 1990-1992, 1999, 2000, 2004, 2009, 2010, 2015, 2017, Oracle and/or its affiliates. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -228,35 +227,6 @@ PERFORMANCE OF THIS SOFTWARE. ---------------------------------------- - -Copyright (c) 1995 David E. Wexelblat. All rights reserved - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL DAVID E. WEXELBLAT BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of David E. Wexelblat shall -not be used in advertising or otherwise to promote the sale, use or -other dealings in this Software without prior written authorization -from David E. Wexelblat. - - ---------------------------------------- - Copyright 1990, 1991 by OMRON Corporation Permission to use, copy, modify, distribute, and sell this software and its @@ -938,5 +908,21 @@ AND FITNESS, IN NO EVENT SHALL OMRON, NTT SOFTWARE, OR NTT, 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. + + ---------------------------------------- + +Copyright (c) 2008 Otto Moerbeek + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, 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. diff --git a/lib/libX11/ChangeLog b/lib/libX11/ChangeLog index e7fa76ad..c314f0a9 100644 --- a/lib/libX11/ChangeLog +++ b/lib/libX11/ChangeLog @@ -1,3 +1,1705 @@ +commit a465588218c1643eedc35b3c24409cb775454eee +Author: Alan Coopersmith +Date: Fri Apr 5 15:50:06 2024 -0700 + + libX11 1.8.9 + + Signed-off-by: Alan Coopersmith + +commit 52a191ee096e93cf711f77b6a56c508b68afc0b6 +Author: Peter Hutterer +Date: Fri Apr 5 13:15:32 2024 +1000 + + Revert "ximcp: Unmark to fabricate key events with XKeyEvent serial" + + This commit causes a regression, see #205, #206, #207, #208. + + This reverts commit 024d229fdf88a7755577b01b46af6ef908d599e0. + +commit 3ea9f4f769fecbbc8c5210c5833ad83ab8d9e97e +Author: Peter Hutterer +Date: Fri Apr 5 13:14:33 2024 +1000 + + Revert "imDefLkup: Commit first info in XimCommitInfo" + + This commit causes a regression, see #205, #206, #207, #208. + + This reverts commit 041b5291f0956c5cda5054be2981c0d02b009a4c. + +commit 9afd55ada5d7a3c1d3ed23ff8451629a1d989a7f +Author: Alan Coopersmith +Date: Mon Mar 25 11:51:03 2024 -0700 + + xlibi18n: restore parse_line1 for WIN32 builds + + Accidentally removed by __UNIXOS2__ cleanup + Closes: #204 + Fixes: 225a4bbb ("unifdef __UNIXOS2__") + + Signed-off-by: Alan Coopersmith + +commit e4927d0c4fbf950bc45fc27309290e1911e75f42 +Author: Alan Coopersmith +Date: Sun Mar 24 15:02:23 2024 -0700 + + libX11 1.8.8 + + Signed-off-by: Alan Coopersmith + +commit 4ab58f26d388c82ffe46ef1c7dd1cee6259eec8a +Author: Alan Coopersmith +Date: Wed Feb 21 18:23:36 2024 -0800 + + unifdef NULL_NOT_ZERO + + I can't find any evidence this was ever defined, should only have + been needed for odd-ball pre-C89 compilers. + + Signed-off-by: Alan Coopersmith + +commit 7bb2a5050a2f6049c92b301fae1cf89532b70060 +Author: Alan Coopersmith +Date: Wed Feb 21 18:18:46 2024 -0800 + + unifdef USL_SHAREDLIB + + I can't find any history of this being set in the imake or autoconf builds + + Signed-off-by: Alan Coopersmith + +commit 4400a68b3a5ecacd1f997d41a0572544fa8fe544 +Author: Alan Coopersmith +Date: Sat Feb 17 15:37:41 2024 -0800 + + unifdef Lynx + + Signed-off-by: Alan Coopersmith + +commit 1e56b27429667e772b15b0f39863a8467297062b +Author: Alan Coopersmith +Date: Sun Feb 11 15:15:00 2024 -0800 + + unifdef __QNX__ + + Signed-off-by: Alan Coopersmith + +commit ab0a3014822687da48cd3784253c34dea0a6ad2c +Author: Alan Coopersmith +Date: Sun Feb 11 15:10:59 2024 -0800 + + unifdef __uxp__ + + Signed-off-by: Alan Coopersmith + +commit 4ce3962b701c502acc96b6eaf104a5ffc317c5d7 +Author: Alan Coopersmith +Date: Sun Feb 11 15:07:15 2024 -0800 + + unifdef __vax__ + + Signed-off-by: Alan Coopersmith + +commit 65a6f162fd9fee4e647ac49c546c5d6a1655c58c +Author: Alan Coopersmith +Date: Sun Feb 11 15:03:19 2024 -0800 + + unifdef __sgi_not_xconsortium + + Signed-off-by: Alan Coopersmith + +commit 3296d7b8d14a6c114489d40b76e8da339e11b25c +Author: Alan Coopersmith +Date: Sun Feb 11 15:01:25 2024 -0800 + + unifdef __sgi + + Signed-off-by: Alan Coopersmith + +commit 4322fff7e125c7975dc1b83c433b904c7d3384b5 +Author: Alan Coopersmith +Date: Sun Feb 11 15:00:34 2024 -0800 + + unifdef sgi + + Signed-off-by: Alan Coopersmith + +commit 613d3624c2cc0ab2f18206e165a3e4a02e261148 +Author: Alan Coopersmith +Date: Sun Feb 11 14:59:28 2024 -0800 + + unifdef hpux + + Also removes shl_load() support, which was only buildable for HP-UX + + Signed-off-by: Alan Coopersmith + +commit 225a4bbbbd174e26cc408640e10f3c37f81f3a3f +Author: Alan Coopersmith +Date: Sun Feb 11 14:56:22 2024 -0800 + + unifdef __UNIXOS2__ + + Signed-off-by: Alan Coopersmith + +commit 0df284b450933e0239d1a85a7ff2d0c9d44d22af +Author: Alan Coopersmith +Date: Sun Feb 11 14:50:29 2024 -0800 + + unifdef ultrix + + Signed-off-by: Alan Coopersmith + +commit c3f3eb1284c59305568288923810dc155df6025c +Author: Alan Coopersmith +Date: Sun Feb 11 14:49:13 2024 -0800 + + unifdef AIXV3 + + Signed-off-by: Alan Coopersmith + +commit b35344c9a74b478509e33384cc99bcc4fd092a2d +Author: Alan Coopersmith +Date: Sun Feb 11 14:47:31 2024 -0800 + + unifdef __osf__ + + Signed-off-by: Alan Coopersmith + +commit 041b5291f0956c5cda5054be2981c0d02b009a4c +Author: Takao Fujiwara +Date: Wed Jan 31 20:27:57 2024 +0900 + + imDefLkup: Commit first info in XimCommitInfo + + Xic.private.proto.commit_info can receive multiple XimCommitInfo + when typing keys very quickly like an bar code scanner (or evemu-play) + and the first info in XimCommitInfo should be committed to keep + the typing key order. + + Fixes: #198 + +commit 024d229fdf88a7755577b01b46af6ef908d599e0 +Author: Takao Fujiwara +Date: Wed Jan 31 20:26:40 2024 +0900 + + ximcp: Unmark to fabricate key events with XKeyEvent serial + + _XimProtoKeypressFilter() and _XimProtoKeyreleaseFilter() can + receive XKeyEvent from both the typing on the keyboard and the + callback of XIM_FORWARD_EVENT. + + If the filter functions unmark to fabricate XKeyEvent from the typing + on the keyboard during receiving XKeyEvent from the callback of + XIM_FORWARD_EVENT with typing keys very quickly likes an bar code + scanner (or evemu-play), XIM server cannot receive some key events and + it causes the key typing order to get scrambled. + + Now XIM client saves the serial in XKeyEvent and the filter functions + unmark to fabricate XKeyEvent from the callback of XIM_FORWARD_EVENT + only. + + Fixes: #198 + +commit ae3eca18cec44a953789c7f77ffab888713ed132 +Author: Peter Hutterer +Date: Thu Nov 30 15:05:51 2023 +1000 + + Fix _XkbReadGetDeviceInfoReply for nButtons == dev->buttons + + XkbGetDeviceInfo(dpy, XkbXI_ButtonActionsMask, 2, 0, 0) always returns + NULL because the number of buttons on the device equals (unsurpisingly) + the number of buttons requested (i.e. first + nBtns == dev->nbuttons). + + This currently causes it to bail out and return NULL. + + Fixes f293659d5a4024bda386305bb7ebeb4647c40934 + +commit 0a951047f64e87c5ab328084310bf27bcd4964f3 +Author: Walter Harms +Date: Mon Jan 8 17:18:19 2024 +0100 + + _XimProtoIMFree:no need to check arg for Xfree() + + Xfree() will happily ignore NULL, no need to check + +commit dce614623e1f069d79d33a233305e0754fa2fd48 +Author: Walter Harms +Date: Mon Jan 8 17:01:44 2024 +0100 + + _XimEncodeString:no need to check arg for Xfree() + + Xfree() will happily ignore NULL, no need to check + +commit 4f78b615806fa1cfe2bdcf3f7c868b8a00dede77 +Author: Walter Harms +Date: Mon Jan 8 16:50:52 2024 +0100 + + Fix XCreateIC() memory leak (Part 2) + + Direct leak of 12 byte(s) in 2 object(s) allocated from: + #0 0x7f4f25c3f7a7 in strdup (/usr/lib64/libasan.so.6+0x5c7a7) + #1 0x7f4f252ce6a1 in _XimEncodeString libX11-1.8.3/modules/im/ximcp/imRm.c:818 + #2 0x7f4f252ce6a1 in _XimEncodeString libX11-1.8.3/modules/im/ximcp/imRm.c:807 + #3 0x7f4f252d2f0f in _XimSetICValueData libX11-1.8.3/modules/im/ximcp/imRm.c:2912 + #4 0x7f4f252b536a in _XimLocalCreateIC libX11-1.8.3/modules/im/ximcp/imLcIc.c:176 + #5 + + 0x7f4f251f0105 in XCreateIC libX11-1.8.3/src/xlibi18n/ICWrap.c:251 + + detected and fix by Patrick Lerda + applied with adjustment, do changes when OOM (unlikely but good practise) + +commit ed0b97e480d7d07c24719007273989b2eb3e4046 +Author: Walter Harms +Date: Mon Jan 8 16:21:02 2024 +0100 + + _XimLocalDestroyIC:fix possible mem leak + + Adapted: + Fix XCreateIC() memory leak by Patrick Lerda Part 1 + +commit 07978634b8f4f7d9537c7f46ddcd48f2ab3efcb8 +Author: Walter Harms +Date: Mon Jan 8 15:16:11 2024 +0100 + + _XimLocalCreateIC: get rid of bzero + +commit 59c9a89e250d479334bdd4d800ca6cfa919b8fc3 +Author: Walter Harms +Date: Mon Jan 8 15:09:49 2024 +0100 + + _XimLocalCreateIC: minor cleanup + + minor cleanup, no code change + +commit e5b14e59a16fa49c7e7af0acfc1e4311bebec536 +Author: Walter Harms +Date: Mon Jan 8 13:35:28 2024 +0100 + + _XimLocalCreateIC:no need to check arg for Xfree() + + Xfree() will happily ignore NULL, no need to check + +commit e6310b5212f1dea184e1626ad5eeec167fcb41ac +Author: Walter Harms +Date: Mon Jan 8 13:06:03 2024 +0100 + + _XimLocalDestroyIC: no need to check arg for Xfree() + + Xfree() will happily ignore NULL, no need to check + +commit 1261802fb316f088504b99ffe80095d13825a85b +Author: Walter Harms +Date: Sun Jan 7 18:30:30 2024 +0100 + + fix table width + + the width of first column was to small and + caused a hyphenation. there is only one word, + fix for me. + +commit c745719e23af44a4b40ab4508447637b35d91a1e +Author: Alan Coopersmith +Date: Tue Oct 3 09:00:01 2023 -0700 + + libX11 1.8.7 + + Signed-off-by: Alan Coopersmith + +commit 7916869d16bdd115ac5be30a67c3749907aea6a0 +Author: Yair Mizrahi +Date: Thu Sep 7 16:15:32 2023 -0700 + + CVE-2023-43787: Integer overflow in XCreateImage() leading to a heap overflow + + When the format is `Pixmap` it calculates the size of the image data as: + ROUNDUP((bits_per_pixel * width), image->bitmap_pad); + There is no validation on the `width` of the image, and so this + calculation exceeds the capacity of a 4-byte integer, causing an overflow. + + Signed-off-by: Alan Coopersmith + +commit b4031fc023816aca07fbd592ed97010b9b48784b +Author: Alan Coopersmith +Date: Thu Sep 7 16:12:27 2023 -0700 + + XCreatePixmap: trigger BadValue error for out-of-range dimensions + + The CreatePixmap request specifies height & width of the image as CARD16 + (unsigned 16-bit integer), so if either is larger than that, set it to 0 + so the X server returns a BadValue error as the protocol requires. + + Signed-off-by: Alan Coopersmith + +commit 73a37d5f2fcadd6540159b432a70d80f442ddf4a +Author: Alan Coopersmith +Date: Thu Sep 7 15:55:04 2023 -0700 + + XPutImage: clip images to maximum height & width allowed by protocol + + The PutImage request specifies height & width of the image as CARD16 + (unsigned 16-bit integer), same as the maximum dimensions of an X11 + Drawable, which the image is being copied to. + + Signed-off-by: Alan Coopersmith + +commit 204c3393c4c90a29ed6bef64e43849536e863a86 +Author: Alan Coopersmith +Date: Thu Sep 7 15:54:30 2023 -0700 + + CVE-2023-43786: stack exhaustion from infinite recursion in PutSubImage() + + When splitting a single line of pixels into chunks to send to the + X server, be sure to take into account the number of bits per pixel, + so we don't just loop forever trying to send more pixels than fit in + the given request size and not breaking them down into a small enough + chunk to fix. + + Fixes: "almost complete rewrite" (Dec. 12, 1987) from X11R2 + Signed-off-by: Alan Coopersmith + +commit 6858d468d9ca55fb4c5fd70b223dbc78a3358a7f +Author: Alan Coopersmith +Date: Sun Sep 17 14:19:40 2023 -0700 + + CVE-2023-43785: out-of-bounds memory access in _XkbReadKeySyms() + + Make sure we allocate enough memory in the first place, and + also handle error returns from _XkbReadBufferCopyKeySyms() when + it detects out-of-bounds issues. + + Reported-by: Gregory James DUCK + Signed-off-by: Alan Coopersmith + +commit 78b37accff1abbe713349d59fdefd963ffa04bbc +Author: Alan Coopersmith +Date: Sun Sep 17 10:11:02 2023 -0700 + + XOpenDisplay: ensure each screen has a valid root_visual pointer + + Other code assumes this pointer cannot be NULL, so fail the connection + if a bug has caused the X server to give a non-existent visual ID for + the default visual of any screen. + + Reported-by: Gregory James DUCK + Signed-off-by: Alan Coopersmith + +commit 3962080b7846d79fd3cf10b16eddacf68eb321b7 +Author: Antti Savolainen +Date: Tue Aug 8 11:37:03 2023 +0000 + + Add two compose sequences for dagger/obelisk symbols + + The dagger symbol has several modern uses such as marking someone as + dead or something as extinct. Historically it has been used to indicate + a footnote. + +commit 15bbc81cf6b7c76b8a59cab6d77c9aba88b8562d +Author: Christopher Chavez +Date: Sat Jul 29 16:58:05 2023 +0000 + + Xutil.h: use Bool for XEmptyRegion(), XEqualRegion() + +commit 5433cb93513c31e9cba2a447cf48d4b9aeb53285 +Author: Benno Schulenberg +Date: Mon Jul 17 08:02:09 2023 +0200 + + nls: add two compose sequences for currency symbol `฿` (the Thai baht) + + The compose sequences are obvious: the capital B plus the vertical bar. + + Signed-off-by: Benno Schulenberg + +commit 2ff401a472c5f210844cc358d5a27bd340546796 +Author: Benno Schulenberg +Date: Mon Jul 17 07:56:14 2023 +0200 + + nls: reshuffle the compose sequences for currencies into ascending order + + That is: sort them according to code point. + +commit c0e2d42d411be3245498ffe6484b35421f096c02 +Author: Benno Schulenberg +Date: Mon Jul 17 07:27:14 2023 +0200 + + nls: add compose sequences for `₲` (guaraní), `₭` (kip), and `₮` (tugrik) + + When Ghana, Nigeria, Costa Rica and El Salvador have compose sequences + for their currency symbols (cedi: `₵`, naira: `₦`, colón: `₡`), then + Paraguay, Laos, and Mongolia deserve to have such sequences as well. + + The sequences should be obvious: the relevant capital letter of the + name of the currency (G, K, T) plus a vertical bar, a minus sign, + and an equals sign, respectively. + + Also add two sequences for `$` (the dollar sign), for consistency. + + Drop the tentative comments for drachma, penny, and austral, as those + currencies have been obsolete for more than twenty years. + + Signed-off-by: Benno Schulenberg + +commit d9fe5dc735c75398e36998c226d2418137229673 +Author: Benno Schulenberg +Date: Mon Jul 17 07:06:51 2023 +0200 + + nls: change result of sequence ` ` from `¢` (CENT) to `₵` (CEDI) + + As a cent is a small coin, it makes no sense to use an uppercase letter + to compose the `¢` symbol -- having four sequences with a lowercase `c` + plus a `bar` or a `slash` available for composing `¢` should be enough. + + Use the sequence ` + +commit 031e63060ed11eb8a876aac7515bc5a67371ed6b +Author: Antti Savolainen +Date: Thu Aug 17 18:25:20 2023 +0300 + + nls: add a compose sequence with double dead_tilde for ≈ (almost equal to) + + Some keyboards lack direct asciitilde and instead have only dead tilde. + This compose sequence allows those keyboards to type the almost equal + to sign. + +commit df2a18c4643bb4a50f2f795a75a905a1032a004a +Author: Benno Schulenberg +Date: Mon Jul 17 17:03:16 2023 +0200 + + nls: delete twenty seven untypable Greek compose sequences + + Only a few keyboard layouts contain the `dead_iota` keysym, and none + of those layouts contains the `acute` keysym, so compose sequences + that combine the two symbols cannot be typed and are thus useless. + + Signed-off-by: Benno Schulenberg + +commit 44f908d9283710ffc75b22d2ae7a8948119b3e61 +Author: Alan Coopersmith +Date: Sun Aug 20 15:11:04 2023 -0700 + + docs: fix names for XkbKeyKeyType & XkbKeyKeyTypeIndex + + Implementation had "Key" twice in these macro names, + but the docs had only listed it once. + + Signed-off-by: Alan Coopersmith + +commit 7b16c55063ba4eb258bf91c170e378c1e2d398bd +Author: Alan Coopersmith +Date: Sun Aug 20 15:01:09 2023 -0700 + + docs: remove XkbKeySymsOffset + + This function was documented but never implemented. + + Signed-off-by: Alan Coopersmith + +commit 41a157dfeefe943f5a79948e4f9ef93473144fd8 +Author: Alan Coopersmith +Date: Sun Aug 20 14:52:18 2023 -0700 + + docs: remove XkbGetNameChanges + + This function was documented but never implemented. + + Signed-off-by: Alan Coopersmith + +commit 3442a8cee25dc0254ee69bcf83a89d287a86c97a +Author: Alan Coopersmith +Date: Sun Aug 20 14:44:18 2023 -0700 + + docs: remove XkbChangeIndicators and Xkb{Get,Note}IndicatorChanges + + These functions were documented but never implemented. + + Signed-off-by: Alan Coopersmith + +commit b7a15d6c6efd0bfddc81cf8443073c4bc1c9772d +Author: Alan Coopersmith +Date: Sun Aug 20 14:31:20 2023 -0700 + + docs: XkbSAActionSetCtrls is really named XkbActionSetCtrls + + Signed-off-by: Alan Coopersmith + +commit a1d8dd726757e00e3a774b92456f5c742492475b +Author: Alan Coopersmith +Date: Sun Aug 20 14:18:32 2023 -0700 + + docs: remove XkbGetStickyKeysOptions & XkbSetStickyKeysOptions + + These functions were documented but never implemented. + + Signed-off-by: Alan Coopersmith + +commit bf13f197406fe745c5ff46a4748a41b6646aebf6 +Author: Alan Coopersmith +Date: Sun Aug 20 14:09:35 2023 -0700 + + docs: remove XkbGetSlowKeysDelay & XkbSetSlowKeysDelay + + These functions were documented but never implemented. + + Signed-off-by: Alan Coopersmith + +commit caab7321d2ec14ee776ec329ed2facf0816a3136 +Author: Alan Coopersmith +Date: Sun Aug 20 14:04:15 2023 -0700 + + docs: remove XkbGetAccessXTimeout & XkbSetAccessXTimeout + + These functions were documented but never implemented. + + Signed-off-by: Alan Coopersmith + +commit 843e89bd2467a58cb454705a09d095726b96d93f +Author: Alan Coopersmith +Date: Sun Aug 20 12:58:47 2023 -0700 + + docs: remove XkbAllocDeviceLedInfo + + This function was documented but never implemented. + + Signed-off-by: Alan Coopersmith + +commit 2686dd7a9d6e8e02ce2868e446cdec11617ffab4 +Author: Alan Coopersmith +Date: Sun Aug 20 12:41:42 2023 -0700 + + docs: finish removing XkbGetBounceKeysDelay & XkbSetBounceKeysDelay + + These functions were documented but never implemented. + + Signed-off-by: Alan Coopersmith + +commit 188991fe7e41bbf2f384d0875ab2e25c936b0b41 +Author: G. Branden Robinson +Date: Sat Jul 29 10:10:00 2023 -0700 + + configure script reports stray, confusing "yes" + + Closes issue #194 + + Signed-off-by: Alan Coopersmith + +commit 70f44d76fd8fad96f33ba5c80a394d68b77dda03 +Author: Benno Schulenberg +Date: Sun Jul 16 17:08:52 2023 +0200 + + nls: add, correct, and normalize some comments of compose sequences + + Add comments for the Khmer digraphs, correct the comments for the + Arabic lam-alef decompositions, and normalize the comments for the + Breton digraphs and trigraphs. + + Signed-off-by: Benno Schulenberg + +commit 2a57c32e14779cf1c0c1d2da98a9cac21c00c095 +Author: Benno Schulenberg +Date: Sun Jun 25 10:01:05 2023 +0200 + + nls: harmonize the comments for compose sequences with combining accents + + Replace the "WITH" with "plus" and lowercase the "AND" in the comments + for sequences with combining accents, to make it slightly clearer that + the resulting string consists of multiple code points. Also, use the + word "COMBINING" in the names of the accents, so that these sequences + can be easily grepped, and drop the redundant word "ACCENT". + + Signed-off-by: Benno Schulenberg + +commit 757ab5ddd86f6cdce24b8ae2c43206b7beb7ab44 +Author: Alan Coopersmith +Date: Mon Aug 14 08:33:28 2023 -0700 + + Remove XkbSetBounceKeysDelay.man from list of man pages to build + + Fixes: f90e6bfa ("rm XkbSetBounceKeysDelay.man") + + Signed-off-by: Alan Coopersmith + +commit f90e6bface92fd192b26f03b7ae745661d9c2690 +Author: Walter Harms +Date: Sun Aug 13 22:42:50 2023 +0200 + + rm XkbSetBounceKeysDelay.man + + there is no function XkbSetBounceKeysDelay(). + It is listed in the specs but never implemented if someone + does it, feel free to get the file back. + + closes issue #105 + +commit b2c3fb7b4dd4c4c7b9d28c7af7776cccc8e0a98b +Author: Benno Schulenberg +Date: Sat Jul 8 08:11:39 2023 +0200 + + nls: use the shorter and more consistent name for the dead capital schwa + + The `dead_SCHWA` name is available since xorgproto-2023.1, which was + released last month. + +commit e45dff5c2a51ad0392061208a8ad33211d952385 +Author: jmcwilliams403 +Date: Fri Jun 16 11:37:20 2023 -0400 + + NLS: Drop two math sequences, slightly clean up APL sequences. + + * Two compose sequences containing `leftshoe` and `rightshoe` are + dropped as no keyboard layout uses these keysyms. + * The compose sequences for `therefore` and `because` in the APL + block are moved to ascending Unicode order. + * The comments for the compose sequences for `U2299` are corrected to + more accurately reflect its sequence nodes and its real name in + Unicode. + +commit af2b6dfab1616dc85be9c9b196e4c56d00447851 +Author: Benno Schulenberg +Date: Sun Jun 25 09:09:21 2023 +0200 + + nls: delete twenty eight compose sequences that cannot be typed + + The letters `Ǫ` (U+01EA, O with ogonek), `Ȩ` (U+0228, E with cedilla), + `Ȯ` (U+022E, O with dot above), `Ạ` (U+1EA0, A with dot below), and + their lowercase forms do not occur in any layout of xkeyboard-config, + meaning that the compose sequences that contained these letters could + not be typed. Delete their dead weight. + + Signed-off-by: Benno Schulenberg + +commit ab0442d3fa835ce16559b29532ac7f674f8557f4 +Author: Benno Schulenberg +Date: Sat Jun 24 09:46:07 2023 +0200 + + nls: remove four unobvious and redundant compose sequences for ¥ (yen) + + Composing ¥ with Y and a minus sign seems to have been added in analogy + to composing £ with L and a minus sign. But ¥ clearly has a double line + through it, so using the equals sign for this is far more logical (and + those compose sequences of course exist). Also, L plus an equals sign + produces ₤ (lira), not £ (sterling). So... make these sequences more + consistent and allow composing ¥ only with Y/y plus an equals sign. + + Signed-off-by: Benno Schulenberg + +commit 933912480c08495428d45988eebb48fcbe62f14b +Author: Benno Schulenberg +Date: Sat Jun 24 10:02:45 2023 +0200 + + nls: order a few compose sequences left first, and in mirroring pairs + +commit 178c4fefd3b0b4be5e69274108b86a51f08ec3a6 +Author: Benno Schulenberg +Date: Fri Jun 16 09:33:03 2023 +0200 + + nls: remove three duplicated combining acute accents + + For the Cyrillic YU with combining acute accent, the string between + the quotes contained two U+0301 code points, whereas one is enough, + like for all the neighboring strings. + + (This duplication was found by accident with `nano --mini --cons`.) + +commit 695e90ad26f632feb0f58ad94882fb3a263bf114 +Author: Alan Coopersmith +Date: Thu Jun 15 09:14:48 2023 -0700 + + libX11 1.8.6 + + Signed-off-by: Alan Coopersmith + +commit 304a654a0d57bf0f00d8998185f0360332cfa36c +Author: Alan Coopersmith +Date: Sat Jun 10 16:30:07 2023 -0700 + + InitExt.c: Add bounds checks for extension request, event, & error codes + + Fixes CVE-2023-3138: X servers could return values from XQueryExtension + that would cause Xlib to write entries out-of-bounds of the arrays to + store them, though this would only overwrite other parts of the Display + struct, not outside the bounds allocated for that structure. + + Reported-by: Gregory James DUCK + Signed-off-by: Alan Coopersmith + +commit 71b08b8af20474bb704a11affaa8ea39b06d5ddf +Author: Alan Coopersmith +Date: Wed May 31 17:45:40 2023 -0700 + + libX11 1.8.5 + + Signed-off-by: Alan Coopersmith + +commit 03ba0140940cc76524d83096a47309f5c398541f +Author: Benno Schulenberg +Date: Mon May 22 12:02:06 2023 +0200 + + nls: use a slash instead of a combining solidus in compose sequences + + First: combining diacritics like the combining long solidus (`U+0338`) + are not meant to be used in compose sequences. Second: there is just + one layout in xkeyboard-config that contains the `U0338` character: + the deprecated/obsolete German T3 layout. So, practically speaking, + these compose sequences with `U0338` were untypable. So, use a slash + instead, that almost all layouts have. This does require that the + sequence ` ` changes its meaning from backslash + to not-less-than (`≮`). This seems like an acceptable sacrifice, as + the sequence ` ` is a faster/easier sequence + for the backslash and most layouts contain a backslash already anyway. + + Signed-off-by: Benno Schulenberg + +commit 616701317e25b2c0f509f4d93af5dee6de09012d +Author: Benno Schulenberg +Date: Mon May 22 11:19:32 2023 +0200 + + nls: delete six compose sequences that cannot be typed + + None of the layouts in xkeyboard-config contain `Ohook` or `Uhook` + or `U+01D3` (U with caron) nor their lowercase forms, so these six + sequences cannot be typed on any known keyboard. + + (Also, the target characters of the sequences with hook and horn + seem to occur only in Vietnamese, where the horn is part of the + vowel and the hook is a tonal mark. All Vietnamese layouts in + xkeyboard-config contain `Ohorn` and `Uhorn`, and then the five + tonal marks as dead keys, `dead_hook` among them. It does not + make sense to want to apply a horn to a vowel that already has + a tonal mark, nor is it possible with the Vietnamese layouts.) + + Signed-off-by: Benno Schulenberg + +commit 35d9621d78cb196b4ccd3ee1baa1ce2a21e4674b +Author: Benno Schulenberg +Date: Sun May 21 16:17:32 2023 +0200 + + nls: sort three sequences alphabetically in their group, like all others + + Also, consistently form uppercase+lowercase pairs, like for most others. + +commit 208d550954c7266fa8093b02a2a97047e1478c00 +Author: Benno Schulenberg +Date: Thu Apr 13 17:25:35 2023 +0200 + + nls: make the Amharic compose sequences use the dead-vowel symbols + + Last year, commit 488b156fe2 changed mistaken ASCII characters to the + code points that were actually used in the Ethiopian keyboard layout. + + But those code points were mistaken too: the intention was not to use + the code point U+FE68 in the layout but the raw symbol code 0xfe68 -- + and so on for the other codes. The symbols that these raw codes were + intended to refer to were `dead_a` and friends. But these dead vowels + were added under different codes: 0xfe80 to 0xfe8b. + + So, correct the Amharic compose sequences to make use of the dead-vowel + symbols that were specifically added for them fifteen years ago. + + (As soon as this is merged, xkeyboard-config wil be changed too to use + the dead vowels in the Ethiopian layout.) + + Signed-off-by: Benno Schulenberg + +commit 96cbac89a02220eb21e13ca5fa7c8c5adf77028a +Author: jmcwilliams403 +Date: Fri Mar 31 09:47:03 2023 -0400 + + nls: add compose sequence for capital schwa, and delete a deviant one + + This sequence has already been defined in the iso8859-9e compose + file meant for the Azerbaijani locale, yet for the longest time, only + the lowercase form has existed in the en_US.UTF-8 master compose + file. This patch adds one sequence for Latin Capital Letter Schwa for + the Azerbaijani language. + + Additionally, the sequence in the pt_BR.UTF-8 locale for capital + schwa has been removed as it uses two lowercase e's as part of its + sequence, which in practice would make typing both `Multi_key e e` + and `Multi_key E E` output capital schwa. + +commit a6528d92b3865adb4f9951df91a714f55f56d59e +Author: Benno Schulenberg +Date: Tue Apr 4 11:35:44 2023 +0200 + + XSetScreenSaver.man: restore the part that was accidentally snipped + + Four years ago, while removing private macros, commit fe46eb2871 + unintentionally truncated the XSetScreenSaver manpage. Restore + the snipped part (minus trailing spaces and a mistaken singular). + + This fixes issue #187. + + Reported-by: Sergio Gelato + + Signed-off-by: Benno Schulenberg + +commit eb166af8f9f4184108fe8e0611a09af03d12059e +Author: jmcwilliams403 +Date: Fri Mar 24 08:37:32 2023 -0400 + + NLS: Remove strange dead_cedilla cedi sign sequences + + These sequences appear to be a leftover artifact of auto-generating + dead_currency sequences for cent and the cedi sign, where chaining + with ascii "c" vs "ccedilla" would output cent vs the cedi sign + respectively, but somehow this ended up creating strange sequences + with dead_cedilla followed by cent or the colon sign to output the + cedi sign, the latter sequence of which was already removed recently. + Additionally, sequences beginninng with dead_cedilla followed by + currency have been removed as they also appear to be related to these + artifacts. The two remaining sequences beginning with dead_currency + followed by dead_cedilla are maintained and moved to the stretch of + dead_currency sequences next to ccedilla, and sorted in order of + unicode decompositional complexity. + +commit 6e889f34679bb96f4d61ef069259c042cb4a9a59 +Author: Benno Schulenberg +Date: Fri Mar 24 09:41:48 2023 +0100 + + nls: remove twenty two untypable Greek compose sequences + + None of the keyboard layouts in xkeyboard-config contains accented + Greek characters like `Greek_alphaaccent` or `Greek_iotadieresis` + (nor in their Unicode hexadecimal forms, like U03AC or 0x10003CA), + so none of these sequences could be typed on an existing layout. + + Also, the two sequences that started with `Greek_accentdieresis` + were plain wrong: making a spacing character into a dead key. + + Signed-off-by: Benno Schulenberg + +commit 98be4cb23a5eadc98f81f05c4696f687119152c8 +Author: Benno Schulenberg +Date: Fri Mar 24 09:00:48 2023 +0100 + + nls: remove four hundred and sixty untypable Greek compose sequences + + None of the keyboard layouts in xkeyboard-config contains code points + in the range U+1F00..U+1FFF (the Greek Extended block), so none of the + removed sequences could be typed on an existing layout. + + (Of course it is possible that some people have their own private layout + that contains some of the Greek Extended characters, but if they do, + then they can also define private compose sequences, when needed.) + + Modern Greek does not use these characters with polytonic diacritics + anyway -- they are useful only for typing traditional Greek. + + The useless sequences were removed with this command: + + sed -i '//d' nls/en_US.UTF-8/Compose.pre + + Signed-off-by: Benno Schulenberg + +commit ff8706a5eae25b8bafce300527079f68a201d27f +Author: Benno Schulenberg +Date: Wed Jun 15 11:54:54 2022 +0200 + + nls: delete compose sequences that pointlessly mix upper and lower case + + It's nice to have compose sequences for things like © and ®, but allowing + them to be composed also with letters of different case is unneeded. It + is good enough to have sequences of only lowercase and only uppercase. + + Signed-off-by: Benno Schulenberg + +commit ca99e338a9b8aad300933b1336f9e3c091392213 +Author: jmcwilliams403 +Date: Sun Mar 12 15:13:27 2023 +0000 + + NLS: move dead-caron subscript compositions to the relevant Unicode block + +commit dac2985b347cebc0f631e43e41eaeddb68de1676 +Author: jmcwilliams403 +Date: Sun Mar 12 14:49:47 2023 +0000 + + NLS: implement the expansion of the six Breton N-graph keysyms + + These one-keysym-to-multiple-characters sequences will allow fully defining + the Breton keyboard layout, without needing custom compose sequences. + +commit e45ca7b41dcd3ace7681d6897505f85d374640f2 +Author: Alan Coopersmith +Date: Tue Mar 14 10:22:48 2023 -0700 + + gitlab CI: add workflow rules + + Needed due to the gitlab config changes described in: + https://gitlab.freedesktop.org/freedesktop/freedesktop/-/issues/438 + + Signed-off-by: Alan Coopersmith + +commit 72eeeb6dedc39f68608312eb0001f77fffccd499 +Author: jmcwilliams403 +Date: Sun Mar 5 13:33:38 2023 +0000 + + NLS: move long S compositions to respective blocks + +commit 8bbbed75a20556e41658103265974decee974645 +Author: Alan Coopersmith +Date: Sat Mar 4 10:44:45 2023 -0800 + + configure: Use LT_INIT from libtool 2 instead of deprecated AC_PROG_LIBTOOL + + AC_PROG_LIBTOOL was replaced by LT_INIT in libtool 2 in 2008, + so it's time to rely on it. + + Clears autoconf warnings: + + configure.ac:20: warning: The macro `AC_PROG_LIBTOOL' is obsolete. + configure.ac:20: You should run autoupdate. + m4/libtool.m4:100: AC_PROG_LIBTOOL is expanded from... + configure.ac:20: the top level + + Signed-off-by: Alan Coopersmith + +commit 53bf8584e8d7d5d4a4a8114bff26a6f631c7fac1 +Author: Alan Coopersmith +Date: Mon Feb 6 14:09:45 2023 -0800 + + configure: replace deprecated AC_HELP_STRING with AS_HELP_STRING + + This silences an autoconf warning. + + Signed-off-by: Alan Coopersmith + +commit 31a9451111fb1e3ae1199d44f94cd0b134ca455d +Author: Alan Coopersmith +Date: Mon Feb 6 13:13:21 2023 -0800 + + configure: raise minimum autoconf requirement to 2.70 + + Needed for builds on NetBSD to work correctly, since it depends on + AC_USE_SYSTEM_EXTENSIONS defining _OPENBSD_SOURCE to expose the + prototype for reallocarray() in the system headers. + + Signed-off-by: Alan Coopersmith + +commit 1ba02f878f83e3b42389547e01b24371f0a50e60 +Author: Alan Coopersmith +Date: Mon Feb 6 13:32:02 2023 -0800 + + gitlab CI: Add libtool to required packages + + Signed-off-by: Alan Coopersmith + +commit fc5ec8edda1efdf5d66db4e76796e3c407527b3b +Author: Alan Coopersmith +Date: Sat Feb 4 12:02:29 2023 -0800 + + libX11 1.8.4 + + Signed-off-by: Alan Coopersmith + +commit ba548ed1688d4d5a83913218155d0ddf616ff176 +Author: Alan Coopersmith +Date: Sun Jan 15 11:39:20 2023 -0800 + + configure: options summary should say "libX11", not just "X11" + + We're not configuring the entire window system here, just one library + + Signed-off-by: Alan Coopersmith + +commit eb1c272ab5230d548077b9f59aca4b3457c3a8f8 +Author: GaryOderNichts +Date: Sat Dec 17 16:28:40 2022 +0100 + + Fix a9e845 and 797755 Allow X*IfEvent() to reenter libX11 + +commit 0c7c4ce875ea65160705180ebb68a2c88afb678e +Author: Benno Schulenberg +Date: Thu Nov 3 17:25:29 2022 +0100 + + nls: add two compose sequences for capital B with stroke, for consistency + + Two compose sequences (with plain ASCII characters) existed for + the lowercase b with stroke (ƀ) but not for the capital one (Ƀ). + + This addresses part of issue #166. + + Reported-by: J. McWilliams + + Signed-off-by: Benno Schulenberg + +commit a80ef097e713aba0330b9cf9f3c1e309084b926f +Author: Benno Schulenberg +Date: Thu Nov 3 16:48:03 2022 +0100 + + nls: delete twelve compose sequences that cannot be typed + + There is not any keyboard layout (in xkeyboard-config) that contains + `obelowdot` or `ubelowdot`, so having compose sequences that use these + symbols is pointless. + + There are some layouts that contain `otilde` (and one that contains + `utilde`), but those layouts then do not contain `dead_horn`, so + the compose sequences that combine the two symbols are pointless. + + There are a few layouts that contain U+0256, U+025C, U+025F or U+0279, + but those layouts do not contain `dead_hook`, so the compose sequences + that combine the latter with one of the former are pointless. + + Signed-off-by: Benno Schulenberg + +commit 078cc39f05ddfd6166762f3166129258ddd07dd3 +Author: Benno Schulenberg +Date: Thu Nov 3 16:31:04 2022 +0100 + + nls: delete 88 compose sequences that have the accents in the wrong order + + The various compose sequences with the accents in their proper order + (the highest placed accent first) continue to exist. + + Signed-off-by: Benno Schulenberg + +commit aa5ef0ba80558f946871f574d38a15673e66221e +Author: Benno Schulenberg +Date: Thu Nov 3 16:27:51 2022 +0100 + + nls: move the compose sequences for Ș and Ț to the fitting Unicode block + + This addresses a side note of issue #166. + + Reported-by: J. McWilliams + + Signed-off-by: Benno Schulenberg + +commit 82c25879b72f1ba7e9abe00e7bad55add33135cf +Author: Alan Coopersmith +Date: Wed Jan 4 11:25:48 2023 -0800 + + xlibi18n: Update Imake instructions to autoconf equivalent in comments + + Signed-off-by: Alan Coopersmith + +commit 88399e01be679bfcc9a5e8922ffe2c47f0e56dee +Author: Yuxuan Shui +Date: Tue Jan 3 15:09:28 2023 +0000 + + Revert "Update XPutBackEvent() to support clients that put back unpadded events" + + This reverts commit d6d6cba90215d323567fef13d6565756c9956f60. + + The reverted commit intended to fix the problem where an unpadded X + event struct is passed into XPutBackEvent, by creating a padded struct + with _XEventToWire and _XWireToEvent. However, _XWireToEvent updates the + last sequence number in Display, which may cause xlib to complain about + lost sequence numbers. + + IMO, the problem that commit tried to solve is a bug in the client + library, and workaround it inside Xlib is bad practice, especially given + the problem it caused. Plus, the offender cited in the original commit + message, freeglut, has already fixed this problem. + + Fixes: #176 #174 + + Signed-off-by: Yuxuan Shui + +commit 48487c4b9028e9eec5371742f51e1d64c2e17296 +Author: Alan Coopersmith +Date: Thu Dec 15 14:52:20 2022 -0800 + + libX11 1.8.3 + + Signed-off-by: Alan Coopersmith + +commit d6d6cba90215d323567fef13d6565756c9956f60 +Author: Keith Packard +Date: Sun Dec 11 10:32:26 2022 -0800 + + Update XPutBackEvent() to support clients that put back unpadded events + + It seems to be common practice of some X11 clients to pass specific event + types into APIs that take XEvent*. For example, freeglut does: + + XConfigureEvent fakeEvent = {0}; + ... + XPutBackEvent(fgDisplay.Display, (XEvent*)&fakeEvent); + + This can result in reads overflowing the input event when libX11 does: + + XEvent store = *event; + + ================================================================= + ==75304==ERROR: AddressSanitizer: stack-buffer-overflow on address 0x00016ee4a8e8 at pc 0x000101c54d14 bp 0x00016ee4a0d0 sp 0x00016ee49888 + READ of size 192 at 0x00016ee4a8e8 thread T0 + #0 0x101c54d10 in __asan_memcpy+0x1a4 (libclang_rt.asan_osx_dynamic.dylib:arm64e+0x3cd10) + #1 0x102848a18 in _XPutBackEvent PutBEvent.c:41 + #2 0x1028490a4 in XPutBackEvent PutBEvent.c:84 + #3 0x1013295c8 in fgOpenWindow freeglut_window.c:1178 + #4 0x101321984 in fgCreateWindow freeglut_structure.c:108 + #5 0x10132b138 in glutCreateWindow freeglut_window.c:1551 + #6 0x100fb7d94 in main+0x78 (checkeredTriangles:arm64+0x100003d94) + #7 0x197de3e4c () + + Address 0x00016ee4a8e8 is located in stack of thread T0 at offset 840 in frame + #0 0x1013282f8 in fgOpenWindow freeglut_window.c:1063 + + This frame has 8 object(s): + [32, 40) 'title.addr' + [64, 176) 'winAttr' (line 1066) + [208, 240) 'textProperty' (line 1067) + [272, 352) 'sizeHints' (line 1068) + [384, 440) 'wmHints' (line 1069) + [480, 672) 'eventReturnBuffer' (line 1070) + [736, 740) 'num_FBConfigs' (line 1072) + [752, 840) 'fakeEvent' (line 1074) <== Memory access at offset 840 overflows this variable + + This change allows XPutBackEvent() to support such clients without + risk of memory read overflow. + + Reviewed-by: Jeremy Huddleston Sequoia + Tested-by: Jeremy Huddleston Sequoia + +commit 496d9bfeedda89a2211ec665f9214c2693c022f4 +Author: Jeremy Huddleston Sequoia +Date: Sat Dec 3 16:26:47 2022 -0800 + + ximcp: Address warning found by UBSan when growing an empty tree + + imLcPrs.c:681:52: runtime error: applying zero offset to null pointer + + Signed-off-by: Jeremy Huddleston Sequoia + +commit 7f7bcd7b6f569e9f70e3ddd134924f178e2596b1 +Author: Takao Fujiwara +Date: Tue Dec 6 16:59:56 2022 +0000 + + nls: consecutive cs number in en_US.UTF-8/XLC_LOCALE + +commit ba095967349dff583bd0989d0ba78aa334e9bedf +Author: Ulrich Sibiller +Date: Wed Nov 30 23:47:29 2022 +0100 + + ChkIfEv.c: fix wrong handling of dpy->in_ifevent + + Is no longer a bool but a counter. + + Signed-off-by: Ulrich Sibiller + +commit 70eaf1174e2809d1a6c43868d53f8cd844ef636a +Author: Ulrich Sibiller +Date: Wed Nov 30 23:42:02 2022 +0100 + + Indentation fixes around recent dpy->in_ifevent changes + + Use the same indentation as the surrounding code. + + Signed-off-by: Ulrich Sibiller + Reviewed-by: Alan Coopersmith + +commit a9e845809bcaae22496bc8aa3ca252b410d5f39b +Author: Matthieu Herrb +Date: Fri Nov 11 18:55:23 2022 +0100 + + Fix 797755 Allow X*IfEvent() to reenter libX11 + + - the activation logic is reversed + - there is also _XInternalLockDisplay() that needs protection + - I've found cases (in fvwm2) where the callback calls XCheckIfEvent() + recursively. So the flag needs to be a counter. + + Reviewed-by: Adam Jackson + +commit bccd787a565d3a88673bfc06574c1939f98d8d72 +Author: Nia Alarie +Date: Thu Nov 10 22:31:47 2022 +0100 + + Don't use pragma inside a function, it breaks compiling with older GCCs. + + XKBBind.c:230: error: #pragma GCC diagnostic not allowed inside functions + + Signed-off-by: Thomas Klausner + +commit 696d19d5db7bcb1c1f582c2b1846520e7e0870cb +Author: Oliver +Date: Fri Nov 11 17:04:00 2022 +0000 + + Add XFreeThreads function. + +commit b4f24b272c6ef888b6fcfcf80670c196b2e8f755 +Author: Alan Coopersmith +Date: Thu Nov 10 12:18:17 2022 -0800 + + libX11 1.8.2 + + Signed-off-by: Alan Coopersmith + +commit 77629ea5e79fa9b1596438bc36cfc7e0c631af43 +Author: Alan Coopersmith +Date: Thu Nov 3 13:00:50 2022 -0700 + + README.md: Add 1.8.2 changes + + Signed-off-by: Alan Coopersmith + +commit d1baf2ec4869dea3732d6fe13ba4935cb6caad01 +Author: Alan Coopersmith +Date: Thu Nov 3 11:22:37 2022 -0700 + + Remove NEWS file which only covered 2006 & 2007 releases + + Signed-off-by: Alan Coopersmith + +commit 1294bfa487bdecfd32621822922fec03203ee188 +Author: Po Lu +Date: Mon Oct 3 08:44:59 2022 +0800 + + specs: document change in XIMPreeditCallbacks + + Signed-off-by: Alan Coopersmith + +commit 1a7e54609ce4dc0f2d3b933502437a413cf3dea8 +Author: Alan Coopersmith +Date: Thu Nov 3 14:44:22 2022 -0700 + + man pages: document XCloseIM frees its argument + + Signed-off-by: Alan Coopersmith + +commit a04b84f0f7bb3a78088756759f4b9b8bb363251e +Author: Alan Coopersmith +Date: Thu Nov 3 20:31:31 2022 +0000 + + Copyright & license cleanup + +commit 5e41119d9611504ff7e61c6aa4da1df708096801 +Author: Benno Schulenberg +Date: Mon Oct 31 12:42:51 2022 +0100 + + nls: reshuffle a few compose sequences, to have similar ones together + + It makes more sense to have similar sequences grouped together + than to rigidly follow the order of ascending Unicode codes. + +commit 65d89342f59cfc2eac9bf8010076b937f22554e8 +Author: Benno Schulenberg +Date: Mon Oct 31 12:50:11 2022 +0100 + + nls: remove two compose sequences that use deprecated symbols + + The last few occurrences of `leftcaret` and `rightcaret` were replaced + with `less` and `greater` in xkeyboard-config half a year ago. + +commit 6baccbae5324e7342cb5176cae82f463a6b34eae +Author: Benno Schulenberg +Date: Mon Oct 31 12:40:12 2022 +0100 + + nls: let ` ` compose U+2212 (MINUS SIGN) + + There was not yet any way to compose the Unicode minus sign, U+2212. + +commit 79775575418fd6f8ee1c5e5bbe403df4606fb5b6 +Author: Adam Jackson +Date: Fri Aug 5 15:19:08 2022 -0400 + + Allow X*IfEvent() to reenter libX11 + + The documentation for this family of functions very clearly says not to + call into xlib in your predicate function, but historically single + threaded apps could get away with it just fine, and now that we've + forced thread-safety on the world such apps will now deadlock instead. + That's not an acceptable regression even if the app is technically + broken. This has been reported with XFCE and FVWM, and Motif's + cut-and-paste code has the same bug by inspection, so this does need to + be addressed. + + This change nerfs LockDisplay/UnlockDisplay while inside the critical + bit of an IfEvent function. This is still safe in the sense that the + display remains locked and no other thread should be able to change it + from under us, but the loop that scans the event queue might not be + robust against it being modified as a side effect of protocol emitted by + the predicate callback. But that's not new, non-XInitThreads'd xlib + would have the same caveat. + + Closes: xorg/lib/libx11#157 + +commit 0d1d65bdd98966f52bcac4077f94827b20b229dd +Author: Benno Schulenberg +Date: Fri Oct 21 12:18:25 2022 +0200 + + nls: change <^> <-> to mean superscript minus instead of macron + + Several other ` ` sequences + produce the superscript equivalent of the given symbol. So, + let ` ` do the same. + + Also, add two other sequences for producing a plain macron, + to compensate a bit the loss of the above sequence. + + Additionally, make ` ` produce + a subscript minus, for consistency. + + This fixes issue #165. + + Requested-by: J. McWilliams + + Signed-off-by: Benno Schulenberg + +commit 310898270787c1a3a6ab50221324f8654dddce8e +Author: Jan Tojnar +Date: Thu Oct 20 07:10:58 2022 +0000 + + nls: Map sr locales to sr_RS compose files + + Serbian used sr_YU (Yugoslavia) code in the past. + Then it was succeeded by sr_CS (Serbia and Montenegro). + Finally, it was split into sr_RS (Serbia) and sr_ME (Montenegro). + + https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/da95ecbbdcacc483cd0b5fd7db1fb2e2543341bd + introduced the modern sr_RS and sr_ME codes. + + Next, https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/40761898692e5063957bfa2518cca3d35b2e354a + added the Serbian compose table but only for the legacy sr_CS entry. + + https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/5cd60398b7787297008b13a848ed3cfbd7ef178d + removed the legacy sr_CS entry, the only one pointing to the correct compose file. + It also renamed the file to sr_RS, but did not update the compose mapping. + + Let’s point all Serbian locales to the Compose file again. + +commit a35d706cd8dc7b498bca2a3fc4a3732047439ed7 +Author: Alan Coopersmith +Date: Fri Oct 14 13:40:37 2022 -0700 + + COPYING: remove notice for the removed UIThrStubs.c + + Fixes: 701e9e9a ("Use same pthread-stubs as libxcb") + + Signed-off-by: Alan Coopersmith + +commit 3b1750e982fedce0d61bface68aadcd5b1ea1fae +Author: Benno Schulenberg +Date: Fri Oct 14 09:28:42 2022 +0200 + + nls: delete two compose sequences with an anomalous post-fixed breve + + Two years ago, commit b126bfd7fe allowed using also a lowercase `u` + wherever an uppercase `U` was used to represent a breve. But the + commit should have limited itself to only the prefixed uses of `U`, + as that is how most letters with a breve are composed. + + Also, group the two compose sequences with an uppercase post-fixed `U` + together with the corresponding other post-fixed sequences. + + Signed-off-by: Benno Schulenberg + +commit 701e9e9afb88bdc68c84a4611adc533400a3df36 +Author: Alan Coopersmith +Date: Tue Oct 4 11:24:57 2022 -0700 + + Use same pthread-stubs as libxcb + + Avoid conflicts when libX11 calls libxcb and gets its pthread functions + overriding our ancient stubs. + + v2: Keep linking with real threads libraries when thread safety + constructor is enabled. + + Signed-off-by: Alan Coopersmith + +commit 1d11822601fd24a396b354fa616b04ed3df8b4ef +Author: Thomas E. Dickey +Date: Tue Oct 4 18:26:17 2022 -0400 + + fix a memory leak in XRegisterIMInstantiateCallback + + Analysis: + + _XimRegisterIMInstantiateCallback() opens an XIM and closes it using + the internal function pointers, but the internal close function does + not free the pointer to the XIM (this would be done in XCloseIM()). + + Report/patch: + + Date: Mon, 03 Oct 2022 18:47:32 +0800 + From: Po Lu + To: xorg-devel@lists.x.org + Subject: Re: Yet another leak in Xlib + + For reference, here's how I'm calling XRegisterIMInstantiateCallback: + + XSetLocaleModifiers (""); + XRegisterIMInstantiateCallback (compositor.display, + XrmGetDatabase (compositor.display), + (char *) compositor.resource_name, + (char *) compositor.app_name, + IMInstantiateCallback, NULL); + + and XMODIFIERS is: + + @im=ibus + + Signed-off-by: Thomas E. Dickey + +commit 1f8fd7ff1cf688ec1d3b34397c6d58110bb0cae5 +Author: Alan Coopersmith +Date: Mon Sep 26 16:01:40 2022 -0700 + + If thread-safety-constructor is enabled, link against pthreads not stubs + + Only really makes a difference if pthreads is not in libc. + + Fixes: #162 + + Signed-off-by: Alan Coopersmith + Reviewed-by: Adam Jackson + +commit bfe5d2dd98f705438b0cdddbbf9c12882da89bae +Author: Thomas E. Dickey +Date: Sun Sep 11 11:44:41 2022 -0400 + + reduce compiler warnings with casts (no object change) + + Signed-off-by: Thomas E. Dickey + +commit 926f2454bca9a7a7d1f4cf0648b0c193f5cef644 +Author: Thomas E. Dickey +Date: Sun Sep 11 10:35:31 2022 -0400 + + use casts to reduce compiler warnings (no object change) + + Signed-off-by: Thomas E. Dickey + +commit dc553ff908f10832c71dc2b5ba5af7e68589218e +Author: Mike FABIAN +Date: Fri Jul 22 11:39:01 2022 +0200 + + Remove KOI8-R character set from en_US.UTF-8/XLC_LOCALE + + https://gitlab.freedesktop.org/xorg/lib/libx11/-/blob/master/src/xlibi18n/lcCT.c#L58 + has no escape sequence for KOI8-R. + That makes Xutf8TextListToTextProperty() sometimes fail when trying to + convert to COMPOUND_TEXT and when the KOI8-R charset is tried. + + This is the cause for this bug: + + https://github.com/ibus/ibus/issues/2422 + + Removing the KOI8-R charset entry fixes the problem. + + This commit also fixes a few wrong texts in comments. + + Signed-off-by: Mike FABIAN + +commit 1c04ac514196db5e2255d99635fb6e3c36be330d +Author: Adam Sampson +Date: Sun Jul 4 23:02:04 2021 +0100 + + xkb: Fix off-by-one error in XKeycodeToKeysym + + The code here that made indexes greater than 3 refer to XKB symbol + groups had an off-by-one error, so it would always leave out the symbol + that should have been at index 4. Rewrite the code to fix this and + simplify the logic a bit. + + Signed-off-by: Adam Sampson + +commit ddaacd219609104f138006db6a8f708226db3874 +Author: Thomas E. Dickey +Date: Fri Sep 9 20:17:35 2022 -0400 + + reduce compiler warnings for macros BufAlloc, Data and Data32 using casts + + Signed-off-by: Thomas E. Dickey + +commit 62c3337d89d31e0d3ed807004e73ad711fad3342 +Author: Kirill Chibisov +Date: Thu Sep 8 22:50:30 2022 +0000 + + ximcp/imRm.c: allow XNSpotLocation with OnTheSpot + +commit 1272879074ad9612314858a75cf844783c1963b2 +Author: Alan Coopersmith +Date: Thu Jul 28 17:30:21 2022 -0700 + + gitlab CI: stop requiring Signed-off-by in commits + + Signed-off-by: Alan Coopersmith + +commit 38033b073f393564acf6a04501927002b2b4aa86 +Author: David H. Gutteridge +Date: Mon Jul 25 19:30:19 2022 -0400 + + configure.ac: report thread safety constructor build status + + Signed-off-by: David H. Gutteridge + +commit 9a90b3a63d02da92dc8692ed3f6269d3e0c7c8cc +Author: Alan Coopersmith +Date: Sun Jul 10 11:55:11 2022 -0700 + + doc: Document possible return values for XkbGetKeyboard() + + Fixes: #160 + + Signed-off-by: Alan Coopersmith + +commit 0beb0cf46ae48b0d4322ff8a0221f47bdb7d2296 +Author: Alan Coopersmith +Date: Sun Jul 10 11:42:19 2022 -0700 + + xkb: set num_keys when filling in keys in _XkbReadGetNamesReply() + + Fixes: #160 + + Signed-off-by: Alan Coopersmith + +commit 487e9489d1e086cc62c53045206ab6d6d9d02031 +Author: Jon Turney +Date: Wed Jun 22 16:15:37 2022 +0100 + + Fix Win32 build with -fno-common + + /work/xorg/lib/libX11/src/XlibInt.c:1968: multiple definition of `_Xdebug_p'; .libs/globals.o:globals.c:(.bss+0xc): first defined here + + Avoid redundant definition of _Xdebug_p in globals.c (which is under the + influence of _Xdebug being #defined to _Xdebug_p. + + This appears to be an ancient hack to work around data exports resolving + to the address of the import stub, not the import. (See [1]). + + (This is probably no longer needed or can be done in a better way, as + per the discussion under --enable-auto-import in the ld manpage.) + + [1] https://cygwin.com/pipermail/cygwin-xfree/2001-May/004606.html + + Signed-off-by: Jon Turney + +commit 35ad99fad2f65ec2c69bd84bdeb8138329092b57 +Author: Benno Schulenberg +Date: Fri Jul 15 11:29:46 2022 +0200 + + nls: add four sequences for the Samogitian E with dot above and macron + + These sequences each produce two code points: the E-with-dot-above and + a combining macron. The XIM input method is required for this to work. + + (Also add a missing comment for a Unicode block.) + + This fixes issue #54. + + Requested-by: Arns Udovīčė + + Signed-off-by: Benno Schulenberg + +commit 2732dd20cc2694dd5c32fef292e1f48626011032 +Author: Benno Schulenberg +Date: Wed Jul 6 16:44:50 2022 +0200 + + nls: delete eight sequences that pointlessly mix upper and lower case + + Typing a compose sequence requires some care -- surely the user is able + to either keep holding the Shift key or not touch it at all while typing + the sequence. Also, compose sequences are not an infinite resource AND + take up space and time -- defining redundant ones is a waste. + + Signed-off-by: Benno Schulenberg + +commit ea3cc474e1acfed47b9fb856ea151008fa6cfd30 +Author: Benno Schulenberg +Date: Wed Jul 6 16:36:48 2022 +0200 + + nls: add compose sequences for the double-struck capitals ℕ ℤ ℚ ℝ ℂ + + This allows the user to type the symbols for the five number systems. + + This fixes the reasonable part of issue #159. + + Signed-off-by: Benno Schulenberg + +commit 95a03cde434c447fdb41d8cccbbdd41f20750f32 +Author: Benno Schulenberg +Date: Thu Jul 14 12:00:45 2022 +0200 + + nls: delete some pointless and wrong compose sequences meant for Bépo + + Fourteen years ago, commit 7302984642 added some four hundred compose + sequences for the benefit of the French Bépo layout. But among these + four hundred there are several that use symbols that are not available + in the Bépo layout and are thus impossible to type. Some of the used + symbols, like Ahook, Ehook and Ohook, are not even present in *any* + layout, making these sequences a dead weight in the Compose file. + + The Amacron and Omacron are available only in the Latvian, Hawaiian, + and Maori layouts, and the Omacron also in the Silesian layout. But + the Latvian layouts and the Hawaiian do not contain any dead keys. + Only in the Maori and Silesian layouts these sequences with Amacron + and Omacron could be typed, but that was not why they were added. + + More importantly, as James Cloos noted in issue #54, sequences like + ` ` for generating `ǡ` (that is: the macron + above the dot) are questionable, as in compose sequences generally + the first accent typed is the uppermost in the composed character. + + Reference: + https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues/54#note_17321 + + Signed-off-by: Benno Schulenberg + +commit 9702b836862da6838d725f555e7a1d83faf51740 +Author: Matthieu Herrb +Date: Fri Jul 1 11:13:13 2022 +0200 + + Mention that the predicate function is called with the display lock + + Signed-off-by: Matthieu Herrb + +commit a5d00f889fadad3f5b11e53fd5c04cf5343fa8a2 +Author: Benno Schulenberg +Date: Fri Jun 24 16:20:52 2022 +0200 + + docs: replace three placeholders with something that makes sense + + Also, uncapitalize two arguments, to match the style of all others. + + Signed-off-by: Benno Schulenberg + +commit 9ff8502040e94cb172426d59df722cefa752a401 +Author: Benno Schulenberg +Date: Fri Jun 24 16:07:22 2022 +0200 + + docs: remove the unsightly dashes from the overviews of arguments + + Seventeen months ago, commits 78027fdb7a and 4f15cfc645 removed + these dashes from two of the man pages. Now, remove them all. + They are unhelpful and just make one wonder why they are there + (probably to function as improvised bullet points). + + Also remove four leading spaces and a trailing comma. + + Signed-off-by: Benno Schulenberg + +commit a7968c47e35703446d67d070234fd9adf07f34b0 +Author: Benno Schulenberg +Date: Thu Jun 23 15:48:05 2022 +0200 + + docs: hard-wrap some items so that Table 2 fits within 80 characters + + (Table 1 hard-wraps the first-column items in the same way.) + + Also, correct the formatting of the subsequent paragraph. + + Signed-off-by: Benno Schulenberg + +commit c601c779ca8f46dc4335180ec2829851fb8bbc13 +Author: Benno Schulenberg +Date: Wed Jun 15 10:55:38 2022 +0200 + + nls: delete compose sequences that mix top-row digits with numpad digits + + Compose sequences for circled numbers, like ⑫ or ㉑, are nice to have, + but allowing them to be composed by typing one digit on the top row and + the other on the numerical keypad (or the other way around) is over the + top. Remove these absurd sequences. Keep only the sequences where both + digits are either on the top row or on the numerical keypad. + + Signed-off-by: Benno Schulenberg + commit 3a30ada60c5217ada37b143b541c8e6f6284c7fa Author: Alan Coopersmith Date: Wed Jun 8 17:30:14 2022 -0700 @@ -2392,7 +4094,7 @@ Date: Fri Jun 7 23:35:33 2019 +0200 Tested-by: Jean-Philippe Mengual commit 99a2cf1aa0b58391078d5d3edf0a7dab18c7745d -Author: Tapani Pälli +Author: Tapani Pälli Date: Mon May 13 08:29:49 2019 +0300 Protect colormap add/removal with display lock @@ -2418,7 +4120,7 @@ Date: Wed Mar 13 13:12:20 2019 +0000 Windows. commit 87c77a1e6d7034536e9d25ce24a667ebf53486a7 -Author: Matthias Dieter Wallnöfer +Author: Matthias Dieter Wallnöfer Date: Mon Mar 11 14:19:52 2019 +0000 locale.alias.pre - add the de_IT locale @@ -2426,7 +4128,7 @@ Date: Mon Mar 11 14:19:52 2019 +0000 Signed-off-by: Alan Coopersmith commit 568f77f414072506bbe48646637c872987c97e63 -Author: Matthias Dieter Wallnöfer +Author: Matthias Dieter Wallnöfer Date: Mon Mar 11 14:17:10 2019 +0000 locale.dir.pre - add the de_IT locale @@ -2434,7 +4136,7 @@ Date: Mon Mar 11 14:17:10 2019 +0000 Signed-off-by: Alan Coopersmith commit 38c0c92feaef7dc4a72920b1dd79872e6578086c -Author: Matthias Dieter Wallnöfer +Author: Matthias Dieter Wallnöfer Date: Mon Mar 11 14:12:07 2019 +0000 compose.dir.pre - add de_IT locale @@ -2442,7 +4144,7 @@ Date: Mon Mar 11 14:12:07 2019 +0000 Signed-off-by: Alan Coopersmith commit 49f835611ba6ab82e68b7b851507931c142db7a5 -Author: Matthias Dieter Wallnöfer +Author: Matthias Dieter Wallnöfer Date: Tue Jan 29 15:34:34 2019 +0000 Update locale.alias.pre - introduce the de_LI aliases (equivalent to de_CH) @@ -2450,7 +4152,7 @@ Date: Tue Jan 29 15:34:34 2019 +0000 Signed-off-by: Alan Coopersmith commit ed669234d0cd5933618aa5fd2da697b59845b9be -Author: Matthias Dieter Wallnöfer +Author: Matthias Dieter Wallnöfer Date: Tue Jan 29 15:28:18 2019 +0000 locale.dir.pre - fix the de_LI latin15 locale @@ -2772,7 +4474,7 @@ Date: Tue Oct 9 10:26:05 2018 -0400 Signed-off-by: Matt Turner commit 823a0f8a820247b6c1e092f679b49cbdc2ea5c95 -Author: Michel Dänzer +Author: Michel Dänzer Date: Fri Sep 28 17:24:17 2018 +0200 poll_for_event: Allow using xcb_poll_for_queued_event @@ -2784,7 +4486,7 @@ Date: Fri Sep 28 17:24:17 2018 +0200 Reviewed-by: Uli Schlachter commit 406afe4b0f1b655c0db19bbc9a0c48da9a46acf5 -Author: Michel Dänzer +Author: Michel Dänzer Date: Tue Sep 25 17:10:58 2018 +0200 poll_for_response: Call poll_for_event again if xcb_poll_for_reply fails @@ -3313,7 +5015,7 @@ Date: Fri Feb 10 18:48:18 2017 +0500 Signed-off-by: Mihail Konev commit 23d9623c661694aba8cf1e8f277dffa7a86cf065 -Author: Petr Písař < +Author: Petr Písař Date: Sun Oct 30 12:49:11 2016 +0100 Revert cs_CZ.UTF-8 XLC_LOCALE to en_US.UTF-8 @@ -7806,7 +9508,7 @@ Date: Sun Feb 12 19:01:43 2012 -0800 Signed-off-by: Jeremy Huddleston commit f180e043f55531933bedfa6e0ff36a00a9ec07f3 -Author: Frédéric Boiteux < +Author: Frédéric Boiteux Date: Wed Nov 30 12:47:31 2011 +0000 Compositions with the dead greek symbol @@ -9386,7 +11088,7 @@ Date: Mon Mar 14 14:45:35 2011 -0700 Signed-off-by: Jamey Sharp commit 690f8bffd48a4e7e74298360ddd0431dc95dcd3f -Author: Erkki Seppälä < +Author: Erkki Seppälä Date: Tue Jan 18 15:58:20 2011 +0200 xkb: XkbPropertyPtr determined allocation success from wrong variables @@ -9402,7 +11104,7 @@ Date: Tue Jan 18 15:58:20 2011 +0200 Reviewed-by: Alan Coopersmith commit 6a4d027284e7bb5dd458157947bbb1ff580ad071 -Author: Erkki Seppälä < +Author: Erkki Seppälä Date: Mon Jan 10 16:37:22 2011 +0200 keyBind: Use Xcalloc to initialize allocated _XKeytrans @@ -9415,7 +11117,7 @@ Date: Mon Jan 10 16:37:22 2011 +0200 Reviewed-by: Alan Coopersmith commit b993d73bb3214ecc24646f5427c8003b816c6921 -Author: Erkki Seppälä < +Author: Erkki Seppälä Date: Mon Jan 10 16:22:45 2011 +0200 im/ximcp: release modifiermap before returning @@ -9527,7 +11229,7 @@ Date: Fri Feb 11 14:20:24 2011 -0800 Signed-off-by: Alan Coopersmith commit 502d414118c97d35a44f8e295709682022876331 -Author: Erkki Seppälä < +Author: Erkki Seppälä Date: Thu Feb 3 17:08:57 2011 +0200 xcms/cmsProp: don't deal with uninitialized values, fail instead @@ -9601,7 +11303,7 @@ Date: Wed Feb 2 08:56:00 2011 -0800 Reviewed-by: Julien Cristau commit 450e17422c0e374d25c643f343ea268cec68da38 -Author: Erkki Seppälä < +Author: Erkki Seppälä Date: Mon Jan 31 14:01:57 2011 +0200 XlibInt: Use strncpy+zero termination instead of strcpy to enforce buffer size @@ -9631,7 +11333,7 @@ Date: Mon Jan 31 14:02:13 2011 +0200 Signed-off-by: Alan Coopersmith commit 03f81ad8fb9783986cf9b17661dd31e95c396681 -Author: Erkki Seppälä < +Author: Erkki Seppälä Date: Mon Jan 31 14:02:16 2011 +0200 xlibi18n/lcFile: Removed superfluous check for NULL target_dir @@ -9646,7 +11348,7 @@ Date: Mon Jan 31 14:02:16 2011 +0200 Signed-off-by: Alan Coopersmith commit 1346b9ea3b3882201ff8c3ee462ff4b0d4edf639 -Author: Erkki Seppälä < +Author: Erkki Seppälä Date: Mon Jan 31 14:02:15 2011 +0200 ximcp/imLckup: Handle negative return value from _Xlcwctomb @@ -9667,7 +11369,7 @@ Date: Mon Jan 31 14:02:15 2011 +0200 Signed-off-by: Alan Coopersmith commit 79a5c86e020f08cc108184298a72e2777036de39 -Author: Erkki Seppälä < +Author: Erkki Seppälä Date: Mon Jan 31 14:02:14 2011 +0200 ximcp/imTrX: Handle failing XGetWindowProperty @@ -9699,7 +11401,7 @@ Date: Mon Jan 31 14:02:12 2011 +0200 Signed-off-by: Alan Coopersmith commit 2b16a7e683e355c9746290b2cee2fd0dd2bf342a -Author: Erkki Seppälä < +Author: Erkki Seppälä Date: Mon Jan 31 14:02:10 2011 +0200 GetProp: Zero-initialized error so its resourceID field is initialized @@ -9739,7 +11441,7 @@ Date: Mon Jan 31 14:02:08 2011 +0200 Signed-off-by: Alan Coopersmith commit be3e6c205d94dedc1cdebf5d17b987f0f828377a -Author: Erkki Seppälä < +Author: Erkki Seppälä Date: Mon Jan 31 14:02:06 2011 +0200 Xrm: Handle the extremely unlikely situation of fstat failing @@ -9752,7 +11454,7 @@ Date: Mon Jan 31 14:02:06 2011 +0200 Signed-off-by: Alan Coopersmith commit 3fae16c64d6ef76fd4a25a54c7f7de76596457db -Author: Erkki Seppälä < +Author: Erkki Seppälä Date: Mon Jan 31 14:02:05 2011 +0200 Xrm: NEWTABLE had a memory leak after a memory allocation error @@ -9768,7 +11470,7 @@ Date: Mon Jan 31 14:02:05 2011 +0200 Signed-off-by: Alan Coopersmith commit 7110ac653349a23c80c365f11f6270dc27c8975a -Author: Erkki Seppälä < +Author: Erkki Seppälä Date: Mon Jan 31 14:02:03 2011 +0200 ImUtil: Handle a memory leak in one early return branch @@ -9783,7 +11485,7 @@ Date: Mon Jan 31 14:02:03 2011 +0200 Signed-off-by: Alan Coopersmith commit d695f5da9f5b778e54b6987d9177048e32818c4d -Author: Erkki Seppälä < +Author: Erkki Seppälä Date: Mon Jan 31 14:02:01 2011 +0200 ximcp/imRm: Handle leaking colormap_ret @@ -9798,7 +11500,7 @@ Date: Mon Jan 31 14:02:01 2011 +0200 Signed-off-by: Alan Coopersmith commit f9eda19d08c1ea0973dfe0bc10a2519d6fd26cc7 -Author: Erkki Seppälä < +Author: Erkki Seppälä Date: Mon Jan 31 14:01:59 2011 +0200 ximcp/imRmAttr: Handle leaking missing_list @@ -9813,7 +11515,7 @@ Date: Mon Jan 31 14:01:59 2011 +0200 Signed-off-by: Alan Coopersmith commit 3183269e0979c9dbce9d55d9e03937897dc9fb3b -Author: Erkki Seppälä < +Author: Erkki Seppälä Date: Mon Jan 31 14:01:58 2011 +0200 ximcp/imRmAttr: Handle leaking colormap_ret @@ -9827,7 +11529,7 @@ Date: Mon Jan 31 14:01:58 2011 +0200 Signed-off-by: Alan Coopersmith commit f66a032a937030f2d9baa81744d36dc585bb085c -Author: Erkki Seppälä < +Author: Erkki Seppälä Date: Mon Jan 31 14:01:56 2011 +0200 xlibi18n/lcGeneric: Initialize uninitialized local variable @@ -9840,7 +11542,7 @@ Date: Mon Jan 31 14:01:56 2011 +0200 Signed-off-by: Alan Coopersmith commit d0266e06d38110ec908ca28379014eff743630b7 -Author: Erkki Seppälä < +Author: Erkki Seppälä Date: Mon Jan 31 14:01:54 2011 +0200 xcmx/cmxColNm: Removed unused assignments to pBuf (in two functions) @@ -9887,7 +11589,7 @@ Date: Mon Jan 31 14:50:19 2011 -0500 Signed-off-by: Gaetan Nadon commit e994ab227ed28655565c3193e63733630105e7f9 -Author: Erkki Seppälä < +Author: Erkki Seppälä Date: Tue Jan 18 12:49:48 2011 +0200 Comparing array against NULL is not useful "&xkb->server->vmods != NULL" @@ -9898,7 +11600,7 @@ Date: Tue Jan 18 12:49:48 2011 +0200 Signed-off-by: Erkki Seppälä commit 4115f051e62f9b098efce691e070d44f09f30f1c -Author: Erkki Seppälä < +Author: Erkki Seppälä Date: Wed Jan 12 15:51:11 2011 +0200 Variable "entry" tracked as NULL was dereferenced. @@ -9910,7 +11612,7 @@ Date: Wed Jan 12 15:51:11 2011 +0200 Signed-off-by: Erkki Seppälä commit 0edb76d1d5fdca5a2543332699be2e72386dab24 -Author: Erkki Seppälä < +Author: Erkki Seppälä Date: Thu Jan 27 09:54:00 2011 +0200 Dereferencing possibly NULL "str" in call to function "memcpy" (Deref assumed on the basis of 'nonnull' parameter attribute.) @@ -9922,7 +11624,7 @@ Date: Thu Jan 27 09:54:00 2011 +0200 Signed-off-by: Erkki Seppälä commit 59da8a211ef723909d0530c0331d541db8e63378 -Author: Erkki Seppälä < +Author: Erkki Seppälä Date: Mon Jan 10 16:17:47 2011 +0200 Using freed pointer "e" @@ -11767,7 +13469,7 @@ Date: Tue Jan 26 19:41:08 2010 -0500 Signed-off-by: Gaetan Nadon commit eb289b34bfc9978eef724e0f268975938334c06c -Author: Kristian Høgsberg +Author: Kristian Høgsberg Date: Thu Jan 21 13:39:17 2010 -0500 XErrorDB: Add new DRI2 request names @@ -13073,7 +14775,7 @@ Date: Sat Feb 21 14:48:42 2009 -0500 Signed-off-by: Chris Ball commit da6bbca07c796c69172a649405474f03bee66754 -Author: Emilio Jesús Gallego Arias +Author: Emilio Jesús Gallego Arias Date: Sat Feb 21 20:17:23 2009 +0100 xcb_io: Avoid datatype overflow on AMD64 and friends. @@ -13754,7 +15456,7 @@ Date: Wed Sep 17 10:43:52 2008 -0400 Bug #17616: Fix an XCB leak when the client has a non-fatal error handler. commit db0b85db29699be6bf7e78dede655d59ba926dfc -Author: Rafael Ávila de Espíndola < +Author: Rafael Ávila de Espíndola Date: Sun Sep 14 19:15:26 2008 -0400 Fix problem with in pt_BR.UTF-8 @@ -14160,7 +15862,7 @@ Date: Thu Feb 28 20:17:41 2008 -0800 Man page typo fixes commit 1a1a42a3ca1dfaf42f1094936b71c140fc030fcb -Author: Søren Sandmann Pedersen +Author: Søren Sandmann Pedersen Date: Sun Feb 24 20:03:35 2008 -0500 XIM: Fix a hand when switching input context. @@ -14390,7 +16092,7 @@ Date: Fri Aug 31 17:30:33 2007 -0700 Bug #2081: Note the range limitation of XSetScreenSaver arguments. commit 31540f1438ec63faf37044f2fd654b335ddf80f0 -Author: Kristian Høgsberg +Author: Kristian Høgsberg Date: Wed Aug 29 19:50:57 2007 -0400 Add GLX 1.4 requests and errors. @@ -15245,7 +16947,7 @@ Date: Wed Nov 8 12:17:41 2006 -0800 This fixes an XCB locking assertion failure, particularly with emacs. commit e494ecaac1ec8a22bd9a85f800fca74d02e9d358 -Author: Diego 'Flameeyes' Pettenò +Author: Diego 'Flameeyes' Pettenò Date: Tue Nov 7 09:32:00 2006 -0800 Add xcb-xlib dependency to x11.pc when built against XCB. @@ -16532,7 +18234,7 @@ Date: Fri Oct 7 15:00:00 2005 +0000 Add missing dist tarball files commit 440399b470c97b159a530602fff11c315aca8d97 -Author: Søren Sandmann Pedersen +Author: Søren Sandmann Pedersen Date: Wed Oct 5 18:27:10 2005 +0000 Add el_GR.UTF-8 compose file @@ -16587,7 +18289,7 @@ Date: Fri Sep 2 23:00:30 2005 +0000 Issue an error if XTRANS macros were not found when generating configure from configure.ac to flag errors early, instead of when people wonder why libX11 can't talk to an Xserver because it has no transports defined commit 3eb9f2d693af89d04e2fd92492c8205dce332c9c -Author: Kristian Høgsberg +Author: Kristian Høgsberg Date: Thu Sep 1 19:24:13 2005 +0000 Use $(X11_LOCALEDATADIR) instead of @X11_LOCALEDATADIR@ so this install destination can be overridden at make install time. @@ -16868,7 +18570,7 @@ Date: Fri Jul 1 22:13:35 2005 +0000 Added if not already present. commit c162d60ad8f124563f94a2a266de59373936266c -Author: Søren Sandmann Pedersen +Author: Søren Sandmann Pedersen Date: Wed Jun 22 22:46:31 2005 +0000 Apply these patches from Theo van Klaveren: @@ -16993,7 +18695,7 @@ Date: Thu May 19 00:10:07 2005 +0000 Require automake 1.7 in AM_INIT_AUTOMAKE commit cd4657c175dbab6aaca36f18a0ca92c95b5567dd -Author: Søren Sandmann Pedersen +Author: Søren Sandmann Pedersen Date: Tue May 17 22:32:09 2005 +0000 - Check for xproto as its CFLAGS are needed in the .pc file @@ -17015,7 +18717,7 @@ Date: Mon May 16 22:35:27 2005 +0000 Remove the entries from the xlibs tree, as they are not relevant here. commit 8bd3aea84ce54b8b76a898f3ae00e2b499c14a5e -Author: Søren Sandmann Pedersen +Author: Søren Sandmann Pedersen Date: Mon May 16 21:48:36 2005 +0000 Mon May 16 17:48:03 2005 Søren Sandmann @@ -17029,7 +18731,7 @@ Date: Mon May 16 21:27:35 2005 +0000 Remove the entries from the xlibs tree, as they are not relevant here. commit 7eee605e3aeed549d1053325a03027c5e8cbf71b -Author: Søren Sandmann Pedersen +Author: Søren Sandmann Pedersen Date: Fri May 13 22:53:36 2005 +0000 - For now put xtrans in X11/Xtrans/X11, since libX11 is looking for it in @@ -17163,7 +18865,7 @@ Date: Mon Nov 15 13:29:56 2004 +0000 Bugzilla #1864, http://freedesktop.org/bugzilla/show_bug.cgi?id=1864 Initialize pointer to NULL to avoid freeing random memory commit 436108cd6c84053698e5ca629096f59b34f50c2a -Author: Kristian Høgsberg +Author: Kristian Høgsberg Date: Thu Nov 11 15:37:01 2004 +0000 Fix #1818 @@ -17221,7 +18923,7 @@ Date: Wed Oct 13 07:38:00 2004 +0000 Use attributes instead of pragmas for weak symbols on gcc 2.95 as well. Using pragmas may result in the symbols being undefined with big -O. (FreeBSD ports/69708, Masakazu HIGAKI ) commit d80237db627bf71ad5615ff4ba05e6ab436aa740 -Author: Søren Sandmann Pedersen +Author: Søren Sandmann Pedersen Date: Fri Oct 8 22:57:56 2004 +0000 Fri Oct 8 18:53:11 2004 Soeren Sandmann @@ -17307,7 +19009,7 @@ Date: Tue Jul 27 06:06:05 2004 +0000 - remove unused file. commit 6e884b12911eedfb003e90a3829ce66f7fc9cf2d -Author: Søren Sandmann Pedersen +Author: Søren Sandmann Pedersen Date: Tue Jul 20 17:48:09 2004 +0000 Tue Jul 20 19:38:06 2004 Soeren Sandmann diff --git a/lib/libX11/Makefile.bsd-wrapper b/lib/libX11/Makefile.bsd-wrapper index 01a558fc..98eca786 100644 --- a/lib/libX11/Makefile.bsd-wrapper +++ b/lib/libX11/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.29 2022/09/03 06:55:25 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.30 2024/07/11 07:28:46 matthieu Exp $ .include # when buming X11 major also bump: @@ -10,11 +10,10 @@ # when bumping X11_xcb also bump: # libEGL libGL libIntelXvMC libGLU -SHARED_LIBS= X11 18.0 X11_xcb 2.0 +SHARED_LIBS= X11 18.1 X11_xcb 2.0 CONFIGURE_ARGS= --enable-tcp-transport --enable-unix-transport --enable-ipv6 \ --disable-composecache \ - --disable-thread-safety-constructor \ --without-xmlto --without-fop --without-xsltproc .include diff --git a/lib/libX11/Makefile.in b/lib/libX11/Makefile.in index 855bc0b2..56ba88d5 100644 --- a/lib/libX11/Makefile.in +++ b/lib/libX11/Makefile.in @@ -55,7 +55,7 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/x11-xcb.pc.in \ $(srcdir)/x11.pc.in $(top_srcdir)/configure \ $(top_srcdir)/include/X11/XlibConf.h.in AUTHORS COPYING \ - ChangeLog INSTALL NEWS compile config.guess config.sub depcomp \ + ChangeLog INSTALL compile config.guess config.sub depcomp \ install-sh ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \ @@ -281,6 +281,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/NEWS b/lib/libX11/NEWS deleted file mode 100644 index e03d5562..00000000 --- a/lib/libX11/NEWS +++ /dev/null @@ -1,185 +0,0 @@ -Version 1.1.2 - 2007-06-03 - -* Security fixes: - * Fix CVE-2007-1667: Multiple integer overflows in the XGetPixel() and - XInitImage() functions. - * Bug #9279: Fixed a file descriptor leak. - -* Xlib/XCB: Ensure _XReadEvents reads at least one new event and blocks for - exactly one event. Large performance improvement for XIfEvent and similar. - -* Hold XCB's Xlib lock even when only the user lock (XLockDisplay) is held. - An Xlib client can query Display state, such as with NextRequest, while it - holds only the Xlib user lock (between XLockDisplay and XUnlockDisplay), so - XCB requests in other threads should be blocked when the Xlib user lock is - held. We acquire the lock even when XInitThreads was not called, so that - pure XCB code can use multiple threads even in an otherwise single-threaded - Xlib application. - -* Allow re-entrant Xlib calls from _XIOError. - Some libraries try to clean up X resources from atexit handlers, _fini, or - C++ destructors. To make these work, downgrade the Display lock to a user - lock (as in XLockDisplay) before calling exit(3). This blocks Xlib calls - from threads other than the one calling exit(3) while still allowing the - exit handlers to call Xlib. - -* Xlib/XCB: Avoid re-crashing after _XIOError. - -* Xlib/XCB: Only remove pending_requests when there are provably no more responses. - -* For NetBSD, define XTHREADLIB and XTHREAD_CFLAGS. - -* Bug #7703: Fixed XSetSizeHints() et al wrt use of uninitialized data. - Now only those fields of the respective hint struct are set that - are actually valid in the input data. - -* Bug #10292: Fixed a memory leak related to XOpenDisplay() in the XCB code. - -* Bug #7713: Initialize all of the event's fields before sending it. - -* Bug #10562: Define _GNU_SOURCE on glibc systems. - -* Use unistd.h to get getresuid() and friends, now that we have _GNU_SOURCE - defined. - -* Switched function definitions from K&R to ANSI style. - -* Many constness fixes. - -* Fixed a few warnings. - -* Fix 64bit issues with reallocation. - -* Manpage fixes: - * Add man pages for XKB APIs. - (Volunteer needed to convert prototypes in man pages to ANSI C style...) - * Protect C comments and #defines in XKB man pages from being mangled by cpp - * Fix typo in nroff macro in XkbAddGeomOverlayKey.man - * Bug #9695: Fixed a few argument types in the XOpenIM manpage. - * Markup tweak for XOpenIM. - * Bug #9696: refer to XDefineCursor() instead of XDefineCusor(). - * Bug #9697: Fixed documentation of XVisualInfo struct. The "depth" member - was said to be unsigned int, but it's signed. - -* nls fixes: - * Update el_GR.UTF-8/Compose.pre to match changes in xkeyboard-config cvs. - * For nls/*.pre, allow people to comment lines by starting them with '##'. - -* Build system fixes: - * Add autogen.sh to EXTRA_DIST. - * Makefile.am: make ChangeLog hook safer - * Don't distribute the configure-generated XlibConf.h in tarballs. - -Version 1.1.1 - 2006-11-30 - -The "xcompmgr is hard, let's go releasing" release - -* Fix Bug #9154 and friends, to unbreak xcompmgr: - Always process an event for _XReadEvents, even if an error occurs. - Previously, process_responses (in the wait_for_first_event case called - from _XReadEvents) considered any return from xcb_wait_for_event - sufficient to think it had processed an event. If xcb_wait_for_event - returned an error, and no more events occurred before process_responses - called xcb_poll_for_event, process_responses would try to return with - dpy->head NULL, and would fail an assertion for the _XReadEvents - postcondition. Now, process_responses continues using xcb_wait_for_event - until it gets an event. - -* Bug #9153: Fix access to freed memory. - The fix for bug #8622 introduced a smaller bug where _XReply would - read memory shortly after freeing it. This patch caches the needed - value in a stack-allocated variable before the heap-allocated memory - is freed. - -* libx11 doesn't use inputproto in public headers; don't require it in x11.pc. - Based on a Debian patch. - -* Debian bug #354315: Clarify return value in XGetWindowAttributes man page. - Patch by Debian user Ross Combs. - - -Version 1.1 - 2006-11-23 - -* Add note in man-page that XListFontsWithInfo is not thread-safe. _XReply - drops the Display lock, so the value of dpy->request may change before - _XReply is called again. Jamey Sharp discovered this by inspection a few - years ago. - -* Fix Bug #8622, by fixing the response processing order for threaded apps. - process_responses (the common code for _XReply, _XReadEvents, and - _XEventsQueued) now handles responses in order, by adding condition variables - to the list of outstanding requests in dpy->xcb->pending_requests, and - blocking on them when those requests should get processed, to allow _XReply - to process them; if actually called from _XReply, it returns when _XReply's - request should get processed. _XReply broadcasts on its condition variable - after it has read its reply and re-acquired the display lock. - -* Don't hold the display lock around callbacks to the application. This avoids - recursive locking of the display lock (which triggers an XCB locking - assertion), particularly with emacs. - -* Add xcb-xlib dependency to x11.pc when built against XCB. - -* Allocate the right amount of memory for dpy->lock_fns. Fixes a crash on - startup with gdk. - - -Version 1.1 RC2 - 2006-11-02 - -Benno Schulenberg: - nls: remove duplicate compose entries (bug #2286) - nls: remove shadowed compose entries (bug #2286) - nls (en_US): remove long compositions that override shorter (bug #2286) - -Caolan McNamara: - XKB geometry: fix leaks in GetKeyboardByName (bug #8099) - -David Nusinow: - Dynamically generate internal manpage section using __libmanpagesuffix__ so that it actually matches the section if you don't use 3X11 - -Jamey Sharp: - Add correct Display locking to XKB functions. - XKB bugfix: SyncHandle must be called after UnlockDisplay, not before. - XCB: check for and handle I/O errors in _XGetXCBBuffer. - -Matthias Hopf: - Fix double open of compose file. - - -Version 1.1 RC1 - 2006-10-06 - -This release includes the Xlib/XCB work, which uses XCB as the Xlib transport -layer, and allows a client to use both Xlib and XCB on the same connection. -This allows clients to transition from Xlib to XCB incrementally. - -Clients which link only to libX11, and do not use XCB, should not notice any -differences in this release. Clients desiring XCB interoperability should -additionally #include , link to libX11-xcb, use -XGetXCBConnection(dpy) to obtain the underlying XCB connection, and then use -XCB functions directly on that connection. - -Note that while a client can issue requests and handle their replies or errors -with either Xlib or XCB, only one can own and handle the event queue. By -default, Xlib must own the event queue, for compatibility with legacy Xlib -clients. Clients can use the function XSetEventQueueOwner immediately after -XOpenDisplay to let XCB own the event queue instead. Clients may not call -this function after processing any responses, as this will potentially lose -responses. - -We expect to have an RC2 release corresponding to the Xorg RC2 schedule, which -should include additional internal architecture enhancements, but no -user-visible changes. 1.0 final should match RC2. - -Other smaller changes in this release: -* correct ChangeLog generation -* support running lint and sparse -* Autoconf 2.60 -* fix man page for XUrgencyHint -* improve man pages for XGrabButton, XGrabKey, XGetWindowProperty -* new locales: as_IN.UTF-8, kn_IN.UTF-8, ml_IN.UTF-8, or_IN.UTF-8, - te_IN.UTF-8, ur_IN.UTF-8 -* on systems with both UNIXCONN and LOCALCONN, try unix if local fails -* fix sparse warnings -* ansify static functions - --- Josh Triplett , Jamey Sharp diff --git a/lib/libX11/README.md b/lib/libX11/README.md index 48ed5482..be1bddbb 100644 --- a/lib/libX11/README.md +++ b/lib/libX11/README.md @@ -31,6 +31,79 @@ For patch submission instructions, see: https://www.x.org/wiki/Development/Documentation/SubmittingPatches +## Release 1.8.9 + + * Fix regressions introduced in 1.8.8 (!245, !248) - this includes reverting + for now the previous "Fix XIM input sometimes jumbled (#198, !236)" + +## Release 1.8.8 + + * Fix XIM input sometimes jumbled (#198, !236) + * Fix _XkbReadGetDeviceInfoReply for nButtons == dev->buttons (!237) + * Drop ifdefs for platforms that are no longer supported (!242, !243) + * Assorted memory handling cleanups + +## Release 1.8.7 + + * Security fixes and hardening in XImage and pixmap handling code + (CVE-2023-43786, CVE-2023-43787, !234) + * Fix buffer allocation in _XkbReadKeySyms() (CVE-2023-43785) + * Fail XOpenDisplay() if server-provided default visual is invalid (!233) + * Bring XKB docs in line with actual implementation (!231, !228) + * Xutil.h: declare XEmptyRegion() and XEqualRegion() as Bool (!225) + * Assorted updates to en_US.UTF-8 compose keys (!213, !214, !215, !216, + !217, !219, !220, !222, !223, !226, !227, !229) + +## Release 1.8.6 + + * Add bounds checks in InitExt.c (CVE-2023-3138) + +## Release 1.8.5 + + * autoconf & libtool updates (!187, !188) + * Restore missing text in XSetScreenSaver man page (#187, !203) + * Update am_ET.UTF-8 compose keys to use dead-vowel symbols, + in coordination with xkeyboard-config 2.39 (!205) + * Assorted updates to en_US.UTF-8 compose keys (!189, !195, !196, !198, + !199, !200, !201, !207, !208, !209) + +## Release 1.8.4 + + * Revert AddressSanitizer fix from 1.8.3 that caused regression (#176, !180) + * Add two compose sequences for "capital B with stroke", remove others (!179) + * Further improved handling of reentering libX11 via X*IfEvent() calls (!176) + + +## Release 1.8.3 + + * Improved handling of reentering libX11 via X*IfEvent() calls (!171, !173) + * Fix loading of en_US.UTF-8/XLC_LOCALE (#167, !174) + * Add XFreeThreads() and automatic call from a destructor function when + thread-safety-constructor is enabled (!167). + * Address issues found by UBSan and AddressSanitizer + * Fix build with older gcc versions (!169) + +## Release 1.8.2 + + * Allow X*IfEvent() to reenter libX11 to avoid deadlock from unsafe + calls when thread-safety-constructor is enabled (!150). + * Remove Xlib's pthread function stubs - instead use system provided + threads functions, including linking against any needed pthread + libraries if thread-safety-constructor is enabled (!155, !156). + * Fix off-by-one error in XKeycodeToKeysym for indexes > 3 (!78). + * Allow XNSpotLocation with OnTheSpot (!127). + * Fix Win32 build when -fno-common is in effect (!140). + * Fix memory leak in XRegisterIMInstantiateCallback (!158). + * Add compose sequences for the double-struck capitals ℕ ℤ ℚ ℝ ℂ (!144), + the Samogitian E with dot above and macron (!147), Unicode minus sign (!163). + * Change <^> <-> to mean superscript minus instead of macron (!162). + * Delete compose sequences that mix top-row digits with numpad digits (!139) + or mix upper & lower case letters (!144). + * Delete some unuseful compose sequences meant for Bépo layout (!146). + * Delete compose sequences using leftcaret & rightcaret keysyms (!163). + * Remove KOI8-R character set from en_US.UTF-8/XLC_LOCALE (!148). + * Map sr locales to sr_RS compose files (!161). + ## Release 1.8.1 * Fix --enable-thread-safety-constructor configure option diff --git a/lib/libX11/aclocal.m4 b/lib/libX11/aclocal.m4 index c7641818..61be2d52 100644 --- a/lib/libX11/aclocal.m4 +++ b/lib/libX11/aclocal.m4 @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, -[m4_warning([this file was generated for autoconf 2.69. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.71],, +[m4_warning([this file was generated for autoconf 2.71. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) @@ -1325,7 +1325,7 @@ m4_include([m4/ltversion.m4]) m4_include([m4/lt~obsolete.m4]) dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure. dnl -dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. +dnl Copyright (c) 2005, 2023, Oracle and/or its affiliates. dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the "Software"), @@ -1362,7 +1362,7 @@ dnl DEALINGS IN THE SOFTWARE. # See the "minimum version" comment for each macro you use to see what # version you require. m4_defun([XORG_MACROS_VERSION],[ -m4_define([vers_have], [1.19.2]) +m4_define([vers_have], [1.20.1]) m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.]))) m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.]))) m4_if(m4_cmp(maj_have, maj_needed), 0,, @@ -1383,7 +1383,7 @@ AM_MAINTAINER_MODE # such as man pages and config files AC_DEFUN([XORG_PROG_RAWCPP],[ AC_REQUIRE([AC_PROG_CPP]) -AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}], +AC_PATH_TOOL(RAWCPP, [cpp], [${CPP}], [$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib]) # Check for flag to avoid builtin definitions - assumes unix is predefined, @@ -1409,10 +1409,10 @@ rm -f conftest.$ac_ext AC_MSG_CHECKING([if $RAWCPP requires -traditional]) AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp preserve "whitespace"?]])]) -if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then +if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve "'` -eq 1 ; then AC_MSG_RESULT([no]) else - if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then + if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve "'` -eq 1 ; then TRADITIONALCPPFLAGS="-traditional" RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" AC_MSG_RESULT([yes]) @@ -1693,7 +1693,7 @@ AC_SUBST(MAKE_HTML) # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-xmlto option, it allows maximum flexibilty in making decisions +# the --with-xmlto option, it allows maximum flexibility in making decisions # as whether or not to use the xmlto package. When DEFAULT is not specified, # --with-xmlto assumes 'auto'. # @@ -1907,7 +1907,7 @@ AM_CONDITIONAL([HAVE_PERL], [test "$have_perl" = yes]) # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-asciidoc option, it allows maximum flexibilty in making decisions +# the --with-asciidoc option, it allows maximum flexibility in making decisions # as whether or not to use the asciidoc package. When DEFAULT is not specified, # --with-asciidoc assumes 'auto'. # @@ -1977,7 +1977,7 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes]) # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-doxygen option, it allows maximum flexibilty in making decisions +# the --with-doxygen option, it allows maximum flexibility in making decisions # as whether or not to use the doxygen package. When DEFAULT is not specified, # --with-doxygen assumes 'auto'. # @@ -2061,7 +2061,7 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes]) # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-groff option, it allows maximum flexibilty in making decisions +# the --with-groff option, it allows maximum flexibility in making decisions # as whether or not to use the groff package. When DEFAULT is not specified, # --with-groff assumes 'auto'. # @@ -2169,7 +2169,7 @@ AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes]) # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-fop option, it allows maximum flexibilty in making decisions +# the --with-fop option, it allows maximum flexibility in making decisions # as whether or not to use the fop package. When DEFAULT is not specified, # --with-fop assumes 'auto'. # @@ -2263,7 +2263,7 @@ AC_SUBST([M4], [$ac_cv_path_M4]) # Documentation tools are not always available on all platforms and sometimes # not at the appropriate level. This macro enables a module to test for the # presence of the tool and obtain it's path in separate variables. Coupled with -# the --with-ps2pdf option, it allows maximum flexibilty in making decisions +# the --with-ps2pdf option, it allows maximum flexibility in making decisions # as whether or not to use the ps2pdf package. When DEFAULT is not specified, # --with-ps2pdf assumes 'auto'. # @@ -2318,7 +2318,7 @@ AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes]) # not at the appropriate level. This macro enables a builder to skip all # documentation targets except traditional man pages. # Combined with the specific tool checking macros XORG_WITH_*, it provides -# maximum flexibilty in controlling documentation building. +# maximum flexibility in controlling documentation building. # Refer to: # XORG_WITH_XMLTO --with-xmlto # XORG_WITH_ASCIIDOC --with-asciidoc @@ -2351,7 +2351,7 @@ AC_MSG_RESULT([$build_docs]) # # This macro enables a builder to skip all developer documentation. # Combined with the specific tool checking macros XORG_WITH_*, it provides -# maximum flexibilty in controlling documentation building. +# maximum flexibility in controlling documentation building. # Refer to: # XORG_WITH_XMLTO --with-xmlto # XORG_WITH_ASCIIDOC --with-asciidoc @@ -2384,7 +2384,7 @@ AC_MSG_RESULT([$build_devel_docs]) # # This macro enables a builder to skip all functional specification targets. # Combined with the specific tool checking macros XORG_WITH_*, it provides -# maximum flexibilty in controlling documentation building. +# maximum flexibility in controlling documentation building. # Refer to: # XORG_WITH_XMLTO --with-xmlto # XORG_WITH_ASCIIDOC --with-asciidoc @@ -2859,7 +2859,11 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno]) AC_DEFUN([XORG_COMPILER_BRAND], [ AC_LANG_CASE( [C], [ - AC_REQUIRE([AC_PROG_CC_C99]) + dnl autoconf-2.70 folded AC_PROG_CC_C99 into AC_PROG_CC + dnl and complains that AC_PROG_CC_C99 is obsolete + m4_version_prereq([2.70], + [AC_REQUIRE([AC_PROG_CC])], + [AC_REQUIRE([AC_PROG_CC_C99])]) ], [C++], [ AC_REQUIRE([AC_PROG_CXX]) @@ -2875,7 +2879,7 @@ AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"]) # Minimum version: 1.16.0 # # Test if the compiler works when passed the given flag as a command line argument. -# If it succeeds, the flag is appeneded to the given variable. If not, it tries the +# If it succeeds, the flag is appended to the given variable. If not, it tries the # next flag in the list until there are no more options. # # Note that this does not guarantee that the compiler supports the flag as some @@ -2891,7 +2895,11 @@ AC_LANG_COMPILER_REQUIRE AC_LANG_CASE( [C], [ - AC_REQUIRE([AC_PROG_CC_C99]) + dnl autoconf-2.70 folded AC_PROG_CC_C99 into AC_PROG_CC + dnl and complains that AC_PROG_CC_C99 is obsolete + m4_version_prereq([2.70], + [AC_REQUIRE([AC_PROG_CC])], + [AC_REQUIRE([AC_PROG_CC_C99])]) define([PREFIX], [C]) define([CACHE_PREFIX], [cc]) define([COMPILER], [$CC]) @@ -3032,7 +3040,7 @@ XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op]) # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) -# Turn some warnings into errors, so we don't accidently get successful builds +# Turn some warnings into errors, so we don't accidentally get successful builds # when there are problems that should be fixed. if test "x$SELECTIVE_WERROR" = "xyes" ; then @@ -3141,23 +3149,35 @@ AC_SUBST([BASE_]PREFIX[FLAGS]) AC_LANG_CASE([C], AC_SUBST([CWARNFLAGS])) ]) # XORG_STRICT_OPTION -# XORG_DEFAULT_OPTIONS -# -------------------- -# Minimum version: 1.3.0 +# XORG_DEFAULT_NOCODE_OPTIONS +# --------------------------- +# Minimum version: 1.20.0 # -# Defines default options for X.Org modules. +# Defines default options for X.Org modules which don't compile code, +# such as fonts, bitmaps, cursors, and docs. # -AC_DEFUN([XORG_DEFAULT_OPTIONS], [ +AC_DEFUN([XORG_DEFAULT_NOCODE_OPTIONS], [ AC_REQUIRE([AC_PROG_INSTALL]) -XORG_COMPILER_FLAGS -XORG_CWARNFLAGS -XORG_STRICT_OPTION XORG_RELEASE_VERSION XORG_CHANGELOG XORG_INSTALL XORG_MANPAGE_SECTIONS m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) +]) # XORG_DEFAULT_NOCODE_OPTIONS + +# XORG_DEFAULT_OPTIONS +# -------------------- +# Minimum version: 1.3.0 +# +# Defines default options for X.Org modules which compile code. +# +AC_DEFUN([XORG_DEFAULT_OPTIONS], [ +AC_REQUIRE([AC_PROG_INSTALL]) +XORG_COMPILER_FLAGS +XORG_CWARNFLAGS +XORG_STRICT_OPTION +XORG_DEFAULT_NOCODE_OPTIONS ]) # XORG_DEFAULT_OPTIONS # XORG_INSTALL() @@ -3244,7 +3264,7 @@ AC_SUBST([CHANGELOG_CMD]) ]) # XORG_CHANGELOG dnl -dnl Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +dnl Copyright (c) 2005, Oracle and/or its affiliates. dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the "Software"), @@ -3367,7 +3387,7 @@ AC_DEFUN([XTRANS_CONNECTION_FLAGS],[ XTRANS_TCP_FLAGS fi [case $host_os in - solaris*|sco*|sysv4*) localdef="yes" ;; + solaris*) localdef="yes" ;; *) localdef="no" ;; esac] AC_ARG_ENABLE(local-transport, diff --git a/lib/libX11/config.guess b/lib/libX11/config.guess index 247d84db..f6d217a4 100644 --- a/lib/libX11/config.guess +++ b/lib/libX11/config.guess @@ -1,14 +1,14 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2024 Free Software Foundation, Inc. -timestamp='2012-09-25' +# shellcheck disable=SC2006,SC2268 # see below for rationale + +timestamp='2024-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -17,33 +17,39 @@ timestamp='2012-09-25' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess +# +# Please send patches to . + + +# The "shellcheck disable" line above the timestamp inhibits complaints +# about features and limitations of the classic Bourne shell that were +# superseded or lifted in POSIX. However, this script identifies a wide +# variety of pre-POSIX systems that do not have POSIX shells at all, and +# even some reasonably current systems (Solaris 10 as case-in-point) still +# have a pre-POSIX /bin/sh. + me=`echo "$0" | sed -e 's,.*/,,'` usage="\ Usage: $0 [OPTION] -Output the configuration name of the system \`$me' is run on. +Output the configuration name of the system '$me' is run on. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -54,15 +60,13 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2024 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" -Try \`$me --help' for more information." +Try '$me --help' for more information." # Parse command line while test $# -gt 0 ; do @@ -90,57 +94,109 @@ if test $# != 0; then exit 1 fi -trap 'exit 1' 1 2 15 +# Just in case it came from the environment. +GUESS= # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires # temporary files to be created and, as you can see below, it is a # headache to deal with in a portable fashion. -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. +# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still +# use 'HOST_CC' if defined, but it is deprecated. # Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +tmp= +# shellcheck disable=SC2172 +trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 + +set_cc_for_build() { + # prevent multiple calls if $tmp is already set + test "$tmp" && return 0 + : "${TMPDIR=/tmp}" + # shellcheck disable=SC2039,SC3028 + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } + dummy=$tmp/dummy + case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in + ,,) echo "int x;" > "$dummy.c" + for driver in cc gcc c89 c99 ; do + if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then + CC_FOR_BUILD=$driver + break + fi + done + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; + esac +} # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then +if test -f /.attbin/uname ; then PATH=$PATH:/.attbin ; export PATH fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case $UNAME_SYSTEM in +Linux|GNU|GNU/*) + LIBC=unknown + + set_cc_for_build + cat <<-EOF > "$dummy.c" + #if defined(__ANDROID__) + LIBC=android + #else + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #elif defined(__GLIBC__) + LIBC=gnu + #elif defined(__LLVM_LIBC__) + LIBC=llvm + #else + #include + /* First heuristic to detect musl libc. */ + #ifdef __DEFINED_va_list + LIBC=musl + #endif + #endif + #endif + EOF + cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "$cc_set_libc" + + # Second heuristic to detect musl libc. + if [ "$LIBC" = unknown ] && + command -v ldd >/dev/null && + ldd --version 2>&1 | grep -q ^musl; then + LIBC=musl + fi + + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + if [ "$LIBC" = unknown ]; then + LIBC=gnu + fi + ;; +esac + # Note: order is significant - the case branches are not exclusive. -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -152,22 +208,32 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + echo unknown)` + case $UNAME_MACHINE_ARCH in + aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + earmv*) + arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; + *) machine=$UNAME_MACHINE_ARCH-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in + # to ELF recently (or will in the future) and ABI. + case $UNAME_MACHINE_ARCH in + earm*) + os=netbsdelf + ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build + set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -182,49 +248,80 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in os=netbsd ;; esac + # Determine ABI tags. + case $UNAME_MACHINE_ARCH in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in + case $UNAME_VERSION in Debian*) release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; + GUESS=$machine-${os}${release}${abi-} + ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE + ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE + ;; *:SecBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-secbsd${UNAME_RELEASE} - exit ;; + UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` + GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE + ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE + ;; + *:MidnightBSD:*:*) + GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE + ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE + ;; *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE + ;; + *:OS108:*:*) + GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE + ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; + GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE + ;; *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE + ;; + *:Sortix:*:*) + GUESS=$UNAME_MACHINE-unknown-sortix + ;; + *:Twizzler:*:*) + GUESS=$UNAME_MACHINE-unknown-twizzler + ;; + *:Redox:*:*) + GUESS=$UNAME_MACHINE-unknown-redox + ;; + mips:OSF1:*.*) + GUESS=mips-dec-osf1 + ;; alpha:OSF1:*:*) + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + trap '' 0 case $UNAME_RELEASE in *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -238,163 +335,158 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in + case $ALPHA_CPU_TYPE in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; + OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + GUESS=$UNAME_MACHINE-dec-osf$OSF_REL + ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; + GUESS=m68k-unknown-sysv4 + ;; *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; + GUESS=$UNAME_MACHINE-unknown-amigaos + ;; *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit ;; + GUESS=$UNAME_MACHINE-unknown-morphos + ;; *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; + GUESS=i370-ibm-openedition + ;; *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; + GUESS=s390-ibm-zvmoe + ;; *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; + GUESS=powerpc-ibm-os400 + ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; + GUESS=arm-acorn-riscix$UNAME_RELEASE + ;; arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; + GUESS=arm-unknown-riscos + ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; + GUESS=hppa1.1-hitachi-hiuxmpp + ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; + case `(/bin/universe) 2>/dev/null` in + att) GUESS=pyramid-pyramid-sysv3 ;; + *) GUESS=pyramid-pyramid-bsd ;; + esac + ;; NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; + GUESS=pyramid-pyramid-svr4 + ;; DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; + GUESS=sparc-icl-nx6 + ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; + sparc) GUESS=sparc-icl-nx7 ;; + esac + ;; s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL + ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-hal-solaris2$SUN_REL + ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris2$SUN_REL + ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} - exit ;; + GUESS=i386-pc-auroraux$UNAME_RELEASE + ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" + set_cc_for_build + SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH="x86_64" + SUN_ARCH=x86_64 fi fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$SUN_ARCH-pc-solaris2$SUN_REL + ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris3$SUN_REL + ;; sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in + case `/usr/bin/arch -k` in Series*|S4*) UNAME_RELEASE=`uname -v` ;; esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; + # Japanese Language versions have a version number like '4.1.3-JL'. + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` + GUESS=sparc-sun-sunos$SUN_REL + ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; + GUESS=m68k-sun-sunos$UNAME_RELEASE + ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in + test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 + case `/bin/arch` in sun3) - echo m68k-sun-sunos${UNAME_RELEASE} + GUESS=m68k-sun-sunos$UNAME_RELEASE ;; sun4) - echo sparc-sun-sunos${UNAME_RELEASE} + GUESS=sparc-sun-sunos$UNAME_RELEASE ;; esac - exit ;; + ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; + GUESS=sparc-auspex-sunos$UNAME_RELEASE + ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -404,44 +496,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + GUESS=m68k-milan-mint$UNAME_RELEASE + ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + GUESS=m68k-hades-mint$UNAME_RELEASE + ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + GUESS=m68k-unknown-mint$UNAME_RELEASE + ;; m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; + GUESS=m68k-apple-machten$UNAME_RELEASE + ;; powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; + GUESS=powerpc-apple-machten$UNAME_RELEASE + ;; RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; + GUESS=mips-dec-mach_bsd4.3 + ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; + GUESS=mips-dec-ultrix$UNAME_RELEASE + ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; + GUESS=vax-dec-ultrix$UNAME_RELEASE + ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; + GUESS=clipper-intergraph-clix$UNAME_RELEASE + ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ int main (int argc, char *argv[]) { @@ -450,95 +542,96 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in #endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); #endif #endif exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && + dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} - exit ;; + GUESS=mips-mips-riscos$UNAME_RELEASE + ;; Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; + GUESS=powerpc-motorola-powermax + ;; Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; + GUESS=powerpc-harris-powermax + ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; + GUESS=powerpc-harris-powermax + ;; Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; + GUESS=powerpc-harris-powerunix + ;; m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; + GUESS=m88k-harris-cxux7 + ;; m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; + GUESS=m88k-motorola-sysv4 + ;; m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; + GUESS=m88k-motorola-sysv3 + ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] + if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ + test "$TARGET_BINARY_INTERFACE"x = x then - echo m88k-dg-dgux${UNAME_RELEASE} + GUESS=m88k-dg-dgux$UNAME_RELEASE else - echo m88k-dg-dguxbcs${UNAME_RELEASE} + GUESS=m88k-dg-dguxbcs$UNAME_RELEASE fi else - echo i586-dg-dgux${UNAME_RELEASE} + GUESS=i586-dg-dgux$UNAME_RELEASE fi - exit ;; + ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; + GUESS=m88k-dolphin-sysv3 + ;; M88*:*:R3*:*) # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; + GUESS=m88k-motorola-sysv3 + ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; + GUESS=m88k-tektronix-sysv3 + ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; + GUESS=m68k-tektronix-bsd + ;; *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; + IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'` + GUESS=mips-sgi-irix$IRIX_REL + ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id + ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; + GUESS=i386-ibm-aix + ;; ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then + if test -x /usr/bin/oslevel ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; + GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV + ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #include main() @@ -549,76 +642,77 @@ EOF exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then - echo "$SYSTEM_NAME" + GUESS=$SYSTEM_NAME else - echo rs6000-ibm-aix3.2.5 + GUESS=rs6000-ibm-aix3.2.5 fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 + GUESS=rs6000-ibm-aix3.2.4 else - echo rs6000-ibm-aix3.2 + GUESS=rs6000-ibm-aix3.2 fi - exit ;; + ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` + if test -x /usr/bin/lslpp ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \ + awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; + GUESS=$IBM_ARCH-ibm-aix$IBM_REV + ;; *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit ;; + GUESS=rs6000-ibm-aix + ;; + ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) + GUESS=romp-ibm-bsd4.4 + ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 + GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to + ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; + GUESS=rs6000-bull-bosx + ;; DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; + GUESS=m68k-bull-sysv3 + ;; 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; + GUESS=m68k-hp-bsd + ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; + GUESS=m68k-hp-bsd4.4 + ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + case $UNAME_MACHINE in + 9000/31?) HP_ARCH=m68000 ;; + 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then + if test -x /usr/bin/getconf; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + case $sc_cpu_version in + 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 + 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + case $sc_kernel_bits in + 32) HP_ARCH=hppa2.0n ;; + 64) HP_ARCH=hppa2.0w ;; + '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + if test "$HP_ARCH" = ""; then + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE #include @@ -651,13 +745,13 @@ EOF exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if test "$HP_ARCH" = hppa2.0w then - eval $set_cc_for_build + set_cc_for_build # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -668,23 +762,23 @@ EOF # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; + GUESS=$HP_ARCH-hp-hpux$HPUX_REV + ;; ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit ;; + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + GUESS=ia64-hp-hpux$HPUX_REV + ;; 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + sed 's/^ //' << EOF > "$dummy.c" #include int main () @@ -709,38 +803,38 @@ EOF exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit ;; + GUESS=unknown-hitachi-hiuxwe2 + ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) + GUESS=hppa1.1-hp-bsd + ;; 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; + GUESS=hppa1.0-hp-bsd + ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; + GUESS=hppa1.0-hp-mpeix + ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) + GUESS=hppa1.1-hp-osf + ;; hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; + GUESS=hppa1.0-hp-osf + ;; i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk + if test -x /usr/sbin/sysversion ; then + GUESS=$UNAME_MACHINE-unknown-osf1mk else - echo ${UNAME_MACHINE}-unknown-osf1 + GUESS=$UNAME_MACHINE-unknown-osf1 fi - exit ;; + ;; parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; + GUESS=hppa1.1-hp-lites + ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; + GUESS=c1-convex-bsd + ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd @@ -748,139 +842,174 @@ EOF fi exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; + GUESS=c34-convex-bsd + ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; + GUESS=c38-convex-bsd + ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; + GUESS=c4-convex-bsd + ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=ymp-cray-unicos$CRAY_REL + ;; CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=t90-cray-unicos$CRAY_REL + ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=alphaev5-cray-unicosmk$CRAY_REL + ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=sv1-cray-unicos$CRAY_REL + ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=craynv-cray-unicosmp$CRAY_REL + ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` + GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` + FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` + GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE + ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; + GUESS=sparc-unknown-bsdi$UNAME_RELEASE + ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE + ;; + arm:FreeBSD:*:*) + UNAME_PROCESSOR=`uname -p` + set_cc_for_build + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi + else + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf + fi + ;; *:FreeBSD:*:*) - UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in + UNAME_PROCESSOR=`uname -p` + case $UNAME_PROCESSOR in amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=x86_64 ;; + i386) + UNAME_PROCESSOR=i586 ;; esac - exit ;; + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL + ;; i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; + GUESS=$UNAME_MACHINE-pc-cygwin + ;; *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 - exit ;; + GUESS=$UNAME_MACHINE-pc-mingw64 + ;; *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:MSYS*:*) - echo ${UNAME_MACHINE}-pc-msys - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; + GUESS=$UNAME_MACHINE-pc-mingw32 + ;; + *:MSYS*:*) + GUESS=$UNAME_MACHINE-pc-msys + ;; i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; + GUESS=$UNAME_MACHINE-pc-pw32 + ;; + *:SerenityOS:*:*) + GUESS=$UNAME_MACHINE-pc-serenity + ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case $UNAME_MACHINE in x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; + GUESS=i586-pc-interix$UNAME_RELEASE + ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; + GUESS=x86_64-unknown-interix$UNAME_RELEASE + ;; IA64) - echo ia64-unknown-interix${UNAME_RELEASE} - exit ;; + GUESS=ia64-unknown-interix$UNAME_RELEASE + ;; esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit ;; + GUESS=$UNAME_MACHINE-pc-uwin + ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; + GUESS=x86_64-pc-cygwin + ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=powerpcle-unknown-solaris2$SUN_REL + ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; + GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'` + GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL + ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; + GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC + ;; + x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-pc-managarm-mlibc" + ;; + *:[Mm]anagarm:*:*) + GUESS="$UNAME_MACHINE-unknown-managarm-mlibc" + ;; + *:Minix:*:*) + GUESS=$UNAME_MACHINE-unknown-minix + ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + set_cc_for_build + CPU=$UNAME_MACHINE + LIBCABI=$LIBC + if test "$CC_FOR_BUILD" != no_compiler_found; then + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __ARM_EABI__ + #ifdef __ARM_PCS_VFP + ABI=eabihf + #else + ABI=eabi + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;; + esac + fi + GUESS=$CPU-unknown-linux-$LIBCABI + ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -890,168 +1019,246 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; + if test "$?" = 0 ; then LIBC=gnulibc1 ; fi + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; arm*:Linux:*:*) - eval $set_cc_for_build + set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf fi fi - exit ;; + ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; + e2k:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit ;; + GUESS=$UNAME_MACHINE-pc-linux-$LIBC + ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + k1om:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + kvx:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + kvx:cos:*:*) + GUESS=$UNAME_MACHINE-unknown-cos + ;; + kvx:mbr:*:*) + GUESS=$UNAME_MACHINE-unknown-mbr + ;; + loongarch32:Linux:*:* | loongarch64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + set_cc_for_build + IS_GLIBC=0 + test x"${LIBC}" = xgnu && IS_GLIBC=1 + sed 's/^ //' << EOF > "$dummy.c" #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el + #undef mips + #undef mipsel + #undef mips64 + #undef mips64el + #if ${IS_GLIBC} && defined(_ABI64) + LIBCABI=gnuabi64 + #else + #if ${IS_GLIBC} && defined(_ABIN32) + LIBCABI=gnuabin32 + #else + LIBCABI=${LIBC} + #endif + #endif + + #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa64r6 + #else + #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa32r6 + #else + #if defined(__mips64) + CPU=mips64 + #else + CPU=mips + #endif + #endif + #endif + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el + MIPS_ENDIAN=el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} + MIPS_ENDIAN= #else - CPU= + MIPS_ENDIAN= #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'` + eval "$cc_set_vars" + test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } + ;; + mips64el:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + openrisc*:Linux:*:*) + GUESS=or1k-unknown-linux-$LIBC + ;; + or32:Linux:*:* | or1k*:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC ;; - or32:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu - exit ;; + GUESS=sparc-unknown-linux-$LIBC + ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit ;; + GUESS=hppa64-unknown-linux-$LIBC + ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;; + PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;; + *) GUESS=hppa-unknown-linux-$LIBC ;; esac - exit ;; + ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; + GUESS=powerpc64-unknown-linux-$LIBC + ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; + GUESS=powerpc-unknown-linux-$LIBC + ;; + ppc64le:Linux:*:*) + GUESS=powerpc64le-unknown-linux-$LIBC + ;; + ppcle:Linux:*:*) + GUESS=powerpcle-unknown-linux-$LIBC + ;; + riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; + GUESS=$UNAME_MACHINE-ibm-linux-$LIBC + ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-dec-linux-$LIBC + ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + set_cc_for_build + CPU=$UNAME_MACHINE + LIBCABI=$LIBC + if test "$CC_FOR_BUILD" != no_compiler_found; then + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __i386__ + ABI=x86 + #else + #ifdef __ILP32__ + ABI=x32 + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + x86) CPU=i686 ;; + x32) LIBCABI=${LIBC}x32 ;; + esac + fi + GUESS=$CPU-pc-linux-$LIBCABI + ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; + GUESS=i386-sequent-sysv4 + ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; + GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION + ;; i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility + # If we were able to find 'uname', then EMX Unix compatibility # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; + GUESS=$UNAME_MACHINE-pc-os2-emx + ;; i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit ;; + GUESS=$UNAME_MACHINE-unknown-stop + ;; i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit ;; + GUESS=$UNAME_MACHINE-unknown-atheos + ;; i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; + GUESS=$UNAME_MACHINE-pc-syllable + ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; + GUESS=i386-unknown-lynxos$UNAME_RELEASE + ;; i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + GUESS=$UNAME_MACHINE-pc-msdosdjgpp + ;; + i*86:*:4.*:*) + UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL fi - exit ;; + ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in @@ -1059,12 +1266,12 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; + GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1074,43 +1281,43 @@ EOF && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL else - echo ${UNAME_MACHINE}-pc-sysv32 + GUESS=$UNAME_MACHINE-pc-sysv32 fi - exit ;; + ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; + GUESS=i586-pc-msdosdjgpp + ;; Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; + GUESS=i386-pc-mach3 + ;; paragon:*:*:*) - echo i860-intel-osf1 - exit ;; + GUESS=i860-intel-osf1 + ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4 fi - exit ;; + ;; mini*:CTIX:SYS*5:*) # "miniframe" - echo m68010-convergent-sysv - exit ;; + GUESS=m68010-convergent-sysv + ;; mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; + GUESS=m68k-convergent-sysv + ;; M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; + GUESS=m68k-diab-dnix + ;; M68*:*:R3V[5678]*:*) test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) @@ -1118,9 +1325,9 @@ EOF test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; @@ -1129,226 +1336,290 @@ EOF test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; + GUESS=m68k-unknown-lynxos$UNAME_RELEASE + ;; mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; + GUESS=m68k-atari-sysv4 + ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; + GUESS=sparc-unknown-lynxos$UNAME_RELEASE + ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; + GUESS=rs6000-unknown-lynxos$UNAME_RELEASE + ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; + GUESS=powerpc-unknown-lynxos$UNAME_RELEASE + ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit ;; + GUESS=mips-dde-sysv$UNAME_RELEASE + ;; RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; + GUESS=mips-sni-sysv4 + ;; RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; + GUESS=mips-sni-sysv4 + ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 + GUESS=$UNAME_MACHINE-sni-sysv4 else - echo ns32k-sni-sysv + GUESS=ns32k-sni-sysv fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + ;; + PENTIUM:*:4.0*:*) # Unisys 'ClearPath HMP IX 4000' SVR4/MP effort # says - echo i586-unisys-sysv4 - exit ;; + GUESS=i586-unisys-sysv4 + ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; + GUESS=hppa1.1-stratus-sysv4 + ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; + GUESS=i860-stratus-sysv4 + ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; + GUESS=$UNAME_MACHINE-stratus-vos + ;; *:VOS:*:*) # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; + GUESS=hppa1.1-stratus-vos + ;; mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit ;; + GUESS=m68k-apple-aux$UNAME_RELEASE + ;; news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; + GUESS=mips-sony-newsos6 + ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + if test -d /usr/nec; then + GUESS=mips-nec-sysv$UNAME_RELEASE else - echo mips-unknown-sysv${UNAME_RELEASE} + GUESS=mips-unknown-sysv$UNAME_RELEASE fi - exit ;; + ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; + GUESS=powerpc-be-beos + ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; + GUESS=powerpc-apple-beos + ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; + GUESS=i586-pc-beos + ;; BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; - x86_64:Haiku:*:*) - echo x86_64-unknown-haiku - exit ;; + GUESS=i586-pc-haiku + ;; + ppc:Haiku:*:*) # Haiku running on Apple PowerPC + GUESS=powerpc-apple-haiku + ;; + *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) + GUESS=$UNAME_MACHINE-unknown-haiku + ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; + GUESS=sx4-nec-superux$UNAME_RELEASE + ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit ;; + GUESS=sx5-nec-superux$UNAME_RELEASE + ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; + GUESS=sx6-nec-superux$UNAME_RELEASE + ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; + GUESS=sx7-nec-superux$UNAME_RELEASE + ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; + GUESS=sx8-nec-superux$UNAME_RELEASE + ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; + GUESS=sx8r-nec-superux$UNAME_RELEASE + ;; + SX-ACE:SUPER-UX:*:*) + GUESS=sxace-nec-superux$UNAME_RELEASE + ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; + GUESS=powerpc-apple-rhapsody$UNAME_RELEASE + ;; *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE + ;; + arm64:Darwin:*:*) + GUESS=aarch64-apple-darwin$UNAME_RELEASE + ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + UNAME_PROCESSOR=`uname -p` case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; unknown) UNAME_PROCESSOR=powerpc ;; esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; + if command -v xcode-select > /dev/null 2> /dev/null && \ + ! xcode-select --print-path > /dev/null 2> /dev/null ; then + # Avoid executing cc if there is no toolchain installed as + # cc will be a stub that puts up a graphical alert + # prompting the user to install developer tools. + CC_FOR_BUILD=no_compiler_found + else + set_cc_for_build + fi + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # uname -m returns i386 or x86_64 + UNAME_PROCESSOR=$UNAME_MACHINE + fi + GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE + ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then + if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE + ;; *:QNX:*:4*) - echo i386-pc-qnx - exit ;; - NEO-?:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} - exit ;; + GUESS=i386-pc-qnx + ;; + NEO-*:NONSTOP_KERNEL:*:*) + GUESS=neo-tandem-nsk$UNAME_RELEASE + ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; + GUESS=nse-tandem-nsk$UNAME_RELEASE + ;; + NSR-*:NONSTOP_KERNEL:*:*) + GUESS=nsr-tandem-nsk$UNAME_RELEASE + ;; + NSV-*:NONSTOP_KERNEL:*:*) + GUESS=nsv-tandem-nsk$UNAME_RELEASE + ;; + NSX-*:NONSTOP_KERNEL:*:*) + GUESS=nsx-tandem-nsk$UNAME_RELEASE + ;; *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; + GUESS=mips-compaq-nonstopux + ;; BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; + GUESS=bs2000-siemens-sysv + ;; DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; + GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE + ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + if test "${cputype-}" = 386; then UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" + elif test "x${cputype-}" != x; then + UNAME_MACHINE=$cputype fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; + GUESS=$UNAME_MACHINE-unknown-plan9 + ;; *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; + GUESS=pdp10-unknown-tops10 + ;; *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; + GUESS=pdp10-unknown-tenex + ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; + GUESS=pdp10-dec-tops20 + ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; + GUESS=pdp10-xkl-tops20 + ;; *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; + GUESS=pdp10-unknown-tops20 + ;; *:ITS:*:*) - echo pdp10-unknown-its - exit ;; + GUESS=pdp10-unknown-its + ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit ;; + GUESS=mips-sei-seiux$UNAME_RELEASE + ;; *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; + DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL + ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; + case $UNAME_MACHINE in + A*) GUESS=alpha-dec-vms ;; + I*) GUESS=ia64-dec-vms ;; + V*) GUESS=vax-dec-vms ;; esac ;; *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; + GUESS=i386-pc-xenix + ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; + SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'` + GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL + ;; i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; + GUESS=$UNAME_MACHINE-pc-rdos + ;; + i*86:Fiwix:*:*) + GUESS=$UNAME_MACHINE-pc-fiwix + ;; + *:AROS:*:*) + GUESS=$UNAME_MACHINE-unknown-aros + ;; x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx - exit ;; + GUESS=$UNAME_MACHINE-unknown-esx + ;; + amd64:Isilon\ OneFS:*:*) + GUESS=x86_64-unknown-onefs + ;; + *:Unleashed:*:*) + GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE + ;; + *:Ironclad:*:*) + GUESS=$UNAME_MACHINE-unknown-ironclad + ;; esac -eval $set_cc_for_build -cat >$dummy.c < "$dummy.c" < -# include +#include +#include +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#include +#if defined(_SIZE_T_) || defined(SIGLOST) +#include +#endif +#endif #endif main () { @@ -1361,22 +1632,14 @@ main () #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - #if defined (NeXT) #if !defined (__ARCHITECTURE__) #define __ARCHITECTURE__ "m68k" @@ -1416,39 +1679,54 @@ main () #endif #if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); + struct utsname un; + uname(&un); + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); #endif #if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif +#if !defined (ultrix) +#include +#if defined (BSD) +#if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +#else +#if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#endif +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#else +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname un; + uname (&un); + printf ("vax-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("vax-dec-ultrix\n"); exit (0); +#endif +#endif +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname *un; + uname (&un); + printf ("mips-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("mips-dec-ultrix\n"); exit (0); +#endif +#endif #endif #if defined (alliant) && defined (i860) @@ -1459,54 +1737,46 @@ main () } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && +$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. +test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } +echo "$0: unable to guess system type" >&2 -# Convex versions that predate uname can use getsysinfo(1) +case $UNAME_MACHINE:$UNAME_SYSTEM in + mips:Linux | mips64:Linux) + # If we got here on MIPS GNU/Linux, output extra information. + cat >&2 <&2 < in order to provide the needed -information to handle your system. +our_year=`echo $timestamp | sed 's,-.*,,'` +thisyear=`date +%Y` +# shellcheck disable=SC2003 +script_age=`expr "$thisyear" - "$our_year"` +if test "$script_age" -lt 3 ; then + cat >&2 </dev/null` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} +UNAME_MACHINE = "$UNAME_MACHINE" +UNAME_RELEASE = "$UNAME_RELEASE" +UNAME_SYSTEM = "$UNAME_SYSTEM" +UNAME_VERSION = "$UNAME_VERSION" EOF +fi exit 1 # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/lib/libX11/config.sub b/lib/libX11/config.sub index e842e0ef..2c6a07ab 100644 --- a/lib/libX11/config.sub +++ b/lib/libX11/config.sub @@ -1,36 +1,33 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011, 2012 Free Software Foundation, Inc. +# Copyright 1992-2024 Free Software Foundation, Inc. -timestamp='2012-12-06' +# shellcheck disable=SC2006,SC2268 # see below for rationale -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +timestamp='2024-01-01' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches to . # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -38,7 +35,7 @@ timestamp='2012-12-06' # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -55,15 +52,21 @@ timestamp='2012-12-06' # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. +# The "shellcheck disable" line above the timestamp inhibits complaints +# about features and limitations of the classic Bourne shell that were +# superseded or lifted in POSIX. However, this script identifies a wide +# variety of pre-POSIX systems that do not have POSIX shells at all, and +# even some reasonably current systems (Solaris 10 as case-in-point) still +# have a pre-POSIX /bin/sh. + me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -73,15 +76,13 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -Free Software Foundation, Inc. +Copyright 1992-2024 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" -Try \`$me --help' for more information." +Try '$me --help' for more information." # Parse command line while test $# -gt 0 ; do @@ -97,12 +98,12 @@ while test $# -gt 0 ; do - ) # Use stdin as input. break ;; -* ) - echo "$me: invalid option $1$help" + echo "$me: invalid option $1$help" >&2 exit 1 ;; *local*) # First pass through any local machine types. - echo $1 + echo "$1" exit ;; * ) @@ -118,1207 +119,1167 @@ case $# in exit 1;; esac -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac +# Split fields of configuration type +# shellcheck disable=SC2162 +saved_IFS=$IFS +IFS="-" read field1 field2 field3 field4 <&2 +# Separate into logical components for further validation +case $1 in + *-*-*-*-*) + echo "Invalid configuration '$1': more than four components" >&2 exit 1 ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) + *-*-*-*) + basic_machine=$field1-$field2 + basic_os=$field3-$field4 ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown + *-*-*) + # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two + # parts + maybe_os=$field2-$field3 + case $maybe_os in + nto-qnx* | linux-* | uclinux-uclibc* \ + | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ + | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ + | storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \ + | windows-* ) + basic_machine=$field1 + basic_os=$maybe_os + ;; + android-linux) + basic_machine=$field1-unknown + basic_os=linux-android + ;; + *) + basic_machine=$field1-$field2 + basic_os=$field3 + ;; + esac ;; + *-*) + # A lone config we happen to match not fitting any pattern + case $field1-$field2 in + decstation-3100) + basic_machine=mips-dec + basic_os= + ;; + *-*) + # Second component is usually, but not always the OS + case $field2 in + # Prevent following clause from handling this valid os + sun*os*) + basic_machine=$field1 + basic_os=$field2 + ;; + zephyr*) + basic_machine=$field1-unknown + basic_os=$field2 + ;; + # Manufacturers + dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ + | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ + | unicom* | ibm* | next | hp | isi* | apollo | altos* \ + | convergent* | ncr* | news | 32* | 3600* | 3100* \ + | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ + | ultra | tti* | harris | dolphin | highlevel | gould \ + | cbm | ns | masscomp | apple | axis | knuth | cray \ + | microblaze* | sim | cisco \ + | oki | wec | wrs | winbond) + basic_machine=$field1-$field2 + basic_os= + ;; + *) + basic_machine=$field1 + basic_os=$field2 + ;; + esac + ;; + esac + ;; + *) + # Convert single-component short-hands not valid as part of + # multi-component configurations. + case $field1 in + 386bsd) + basic_machine=i386-pc + basic_os=bsd + ;; + a29khif) + basic_machine=a29k-amd + basic_os=udi + ;; + adobe68k) + basic_machine=m68010-adobe + basic_os=scout + ;; + alliant) + basic_machine=fx80-alliant + basic_os= + ;; + altos | altos3068) + basic_machine=m68k-altos + basic_os= + ;; + am29k) + basic_machine=a29k-none + basic_os=bsd + ;; + amdahl) + basic_machine=580-amdahl + basic_os=sysv + ;; + amiga) + basic_machine=m68k-unknown + basic_os= + ;; + amigaos | amigados) + basic_machine=m68k-unknown + basic_os=amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + basic_os=sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + basic_os=sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + basic_os=bsd + ;; + aros) + basic_machine=i386-pc + basic_os=aros + ;; + aux) + basic_machine=m68k-apple + basic_os=aux + ;; + balance) + basic_machine=ns32k-sequent + basic_os=dynix + ;; + blackfin) + basic_machine=bfin-unknown + basic_os=linux + ;; + cegcc) + basic_machine=arm-unknown + basic_os=cegcc + ;; + convex-c1) + basic_machine=c1-convex + basic_os=bsd + ;; + convex-c2) + basic_machine=c2-convex + basic_os=bsd + ;; + convex-c32) + basic_machine=c32-convex + basic_os=bsd + ;; + convex-c34) + basic_machine=c34-convex + basic_os=bsd + ;; + convex-c38) + basic_machine=c38-convex + basic_os=bsd + ;; + cray) + basic_machine=j90-cray + basic_os=unicos + ;; + crds | unos) + basic_machine=m68k-crds + basic_os= + ;; + da30) + basic_machine=m68k-da30 + basic_os= + ;; + decstation | pmax | pmin | dec3100 | decstatn) + basic_machine=mips-dec + basic_os= + ;; + delta88) + basic_machine=m88k-motorola + basic_os=sysv3 + ;; + dicos) + basic_machine=i686-pc + basic_os=dicos + ;; + djgpp) + basic_machine=i586-pc + basic_os=msdosdjgpp + ;; + ebmon29k) + basic_machine=a29k-amd + basic_os=ebmon + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + basic_os=ose + ;; + gmicro) + basic_machine=tron-gmicro + basic_os=sysv + ;; + go32) + basic_machine=i386-pc + basic_os=go32 + ;; + h8300hms) + basic_machine=h8300-hitachi + basic_os=hms + ;; + h8300xray) + basic_machine=h8300-hitachi + basic_os=xray + ;; + h8500hms) + basic_machine=h8500-hitachi + basic_os=hms + ;; + harris) + basic_machine=m88k-harris + basic_os=sysv3 + ;; + hp300 | hp300hpux) + basic_machine=m68k-hp + basic_os=hpux + ;; + hp300bsd) + basic_machine=m68k-hp + basic_os=bsd + ;; + hppaosf) + basic_machine=hppa1.1-hp + basic_os=osf + ;; + hppro) + basic_machine=hppa1.1-hp + basic_os=proelf + ;; + i386mach) + basic_machine=i386-mach + basic_os=mach + ;; + isi68 | isi) + basic_machine=m68k-isi + basic_os=sysv + ;; + m68knommu) + basic_machine=m68k-unknown + basic_os=linux + ;; + magnum | m3230) + basic_machine=mips-mips + basic_os=sysv + ;; + merlin) + basic_machine=ns32k-utek + basic_os=sysv + ;; + mingw64) + basic_machine=x86_64-pc + basic_os=mingw64 + ;; + mingw32) + basic_machine=i686-pc + basic_os=mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + basic_os=mingw32ce + ;; + monitor) + basic_machine=m68k-rom68k + basic_os=coff + ;; + morphos) + basic_machine=powerpc-unknown + basic_os=morphos + ;; + moxiebox) + basic_machine=moxie-unknown + basic_os=moxiebox + ;; + msdos) + basic_machine=i386-pc + basic_os=msdos + ;; + msys) + basic_machine=i686-pc + basic_os=msys + ;; + mvs) + basic_machine=i370-ibm + basic_os=mvs + ;; + nacl) + basic_machine=le32-unknown + basic_os=nacl + ;; + ncr3000) + basic_machine=i486-ncr + basic_os=sysv4 + ;; + netbsd386) + basic_machine=i386-pc + basic_os=netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + basic_os=linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + basic_os=newsos + ;; + news1000) + basic_machine=m68030-sony + basic_os=newsos + ;; + necv70) + basic_machine=v70-nec + basic_os=sysv + ;; + nh3000) + basic_machine=m68k-harris + basic_os=cxux + ;; + nh[45]000) + basic_machine=m88k-harris + basic_os=cxux + ;; + nindy960) + basic_machine=i960-intel + basic_os=nindy + ;; + mon960) + basic_machine=i960-intel + basic_os=mon960 + ;; + nonstopux) + basic_machine=mips-compaq + basic_os=nonstopux + ;; + os400) + basic_machine=powerpc-ibm + basic_os=os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + basic_os=ose + ;; + os68k) + basic_machine=m68k-none + basic_os=os68k + ;; + paragon) + basic_machine=i860-intel + basic_os=osf + ;; + parisc) + basic_machine=hppa-unknown + basic_os=linux + ;; + psp) + basic_machine=mipsallegrexel-sony + basic_os=psp + ;; + pw32) + basic_machine=i586-unknown + basic_os=pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + basic_os=rdos + ;; + rdos32) + basic_machine=i386-pc + basic_os=rdos + ;; + rom68k) + basic_machine=m68k-rom68k + basic_os=coff + ;; + sa29200) + basic_machine=a29k-amd + basic_os=udi + ;; + sei) + basic_machine=mips-sei + basic_os=seiux + ;; + sequent) + basic_machine=i386-sequent + basic_os= + ;; + sps7) + basic_machine=m68k-bull + basic_os=sysv2 + ;; + st2000) + basic_machine=m68k-tandem + basic_os= + ;; + stratus) + basic_machine=i860-stratus + basic_os=sysv4 + ;; + sun2) + basic_machine=m68000-sun + basic_os= + ;; + sun2os3) + basic_machine=m68000-sun + basic_os=sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + basic_os=sunos4 + ;; + sun3) + basic_machine=m68k-sun + basic_os= + ;; + sun3os3) + basic_machine=m68k-sun + basic_os=sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + basic_os=sunos4 + ;; + sun4) + basic_machine=sparc-sun + basic_os= + ;; + sun4os3) + basic_machine=sparc-sun + basic_os=sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + basic_os=sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + basic_os=solaris2 + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + basic_os= + ;; + sv1) + basic_machine=sv1-cray + basic_os=unicos + ;; + symmetry) + basic_machine=i386-sequent + basic_os=dynix + ;; + t3e) + basic_machine=alphaev5-cray + basic_os=unicos + ;; + t90) + basic_machine=t90-cray + basic_os=unicos + ;; + toad1) + basic_machine=pdp10-xkl + basic_os=tops20 + ;; + tpf) + basic_machine=s390x-ibm + basic_os=tpf + ;; + udi29k) + basic_machine=a29k-amd + basic_os=udi + ;; + ultra3) + basic_machine=a29k-nyu + basic_os=sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + basic_os=none + ;; + vaxv) + basic_machine=vax-dec + basic_os=sysv + ;; + vms) + basic_machine=vax-dec + basic_os=vms + ;; + vsta) + basic_machine=i386-pc + basic_os=vsta + ;; + vxworks960) + basic_machine=i960-wrs + basic_os=vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + basic_os=vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + basic_os=vxworks + ;; + xbox) + basic_machine=i686-pc + basic_os=mingw32 + ;; + ymp) + basic_machine=ymp-cray + basic_os=unicos + ;; + *) + basic_machine=$1 + basic_os= + ;; + esac + ;; +esac + +# Decode 1-component or ad-hoc basic machines +case $basic_machine in + # Here we handle the default manufacturer of certain CPU types. It is in + # some cases the only manufacturer, in others, it is the most popular. + w89k) + cpu=hppa1.1 + vendor=winbond + ;; + op50n) + cpu=hppa1.1 + vendor=oki + ;; + op60c) + cpu=hppa1.1 + vendor=oki + ;; + ibm*) + cpu=i370 + vendor=ibm + ;; + orion105) + cpu=clipper + vendor=highlevel + ;; + mac | mpw | mac-mpw) + cpu=m68k + vendor=apple + ;; + pmac | pmac-mpw) + cpu=powerpc + vendor=apple + ;; + # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att + cpu=m68000 + vendor=att ;; 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux + cpu=we32k + vendor=att ;; bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec + cpu=powerpc + vendor=ibm + basic_os=cnk ;; decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 + cpu=pdp10 + vendor=dec + basic_os=tops10 ;; decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 + cpu=pdp10 + vendor=dec + basic_os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola + cpu=m68k + vendor=motorola ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd + dpx2*) + cpu=m68k + vendor=bull + basic_os=sysv3 ;; encore | umax | mmax) - basic_machine=ns32k-encore + cpu=ns32k + vendor=encore ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose + elxsi) + cpu=elxsi + vendor=elxsi + basic_os=${basic_os:-bsd} ;; fx2800) - basic_machine=i860-alliant + cpu=i860 + vendor=alliant ;; genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 + cpu=ns32k + vendor=ns ;; h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux + cpu=hppa1.1 + vendor=hitachi + basic_os=hiuxwe2 ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp + cpu=m68000 + vendor=hp ;; hp9k3[2-9][0-9]) - basic_machine=m68k-hp + cpu=m68k + vendor=hp ;; hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k78[0-9] | hp78[0-9]) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm + cpu=hppa1.0 + vendor=hp ;; i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv32 ;; i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv4 ;; i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv ;; i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=solaris2 ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta + j90 | j90-cray) + cpu=j90 + vendor=cray + basic_os=${basic_os:-unicos} ;; iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) + cpu=mips + vendor=sgi + case $basic_os in + irix*) ;; *) - os=-irix4 + basic_os=irix4 ;; esac ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze*) - basic_machine=microblaze-xilinx - ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; miniframe) - basic_machine=m68000-convergent + cpu=m68000 + vendor=convergent ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - msys) - basic_machine=i386-pc - os=-msys - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - nacl) - basic_machine=le32-unknown - os=-nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos + *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) + cpu=m68k + vendor=atari + basic_os=mint ;; news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos + cpu=mips + vendor=sony + basic_os=newsos ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) + next | m*-next) + cpu=m68k + vendor=next + case $basic_os in + openstep*) + ;; + nextstep*) ;; - -ns2*) - os=-nextstep2 + ns2*) + basic_os=nextstep2 ;; *) - os=-nextstep3 + basic_os=nextstep3 ;; esac ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; np1) - basic_machine=np1-gould - ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) - basic_machine=nsr-tandem + cpu=np1 + vendor=gould ;; op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k + cpu=hppa1.1 + vendor=oki + basic_os=proelf ;; pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux + cpu=hppa1.1 + vendor=hitachi + basic_os=hiuxwe2 ;; pbd) - basic_machine=sparc-tti + cpu=sparc + vendor=tti ;; pbb) - basic_machine=m68k-tti + cpu=m68k + vendor=tti ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + pc532) + cpu=ns32k + vendor=pc532 ;; pn) - basic_machine=pn-gould + cpu=pn + vendor=gould ;; - power) basic_machine=power-ibm - ;; - ppc | ppcbe) basic_machine=powerpc-unknown - ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + power) + cpu=power + vendor=ibm ;; ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=-rdos - ;; - rdos32) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff + cpu=i386 + vendor=ibm ;; rm[46]00) - basic_machine=mips-siemens + cpu=mips + vendor=siemens ;; rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown + cpu=romp + vendor=ibm ;; sde) - basic_machine=mipsisa32-sde - os=-elf + cpu=mipsisa32 + vendor=sde + basic_os=${basic_os:-elf} ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh5el) - basic_machine=sh5le-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - strongarm-* | thumb-*) - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tile*) - basic_machine=$basic_machine-unknown - os=-linux-gnu - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 + simso-wrs) + cpu=sparclite + vendor=wrs + basic_os=vxworks ;; tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms + cpu=m68k + vendor=ncr ;; vpp*|vx|vx-*) - basic_machine=f301-fujitsu + cpu=f301 + vendor=fujitsu ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none + w65) + cpu=w65 + vendor=wdc ;; w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - xscale-* | xscalee[bl]-*) - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim + cpu=hppa1.1 + vendor=winbond + basic_os=proelf ;; none) - basic_machine=none-none - os=-none + cpu=none + vendor=none + ;; + leon|leon[3-9]) + cpu=sparc + vendor=$basic_machine + ;; + leon-*|leon[3-9]-*) + cpu=sparc + vendor=`echo "$basic_machine" | sed 's/-.*//'` ;; -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond + *-*) + # shellcheck disable=SC2162 + saved_IFS=$IFS + IFS="-" read cpu vendor <&2 - exit 1 + cpu=$basic_machine + vendor=unknown + ;; +esac + +unset -v basic_machine + +# Decode basic machines in the full and proper CPU-Company form. +case $cpu-$vendor in + # Here we handle the default manufacturer of certain CPU types in canonical form. It is in + # some cases the only manufacturer, in others, it is the most popular. + craynv-unknown) + vendor=cray + basic_os=${basic_os:-unicosmp} + ;; + c90-unknown | c90-cray) + vendor=cray + basic_os=${Basic_os:-unicos} + ;; + fx80-unknown) + vendor=alliant + ;; + romp-unknown) + vendor=ibm + ;; + mmix-unknown) + vendor=knuth + ;; + microblaze-unknown | microblazeel-unknown) + vendor=xilinx + ;; + rs6000-unknown) + vendor=ibm + ;; + vax-unknown) + vendor=dec + ;; + pdp11-unknown) + vendor=dec + ;; + we32k-unknown) + vendor=att + ;; + cydra-unknown) + vendor=cydrome + ;; + i370-ibm*) + vendor=ibm + ;; + orion-unknown) + vendor=highlevel + ;; + xps-unknown | xps100-unknown) + cpu=xps100 + vendor=honeywell + ;; + + # Here we normalize CPU types with a missing or matching vendor + armh-unknown | armh-alt) + cpu=armv7l + vendor=alt + basic_os=${basic_os:-linux-gnueabihf} + ;; + dpx20-unknown | dpx20-bull) + cpu=rs6000 + vendor=bull + basic_os=${basic_os:-bosx} + ;; + + # Here we normalize CPU types irrespective of the vendor + amd64-*) + cpu=x86_64 + ;; + blackfin-*) + cpu=bfin + basic_os=linux + ;; + c54x-*) + cpu=tic54x + ;; + c55x-*) + cpu=tic55x + ;; + c6x-*) + cpu=tic6x + ;; + e500v[12]-*) + cpu=powerpc + basic_os=${basic_os}"spe" + ;; + mips3*-*) + cpu=mips64 + ;; + ms1-*) + cpu=mt + ;; + m68knommu-*) + cpu=m68k + basic_os=linux + ;; + m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*) + cpu=s12z + ;; + openrisc-*) + cpu=or32 + ;; + parisc-*) + cpu=hppa + basic_os=linux + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + cpu=i586 + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*) + cpu=i686 + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + cpu=i686 + ;; + pentium4-*) + cpu=i786 + ;; + pc98-*) + cpu=i386 + ;; + ppc-* | ppcbe-*) + cpu=powerpc + ;; + ppcle-* | powerpclittle-*) + cpu=powerpcle + ;; + ppc64-*) + cpu=powerpc64 + ;; + ppc64le-* | powerpc64little-*) + cpu=powerpc64le + ;; + sb1-*) + cpu=mipsisa64sb1 + ;; + sb1el-*) + cpu=mipsisa64sb1el + ;; + sh5e[lb]-*) + cpu=`echo "$cpu" | sed 's/^\(sh.\)e\(.\)$/\1\2e/'` + ;; + spur-*) + cpu=spur + ;; + strongarm-* | thumb-*) + cpu=arm + ;; + tx39-*) + cpu=mipstx39 + ;; + tx39el-*) + cpu=mipstx39el + ;; + x64-*) + cpu=x86_64 + ;; + xscale-* | xscalee[bl]-*) + cpu=`echo "$cpu" | sed 's/^xscale/arm/'` + ;; + arm64-* | aarch64le-*) + cpu=aarch64 + ;; + + # Recognize the canonical CPU Types that limit and/or modify the + # company names they are paired with. + cr16-*) + basic_os=${basic_os:-elf} + ;; + crisv32-* | etraxfs*-*) + cpu=crisv32 + vendor=axis + ;; + cris-* | etrax*-*) + cpu=cris + vendor=axis + ;; + crx-*) + basic_os=${basic_os:-elf} + ;; + neo-tandem) + cpu=neo + vendor=tandem + ;; + nse-tandem) + cpu=nse + vendor=tandem + ;; + nsr-tandem) + cpu=nsr + vendor=tandem + ;; + nsv-tandem) + cpu=nsv + vendor=tandem + ;; + nsx-tandem) + cpu=nsx + vendor=tandem + ;; + mipsallegrexel-sony) + cpu=mipsallegrexel + vendor=sony + ;; + tile*-*) + basic_os=${basic_os:-linux-gnu} + ;; + + *) + # Recognize the canonical CPU types that are allowed with any + # company name. + case $cpu in + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be | aarch64c | arm64ec \ + | abacus \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ + | alphapca5[67] | alpha64pca5[67] \ + | am33_2.0 \ + | amdgcn \ + | arc | arceb | arc32 | arc64 \ + | arm | arm[lb]e | arme[lb] | armv* \ + | avr | avr32 \ + | asmjs \ + | ba \ + | be32 | be64 \ + | bfin | bpf | bs2000 \ + | c[123]* | c30 | [cjt]90 | c4x \ + | c8051 | clipper | craynv | csky | cydra \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | elxsi | epiphany \ + | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ + | javascript \ + | h8300 | h8500 \ + | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i*86 | i860 | i960 | ia16 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | kvx \ + | le32 | le64 \ + | lm32 \ + | loongarch32 | loongarch64 \ + | m32c | m32r | m32rle \ + | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ + | m88110 | m88k | maxq | mb | mcore | mep | metag \ + | microblaze | microblazeel \ + | mips* \ + | mmix \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nanomips* \ + | nds32 | nds32le | nds32be \ + | nfp \ + | nios | nios2 | nios2eb | nios2el \ + | none | np1 | ns16k | ns32k | nvptx \ + | open8 \ + | or1k* \ + | or32 \ + | orion \ + | picochip \ + | pdp10 | pdp11 | pj | pjl | pn | power \ + | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ + | pru \ + | pyramid \ + | riscv | riscv32 | riscv32be | riscv64 | riscv64be \ + | rl78 | romp | rs6000 | rx \ + | s390 | s390x \ + | score \ + | sh | shl \ + | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ + | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \ + | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ + | spu \ + | tahoe \ + | thumbv7* \ + | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ + | tron \ + | ubicom32 \ + | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ + | vax \ + | vc4 \ + | visium \ + | w65 \ + | wasm32 | wasm64 \ + | we32k \ + | x86 | x86_64 | xc16x | xgate | xps100 \ + | xstormy16 | xtensa* \ + | ymp \ + | z8k | z80) + ;; + + *) + echo "Invalid configuration '$1': machine '$cpu-$vendor' not recognized" 1>&2 + exit 1 + ;; + esac ;; esac # Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` +case $vendor in + digital*) + vendor=dec ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + commodore*) + vendor=cbm ;; *) ;; @@ -1326,203 +1287,226 @@ esac # Decode manufacturer-specific aliases for certain operating systems. -if [ x"$os" != x"" ] +if test x"$basic_os" != x then + +# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just +# set os. +obj= +case $basic_os in + gnu/linux*) + kernel=linux + os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'` + ;; + os2-emx) + kernel=os2 + os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'` + ;; + nto-qnx*) + kernel=nto + os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'` + ;; + *-*) + # shellcheck disable=SC2162 + saved_IFS=$IFS + IFS="-" read kernel os <&2 - exit 1 + # No normalization, but not necessarily accepted, that comes below. ;; esac + else # Here we handle the default operating systems that come with various machines. @@ -1535,258 +1519,452 @@ else # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. -case $basic_machine in +kernel= +obj= +case $cpu-$vendor in score-*) - os=-elf + os= + obj=elf ;; spu-*) - os=-elf + os= + obj=elf ;; *-acorn) - os=-riscix1.2 + os=riscix1.2 ;; arm*-rebel) - os=-linux + kernel=linux + os=gnu ;; arm*-semi) - os=-aout + os= + obj=aout ;; c4x-* | tic4x-*) - os=-coff + os= + obj=coff + ;; + c8051-*) + os= + obj=elf + ;; + clipper-intergraph) + os=clix ;; hexagon-*) - os=-elf + os= + obj=elf ;; tic54x-*) - os=-coff + os= + obj=coff ;; tic55x-*) - os=-coff + os= + obj=coff ;; tic6x-*) - os=-coff + os= + obj=coff ;; # This must come before the *-dec entry. pdp10-*) - os=-tops20 + os=tops20 ;; pdp11-*) - os=-none + os=none ;; *-dec | vax-*) - os=-ultrix4.2 + os=ultrix4.2 ;; m68*-apollo) - os=-domain + os=domain ;; i386-sun) - os=-sunos4.0.2 + os=sunos4.0.2 ;; m68000-sun) - os=-sunos3 + os=sunos3 ;; m68*-cisco) - os=-aout + os= + obj=aout ;; mep-*) - os=-elf + os= + obj=elf ;; mips*-cisco) - os=-elf + os= + obj=elf ;; - mips*-*) - os=-elf + mips*-*|nanomips*-*) + os= + obj=elf ;; or32-*) - os=-coff + os= + obj=coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 + os=sysv3 ;; sparc-* | *-sun) - os=-sunos4.1.1 + os=sunos4.1.1 + ;; + pru-*) + os= + obj=elf ;; *-be) - os=-beos - ;; - *-haiku) - os=-haiku + os=beos ;; *-ibm) - os=-aix + os=aix ;; *-knuth) - os=-mmixware + os=mmixware ;; *-wec) - os=-proelf + os=proelf ;; *-winbond) - os=-proelf + os=proelf ;; *-oki) - os=-proelf + os=proelf ;; *-hp) - os=-hpux + os=hpux ;; *-hitachi) - os=-hiux + os=hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv + os=sysv ;; *-cbm) - os=-amigaos + os=amigaos ;; *-dg) - os=-dgux + os=dgux ;; *-dolphin) - os=-sysv3 + os=sysv3 ;; m68k-ccur) - os=-rtu + os=rtu ;; m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs + os=luna ;; *-next) - os=-nextstep3 + os=nextstep + ;; + *-sequent) + os=ptx + ;; + *-crds) + os=unos + ;; + *-ns) + os=genix + ;; + i370-*) + os=mvs ;; *-gould) - os=-sysv + os=sysv ;; *-highlevel) - os=-bsd + os=bsd ;; *-encore) - os=-bsd + os=bsd ;; *-sgi) - os=-irix + os=irix ;; *-siemens) - os=-sysv4 + os=sysv4 ;; *-masscomp) - os=-rtu + os=rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=-uxpv + os=uxpv ;; *-rom68k) - os=-coff + os= + obj=coff ;; *-*bug) - os=-coff + os= + obj=coff ;; *-apple) - os=-macos + os=macos ;; *-atari*) - os=-mint + os=mint + ;; + *-wrs) + os=vxworks ;; *) - os=-none + os=none ;; esac + fi +# Now, validate our (potentially fixed-up) individual pieces (OS, OBJ). + +case $os in + # Sometimes we do "kernel-libc", so those need to count as OSes. + llvm* | musl* | newlib* | relibc* | uclibc*) + ;; + # Likewise for "kernel-abi" + eabi* | gnueabi*) + ;; + # VxWorks passes extra cpu info in the 4th filed. + simlinux | simwindows | spe) + ;; + # See `case $cpu-$os` validation below + ghcjs) + ;; + # Now accept the basic system types. + # The portable systems comes first. + # Each alternative MUST end in a * to match a version number. + gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ + | hiux* | abug | nacl* | netware* | windows* \ + | os9* | macos* | osx* | ios* | tvos* | watchos* \ + | mpw* | magic* | mmixware* | mon960* | lnews* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* | twizzler* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | mirbsd* | netbsd* | dicos* | openedition* | ose* \ + | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \ + | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ + | bosx* | nextstep* | cxux* | oabi* \ + | ptx* | ecoff* | winnt* | domain* | vsta* \ + | udi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* | serenity* \ + | cygwin* | msys* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | mint* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ + | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ + | fiwix* | mlibc* | cos* | mbr* | ironclad* ) + ;; + # This one is extra strict with allowed versions + sco3.2v2 | sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + # This refers to builds using the UEFI calling convention + # (which depends on the architecture) and PE file format. + # Note that this is both a different calling convention and + # different file format than that of GNU-EFI + # (x86_64-w64-mingw32). + uefi) + ;; + none) + ;; + kernel* | msvc* ) + # Restricted further below + ;; + '') + if test x"$obj" = x + then + echo "Invalid configuration '$1': Blank OS only allowed with explicit machine code file format" 1>&2 + fi + ;; + *) + echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2 + exit 1 + ;; +esac + +case $obj in + aout* | coff* | elf* | pe*) + ;; + '') + # empty is fine + ;; + *) + echo "Invalid configuration '$1': Machine code format '$obj' not recognized" 1>&2 + exit 1 + ;; +esac + +# Here we handle the constraint that a (synthetic) cpu and os are +# valid only in combination with each other and nowhere else. +case $cpu-$os in + # The "javascript-unknown-ghcjs" triple is used by GHC; we + # accept it here in order to tolerate that, but reject any + # variations. + javascript-ghcjs) + ;; + javascript-* | *-ghcjs) + echo "Invalid configuration '$1': cpu '$cpu' is not valid with os '$os$obj'" 1>&2 + exit 1 + ;; +esac + +# As a final step for OS-related things, validate the OS-kernel combination +# (given a valid OS), if there is a kernel. +case $kernel-$os-$obj in + linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \ + | linux-mlibc*- | linux-musl*- | linux-newlib*- \ + | linux-relibc*- | linux-uclibc*- ) + ;; + uclinux-uclibc*- ) + ;; + managarm-mlibc*- | managarm-kernel*- ) + ;; + windows*-msvc*-) + ;; + -dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \ + | -uclibc*- ) + # These are just libc implementations, not actual OSes, and thus + # require a kernel. + echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2 + exit 1 + ;; + -kernel*- ) + echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2 + exit 1 + ;; + *-kernel*- ) + echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2 + exit 1 + ;; + *-msvc*- ) + echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2 + exit 1 + ;; + kfreebsd*-gnu*- | kopensolaris*-gnu*-) + ;; + vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-) + ;; + nto-qnx*-) + ;; + os2-emx-) + ;; + *-eabi*- | *-gnueabi*-) + ;; + none--*) + # None (no kernel, i.e. freestanding / bare metal), + # can be paired with an machine code file format + ;; + -*-) + # Blank kernel with real OS is always fine. + ;; + --*) + # Blank kernel and OS with real machine code file format is always fine. + ;; + *-*-*) + echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2 + exit 1 + ;; +esac + # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) +case $vendor in + unknown) + case $cpu-$os in + *-riscix*) vendor=acorn ;; - -sunos*) + *-sunos*) vendor=sun ;; - -cnk*|-aix*) + *-cnk* | *-aix*) vendor=ibm ;; - -beos*) + *-beos*) vendor=be ;; - -hpux*) + *-hpux*) vendor=hp ;; - -mpeix*) + *-mpeix*) vendor=hp ;; - -hiux*) + *-hiux*) vendor=hitachi ;; - -unos*) + *-unos*) vendor=crds ;; - -dgux*) + *-dgux*) vendor=dg ;; - -luna*) + *-luna*) vendor=omron ;; - -genix*) + *-genix*) vendor=ns ;; - -mvs* | -opened*) + *-clix*) + vendor=intergraph + ;; + *-mvs* | *-opened*) vendor=ibm ;; - -os400*) + *-os400*) vendor=ibm ;; - -ptx*) + s390-* | s390x-*) + vendor=ibm + ;; + *-ptx*) vendor=sequent ;; - -tpf*) + *-tpf*) vendor=ibm ;; - -vxsim* | -vxworks* | -windiss*) + *-vxsim* | *-vxworks* | *-windiss*) vendor=wrs ;; - -aux*) + *-aux*) vendor=apple ;; - -hms*) + *-hms*) vendor=hitachi ;; - -mpw* | -macos*) + *-mpw* | *-macos*) vendor=apple ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) vendor=atari ;; - -vos*) + *-vos*) vendor=stratus ;; esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; esac -echo $basic_machine$os +echo "$cpu-$vendor${kernel:+-$kernel}${os:+-$os}${obj:+-$obj}" exit # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/lib/libX11/configure b/lib/libX11/configure index 0a3750dc..0ad6b6c2 100644 --- a/lib/libX11/configure +++ b/lib/libX11/configure @@ -1,11 +1,12 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libX11 1.8.1. +# Generated by GNU Autoconf 2.71 for libX11 1.8.9. # -# Report bugs to . +# Report bugs to . # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -16,14 +17,16 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -33,46 +36,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -81,13 +84,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -96,8 +92,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -109,30 +109,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. @@ -154,20 +134,22 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else +else \$as_nop case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( @@ -187,18 +169,20 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; } as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +then : -else +else \$as_nop exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 +blah=\$(echo \$(echo blah)) +test x\"\$blah\" = xblah || exit 1 test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1 test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || ( ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' @@ -206,31 +190,40 @@ test \$(( 1 + 1 )) = 2 || exit 1 ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO PATH=/empty FPATH=/empty; export PATH FPATH test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\ - || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1" - if (eval "$as_required") 2>/dev/null; then : + || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null +then : as_have_required=yes -else +else $as_nop as_have_required=no fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +then : -else +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base + as_shell=$as_dir$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null +then : break 2 fi fi @@ -238,14 +231,21 @@ fi esac as_found=false done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi +fi - if test "x$CONFIG_SHELL" != x; then : + if test "x$CONFIG_SHELL" != x +then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also @@ -263,19 +263,20 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." + if test x$as_have_required = xno +then : + printf "%s\n" "$0: This script requires a shell more modern than all" + printf "%s\n" "$0: the shells that I found on your system." + if test ${ZSH_VERSION+y} ; then + printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" + printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: https://gitlab.freedesktop.org/xorg/lib/libx11/issues + printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and +$0: https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues $0: about your system, including any error possibly output $0: before this message. Then install a modern shell, or $0: manually run the script under such a shell if you do @@ -303,6 +304,7 @@ as_fn_unset () } as_unset=as_fn_unset + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -320,6 +322,14 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -334,7 +344,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -343,7 +353,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -382,12 +392,13 @@ as_fn_executable_p () # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -399,18 +410,27 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -422,9 +442,9 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -451,7 +471,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -495,7 +515,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall @@ -509,6 +529,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits exit } + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -522,6 +546,13 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -651,49 +682,45 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libX11' PACKAGE_TARNAME='libX11' -PACKAGE_VERSION='1.8.1' -PACKAGE_STRING='libX11 1.8.1' -PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libx11/issues' +PACKAGE_VERSION='1.8.9' +PACKAGE_STRING='libX11 1.8.9' +PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues' PACKAGE_URL='' ac_unique_file="Makefile.am" # Factoring default headers for most tests. ac_includes_default="\ -#include -#ifdef HAVE_SYS_TYPES_H -# include +#include +#ifdef HAVE_STDIO_H +# include #endif -#ifdef HAVE_SYS_STAT_H -# include -#endif -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif #endif #ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include -# endif # include #endif -#ifdef HAVE_STRINGS_H -# include -#endif #ifdef HAVE_INTTYPES_H # include #endif #ifdef HAVE_STDINT_H # include #endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif #ifdef HAVE_UNISTD_H # include #endif" -ac_header_list= +ac_header_c_list= +ac_func_c_list= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -730,10 +757,9 @@ XLOCALE_TRUE XCMS_FALSE XCMS_TRUE KEYSYMDEFS +USE_THREAD_LIBS XTHREAD_CFLAGS XTHREADLIB -THRSTUBS_FALSE -THRSTUBS_TRUE LAUNCHD OS2_FALSE OS2_TRUE @@ -754,6 +780,7 @@ PERL TRADITIONALCPPFLAGS RAWCPPFLAGS RAWCPP +CPP HAVE_STYLESHEETS_FALSE HAVE_STYLESHEETS_TRUE XSL_STYLESHEET @@ -818,6 +845,8 @@ ac_ct_DUMPBIN DUMPBIN LD FGREP +EGREP +GREP SED LIBTOOL am__fastdepCC_FALSE @@ -853,9 +882,6 @@ am__isrc INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -EGREP -GREP -CPP OBJEXT EXEEXT ac_ct_CC @@ -960,13 +986,13 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR XMLTO FOP XSLTPROC +CPP PERL BIGFONT_CFLAGS BIGFONT_LIBS @@ -1042,8 +1068,6 @@ do *) ac_optarg=yes ;; esac - # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_dashdash$ac_option in --) ac_dashdash=yes ;; @@ -1084,9 +1108,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1110,9 +1134,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1323,9 +1347,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1339,9 +1363,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1385,9 +1409,9 @@ Try \`$0 --help' for more information" *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1403,7 +1427,7 @@ if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1467,7 +1491,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | +printf "%s\n" X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1524,7 +1548,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libX11 1.8.1 to adapt to many kinds of systems. +\`configure' configures libX11 1.8.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1595,7 +1619,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libX11 1.8.1:";; + short | recursive ) echo "Configuration of libX11 1.8.9:";; esac cat <<\_ACEOF @@ -1679,7 +1703,6 @@ Some influential environment variables: LIBS libraries to pass to the linker, e.g. -l CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory - CPP C preprocessor PKG_CONFIG path to pkg-config utility PKG_CONFIG_PATH directories to add to pkg-config's search path @@ -1688,6 +1711,7 @@ Some influential environment variables: XMLTO Path to xmlto command FOP Path to fop command XSLTPROC Path to xsltproc command + CPP C preprocessor PERL Path to perl command BIGFONT_CFLAGS C compiler flags for BIGFONT, overriding pkg-config @@ -1701,7 +1725,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -1717,9 +1741,9 @@ if test "$ac_init_help" = "recursive"; then case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1747,7 +1771,8 @@ esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -1755,7 +1780,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1764,10 +1789,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libX11 configure 1.8.1 -generated by GNU Autoconf 2.69 +libX11 configure 1.8.9 +generated by GNU Autoconf 2.71 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1784,14 +1809,14 @@ fi ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1799,14 +1824,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1816,176 +1842,6 @@ fi } # ac_fn_c_try_compile -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_c_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## -------------------------------------------------------------------- ## -## Report this to https://gitlab.freedesktop.org/xorg/lib/libx11/issues ## -## -------------------------------------------------------------------- ##" - ) | sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_mongrel - -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES # ------------------------------------------------------- # Tests whether HEADER exists and can be compiled using the include files in @@ -1993,26 +1849,28 @@ fi ac_fn_c_check_header_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -2023,14 +1881,14 @@ $as_echo "$ac_res" >&6; } ac_fn_c_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext + rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -2038,17 +1896,18 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -2069,11 +1928,12 @@ fi ac_fn_c_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case declares $2. @@ -2081,16 +1941,9 @@ else #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif + which can conflict with char $2 (); below. */ +#include #undef $2 /* Override any GCC internal prototype to avoid an error. @@ -2108,47 +1961,51 @@ choke me #endif int -main () +main (void) { return $2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func -# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES -# --------------------------------------------- +# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR +# ------------------------------------------------------------------ # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR -# accordingly. -ac_fn_c_check_decl () +# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR. +ac_fn_check_decl () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack as_decl_name=`echo $2|sed 's/ *(.*//'` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +printf %s "checking whether $as_decl_name is declared... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 -$as_echo_n "checking whether $as_decl_name is declared... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + eval ac_save_FLAGS=\$$6 + as_fn_append $6 " $5" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { #ifndef $as_decl_name #ifdef __cplusplus @@ -2162,19 +2019,60 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + eval $6=\$ac_save_FLAGS + fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno -} # ac_fn_c_check_decl +} # ac_fn_check_decl + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + } +then : + ac_retval=0 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES # ---------------------------------------------------- @@ -2183,16 +2081,17 @@ $as_echo "$ac_res" >&6; } ac_fn_c_check_member () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 -$as_echo_n "checking for $2.$3... " >&6; } -if eval \${$4+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 +printf %s "checking for $2.$3... " >&6; } +if eval test \${$4+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $5 int -main () +main (void) { static $2 ac_aggr; if (ac_aggr.$3) @@ -2201,14 +2100,15 @@ return 0; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$4=yes" -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $5 int -main () +main (void) { static $2 ac_aggr; if (sizeof ac_aggr.$3) @@ -2217,18 +2117,19 @@ return 0; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$4=yes" -else +else $as_nop eval "$4=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$4 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_member @@ -2240,17 +2141,18 @@ $as_echo "$ac_res" >&6; } ac_fn_c_check_type () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop eval "$3=no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof ($2)) return 0; @@ -2258,12 +2160,13 @@ if (sizeof ($2)) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof (($2))) return 0; @@ -2271,29 +2174,93 @@ if (sizeof (($2))) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop eval "$3=yes" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that +# executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } +then : + ac_retval=0 +else $as_nop + printf "%s\n" "$as_me: program exited with status $ac_status" >&5 + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run +ac_configure_args_raw= +for ac_arg +do + case $ac_arg in + *\'*) + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append ac_configure_args_raw " '$ac_arg'" +done + +case $ac_configure_args_raw in + *$as_nl*) + ac_safe_unquote= ;; + *) + ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. + ac_unsafe_a="$ac_unsafe_z#~" + ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" + ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; +esac + cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libX11 $as_me 1.8.1, which was -generated by GNU Autoconf 2.69. Invocation command line was +It was created by libX11 $as_me 1.8.9, which was +generated by GNU Autoconf 2.71. Invocation command line was - $ $0 $@ + $ $0$ac_configure_args_raw _ACEOF exec 5>>config.log @@ -2326,8 +2293,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + printf "%s\n" "PATH: $as_dir" done IFS=$as_save_IFS @@ -2362,7 +2333,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -2397,11 +2368,13 @@ done # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - $as_echo "## ---------------- ## + printf "%s\n" "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -2412,8 +2385,8 @@ trap 'exit_status=$? case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -2437,7 +2410,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - $as_echo "## ----------------- ## + printf "%s\n" "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -2445,14 +2418,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + printf "%s\n" "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -2460,15 +2433,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - $as_echo "## ----------- ## + printf "%s\n" "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -2476,8 +2449,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; echo fi test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" + printf "%s\n" "$as_me: caught signal $ac_signal" + printf "%s\n" "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -2491,63 +2464,48 @@ ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -$as_echo "/* confdefs.h */" > confdefs.h +printf "%s\n" "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF +printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF +printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF +printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF +printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF +printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_files="$CONFIG_SITE" elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + ac_site_files="$prefix/share/config.site $prefix/etc/config.site" else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" + +for ac_site_file in $ac_site_files do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} + case $ac_site_file in #( + */*) : + ;; #( + *) : + ac_site_file=./$ac_site_file ;; +esac + if test -f "$ac_site_file" && test -r "$ac_site_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file See \`config.log' for more details" "$LINENO" 5; } fi @@ -2557,22 +2515,438 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +printf "%s\n" "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -as_fn_append ac_header_list " stdlib.h" -as_fn_append ac_header_list " unistd.h" -as_fn_append ac_header_list " sys/param.h" +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" +# Test code for whether the C compiler supports C89 (global declarations) +ac_c_conftest_c89_globals=' +/* Does the compiler advertise C89 conformance? + Do not test the value of __STDC__, because some compilers set it to 0 + while being otherwise adequately conformant. */ +#if !defined __STDC__ +# error "Compiler does not advertise C89 conformance" +#endif + +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ +struct buf { int x; }; +struct buf * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not \xHH hex character constants. + These do not provoke an error unfortunately, instead are silently treated + as an "x". The following induces an error, until -std is added to get + proper ANSI mode. Curiously \x00 != x always comes out true, for an + array size at least. It is necessary to write \x00 == 0 to get something + that is true only with -std. */ +int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) '\''x'\'' +int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), + int, int);' + +# Test code for whether the C compiler supports C89 (body of main). +ac_c_conftest_c89_main=' +ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); +' + +# Test code for whether the C compiler supports C99 (global declarations) +ac_c_conftest_c99_globals=' +// Does the compiler advertise C99 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L +# error "Compiler does not advertise C99 conformance" +#endif + +#include +extern int puts (const char *); +extern int printf (const char *, ...); +extern int dprintf (int, const char *, ...); +extern void *malloc (size_t); + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +// dprintf is used instead of fprintf to avoid needing to declare +// FILE and stderr. +#define debug(...) dprintf (2, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + #error "your preprocessor is broken" +#endif +#if BIG_OK +#else + #error "your preprocessor is broken" +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static bool +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str = ""; + int number = 0; + float fnumber = 0; + + while (*format) + { + switch (*format++) + { + case '\''s'\'': // string + str = va_arg (args_copy, const char *); + break; + case '\''d'\'': // int + number = va_arg (args_copy, int); + break; + case '\''f'\'': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); + + return *str && number && fnumber; +} +' + +# Test code for whether the C compiler supports C99 (body of main). +ac_c_conftest_c99_main=' + // Check bool. + _Bool success = false; + success |= (argc != 0); + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[0] = argv[0][0]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' + || dynamic_array[ni.number - 1] != 543); +' + +# Test code for whether the C compiler supports C11 (global declarations) +ac_c_conftest_c11_globals=' +// Does the compiler advertise C11 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L +# error "Compiler does not advertise C11 conformance" +#endif + +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; + +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); + +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; +' + +# Test code for whether the C compiler supports C11 (body of main). +ac_c_conftest_c11_main=' + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); + v1.i = 2; + v1.w.k = 5; + ok |= v1.i != 5; +' + +# Test code for whether the C compiler supports C11 (complete). +ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} +${ac_c_conftest_c11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + ${ac_c_conftest_c11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C99 (complete). +ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + return ok; +} +" + +# Test code for whether the C compiler supports C89 (complete). +ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + return ok; +} +" + +as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" +as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" +as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" +as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" +as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" +as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" +as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" +as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" +as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" +as_fn_append ac_header_c_list " sys/param.h sys_param_h HAVE_SYS_PARAM_H" +as_fn_append ac_func_c_list " getpagesize HAVE_GETPAGESIZE" + +# Auxiliary files required by this configure script. +ac_aux_files="ltmain.sh missing install-sh config.guess config.sub" + +# Locations in which to look for auxiliary files. +ac_aux_dir_candidates="${srcdir}${PATH_SEPARATOR}${srcdir}/..${PATH_SEPARATOR}${srcdir}/../.." + +# Search for a directory containing all of the required auxiliary files, +# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates. +# If we don't find one directory that contains all the files we need, +# we report the set of missing files from the *first* directory in +# $ac_aux_dir_candidates and give up. +ac_missing_aux_files="" +ac_first_candidate=: +printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false +for as_dir in $ac_aux_dir_candidates +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + as_found=: + + printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5 + ac_aux_dir_found=yes + ac_install_sh= + for ac_aux in $ac_aux_files + do + # As a special case, if "install-sh" is required, that requirement + # can be satisfied by any of "install-sh", "install.sh", or "shtool", + # and $ac_install_sh is set appropriately for whichever one is found. + if test x"$ac_aux" = x"install-sh" + then + if test -f "${as_dir}install-sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5 + ac_install_sh="${as_dir}install-sh -c" + elif test -f "${as_dir}install.sh"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5 + ac_install_sh="${as_dir}install.sh -c" + elif test -f "${as_dir}shtool"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5 + ac_install_sh="${as_dir}shtool install -c" + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} install-sh" + else + break + fi + fi + else + if test -f "${as_dir}${ac_aux}"; then + printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5 + else + ac_aux_dir_found=no + if $ac_first_candidate; then + ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}" + else + break + fi + fi + fi + done + if test "$ac_aux_dir_found" = yes; then + ac_aux_dir="$as_dir" + break + fi + ac_first_candidate=false + + as_found=false +done +IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 +fi + + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +if test -f "${ac_aux_dir}config.guess"; then + ac_config_guess="$SHELL ${ac_aux_dir}config.guess" +fi +if test -f "${ac_aux_dir}config.sub"; then + ac_config_sub="$SHELL ${ac_aux_dir}config.sub" +fi +if test -f "$ac_aux_dir/configure"; then + ac_configure="$SHELL ${ac_aux_dir}configure" +fi + # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -2583,12 +2957,12 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) @@ -2597,24 +2971,24 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -2624,11 +2998,12 @@ $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2645,55 +3020,30 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_headers="$ac_config_headers src/config.h include/X11/XlibConf.h" -ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -# Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if ${ac_cv_build+:} false; then : - $as_echo_n "(cached) " >&6 -else + # Make sure we can run config.sub. +$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 || + as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5 + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 +printf %s "checking build system type... " >&6; } +if test ${ac_cv_build+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_build_alias=$build_alias test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` + ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"` test "x$ac_build_alias" = x && as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 +ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 +printf "%s\n" "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; @@ -2712,21 +3062,22 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if ${ac_cv_host+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 +printf %s "checking host system type... " >&6; } +if test ${ac_cv_host+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` || + as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5 fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 +printf "%s\n" "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; @@ -2746,8 +3097,17 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac # Set common system defines for POSIX extensions, such as _GNU_SOURCE -# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL) +# Must be called before any macros that run the compiler (like LT_INIT) # to avoid autoconf errors. + + + + + + + + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -2756,11 +3116,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2768,11 +3129,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2783,11 +3148,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2796,11 +3161,12 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -2808,11 +3174,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2823,11 +3193,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2835,8 +3205,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2849,11 +3219,12 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2861,11 +3232,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2876,11 +3251,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2889,11 +3264,12 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2902,15 +3278,19 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2926,18 +3306,18 @@ if test $ac_prog_rejected = yes; then # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" fi fi fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2948,11 +3328,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else @@ -2960,11 +3341,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2975,11 +3360,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -2992,11 +3377,12 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else @@ -3004,11 +3390,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -3019,11 +3409,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -3035,8 +3425,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -3044,25 +3434,129 @@ esac fi fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +fi + + +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -for ac_option in --version -v -V -qversion; do +for ac_option in --version -v -V -qversion -version; do { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -3072,7 +3566,7 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 fi rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done @@ -3080,7 +3574,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -3092,9 +3586,9 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +printf %s "checking whether the C compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" @@ -3115,11 +3609,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -3136,7 +3631,7 @@ do # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -3152,44 +3647,46 @@ do done test "$ac_cv_exeext" = no && ac_cv_exeext= -else +else $as_nop ac_file='' fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables See \`config.log' for more details" "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +printf %s "checking for C compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } ac_exeext=$ac_cv_exeext rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -3203,15 +3700,15 @@ for ac_file in conftest.exe conftest conftest.*; do * ) break;; esac done -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext @@ -3220,7 +3717,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { FILE *f = fopen ("conftest.out", "w"); return ferror (f) || fclose (f) != 0; @@ -3232,8 +3729,8 @@ _ACEOF ac_clean_files="$ac_clean_files conftest.out" # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } if test "$cross_compiling" != yes; then { { ac_try="$ac_link" case "(($ac_try" in @@ -3241,10 +3738,10 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if { ac_try='./conftest$ac_cv_exeext' { { case "(($ac_try" in @@ -3252,39 +3749,40 @@ $as_echo "$ac_try_echo"; } >&5 *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details" "$LINENO" 5; } fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; @@ -3298,11 +3796,12 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -3311,31 +3810,32 @@ $as_echo "$ac_try_echo"; } >&5 break;; esac done -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __GNUC__ choke me @@ -3345,29 +3845,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_compiler_gnu=yes -else +else $as_nop ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + if test $ac_compiler_gnu = yes; then GCC=yes else GCC= fi -ac_test_CFLAGS=${CFLAGS+set} +ac_test_CFLAGS=${CFLAGS+y} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no @@ -3376,57 +3880,60 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes -else +else $as_nop CFLAGS="" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_g=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then @@ -3441,94 +3948,144 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c11=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi + +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi + +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_prog_cc_c89=no ac_save_CC=$CC cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} +$ac_c_conftest_c89_program _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_c89=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c89" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC - fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 +fi fi ac_ext=c @@ -3538,469 +4095,182 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes +ac_header= ac_cache= +for ac_item in $ac_header_c_list do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - -else - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.i conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. -continue -else - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.i conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_GREP" || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item fi -else - ac_cv_path_GREP=$GREP -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - as_fn_executable_p "$ac_path_EGREP" || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - done - ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" -if test "x$ac_cv_header_minix_config_h" = xyes; then : - MINIX=yes -else - MINIX= + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + fi - if test "$MINIX" = yes; then - -$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h -$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h -$as_echo "#define _MINIX 1" >>confdefs.h - - fi - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 -$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if ${ac_cv_safe_to_define___extensions__+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 +printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; } +if test ${ac_cv_safe_to_define___extensions__+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ # define __EXTENSIONS__ 1 $ac_includes_default int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_safe_to_define___extensions__=yes -else +else $as_nop ac_cv_safe_to_define___extensions__=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 -$as_echo "$ac_cv_safe_to_define___extensions__" >&6; } - test $ac_cv_safe_to_define___extensions__ = yes && - $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5 +printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; } - $as_echo "#define _ALL_SOURCE 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5 +printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; } +if test ${ac_cv_should_define__xopen_source+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_should_define__xopen_source=no + if test $ac_cv_header_wchar_h = yes +then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ - $as_echo "#define _GNU_SOURCE 1" >>confdefs.h + #include + mbstate_t x; +int +main (void) +{ - $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : - $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + #define _XOPEN_SOURCE 500 + #include + mbstate_t x; +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_should_define__xopen_source=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5 +printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; } + + printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h + + printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h + + printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h + + printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h + + if test $ac_cv_header_minix_config_h = yes +then : + MINIX=yes + printf "%s\n" "#define _MINIX 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h + + printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h + +else $as_nop + MINIX= +fi + if test $ac_cv_safe_to_define___extensions__ = yes +then : + printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h + +fi + if test $ac_cv_should_define__xopen_source = yes +then : + printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h + +fi # Initialize Automake am__api_version='1.12' -# Find a good install program. We prefer a C program (faster), + + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: # SysV /etc/install, /usr/sbin/install @@ -4014,20 +4284,25 @@ am__api_version='1.12' # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -$as_echo_n "checking for a BSD-compatible install... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 +printf %s "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if ${ac_cv_path_install+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${ac_cv_path_install+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in #(( - ./ | .// | /[cC]/* | \ + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + # Account for fact that we put trailing slashes in our PATH walk. +case $as_dir in #(( + ./ | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; @@ -4037,13 +4312,13 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # program-specific install script used by HP pwplus--don't use. : else @@ -4051,12 +4326,12 @@ case $as_dir/ in #(( echo one > conftest.one echo two > conftest.two mkdir conftest.dir - if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" && test -s conftest.one && test -s conftest.two && test -s conftest.dir/conftest.one && test -s conftest.dir/conftest.two then - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c" break 3 fi fi @@ -4072,7 +4347,7 @@ IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir fi - if test "${ac_cv_path_install+set}" = set; then + if test ${ac_cv_path_install+y}; then INSTALL=$ac_cv_path_install else # As a last resort, use the slow shell script. Don't cache a @@ -4082,8 +4357,8 @@ fi INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -$as_echo "$INSTALL" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 +printf "%s\n" "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -4093,8 +4368,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 -$as_echo_n "checking whether build environment is sane... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 +printf %s "checking whether build environment is sane... " >&6; } # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -4148,8 +4423,8 @@ else as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } # If we didn't sleep, we still need to ensure time stamps of config.status and # generated files are strictly newer. am_sleep_pid= @@ -4168,12 +4443,13 @@ test "$program_suffix" != NONE && # Double any \ or $. # By default was `s,x,x', remove it if useless. ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` +program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"` # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` -if test x"${MISSING+set}" != xset; then + + if test x"${MISSING+set}" != xset; then case $am_aux_dir in *\ * | *\ *) MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; @@ -4186,8 +4462,8 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +printf "%s\n" "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -4207,11 +4483,12 @@ if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -4219,11 +4496,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4234,11 +4515,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4247,11 +4528,12 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -4259,11 +4541,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4274,11 +4560,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +printf "%s\n" "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -4286,8 +4572,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -4299,25 +4585,31 @@ fi fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5 +printf %s "checking for a race-free mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if ${ac_cv_path_mkdir+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${ac_cv_path_mkdir+y} +then : + printf %s "(cached) " >&6 +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ + as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue + case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir ('*'coreutils) '* | \ + 'BusyBox '* | \ 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext break 3;; esac done @@ -4328,7 +4620,7 @@ IFS=$as_save_IFS fi test -d ./--version && rmdir ./--version - if test "${ac_cv_path_mkdir+set}" = set; then + if test ${ac_cv_path_mkdir+y}; then MKDIR_P="$ac_cv_path_mkdir -p" else # As a last resort, use the slow shell script. Don't cache a @@ -4338,18 +4630,19 @@ fi MKDIR_P="$ac_install_sh -d" fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 -$as_echo "$MKDIR_P" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 +printf "%s\n" "$MKDIR_P" >&6; } for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AWK+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else @@ -4357,11 +4650,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4372,24 +4669,25 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +printf "%s\n" "$AWK" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -n "$AWK" && break done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 -else +ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval test \${ac_cv_prog_make_${ac_make}_set+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat >conftest.make <<\_ACEOF SHELL = /bin/sh all: @@ -4405,12 +4703,12 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -4435,8 +4733,8 @@ am__doit: .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +printf %s "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= _am_result=none @@ -4463,12 +4761,13 @@ if test "$am__include" = "#"; then fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +printf "%s\n" "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : +if test ${enable_dependency_tracking+y} +then : enableval=$enable_dependency_tracking; fi @@ -4508,17 +4807,13 @@ fi # Define the identity of the package. PACKAGE='libX11' - VERSION='1.8.1' + VERSION='1.8.9' -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF +printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF +printf "%s\n" "#define VERSION \"$VERSION\"" >>confdefs.h # Some tools Automake needs. @@ -4555,11 +4850,12 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 -$as_echo_n "checking dependency style of $depcc... " >&6; } -if ${am_cv_CC_dependencies_compiler_type+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 +printf %s "checking dependency style of $depcc... " >&6; } +if test ${am_cv_CC_dependencies_compiler_type+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For @@ -4666,8 +4962,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 -$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 +printf "%s\n" "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type if @@ -4684,10 +4980,11 @@ fi # Initialize libtool + case `pwd` in *\ * | *\ *) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 -$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 +printf "%s\n" "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;; esac @@ -4707,6 +5004,7 @@ macro_revision='1.3337' + ltmain="$ac_aux_dir/ltmain.sh" # Backslashify metacharacters that are still active within @@ -4730,8 +5028,8 @@ ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 -$as_echo_n "checking how to print strings... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5 +printf %s "checking how to print strings... " >&6; } # Test print first, because it will be a builtin if present. if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \ test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then @@ -4757,12 +5055,12 @@ func_echo_all () } case "$ECHO" in - printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5 -$as_echo "printf" >&6; } ;; - print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 -$as_echo "print -r" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5 -$as_echo "cat" >&6; } ;; + printf*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: printf" >&5 +printf "%s\n" "printf" >&6; } ;; + print*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: print -r" >&5 +printf "%s\n" "print -r" >&6; } ;; + *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cat" >&5 +printf "%s\n" "cat" >&6; } ;; esac @@ -4778,11 +5076,12 @@ esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 -$as_echo_n "checking for a sed that does not truncate output... " >&6; } -if ${ac_cv_path_SED+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +printf %s "checking for a sed that does not truncate output... " >&6; } +if test ${ac_cv_path_SED+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ for ac_i in 1 2 3 4 5 6 7; do ac_script="$ac_script$as_nl$ac_script" @@ -4796,10 +5095,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in sed gsed; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in sed gsed + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + ac_path_SED="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED @@ -4808,13 +5112,13 @@ case `"$ac_path_SED" --version 2>&1` in ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo '' >> "conftest.nl" + printf "%s\n" '' >> "conftest.nl" "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -4842,8 +5146,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 -$as_echo "$ac_cv_path_SED" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +printf "%s\n" "$ac_cv_path_SED" >&6; } SED="$ac_cv_path_SED" rm -f conftest.sed @@ -4860,11 +5164,154 @@ Xsed="$SED -e 1s/^X//" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -$as_echo_n "checking for fgrep... " >&6; } -if ${ac_cv_path_FGREP+:} false; then : - $as_echo_n "(cached) " >&6 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +printf %s "checking for grep that handles long lines and -e... " >&6; } +if test ${ac_cv_path_GREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -z "$GREP"; then + ac_path_GREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in grep ggrep + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_GREP" || continue +# Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_GREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_GREP"; then + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi else + ac_cv_path_GREP=$GREP +fi + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +printf "%s\n" "$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +printf %s "checking for egrep... " >&6; } +if test ${ac_cv_path_EGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + if test -z "$EGREP"; then + ac_path_EGREP_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in egrep + do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_EGREP" || continue +# Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + printf %s 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + printf "%s\n" 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_EGREP_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_EGREP"; then + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + fi +else + ac_cv_path_EGREP=$EGREP +fi + + fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +printf "%s\n" "$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +printf %s "checking for fgrep... " >&6; } +if test ${ac_cv_path_FGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 then ac_cv_path_FGREP="$GREP -F" else @@ -4875,10 +5322,15 @@ else for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in fgrep + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + ac_path_FGREP="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP @@ -4887,13 +5339,13 @@ case `"$ac_path_FGREP" --version 2>&1` in ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'FGREP' >> "conftest.nl" + printf "%s\n" 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -4922,8 +5374,8 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -$as_echo "$ac_cv_path_FGREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +printf "%s\n" "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" @@ -4948,17 +5400,18 @@ test -z "$GREP" && GREP=grep # Check whether --with-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then : +if test ${with_gnu_ld+y} +then : withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes -else +else $as_nop with_gnu_ld=no fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 -$as_echo_n "checking for ld used by $CC... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5 +printf %s "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -4987,15 +5440,16 @@ $as_echo_n "checking for ld used by $CC... " >&6; } ;; esac elif test "$with_gnu_ld" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 -$as_echo_n "checking for GNU ld... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5 +printf %s "checking for GNU ld... " >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 -$as_echo_n "checking for non-GNU ld... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 +printf %s "checking for non-GNU ld... " >&6; } fi -if ${lt_cv_path_LD+:} false; then : - $as_echo_n "(cached) " >&6 -else +if test ${lt_cv_path_LD+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$LD"; then lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR for ac_dir in $PATH; do @@ -5024,18 +5478,19 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 -$as_echo "$LD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5 +printf "%s\n" "$LD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 -$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if ${lt_cv_prog_gnu_ld+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 +printf %s "checking if the linker ($LD) is GNU ld... " >&6; } +if test ${lt_cv_prog_gnu_ld+y} +then : + printf %s "(cached) " >&6 +else $as_nop # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &1 &5 -$as_echo "$lt_cv_prog_gnu_ld" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5 +printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -5058,11 +5513,12 @@ with_gnu_ld=$lt_cv_prog_gnu_ld -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 -$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; } -if ${lt_cv_path_NM+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5 +printf %s "checking for BSD- or MS-compatible name lister (nm)... " >&6; } +if test ${lt_cv_path_NM+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$NM"; then # Let the user override the test. lt_cv_path_NM="$NM" @@ -5107,8 +5563,8 @@ else : ${lt_cv_path_NM=no} fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 -$as_echo "$lt_cv_path_NM" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5 +printf "%s\n" "$lt_cv_path_NM" >&6; } if test "$lt_cv_path_NM" != "no"; then NM="$lt_cv_path_NM" else @@ -5121,11 +5577,12 @@ else do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DUMPBIN+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$DUMPBIN"; then ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test. else @@ -5133,11 +5590,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5148,11 +5609,11 @@ fi fi DUMPBIN=$ac_cv_prog_DUMPBIN if test -n "$DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 -$as_echo "$DUMPBIN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5 +printf "%s\n" "$DUMPBIN" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5165,11 +5626,12 @@ if test -z "$DUMPBIN"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DUMPBIN+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_DUMPBIN"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test. else @@ -5177,11 +5639,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5192,11 +5658,11 @@ fi fi ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN if test -n "$ac_ct_DUMPBIN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 -$as_echo "$ac_ct_DUMPBIN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5 +printf "%s\n" "$ac_ct_DUMPBIN" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5208,8 +5674,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DUMPBIN=$ac_ct_DUMPBIN @@ -5237,11 +5703,12 @@ test -z "$NM" && NM=nm -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 -$as_echo_n "checking the name lister ($NM) interface... " >&6; } -if ${lt_cv_nm_interface+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5 +printf %s "checking the name lister ($NM) interface... " >&6; } +if test ${lt_cv_nm_interface+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5) @@ -5257,26 +5724,27 @@ else fi rm -f conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 -$as_echo "$lt_cv_nm_interface" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5 +printf "%s\n" "$lt_cv_nm_interface" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 +printf %s "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 +printf "%s\n" "no, using $LN_S" >&6; } fi # find the maximum length of command line arguments -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 -$as_echo_n "checking the maximum length of command line arguments... " >&6; } -if ${lt_cv_sys_max_cmd_len+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5 +printf %s "checking the maximum length of command line arguments... " >&6; } +if test ${lt_cv_sys_max_cmd_len+y} +then : + printf %s "(cached) " >&6 +else $as_nop i=0 teststring="ABCD" @@ -5402,11 +5870,11 @@ else fi if test -n $lt_cv_sys_max_cmd_len ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 -$as_echo "$lt_cv_sys_max_cmd_len" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5 +printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5 +printf "%s\n" "none" >&6; } fi max_cmd_len=$lt_cv_sys_max_cmd_len @@ -5419,8 +5887,8 @@ max_cmd_len=$lt_cv_sys_max_cmd_len : ${MV="mv -f"} : ${RM="rm -f"} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 -$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5 +printf %s "checking whether the shell understands some XSI constructs... " >&6; } # Try some XSI features xsi_shell=no ( _lt_dummy="a/b/c" @@ -5429,18 +5897,18 @@ xsi_shell=no && eval 'test $(( 1 + 1 )) -eq 2 \ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ && xsi_shell=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 -$as_echo "$xsi_shell" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5 +printf "%s\n" "$xsi_shell" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 -$as_echo_n "checking whether the shell understands \"+=\"... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5 +printf %s "checking whether the shell understands \"+=\"... " >&6; } lt_shell_append=no ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \ >/dev/null 2>&1 \ && lt_shell_append=yes -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 -$as_echo "$lt_shell_append" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5 +printf "%s\n" "$lt_shell_append" >&6; } if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then @@ -5474,11 +5942,12 @@ esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 -$as_echo_n "checking how to convert $build file names to $host format... " >&6; } -if ${lt_cv_to_host_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5 +printf %s "checking how to convert $build file names to $host format... " >&6; } +if test ${lt_cv_to_host_file_cmd+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $host in *-*-mingw* ) case $build in @@ -5514,18 +5983,19 @@ esac fi to_host_file_cmd=$lt_cv_to_host_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 -$as_echo "$lt_cv_to_host_file_cmd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5 +printf "%s\n" "$lt_cv_to_host_file_cmd" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 -$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; } -if ${lt_cv_to_tool_file_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5 +printf %s "checking how to convert $build file names to toolchain format... " >&6; } +if test ${lt_cv_to_tool_file_cmd+y} +then : + printf %s "(cached) " >&6 +else $as_nop #assume ordinary cross tools, or native build. lt_cv_to_tool_file_cmd=func_convert_file_noop case $host in @@ -5541,22 +6011,23 @@ esac fi to_tool_file_cmd=$lt_cv_to_tool_file_cmd -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 -$as_echo "$lt_cv_to_tool_file_cmd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5 +printf "%s\n" "$lt_cv_to_tool_file_cmd" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 -$as_echo_n "checking for $LD option to reload object files... " >&6; } -if ${lt_cv_ld_reload_flag+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5 +printf %s "checking for $LD option to reload object files... " >&6; } +if test ${lt_cv_ld_reload_flag+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_ld_reload_flag='-r' fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 -$as_echo "$lt_cv_ld_reload_flag" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5 +printf "%s\n" "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -5589,11 +6060,12 @@ esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OBJDUMP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$OBJDUMP"; then ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. else @@ -5601,11 +6073,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5616,11 +6092,11 @@ fi fi OBJDUMP=$ac_cv_prog_OBJDUMP if test -n "$OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +printf "%s\n" "$OBJDUMP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5629,11 +6105,12 @@ if test -z "$ac_cv_prog_OBJDUMP"; then ac_ct_OBJDUMP=$OBJDUMP # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OBJDUMP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_OBJDUMP"; then ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. else @@ -5641,11 +6118,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5656,11 +6137,11 @@ fi fi ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +printf "%s\n" "$ac_ct_OBJDUMP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OBJDUMP" = x; then @@ -5668,8 +6149,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OBJDUMP=$ac_ct_OBJDUMP @@ -5688,11 +6169,12 @@ test -z "$OBJDUMP" && OBJDUMP=objdump -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 -$as_echo_n "checking how to recognize dependent libraries... " >&6; } -if ${lt_cv_deplibs_check_method+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5 +printf %s "checking how to recognize dependent libraries... " >&6; } +if test ${lt_cv_deplibs_check_method+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= lt_cv_deplibs_check_method='unknown' @@ -5890,8 +6372,8 @@ tpf*) esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 -$as_echo "$lt_cv_deplibs_check_method" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 +printf "%s\n" "$lt_cv_deplibs_check_method" >&6; } file_magic_glob= want_nocaseglob=no @@ -5935,11 +6417,12 @@ test -z "$deplibs_check_method" && deplibs_check_method=unknown if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DLLTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. else @@ -5947,11 +6430,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5962,11 +6449,11 @@ fi fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +printf "%s\n" "$DLLTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5975,11 +6462,12 @@ if test -z "$ac_cv_prog_DLLTOOL"; then ac_ct_DLLTOOL=$DLLTOOL # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DLLTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_DLLTOOL"; then ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. else @@ -5987,11 +6475,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6002,11 +6494,11 @@ fi fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +printf "%s\n" "$ac_ct_DLLTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_DLLTOOL" = x; then @@ -6014,8 +6506,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DLLTOOL=$ac_ct_DLLTOOL @@ -6035,11 +6527,12 @@ test -z "$DLLTOOL" && DLLTOOL=dlltool -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 -$as_echo_n "checking how to associate runtime and link libraries... " >&6; } -if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5 +printf %s "checking how to associate runtime and link libraries... " >&6; } +if test ${lt_cv_sharedlib_from_linklib_cmd+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_sharedlib_from_linklib_cmd='unknown' case $host_os in @@ -6062,8 +6555,8 @@ cygwin* | mingw* | pw32* | cegcc*) esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 -$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5 +printf "%s\n" "$lt_cv_sharedlib_from_linklib_cmd" >&6; } sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO @@ -6078,11 +6571,12 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AR+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. else @@ -6090,11 +6584,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6105,11 +6603,11 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 -$as_echo "$AR" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +printf "%s\n" "$AR" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6122,11 +6620,12 @@ if test -z "$AR"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AR+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_AR+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. else @@ -6134,11 +6633,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6149,11 +6652,11 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 -$as_echo "$ac_ct_AR" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +printf "%s\n" "$ac_ct_AR" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6165,8 +6668,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR @@ -6186,30 +6689,32 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 -$as_echo_n "checking for archiver @FILE support... " >&6; } -if ${lt_cv_ar_at_file+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5 +printf %s "checking for archiver @FILE support... " >&6; } +if test ${lt_cv_ar_at_file+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_ar_at_file=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : echo conftest.$ac_objext > conftest.lst lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 (eval $lt_ar_try) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if test "$ac_status" -eq 0; then # Ensure the archiver fails upon bogus file names. @@ -6217,7 +6722,7 @@ if ac_fn_c_try_compile "$LINENO"; then : { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5 (eval $lt_ar_try) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } if test "$ac_status" -ne 0; then lt_cv_ar_at_file=@ @@ -6226,11 +6731,11 @@ if ac_fn_c_try_compile "$LINENO"; then : rm -f conftest.* libconftest.a fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 -$as_echo "$lt_cv_ar_at_file" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5 +printf "%s\n" "$lt_cv_ar_at_file" >&6; } if test "x$lt_cv_ar_at_file" = xno; then archiver_list_spec= @@ -6247,11 +6752,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -6259,11 +6765,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6274,11 +6784,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6287,11 +6797,12 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. else @@ -6299,11 +6810,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6314,11 +6829,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +printf "%s\n" "$ac_ct_STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -6326,8 +6841,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -6346,11 +6861,12 @@ test -z "$STRIP" && STRIP=: if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else @@ -6358,11 +6874,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6373,11 +6893,11 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -$as_echo "$RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +printf "%s\n" "$RANLIB" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6386,11 +6906,12 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_RANLIB+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. else @@ -6398,11 +6919,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6413,11 +6938,11 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -$as_echo "$ac_ct_RANLIB" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +printf "%s\n" "$ac_ct_RANLIB" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -6425,8 +6950,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -6515,11 +7040,12 @@ compiler=$CC # Check for command to grab the raw symbol name followed by C symbol from nm. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 -$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } -if ${lt_cv_sys_global_symbol_pipe+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5 +printf %s "checking command to parse $NM output from $compiler object... " >&6; } +if test ${lt_cv_sys_global_symbol_pipe+y} +then : + printf %s "(cached) " >&6 +else $as_nop # These are sane defaults that work on at least a few old systems. # [They come from Ultrix. What could be older than Ultrix?!! ;)] @@ -6638,14 +7164,14 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then # Now try to grab the symbols. nlist=conftest.nm if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -6714,7 +7240,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -6749,11 +7275,11 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5 -$as_echo "failed" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +printf "%s\n" "failed" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +printf "%s\n" "ok" >&6; } fi # Response file support. @@ -6789,13 +7315,14 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 -$as_echo_n "checking for sysroot... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5 +printf %s "checking for sysroot... " >&6; } # Check whether --with-sysroot was given. -if test "${with_sysroot+set}" = set; then : +if test ${with_sysroot+y} +then : withval=$with_sysroot; -else +else $as_nop with_sysroot=no fi @@ -6813,21 +7340,22 @@ case ${with_sysroot} in #( no|'') ;; #( *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 -$as_echo "${with_sysroot}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5 +printf "%s\n" "${with_sysroot}" >&6; } as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5 ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 -$as_echo "${lt_sysroot:-no}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5 +printf "%s\n" "${lt_sysroot:-no}" >&6; } # Check whether --enable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then : +if test ${enable_libtool_lock+y} +then : enableval=$enable_libtool_lock; fi @@ -6842,7 +7370,7 @@ ia64-*-hpux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) @@ -6861,7 +7389,7 @@ ia64-*-hpux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in @@ -6899,7 +7427,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *32-bit*) @@ -6949,11 +7477,12 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 -$as_echo_n "checking whether the C compiler needs -belf... " >&6; } -if ${lt_cv_cc_needs_belf+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5 +printf %s "checking whether the C compiler needs -belf... " >&6; } +if test ${lt_cv_cc_needs_belf+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6964,19 +7493,20 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_cc_needs_belf=yes -else +else $as_nop lt_cv_cc_needs_belf=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -6985,8 +7515,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 -$as_echo "$lt_cv_cc_needs_belf" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5 +printf "%s\n" "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" @@ -6998,7 +7528,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then case `/usr/bin/file conftest.o` in *64-bit*) @@ -7035,11 +7565,12 @@ need_locks="$enable_libtool_lock" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args. set dummy ${ac_tool_prefix}mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_MANIFEST_TOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$MANIFEST_TOOL"; then ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test. else @@ -7047,11 +7578,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7062,11 +7597,11 @@ fi fi MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL if test -n "$MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 -$as_echo "$MANIFEST_TOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5 +printf "%s\n" "$MANIFEST_TOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7075,11 +7610,12 @@ if test -z "$ac_cv_prog_MANIFEST_TOOL"; then ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL # Extract the first word of "mt", so it can be a program name with args. set dummy mt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_MANIFEST_TOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_MANIFEST_TOOL"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test. else @@ -7087,11 +7623,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7102,11 +7642,11 @@ fi fi ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL if test -n "$ac_ct_MANIFEST_TOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 -$as_echo "$ac_ct_MANIFEST_TOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5 +printf "%s\n" "$ac_ct_MANIFEST_TOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_MANIFEST_TOOL" = x; then @@ -7114,8 +7654,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL @@ -7125,11 +7665,12 @@ else fi test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 -$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } -if ${lt_cv_path_mainfest_tool+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5 +printf %s "checking if $MANIFEST_TOOL is a manifest tool... " >&6; } +if test ${lt_cv_path_mainfest_tool+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_path_mainfest_tool=no echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5 $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out @@ -7139,8 +7680,8 @@ else fi rm -f conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 -$as_echo "$lt_cv_path_mainfest_tool" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5 +printf "%s\n" "$lt_cv_path_mainfest_tool" >&6; } if test "x$lt_cv_path_mainfest_tool" != xyes; then MANIFEST_TOOL=: fi @@ -7155,11 +7696,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_DSYMUTIL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$DSYMUTIL"; then ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. else @@ -7167,11 +7709,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7182,11 +7728,11 @@ fi fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 -$as_echo "$DSYMUTIL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5 +printf "%s\n" "$DSYMUTIL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7195,11 +7741,12 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_DSYMUTIL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_DSYMUTIL"; then ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. else @@ -7207,11 +7754,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7222,11 +7773,11 @@ fi fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 -$as_echo "$ac_ct_DSYMUTIL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5 +printf "%s\n" "$ac_ct_DSYMUTIL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_DSYMUTIL" = x; then @@ -7234,8 +7785,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DSYMUTIL=$ac_ct_DSYMUTIL @@ -7247,11 +7798,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_NMEDIT+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$NMEDIT"; then ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. else @@ -7259,11 +7811,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7274,11 +7830,11 @@ fi fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 -$as_echo "$NMEDIT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5 +printf "%s\n" "$NMEDIT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7287,11 +7843,12 @@ if test -z "$ac_cv_prog_NMEDIT"; then ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_NMEDIT+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_NMEDIT"; then ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. else @@ -7299,11 +7856,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7314,11 +7875,11 @@ fi fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 -$as_echo "$ac_ct_NMEDIT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5 +printf "%s\n" "$ac_ct_NMEDIT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_NMEDIT" = x; then @@ -7326,8 +7887,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac NMEDIT=$ac_ct_NMEDIT @@ -7339,11 +7900,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args. set dummy ${ac_tool_prefix}lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_LIPO+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$LIPO"; then ac_cv_prog_LIPO="$LIPO" # Let the user override the test. else @@ -7351,11 +7913,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7366,11 +7932,11 @@ fi fi LIPO=$ac_cv_prog_LIPO if test -n "$LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 -$as_echo "$LIPO" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5 +printf "%s\n" "$LIPO" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7379,11 +7945,12 @@ if test -z "$ac_cv_prog_LIPO"; then ac_ct_LIPO=$LIPO # Extract the first word of "lipo", so it can be a program name with args. set dummy lipo; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_LIPO+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_LIPO+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_LIPO"; then ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test. else @@ -7391,11 +7958,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7406,11 +7977,11 @@ fi fi ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO if test -n "$ac_ct_LIPO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 -$as_echo "$ac_ct_LIPO" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5 +printf "%s\n" "$ac_ct_LIPO" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_LIPO" = x; then @@ -7418,8 +7989,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac LIPO=$ac_ct_LIPO @@ -7431,11 +8002,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args. set dummy ${ac_tool_prefix}otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$OTOOL"; then ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test. else @@ -7443,11 +8015,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7458,11 +8034,11 @@ fi fi OTOOL=$ac_cv_prog_OTOOL if test -n "$OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 -$as_echo "$OTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5 +printf "%s\n" "$OTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7471,11 +8047,12 @@ if test -z "$ac_cv_prog_OTOOL"; then ac_ct_OTOOL=$OTOOL # Extract the first word of "otool", so it can be a program name with args. set dummy otool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OTOOL+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_OTOOL"; then ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test. else @@ -7483,11 +8060,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7498,11 +8079,11 @@ fi fi ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL if test -n "$ac_ct_OTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 -$as_echo "$ac_ct_OTOOL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5 +printf "%s\n" "$ac_ct_OTOOL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OTOOL" = x; then @@ -7510,8 +8091,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL=$ac_ct_OTOOL @@ -7523,11 +8104,12 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args. set dummy ${ac_tool_prefix}otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_OTOOL64+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$OTOOL64"; then ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test. else @@ -7535,11 +8117,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7550,11 +8136,11 @@ fi fi OTOOL64=$ac_cv_prog_OTOOL64 if test -n "$OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 -$as_echo "$OTOOL64" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5 +printf "%s\n" "$OTOOL64" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7563,11 +8149,12 @@ if test -z "$ac_cv_prog_OTOOL64"; then ac_ct_OTOOL64=$OTOOL64 # Extract the first word of "otool64", so it can be a program name with args. set dummy otool64; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_OTOOL64+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$ac_ct_OTOOL64"; then ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test. else @@ -7575,11 +8162,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7590,11 +8181,11 @@ fi fi ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64 if test -n "$ac_ct_OTOOL64"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 -$as_echo "$ac_ct_OTOOL64" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5 +printf "%s\n" "$ac_ct_OTOOL64" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_ct_OTOOL64" = x; then @@ -7602,8 +8193,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac OTOOL64=$ac_ct_OTOOL64 @@ -7638,11 +8229,12 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 -$as_echo_n "checking for -single_module linker flag... " >&6; } -if ${lt_cv_apple_cc_single_mod+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5 +printf %s "checking for -single_module linker flag... " >&6; } +if test ${lt_cv_apple_cc_single_mod+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_apple_cc_single_mod=no if test -z "${LT_MULTI_MODULE}"; then # By default we will add the -single_module flag. You can override @@ -7671,14 +8263,15 @@ else rm -f conftest.* fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 -$as_echo "$lt_cv_apple_cc_single_mod" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 +printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 -$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } -if ${lt_cv_ld_exported_symbols_list+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 +printf %s "checking for -exported_symbols_list linker flag... " >&6; } +if test ${lt_cv_ld_exported_symbols_list+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS echo "_main" > conftest.sym @@ -7687,31 +8280,33 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_ld_exported_symbols_list=yes -else +else $as_nop lt_cv_ld_exported_symbols_list=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 -$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 +printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 -$as_echo_n "checking for -force_load linker flag... " >&6; } -if ${lt_cv_ld_force_load+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 +printf %s "checking for -force_load linker flag... " >&6; } +if test ${lt_cv_ld_force_load+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF int forced_loaded() { return 2;} @@ -7739,8 +8334,8 @@ _LT_EOF rm -rf conftest.dSYM fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 -$as_echo "$lt_cv_ld_force_load" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5 +printf "%s\n" "$lt_cv_ld_force_load" >&6; } case $host_os in rhapsody* | darwin1.[012]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -7776,19 +8371,14 @@ $as_echo "$lt_cv_ld_force_load" >&6; } ;; esac -for ac_header in dlfcn.h -do : - ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default +ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " -if test "x$ac_cv_header_dlfcn_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DLFCN_H 1 -_ACEOF +if test "x$ac_cv_header_dlfcn_h" = xyes +then : + printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h fi -done - @@ -7804,7 +8394,8 @@ done # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then : +if test ${enable_shared+y} +then : enableval=$enable_shared; p=${PACKAGE-default} case $enableval in yes) enable_shared=yes ;; @@ -7822,7 +8413,7 @@ if test "${enable_shared+set}" = set; then : IFS="$lt_save_ifs" ;; esac -else +else $as_nop enable_shared=yes fi @@ -7835,7 +8426,8 @@ fi # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : +if test ${enable_static+y} +then : enableval=$enable_static; p=${PACKAGE-default} case $enableval in yes) enable_static=yes ;; @@ -7853,7 +8445,7 @@ if test "${enable_static+set}" = set; then : IFS="$lt_save_ifs" ;; esac -else +else $as_nop enable_static=yes fi @@ -7867,7 +8459,8 @@ fi # Check whether --with-pic was given. -if test "${with_pic+set}" = set; then : +if test ${with_pic+y} +then : withval=$with_pic; lt_p=${PACKAGE-default} case $withval in yes|no) pic_mode=$withval ;; @@ -7884,7 +8477,7 @@ if test "${with_pic+set}" = set; then : IFS="$lt_save_ifs" ;; esac -else +else $as_nop pic_mode=default fi @@ -7898,7 +8491,8 @@ test -z "$pic_mode" && pic_mode=default # Check whether --enable-fast-install was given. -if test "${enable_fast_install+set}" = set; then : +if test ${enable_fast_install+y} +then : enableval=$enable_fast_install; p=${PACKAGE-default} case $enableval in yes) enable_fast_install=yes ;; @@ -7916,7 +8510,7 @@ if test "${enable_fast_install+set}" = set; then : IFS="$lt_save_ifs" ;; esac -else +else $as_nop enable_fast_install=yes fi @@ -7984,11 +8578,12 @@ if test -n "${ZSH_VERSION+set}" ; then setopt NO_GLOB_SUBST fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 -$as_echo_n "checking for objdir... " >&6; } -if ${lt_cv_objdir+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5 +printf %s "checking for objdir... " >&6; } +if test ${lt_cv_objdir+y} +then : + printf %s "(cached) " >&6 +else $as_nop rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null if test -d .libs; then @@ -7999,17 +8594,15 @@ else fi rmdir .libs 2>/dev/null fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 -$as_echo "$lt_cv_objdir" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5 +printf "%s\n" "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir -cat >>confdefs.h <<_ACEOF -#define LT_OBJDIR "$lt_cv_objdir/" -_ACEOF +printf "%s\n" "#define LT_OBJDIR \"$lt_cv_objdir/\"" >>confdefs.h @@ -8062,11 +8655,12 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 -$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5 +printf %s "checking for ${ac_tool_prefix}file... " >&6; } +if test ${lt_cv_path_MAGIC_CMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. @@ -8115,11 +8709,11 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +printf "%s\n" "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -8128,11 +8722,12 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5 -$as_echo_n "checking for file... " >&6; } -if ${lt_cv_path_MAGIC_CMD+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5 +printf %s "checking for file... " >&6; } +if test ${lt_cv_path_MAGIC_CMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $MAGIC_CMD in [\\/*] | ?:[\\/]*) lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. @@ -8181,11 +8776,11 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 -$as_echo "$MAGIC_CMD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5 +printf "%s\n" "$MAGIC_CMD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -8270,11 +8865,12 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } -if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } +if test ${lt_cv_prog_compiler_rtti_exceptions+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -8305,8 +8901,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -8632,26 +9228,28 @@ case $host_os in ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 -$as_echo_n "checking for $compiler option to produce PIC... " >&6; } -if ${lt_cv_prog_compiler_pic+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5 +printf %s "checking for $compiler option to produce PIC... " >&6; } +if test ${lt_cv_prog_compiler_pic+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_pic=$lt_prog_compiler_pic fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 -$as_echo "$lt_cv_prog_compiler_pic" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5 +printf "%s\n" "$lt_cv_prog_compiler_pic" >&6; } lt_prog_compiler_pic=$lt_cv_prog_compiler_pic # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } -if ${lt_cv_prog_compiler_pic_works+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } +if test ${lt_cv_prog_compiler_pic_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext echo "$lt_simple_compile_test_code" > conftest.$ac_ext @@ -8682,8 +9280,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 -$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5 +printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in @@ -8711,11 +9309,12 @@ fi # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } -if ${lt_cv_prog_compiler_static_works+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } +if test ${lt_cv_prog_compiler_static_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" @@ -8739,8 +9338,8 @@ else LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 -$as_echo "$lt_cv_prog_compiler_static_works" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5 +printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then : @@ -8754,11 +9353,12 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test ${lt_cv_prog_compiler_c_o+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest @@ -8801,19 +9401,20 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 -$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } -if ${lt_cv_prog_compiler_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5 +printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; } +if test ${lt_cv_prog_compiler_c_o+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler_c_o=no $RM -r conftest 2>/dev/null mkdir conftest @@ -8856,8 +9457,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 -$as_echo "$lt_cv_prog_compiler_c_o" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5 +printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; } @@ -8865,19 +9466,19 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 -$as_echo_n "checking if we can lock with hard links... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5 +printf %s "checking if we can lock with hard links... " >&6; } hard_links=yes $RM conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 -$as_echo "$hard_links" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5 +printf "%s\n" "$hard_links" >&6; } if test "$hard_links" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +printf "%s\n" "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi else @@ -8889,8 +9490,8 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= allow_undefined_flag= @@ -9374,21 +9975,23 @@ _LT_EOF if test "${lt_cv_aix_libpath+set}" = set; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${lt_cv_aix_libpath_+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -9403,7 +10006,7 @@ if ac_fn_c_try_link "$LINENO"; then : lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then lt_cv_aix_libpath_="/usr/lib:/lib" @@ -9427,21 +10030,23 @@ fi if test "${lt_cv_aix_libpath+set}" = set; then aix_libpath=$lt_cv_aix_libpath else - if ${lt_cv_aix_libpath_+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${lt_cv_aix_libpath_+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -9456,7 +10061,7 @@ if ac_fn_c_try_link "$LINENO"; then : lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext if test -z "$lt_cv_aix_libpath_"; then lt_cv_aix_libpath_="/usr/lib:/lib" @@ -9694,11 +10299,12 @@ fi # Older versions of the 11.00 compiler do not understand -b yet # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 -$as_echo_n "checking if $CC understands -b... " >&6; } -if ${lt_cv_prog_compiler__b+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5 +printf %s "checking if $CC understands -b... " >&6; } +if test ${lt_cv_prog_compiler__b+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_prog_compiler__b=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -b" @@ -9722,8 +10328,8 @@ else LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 -$as_echo "$lt_cv_prog_compiler__b" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5 +printf "%s\n" "$lt_cv_prog_compiler__b" >&6; } if test x"$lt_cv_prog_compiler__b" = xyes; then archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' @@ -9763,28 +10369,30 @@ fi # work, assume that -exports_file does not work either and # implicitly export all symbols. # This should be the same for all languages, so no per-tag cache variable. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 -$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; } -if ${lt_cv_irix_exported_symbol+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5 +printf %s "checking whether the $host_os linker accepts -exported_symbol... " >&6; } +if test ${lt_cv_irix_exported_symbol+y} +then : + printf %s "(cached) " >&6 +else $as_nop save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int foo (void) { return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : lt_cv_irix_exported_symbol=yes -else +else $as_nop lt_cv_irix_exported_symbol=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 -$as_echo "$lt_cv_irix_exported_symbol" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5 +printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } if test "$lt_cv_irix_exported_symbol" = yes; then archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' fi @@ -10042,8 +10650,8 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 -$as_echo "$ld_shlibs" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5 +printf "%s\n" "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no with_gnu_ld=$with_gnu_ld @@ -10079,18 +10687,19 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 -$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } -if ${lt_cv_archive_cmds_need_lc+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5 +printf %s "checking whether -lc should be explicitly linked in... " >&6; } +if test ${lt_cv_archive_cmds_need_lc+y} +then : + printf %s "(cached) " >&6 +else $as_nop $RM conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } 2>conftest.err; then soname=conftest lib=conftest @@ -10108,7 +10717,7 @@ else if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5 (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } then lt_cv_archive_cmds_need_lc=no @@ -10122,8 +10731,8 @@ else $RM conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 -$as_echo "$lt_cv_archive_cmds_need_lc" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5 +printf "%s\n" "$lt_cv_archive_cmds_need_lc" >&6; } archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc ;; esac @@ -10282,8 +10891,8 @@ esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 -$as_echo_n "checking dynamic linker characteristics... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 +printf %s "checking dynamic linker characteristics... " >&6; } if test "$GCC" = yes; then case $host_os in @@ -10774,9 +11383,10 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu) shlibpath_overrides_runpath=no # Some binutils ld are patched to set DT_RUNPATH - if ${lt_cv_shlibpath_overrides_runpath+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${lt_cv_shlibpath_overrides_runpath+y} +then : + printf %s "(cached) " >&6 +else $as_nop lt_cv_shlibpath_overrides_runpath=no save_LDFLAGS=$LDFLAGS save_libdir=$libdir @@ -10786,19 +11396,21 @@ else /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then : +if ac_fn_c_try_link "$LINENO" +then : + if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null +then : lt_cv_shlibpath_overrides_runpath=yes fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LDFLAGS=$save_LDFLAGS libdir=$save_libdir @@ -11015,8 +11627,8 @@ uts4*) dynamic_linker=no ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 -$as_echo "$dynamic_linker" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5 +printf "%s\n" "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no variables_saved_for_relink="PATH $shlibpath_var $runpath_var" @@ -11122,8 +11734,8 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 -$as_echo_n "checking how to hardcode library paths into programs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5 +printf %s "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || test -n "$runpath_var" || @@ -11147,8 +11759,8 @@ else # directories. hardcode_action=unsupported fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 -$as_echo "$hardcode_action" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5 +printf "%s\n" "$hardcode_action" >&6; } if test "$hardcode_action" = relink || test "$inherit_rpath" = yes; then @@ -11192,11 +11804,12 @@ else darwin*) # if libdl is installed we need to link against it - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +printf %s "checking for dlopen in -ldl... " >&6; } +if test ${ac_cv_lib_dl_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11205,32 +11818,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dl_dlopen=yes -else +else $as_nop ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes +then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else +else $as_nop lt_cv_dlopen="dyld" lt_cv_dlopen_libs= @@ -11242,14 +11854,16 @@ fi *) ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = xyes; then : +if test "x$ac_cv_func_shl_load" = xyes +then : lt_cv_dlopen="shl_load" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 -$as_echo_n "checking for shl_load in -ldld... " >&6; } -if ${ac_cv_lib_dld_shl_load+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5 +printf %s "checking for shl_load in -ldld... " >&6; } +if test ${ac_cv_lib_dld_shl_load+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11258,41 +11872,42 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char shl_load (); int -main () +main (void) { return shl_load (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dld_shl_load=yes -else +else $as_nop ac_cv_lib_dld_shl_load=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 -$as_echo "$ac_cv_lib_dld_shl_load" >&6; } -if test "x$ac_cv_lib_dld_shl_load" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5 +printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = xyes +then : lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" -else +else $as_nop ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = xyes; then : +if test "x$ac_cv_func_dlopen" = xyes +then : lt_cv_dlopen="dlopen" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 +printf %s "checking for dlopen in -ldl... " >&6; } +if test ${ac_cv_lib_dl_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11301,37 +11916,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dl_dlopen=yes -else +else $as_nop ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = xyes +then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 -$as_echo_n "checking for dlopen in -lsvld... " >&6; } -if ${ac_cv_lib_svld_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5 +printf %s "checking for dlopen in -lsvld... " >&6; } +if test ${ac_cv_lib_svld_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11340,37 +11955,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_svld_dlopen=yes -else +else $as_nop ac_cv_lib_svld_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 -$as_echo "$ac_cv_lib_svld_dlopen" >&6; } -if test "x$ac_cv_lib_svld_dlopen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5 +printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = xyes +then : lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 -$as_echo_n "checking for dld_link in -ldld... " >&6; } -if ${ac_cv_lib_dld_dld_link+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5 +printf %s "checking for dld_link in -ldld... " >&6; } +if test ${ac_cv_lib_dld_dld_link+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11379,30 +11994,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dld_link (); int -main () +main (void) { return dld_link (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dld_dld_link=yes -else +else $as_nop ac_cv_lib_dld_dld_link=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 -$as_echo "$ac_cv_lib_dld_dld_link" >&6; } -if test "x$ac_cv_lib_dld_dld_link" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5 +printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = xyes +then : lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -11441,11 +12055,12 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 -$as_echo_n "checking whether a program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5 +printf %s "checking whether a program can dlopen itself... " >&6; } +if test ${lt_cv_dlopen_self+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "$cross_compiling" = yes; then : lt_cv_dlopen_self=cross else @@ -11524,7 +12139,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -11542,16 +12157,17 @@ rm -fr conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 -$as_echo "$lt_cv_dlopen_self" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5 +printf "%s\n" "$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 -$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } -if ${lt_cv_dlopen_self_static+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5 +printf %s "checking whether a statically linked program can dlopen itself... " >&6; } +if test ${lt_cv_dlopen_self_static+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "$cross_compiling" = yes; then : lt_cv_dlopen_self_static=cross else @@ -11630,7 +12246,7 @@ _LT_EOF if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5 (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -11648,8 +12264,8 @@ rm -fr conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 -$as_echo "$lt_cv_dlopen_self_static" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5 +printf "%s\n" "$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS="$save_CPPFLAGS" @@ -11687,13 +12303,13 @@ fi striplib= old_striplib= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 -$as_echo_n "checking whether stripping libraries is possible... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 +printf %s "checking whether stripping libraries is possible... " >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in @@ -11701,16 +12317,16 @@ else if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi ;; *) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi @@ -11727,13 +12343,13 @@ fi # Report which library types will actually be built - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 -$as_echo_n "checking if libtool supports shared libraries... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 -$as_echo "$can_build_shared" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5 +printf %s "checking if libtool supports shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5 +printf "%s\n" "$can_build_shared" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 -$as_echo_n "checking whether to build shared libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5 +printf %s "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -11753,15 +12369,15 @@ $as_echo_n "checking whether to build shared libraries... " >&6; } fi ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 -$as_echo "$enable_shared" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5 +printf "%s\n" "$enable_shared" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 -$as_echo_n "checking whether to build static libraries... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5 +printf %s "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 -$as_echo "$enable_static" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5 +printf "%s\n" "$enable_static" >&6; } @@ -11799,17 +12415,19 @@ CC="$lt_save_CC" # Check whether --enable-largefile was given. -if test "${enable_largefile+set}" = set; then : +if test ${enable_largefile+y} +then : enableval=$enable_largefile; fi if test "$enable_largefile" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 -$as_echo_n "checking for special C compiler options needed for large files... " >&6; } -if ${ac_cv_sys_largefile_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +printf %s "checking for special C compiler options needed for large files... " >&6; } +if test ${ac_cv_sys_largefile_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_sys_largefile_CC=no if test "$GCC" != yes; then ac_save_CC=$CC @@ -11823,44 +12441,47 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : break fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam CC="$CC -n32" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_largefile_CC=' -n32'; break fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam break done CC=$ac_save_CC rm -f conftest.$ac_ext fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 -$as_echo "$ac_cv_sys_largefile_CC" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; } if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if ${ac_cv_sys_file_offset_bits+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if test ${ac_cv_sys_file_offset_bits+y} +then : + printf %s "(cached) " >&6 +else $as_nop while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11869,22 +12490,23 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_file_offset_bits=no; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _FILE_OFFSET_BITS 64 @@ -11893,43 +12515,43 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_file_offset_bits=64; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_sys_file_offset_bits=unknown break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -$as_echo "$ac_cv_sys_file_offset_bits" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; } case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; *) -cat >>confdefs.h <<_ACEOF -#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits -_ACEOF +printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h ;; esac rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 -$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -if ${ac_cv_sys_large_files+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +printf %s "checking for _LARGE_FILES value needed for large files... " >&6; } +if test ${ac_cv_sys_large_files+y} +then : + printf %s "(cached) " >&6 +else $as_nop while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11938,22 +12560,23 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_large_files=no; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _LARGE_FILES 1 @@ -11962,40 +12585,37 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_large_files=1; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_sys_large_files=unknown break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -$as_echo "$ac_cv_sys_large_files" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +printf "%s\n" "$ac_cv_sys_large_files" >&6; } case $ac_cv_sys_large_files in #( no | unknown) ;; *) -cat >>confdefs.h <<_ACEOF -#define _LARGE_FILES $ac_cv_sys_large_files -_ACEOF +printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h ;; esac rm -rf conftest* fi - - fi @@ -12011,17 +12631,18 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 -$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 +printf %s "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then : +if test ${enable_maintainer_mode+y} +then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval -else +else $as_nop USE_MAINTAINER_MODE=no fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 -$as_echo "$USE_MAINTAINER_MODE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 +printf "%s\n" "$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= MAINTAINER_MODE_FALSE='#' @@ -12034,205 +12655,109 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 -$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } -if ${ac_cv_prog_cc_c99+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c99=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5 +printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; } +if test ${ac_cv_c_undeclared_builtin_options+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_save_CFLAGS=$CFLAGS + ac_cv_c_undeclared_builtin_options='cannot detect' + for ac_arg in '' -fno-builtin; do + CFLAGS="$ac_save_CFLAGS $ac_arg" + # This test program should *not* compile successfully. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include -#include -#include -#include - -// Check varargs macros. These examples are taken from C99 6.10.3.5. -#define debug(...) fprintf (stderr, __VA_ARGS__) -#define showlist(...) puts (#__VA_ARGS__) -#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) -static void -test_varargs_macros (void) -{ - int x = 1234; - int y = 5678; - debug ("Flag"); - debug ("X = %d\n", x); - showlist (The first, second, and third items.); - report (x>y, "x is %d but y is %d", x, y); -} - -// Check long long types. -#define BIG64 18446744073709551615ull -#define BIG32 4294967295ul -#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) -#if !BIG_OK - your preprocessor is broken; -#endif -#if BIG_OK -#else - your preprocessor is broken; -#endif -static long long int bignum = -9223372036854775807LL; -static unsigned long long int ubignum = BIG64; - -struct incomplete_array -{ - int datasize; - double data[]; -}; - -struct named_init { - int number; - const wchar_t *name; - double average; -}; - -typedef const char *ccp; - -static inline int -test_restrict (ccp restrict text) -{ - // See if C++-style comments work. - // Iterate through items via the restricted pointer. - // Also check for declarations in for loops. - for (unsigned int i = 0; *(text+i) != '\0'; ++i) - continue; - return 0; -} - -// Check varargs and va_copy. -static void -test_varargs (const char *format, ...) -{ - va_list args; - va_start (args, format); - va_list args_copy; - va_copy (args_copy, args); - - const char *str; - int number; - float fnumber; - - while (*format) - { - switch (*format++) - { - case 's': // string - str = va_arg (args_copy, const char *); - break; - case 'd': // int - number = va_arg (args_copy, int); - break; - case 'f': // float - fnumber = va_arg (args_copy, double); - break; - default: - break; - } - } - va_end (args_copy); - va_end (args); -} int -main () +main (void) { +(void) strchr; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : - // Check bool. - _Bool success = false; +else $as_nop + # This test program should compile successfully. + # No library function is consistently available on + # freestanding implementations, so test against a dummy + # declaration. Include always-available headers on the + # off chance that they somehow elicit warnings. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +extern void ac_decl (int, char *); - // Check restrict. - if (test_restrict ("String literal") == 0) - success = true; - char *restrict newvar = "Another string"; - - // Check varargs. - test_varargs ("s, d' f .", "string", 65, 34.234); - test_varargs_macros (); - - // Check flexible array members. - struct incomplete_array *ia = - malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); - ia->datasize = 10; - for (int i = 0; i < ia->datasize; ++i) - ia->data[i] = i * 1.234; - - // Check named initializers. - struct named_init ni = { - .number = 34, - .name = L"Test wide string", - .average = 543.34343, - }; - - ni.number = 58; - - int dynamic_array[ni.number]; - dynamic_array[ni.number - 1] = 543; - - // work around unused variable warnings - return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' - || dynamic_array[ni.number - 1] != 543); +int +main (void) +{ +(void) ac_decl (0, (char *) 0); + (void) ac_decl; ; return 0; } _ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c99=$ac_arg +if ac_fn_c_try_compile "$LINENO" +then : + if test x"$ac_arg" = x +then : + ac_cv_c_undeclared_builtin_options='none needed' +else $as_nop + ac_cv_c_undeclared_builtin_options=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c99" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC + break +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + done + CFLAGS=$ac_save_CFLAGS fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c99" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c99" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 -$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5 +printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; } + case $ac_cv_c_undeclared_builtin_options in #( + 'cannot detect') : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot make $CC report undeclared builtins +See \`config.log' for more details" "$LINENO" 5; } ;; #( + 'none needed') : + ac_c_undeclared_builtin_options='' ;; #( + *) : + ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;; esac -if test "x$ac_cv_prog_cc_c99" != xno; then : - -fi - -ac_fn_c_check_decl "$LINENO" "__clang__" "ac_cv_have_decl___clang__" "$ac_includes_default" -if test "x$ac_cv_have_decl___clang__" = xyes; then : +ac_fn_check_decl "$LINENO" "__clang__" "ac_cv_have_decl___clang__" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl___clang__" = xyes +then : CLANGCC="yes" -else +else $as_nop CLANGCC="no" fi - -ac_fn_c_check_decl "$LINENO" "__INTEL_COMPILER" "ac_cv_have_decl___INTEL_COMPILER" "$ac_includes_default" -if test "x$ac_cv_have_decl___INTEL_COMPILER" = xyes; then : +ac_fn_check_decl "$LINENO" "__INTEL_COMPILER" "ac_cv_have_decl___INTEL_COMPILER" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl___INTEL_COMPILER" = xyes +then : INTELCC="yes" -else +else $as_nop INTELCC="no" fi - -ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default" -if test "x$ac_cv_have_decl___SUNPRO_C" = xyes; then : +ac_fn_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl___SUNPRO_C" = xyes +then : SUNCC="yes" -else +else $as_nop SUNCC="no" fi @@ -12243,16 +12768,16 @@ fi - if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. @@ -12262,11 +12787,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12278,11 +12807,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -12291,11 +12820,12 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. @@ -12305,11 +12835,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -12321,11 +12855,11 @@ esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -12333,8 +12867,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -12346,14 +12880,14 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PKG_CONFIG="" fi fi @@ -12363,9 +12897,10 @@ fi # Check whether --enable-selective-werror was given. -if test "${enable_selective_werror+set}" = set; then : +if test ${enable_selective_werror+y} +then : enableval=$enable_selective_werror; SELECTIVE_WERROR=$enableval -else +else $as_nop SELECTIVE_WERROR=yes fi @@ -12398,24 +12933,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -12425,24 +12962,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -12460,29 +12999,31 @@ found="no" CFLAGS="$CFLAGS -Wall" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wall" >&5 -$as_echo_n "checking if $CC supports -Wall... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wall" >&5 +printf %s "checking if $CC supports -Wall... " >&6; } cacheid=xorg_cv_cc_flag__Wall - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -12490,8 +13031,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wall" found="yes" @@ -12516,24 +13057,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -12543,24 +13086,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -12578,29 +13123,31 @@ found="no" CFLAGS="$CFLAGS -Wpointer-arith" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-arith" >&5 -$as_echo_n "checking if $CC supports -Wpointer-arith... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-arith" >&5 +printf %s "checking if $CC supports -Wpointer-arith... " >&6; } cacheid=xorg_cv_cc_flag__Wpointer_arith - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -12608,8 +13155,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wpointer-arith" found="yes" @@ -12634,24 +13181,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -12661,24 +13210,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -12696,29 +13247,31 @@ found="no" CFLAGS="$CFLAGS -Wmissing-declarations" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-declarations" >&5 -$as_echo_n "checking if $CC supports -Wmissing-declarations... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-declarations" >&5 +printf %s "checking if $CC supports -Wmissing-declarations... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_declarations - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -12726,8 +13279,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-declarations" found="yes" @@ -12752,24 +13305,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -12779,24 +13334,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -12814,29 +13371,31 @@ found="no" CFLAGS="$CFLAGS -Wformat=2" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat=2" >&5 -$as_echo_n "checking if $CC supports -Wformat=2... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat=2" >&5 +printf %s "checking if $CC supports -Wformat=2... " >&6; } cacheid=xorg_cv_cc_flag__Wformat_2 - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -12844,8 +13403,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wformat=2" found="yes" @@ -12863,29 +13422,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -Wformat" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat" >&5 -$as_echo_n "checking if $CC supports -Wformat... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wformat" >&5 +printf %s "checking if $CC supports -Wformat... " >&6; } cacheid=xorg_cv_cc_flag__Wformat - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -12893,8 +13454,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wformat" found="yes" @@ -12921,24 +13482,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -12948,24 +13511,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -12983,29 +13548,31 @@ found="no" CFLAGS="$CFLAGS -Wstrict-prototypes" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wstrict-prototypes" >&5 -$as_echo_n "checking if $CC supports -Wstrict-prototypes... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wstrict-prototypes" >&5 +printf %s "checking if $CC supports -Wstrict-prototypes... " >&6; } cacheid=xorg_cv_cc_flag__Wstrict_prototypes - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -13013,8 +13580,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wstrict-prototypes" found="yes" @@ -13039,24 +13606,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -13066,24 +13635,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -13101,29 +13672,31 @@ found="no" CFLAGS="$CFLAGS -Wmissing-prototypes" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-prototypes" >&5 -$as_echo_n "checking if $CC supports -Wmissing-prototypes... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-prototypes" >&5 +printf %s "checking if $CC supports -Wmissing-prototypes... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_prototypes - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -13131,8 +13704,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-prototypes" found="yes" @@ -13157,24 +13730,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -13184,24 +13759,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -13219,29 +13796,31 @@ found="no" CFLAGS="$CFLAGS -Wnested-externs" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnested-externs" >&5 -$as_echo_n "checking if $CC supports -Wnested-externs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnested-externs" >&5 +printf %s "checking if $CC supports -Wnested-externs... " >&6; } cacheid=xorg_cv_cc_flag__Wnested_externs - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -13249,8 +13828,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wnested-externs" found="yes" @@ -13275,24 +13854,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -13302,24 +13883,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -13337,29 +13920,31 @@ found="no" CFLAGS="$CFLAGS -Wbad-function-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wbad-function-cast" >&5 -$as_echo_n "checking if $CC supports -Wbad-function-cast... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wbad-function-cast" >&5 +printf %s "checking if $CC supports -Wbad-function-cast... " >&6; } cacheid=xorg_cv_cc_flag__Wbad_function_cast - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -13367,8 +13952,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wbad-function-cast" found="yes" @@ -13393,24 +13978,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -13420,24 +14007,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -13455,29 +14044,31 @@ found="no" CFLAGS="$CFLAGS -Wold-style-definition" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wold-style-definition" >&5 -$as_echo_n "checking if $CC supports -Wold-style-definition... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wold-style-definition" >&5 +printf %s "checking if $CC supports -Wold-style-definition... " >&6; } cacheid=xorg_cv_cc_flag__Wold_style_definition - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -13485,8 +14076,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wold-style-definition" found="yes" @@ -13504,29 +14095,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -fd" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -fd" >&5 -$as_echo_n "checking if $CC supports -fd... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -fd" >&5 +printf %s "checking if $CC supports -fd... " >&6; } cacheid=xorg_cv_cc_flag__fd - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -13534,8 +14127,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -fd" found="yes" @@ -13560,24 +14153,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -13587,24 +14182,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -13622,29 +14219,31 @@ found="no" CFLAGS="$CFLAGS -Wdeclaration-after-statement" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wdeclaration-after-statement" >&5 -$as_echo_n "checking if $CC supports -Wdeclaration-after-statement... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wdeclaration-after-statement" >&5 +printf %s "checking if $CC supports -Wdeclaration-after-statement... " >&6; } cacheid=xorg_cv_cc_flag__Wdeclaration_after_statement - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -13652,8 +14251,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wdeclaration-after-statement" found="yes" @@ -13682,24 +14281,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -13709,24 +14310,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -13744,29 +14347,31 @@ found="no" CFLAGS="$CFLAGS -Wunused" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wunused" >&5 -$as_echo_n "checking if $CC supports -Wunused... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wunused" >&5 +printf %s "checking if $CC supports -Wunused... " >&6; } cacheid=xorg_cv_cc_flag__Wunused - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -13774,8 +14379,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wunused" found="yes" @@ -13800,24 +14405,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -13827,24 +14434,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -13862,29 +14471,31 @@ found="no" CFLAGS="$CFLAGS -Wuninitialized" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wuninitialized" >&5 -$as_echo_n "checking if $CC supports -Wuninitialized... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wuninitialized" >&5 +printf %s "checking if $CC supports -Wuninitialized... " >&6; } cacheid=xorg_cv_cc_flag__Wuninitialized - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -13892,8 +14503,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wuninitialized" found="yes" @@ -13918,24 +14529,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -13945,24 +14558,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -13980,29 +14595,31 @@ found="no" CFLAGS="$CFLAGS -Wshadow" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wshadow" >&5 -$as_echo_n "checking if $CC supports -Wshadow... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wshadow" >&5 +printf %s "checking if $CC supports -Wshadow... " >&6; } cacheid=xorg_cv_cc_flag__Wshadow - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -14010,8 +14627,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wshadow" found="yes" @@ -14036,24 +14653,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -14063,24 +14682,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -14098,29 +14719,31 @@ found="no" CFLAGS="$CFLAGS -Wmissing-noreturn" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-noreturn" >&5 -$as_echo_n "checking if $CC supports -Wmissing-noreturn... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-noreturn" >&5 +printf %s "checking if $CC supports -Wmissing-noreturn... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_noreturn - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -14128,8 +14751,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-noreturn" found="yes" @@ -14154,24 +14777,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -14181,24 +14806,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -14216,29 +14843,31 @@ found="no" CFLAGS="$CFLAGS -Wmissing-format-attribute" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-format-attribute" >&5 -$as_echo_n "checking if $CC supports -Wmissing-format-attribute... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-format-attribute" >&5 +printf %s "checking if $CC supports -Wmissing-format-attribute... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_format_attribute - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -14246,8 +14875,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-format-attribute" found="yes" @@ -14273,24 +14902,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -14300,24 +14931,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -14335,29 +14968,31 @@ found="no" CFLAGS="$CFLAGS -Wlogical-op" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wlogical-op" >&5 -$as_echo_n "checking if $CC supports -Wlogical-op... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wlogical-op" >&5 +printf %s "checking if $CC supports -Wlogical-op... " >&6; } cacheid=xorg_cv_cc_flag__Wlogical_op - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -14365,8 +15000,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wlogical-op" found="yes" @@ -14382,7 +15017,7 @@ $as_echo "$supported" >&6; } # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) -# Turn some warnings into errors, so we don't accidently get successful builds +# Turn some warnings into errors, so we don't accidentally get successful builds # when there are problems that should be fixed. if test "x$SELECTIVE_WERROR" = "xyes" ; then @@ -14403,24 +15038,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -14430,24 +15067,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -14465,29 +15104,31 @@ found="no" CFLAGS="$CFLAGS -Werror=implicit" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=implicit" >&5 -$as_echo_n "checking if $CC supports -Werror=implicit... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=implicit" >&5 +printf %s "checking if $CC supports -Werror=implicit... " >&6; } cacheid=xorg_cv_cc_flag__Werror_implicit - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -14495,8 +15136,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=implicit" found="yes" @@ -14514,29 +15155,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5 -$as_echo_n "checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" >&5 +printf %s "checking if $CC supports -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED... " >&6; } cacheid=xorg_cv_cc_flag__errwarn_E_NO_EXPLICIT_TYPE_GIVEN__errwarn_E_NO_IMPLICIT_DECL_ALLOWED - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -14544,8 +15187,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_NO_EXPLICIT_TYPE_GIVEN -errwarn=E_NO_IMPLICIT_DECL_ALLOWED" found="yes" @@ -14570,24 +15213,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -14597,24 +15242,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -14632,29 +15279,31 @@ found="no" CFLAGS="$CFLAGS -Werror=nonnull" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=nonnull" >&5 -$as_echo_n "checking if $CC supports -Werror=nonnull... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=nonnull" >&5 +printf %s "checking if $CC supports -Werror=nonnull... " >&6; } cacheid=xorg_cv_cc_flag__Werror_nonnull - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -14662,8 +15311,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=nonnull" found="yes" @@ -14688,24 +15337,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -14715,24 +15366,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -14750,29 +15403,31 @@ found="no" CFLAGS="$CFLAGS -Werror=init-self" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=init-self" >&5 -$as_echo_n "checking if $CC supports -Werror=init-self... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=init-self" >&5 +printf %s "checking if $CC supports -Werror=init-self... " >&6; } cacheid=xorg_cv_cc_flag__Werror_init_self - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -14780,8 +15435,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=init-self" found="yes" @@ -14806,24 +15461,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -14833,24 +15490,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -14868,29 +15527,31 @@ found="no" CFLAGS="$CFLAGS -Werror=main" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=main" >&5 -$as_echo_n "checking if $CC supports -Werror=main... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=main" >&5 +printf %s "checking if $CC supports -Werror=main... " >&6; } cacheid=xorg_cv_cc_flag__Werror_main - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -14898,8 +15559,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=main" found="yes" @@ -14924,24 +15585,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -14951,24 +15614,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -14986,29 +15651,31 @@ found="no" CFLAGS="$CFLAGS -Werror=missing-braces" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=missing-braces" >&5 -$as_echo_n "checking if $CC supports -Werror=missing-braces... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=missing-braces" >&5 +printf %s "checking if $CC supports -Werror=missing-braces... " >&6; } cacheid=xorg_cv_cc_flag__Werror_missing_braces - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -15016,8 +15683,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=missing-braces" found="yes" @@ -15042,24 +15709,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -15069,24 +15738,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -15104,29 +15775,31 @@ found="no" CFLAGS="$CFLAGS -Werror=sequence-point" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=sequence-point" >&5 -$as_echo_n "checking if $CC supports -Werror=sequence-point... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=sequence-point" >&5 +printf %s "checking if $CC supports -Werror=sequence-point... " >&6; } cacheid=xorg_cv_cc_flag__Werror_sequence_point - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -15134,8 +15807,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=sequence-point" found="yes" @@ -15160,24 +15833,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -15187,24 +15862,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -15222,29 +15899,31 @@ found="no" CFLAGS="$CFLAGS -Werror=return-type" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=return-type" >&5 -$as_echo_n "checking if $CC supports -Werror=return-type... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=return-type" >&5 +printf %s "checking if $CC supports -Werror=return-type... " >&6; } cacheid=xorg_cv_cc_flag__Werror_return_type - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -15252,8 +15931,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=return-type" found="yes" @@ -15271,29 +15950,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5 -$as_echo_n "checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT" >&5 +printf %s "checking if $CC supports -errwarn=E_FUNC_HAS_NO_RETURN_STMT... " >&6; } cacheid=xorg_cv_cc_flag__errwarn_E_FUNC_HAS_NO_RETURN_STMT - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -15301,8 +15982,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_FUNC_HAS_NO_RETURN_STMT" found="yes" @@ -15327,24 +16008,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -15354,24 +16037,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -15389,29 +16074,31 @@ found="no" CFLAGS="$CFLAGS -Werror=trigraphs" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=trigraphs" >&5 -$as_echo_n "checking if $CC supports -Werror=trigraphs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=trigraphs" >&5 +printf %s "checking if $CC supports -Werror=trigraphs... " >&6; } cacheid=xorg_cv_cc_flag__Werror_trigraphs - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -15419,8 +16106,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=trigraphs" found="yes" @@ -15445,24 +16132,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -15472,24 +16161,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -15507,29 +16198,31 @@ found="no" CFLAGS="$CFLAGS -Werror=array-bounds" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=array-bounds" >&5 -$as_echo_n "checking if $CC supports -Werror=array-bounds... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=array-bounds" >&5 +printf %s "checking if $CC supports -Werror=array-bounds... " >&6; } cacheid=xorg_cv_cc_flag__Werror_array_bounds - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -15537,8 +16230,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=array-bounds" found="yes" @@ -15563,24 +16256,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -15590,24 +16285,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -15625,29 +16322,31 @@ found="no" CFLAGS="$CFLAGS -Werror=write-strings" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=write-strings" >&5 -$as_echo_n "checking if $CC supports -Werror=write-strings... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=write-strings" >&5 +printf %s "checking if $CC supports -Werror=write-strings... " >&6; } cacheid=xorg_cv_cc_flag__Werror_write_strings - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -15655,8 +16354,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=write-strings" found="yes" @@ -15681,24 +16380,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -15708,24 +16409,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -15743,29 +16446,31 @@ found="no" CFLAGS="$CFLAGS -Werror=address" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=address" >&5 -$as_echo_n "checking if $CC supports -Werror=address... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=address" >&5 +printf %s "checking if $CC supports -Werror=address... " >&6; } cacheid=xorg_cv_cc_flag__Werror_address - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -15773,8 +16478,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=address" found="yes" @@ -15799,24 +16504,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -15826,24 +16533,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -15861,29 +16570,31 @@ found="no" CFLAGS="$CFLAGS -Werror=int-to-pointer-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=int-to-pointer-cast" >&5 -$as_echo_n "checking if $CC supports -Werror=int-to-pointer-cast... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=int-to-pointer-cast" >&5 +printf %s "checking if $CC supports -Werror=int-to-pointer-cast... " >&6; } cacheid=xorg_cv_cc_flag__Werror_int_to_pointer_cast - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -15891,8 +16602,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=int-to-pointer-cast" found="yes" @@ -15910,29 +16621,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION" >&5 -$as_echo_n "checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION" >&5 +printf %s "checking if $CC supports -errwarn=E_BAD_PTR_INT_COMBINATION... " >&6; } cacheid=xorg_cv_cc_flag__errwarn_E_BAD_PTR_INT_COMBINATION - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -15940,8 +16653,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -errwarn=E_BAD_PTR_INT_COMBINATION" found="yes" @@ -15966,24 +16679,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -15993,24 +16708,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -16028,29 +16745,31 @@ found="no" CFLAGS="$CFLAGS -Werror=pointer-to-int-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=pointer-to-int-cast" >&5 -$as_echo_n "checking if $CC supports -Werror=pointer-to-int-cast... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=pointer-to-int-cast" >&5 +printf %s "checking if $CC supports -Werror=pointer-to-int-cast... " >&6; } cacheid=xorg_cv_cc_flag__Werror_pointer_to_int_cast - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -16058,8 +16777,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Werror=pointer-to-int-cast" found="yes" @@ -16068,8 +16787,8 @@ $as_echo "$supported" >&6; } # Also -errwarn=E_BAD_PTR_INT_COMBINATION else -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&5 -$as_echo "$as_me: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&5 +printf "%s\n" "$as_me: WARNING: You have chosen not to turn some select compiler warnings into errors. This should not be necessary. Please report why you needed to do so in a bug report at $PACKAGE_BUGREPORT" >&2;} @@ -16087,24 +16806,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -16114,24 +16835,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -16149,29 +16872,31 @@ found="no" CFLAGS="$CFLAGS -Wimplicit" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wimplicit" >&5 -$as_echo_n "checking if $CC supports -Wimplicit... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wimplicit" >&5 +printf %s "checking if $CC supports -Wimplicit... " >&6; } cacheid=xorg_cv_cc_flag__Wimplicit - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -16179,8 +16904,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wimplicit" found="yes" @@ -16205,24 +16930,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -16232,24 +16959,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -16267,29 +16996,31 @@ found="no" CFLAGS="$CFLAGS -Wnonnull" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnonnull" >&5 -$as_echo_n "checking if $CC supports -Wnonnull... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wnonnull" >&5 +printf %s "checking if $CC supports -Wnonnull... " >&6; } cacheid=xorg_cv_cc_flag__Wnonnull - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -16297,8 +17028,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wnonnull" found="yes" @@ -16323,24 +17054,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -16350,24 +17083,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -16385,29 +17120,31 @@ found="no" CFLAGS="$CFLAGS -Winit-self" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Winit-self" >&5 -$as_echo_n "checking if $CC supports -Winit-self... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Winit-self" >&5 +printf %s "checking if $CC supports -Winit-self... " >&6; } cacheid=xorg_cv_cc_flag__Winit_self - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -16415,8 +17152,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Winit-self" found="yes" @@ -16441,24 +17178,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -16468,24 +17207,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -16503,29 +17244,31 @@ found="no" CFLAGS="$CFLAGS -Wmain" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmain" >&5 -$as_echo_n "checking if $CC supports -Wmain... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmain" >&5 +printf %s "checking if $CC supports -Wmain... " >&6; } cacheid=xorg_cv_cc_flag__Wmain - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -16533,8 +17276,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmain" found="yes" @@ -16559,24 +17302,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -16586,24 +17331,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -16621,29 +17368,31 @@ found="no" CFLAGS="$CFLAGS -Wmissing-braces" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-braces" >&5 -$as_echo_n "checking if $CC supports -Wmissing-braces... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-braces" >&5 +printf %s "checking if $CC supports -Wmissing-braces... " >&6; } cacheid=xorg_cv_cc_flag__Wmissing_braces - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -16651,8 +17400,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wmissing-braces" found="yes" @@ -16677,24 +17426,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -16704,24 +17455,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -16739,29 +17492,31 @@ found="no" CFLAGS="$CFLAGS -Wsequence-point" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wsequence-point" >&5 -$as_echo_n "checking if $CC supports -Wsequence-point... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wsequence-point" >&5 +printf %s "checking if $CC supports -Wsequence-point... " >&6; } cacheid=xorg_cv_cc_flag__Wsequence_point - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -16769,8 +17524,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wsequence-point" found="yes" @@ -16795,24 +17550,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -16822,24 +17579,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -16857,29 +17616,31 @@ found="no" CFLAGS="$CFLAGS -Wreturn-type" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wreturn-type" >&5 -$as_echo_n "checking if $CC supports -Wreturn-type... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wreturn-type" >&5 +printf %s "checking if $CC supports -Wreturn-type... " >&6; } cacheid=xorg_cv_cc_flag__Wreturn_type - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -16887,8 +17648,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wreturn-type" found="yes" @@ -16913,24 +17674,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -16940,24 +17703,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -16975,29 +17740,31 @@ found="no" CFLAGS="$CFLAGS -Wtrigraphs" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wtrigraphs" >&5 -$as_echo_n "checking if $CC supports -Wtrigraphs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wtrigraphs" >&5 +printf %s "checking if $CC supports -Wtrigraphs... " >&6; } cacheid=xorg_cv_cc_flag__Wtrigraphs - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -17005,8 +17772,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wtrigraphs" found="yes" @@ -17031,24 +17798,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -17058,24 +17827,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -17093,29 +17864,31 @@ found="no" CFLAGS="$CFLAGS -Warray-bounds" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Warray-bounds" >&5 -$as_echo_n "checking if $CC supports -Warray-bounds... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Warray-bounds" >&5 +printf %s "checking if $CC supports -Warray-bounds... " >&6; } cacheid=xorg_cv_cc_flag__Warray_bounds - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -17123,8 +17896,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Warray-bounds" found="yes" @@ -17149,24 +17922,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -17176,24 +17951,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -17211,29 +17988,31 @@ found="no" CFLAGS="$CFLAGS -Wwrite-strings" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wwrite-strings" >&5 -$as_echo_n "checking if $CC supports -Wwrite-strings... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wwrite-strings" >&5 +printf %s "checking if $CC supports -Wwrite-strings... " >&6; } cacheid=xorg_cv_cc_flag__Wwrite_strings - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -17241,8 +18020,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wwrite-strings" found="yes" @@ -17267,24 +18046,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -17294,24 +18075,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -17329,29 +18112,31 @@ found="no" CFLAGS="$CFLAGS -Waddress" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Waddress" >&5 -$as_echo_n "checking if $CC supports -Waddress... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Waddress" >&5 +printf %s "checking if $CC supports -Waddress... " >&6; } cacheid=xorg_cv_cc_flag__Waddress - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -17359,8 +18144,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Waddress" found="yes" @@ -17385,24 +18170,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -17412,24 +18199,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -17447,29 +18236,31 @@ found="no" CFLAGS="$CFLAGS -Wint-to-pointer-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wint-to-pointer-cast" >&5 -$as_echo_n "checking if $CC supports -Wint-to-pointer-cast... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wint-to-pointer-cast" >&5 +printf %s "checking if $CC supports -Wint-to-pointer-cast... " >&6; } cacheid=xorg_cv_cc_flag__Wint_to_pointer_cast - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -17477,8 +18268,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wint-to-pointer-cast" found="yes" @@ -17503,24 +18294,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -17530,24 +18323,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -17565,29 +18360,31 @@ found="no" CFLAGS="$CFLAGS -Wpointer-to-int-cast" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-to-int-cast" >&5 -$as_echo_n "checking if $CC supports -Wpointer-to-int-cast... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wpointer-to-int-cast" >&5 +printf %s "checking if $CC supports -Wpointer-to-int-cast... " >&6; } cacheid=xorg_cv_cc_flag__Wpointer_to_int_cast - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -17595,8 +18392,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then BASE_CFLAGS="$BASE_CFLAGS -Wpointer-to-int-cast" found="yes" @@ -17625,9 +18422,10 @@ fi # Check whether --enable-strict-compilation was given. -if test "${enable_strict_compilation+set}" = set; then : +if test ${enable_strict_compilation+y} +then : enableval=$enable_strict_compilation; STRICT_COMPILE=$enableval -else +else $as_nop STRICT_COMPILE=no fi @@ -17654,24 +18452,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -17681,24 +18481,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -17716,29 +18518,31 @@ found="no" CFLAGS="$CFLAGS -pedantic" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -pedantic" >&5 -$as_echo_n "checking if $CC supports -pedantic... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -pedantic" >&5 +printf %s "checking if $CC supports -pedantic... " >&6; } cacheid=xorg_cv_cc_flag__pedantic - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -17746,8 +18550,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then STRICT_CFLAGS="$STRICT_CFLAGS -pedantic" found="yes" @@ -17772,24 +18576,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -17799,24 +18605,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -17834,29 +18642,31 @@ found="no" CFLAGS="$CFLAGS -Werror" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror" >&5 -$as_echo_n "checking if $CC supports -Werror... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror" >&5 +printf %s "checking if $CC supports -Werror... " >&6; } cacheid=xorg_cv_cc_flag__Werror - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -17864,8 +18674,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then STRICT_CFLAGS="$STRICT_CFLAGS -Werror" found="yes" @@ -17883,29 +18693,31 @@ $as_echo "$supported" >&6; } CFLAGS="$CFLAGS -errwarn" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn" >&5 -$as_echo_n "checking if $CC supports -errwarn... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -errwarn" >&5 +printf %s "checking if $CC supports -errwarn... " >&6; } cacheid=xorg_cv_cc_flag__errwarn - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -17913,8 +18725,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then STRICT_CFLAGS="$STRICT_CFLAGS -errwarn" found="yes" @@ -17942,24 +18754,26 @@ xorg_testset_save_CFLAGS="$CFLAGS" if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; } -if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5 +printf %s "checking if $CC supports -Werror=unknown-warning-option... " >&6; } +if test ${xorg_cv_cc_flag_unknown_warning_option+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unknown_warning_option=yes -else +else $as_nop xorg_cv_cc_flag_unknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 -$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unknown_warning_option" >&6; } xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -17969,24 +18783,26 @@ if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then CFLAGS="$CFLAGS -Werror=unknown-warning-option" fi CFLAGS="$CFLAGS -Werror=unused-command-line-argument" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } -if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5 +printf %s "checking if $CC supports -Werror=unused-command-line-argument... " >&6; } +if test ${xorg_cv_cc_flag_unused_command_line_argument+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : xorg_cv_cc_flag_unused_command_line_argument=yes -else +else $as_nop xorg_cv_cc_flag_unused_command_line_argument=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 -$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5 +printf "%s\n" "$xorg_cv_cc_flag_unused_command_line_argument" >&6; } xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument CFLAGS="$xorg_testset_save_CFLAGS" fi @@ -18004,29 +18820,31 @@ found="no" CFLAGS="$CFLAGS -Werror=attributes" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=attributes" >&5 -$as_echo_n "checking if $CC supports -Werror=attributes... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=attributes" >&5 +printf %s "checking if $CC supports -Werror=attributes... " >&6; } cacheid=xorg_cv_cc_flag__Werror_attributes - if eval \${$cacheid+:} false; then : - $as_echo_n "(cached) " >&6 -else + if eval test \${$cacheid+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int i; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval $cacheid=yes -else +else $as_nop eval $cacheid=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -18034,8 +18852,8 @@ fi CFLAGS="$xorg_testset_save_CFLAGS" eval supported=\$$cacheid - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 -$as_echo "$supported" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +printf "%s\n" "$supported" >&6; } if test "$supported" = "yes" ; then STRICT_CFLAGS="$STRICT_CFLAGS -Werror=attributes" found="yes" @@ -18054,6 +18872,8 @@ fi + + cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1` _ACEOF @@ -18063,18 +18883,14 @@ _ACEOF PVM="0" fi -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION_MINOR $PVM -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION_MINOR $PVM" >>confdefs.h PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1` if test "x$PVP" = "x"; then PVP="0" fi -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION_PATCHLEVEL $PVP -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION_PATCHLEVEL $PVP" >>confdefs.h @@ -18104,11 +18920,12 @@ case $host_os in # Solaris 2.0 - 11.3 use SysV man page section numbers, so we # check for a man page file found in later versions that use # traditional section numbers instead - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5 -$as_echo_n "checking for /usr/share/man/man7/attributes.7... " >&6; } -if ${ac_cv_file__usr_share_man_man7_attributes_7+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /usr/share/man/man7/attributes.7" >&5 +printf %s "checking for /usr/share/man/man7/attributes.7... " >&6; } +if test ${ac_cv_file__usr_share_man_man7_attributes_7+y} +then : + printf %s "(cached) " >&6 +else $as_nop test "$cross_compiling" = yes && as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 if test -r "/usr/share/man/man7/attributes.7"; then @@ -18117,11 +18934,12 @@ else ac_cv_file__usr_share_man_man7_attributes_7=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5 -$as_echo "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; } -if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_man_man7_attributes_7" >&5 +printf "%s\n" "$ac_cv_file__usr_share_man_man7_attributes_7" >&6; } +if test "x$ac_cv_file__usr_share_man_man7_attributes_7" = xyes +then : SYSV_MAN_SECTIONS=false -else +else $as_nop SYSV_MAN_SECTIONS=true fi @@ -18216,7 +19034,8 @@ MAN_SUBSTS="\ # Check whether --enable-silent-rules was given. -if test "${enable_silent_rules+set}" = set; then : +if test ${enable_silent_rules+y} +then : enableval=$enable_silent_rules; fi @@ -18226,12 +19045,13 @@ case $enable_silent_rules in # ((( *) AM_DEFAULT_VERBOSITY=0;; esac am_make=${MAKE-make} -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 -$as_echo_n "checking whether $am_make supports nested variables... " >&6; } -if ${am_cv_make_support_nested_variables+:} false; then : - $as_echo_n "(cached) " >&6 -else - if $as_echo 'TRUE=$(BAR$(V)) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +printf %s "checking whether $am_make supports nested variables... " >&6; } +if test ${am_cv_make_support_nested_variables+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if printf "%s\n" 'TRUE=$(BAR$(V)) BAR0=false BAR1=true V=1 @@ -18243,8 +19063,8 @@ else am_cv_make_support_nested_variables=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 -$as_echo "$am_cv_make_support_nested_variables" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +printf "%s\n" "$am_cv_make_support_nested_variables" >&6; } if test $am_cv_make_support_nested_variables = yes; then AM_V='$(V)' AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' @@ -18257,10 +19077,12 @@ AM_BACKSLASH='\' + # Check whether --enable-specs was given. -if test "${enable_specs+set}" = set; then : +if test ${enable_specs+y} +then : enableval=$enable_specs; build_specs=$enableval -else +else $as_nop build_specs=yes fi @@ -18273,19 +19095,20 @@ else ENABLE_SPECS_FALSE= fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build functional specifications" >&5 -$as_echo_n "checking whether to build functional specifications... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $build_specs" >&5 -$as_echo "$build_specs" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build functional specifications" >&5 +printf %s "checking whether to build functional specifications... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $build_specs" >&5 +printf "%s\n" "$build_specs" >&6; } # Check whether --with-xmlto was given. -if test "${with_xmlto+set}" = set; then : +if test ${with_xmlto+y} +then : withval=$with_xmlto; use_xmlto=$withval -else +else $as_nop use_xmlto=auto fi @@ -18294,11 +19117,12 @@ fi if test "x$use_xmlto" = x"auto"; then # Extract the first word of "xmlto", so it can be a program name with args. set dummy xmlto; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XMLTO+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_XMLTO+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $XMLTO in [\\/]* | ?:[\\/]*) ac_cv_path_XMLTO="$XMLTO" # Let the user override the test with a path. @@ -18308,11 +19132,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_XMLTO="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_XMLTO="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18324,17 +19152,17 @@ esac fi XMLTO=$ac_cv_path_XMLTO if test -n "$XMLTO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLTO" >&5 -$as_echo "$XMLTO" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XMLTO" >&5 +printf "%s\n" "$XMLTO" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$XMLTO" = "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xmlto not found - documentation targets will be skipped" >&5 -$as_echo "$as_me: WARNING: xmlto not found - documentation targets will be skipped" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: xmlto not found - documentation targets will be skipped" >&5 +printf "%s\n" "$as_me: WARNING: xmlto not found - documentation targets will be skipped" >&2;} have_xmlto=no else have_xmlto=yes @@ -18342,11 +19170,12 @@ $as_echo "$as_me: WARNING: xmlto not found - documentation targets will be skipp elif test "x$use_xmlto" = x"yes" ; then # Extract the first word of "xmlto", so it can be a program name with args. set dummy xmlto; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XMLTO+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_XMLTO+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $XMLTO in [\\/]* | ?:[\\/]*) ac_cv_path_XMLTO="$XMLTO" # Let the user override the test with a path. @@ -18356,11 +19185,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_XMLTO="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_XMLTO="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18372,11 +19205,11 @@ esac fi XMLTO=$ac_cv_path_XMLTO if test -n "$XMLTO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLTO" >&5 -$as_echo "$XMLTO" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XMLTO" >&5 +printf "%s\n" "$XMLTO" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -18386,8 +19219,8 @@ fi have_xmlto=yes elif test "x$use_xmlto" = x"no" ; then if test "x$XMLTO" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring XMLTO environment variable since --with-xmlto=no was specified" >&5 -$as_echo "$as_me: WARNING: ignoring XMLTO environment variable since --with-xmlto=no was specified" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ignoring XMLTO environment variable since --with-xmlto=no was specified" >&5 +printf "%s\n" "$as_me: WARNING: ignoring XMLTO environment variable since --with-xmlto=no was specified" >&2;} fi have_xmlto=no else @@ -18397,19 +19230,19 @@ fi # Test for a minimum version of xmlto, if provided. if test "$have_xmlto" = yes; then # scrape the xmlto version - { $as_echo "$as_me:${as_lineno-$LINENO}: checking the xmlto version" >&5 -$as_echo_n "checking the xmlto version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the xmlto version" >&5 +printf %s "checking the xmlto version... " >&6; } xmlto_version=`$XMLTO --version 2>/dev/null | cut -d' ' -f3` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xmlto_version" >&5 -$as_echo "$xmlto_version" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xmlto_version" >&5 +printf "%s\n" "$xmlto_version" >&6; } as_arg_v1=$xmlto_version as_arg_v2=0.0.22 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null case $? in #( 1) : if test "x$use_xmlto" = xauto; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xmlto version $xmlto_version found, but 0.0.22 needed" >&5 -$as_echo "$as_me: WARNING: xmlto version $xmlto_version found, but 0.0.22 needed" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: xmlto version $xmlto_version found, but 0.0.22 needed" >&5 +printf "%s\n" "$as_me: WARNING: xmlto version $xmlto_version found, but 0.0.22 needed" >&2;} have_xmlto=no else as_fn_error $? "xmlto version $xmlto_version found, but 0.0.22 needed" "$LINENO" 5 @@ -18432,19 +19265,22 @@ fi have_xmlto_text=no cat > conftest.xml << "EOF" EOF -if test "$have_xmlto" = yes; then : - if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1; then : +if test "$have_xmlto" = yes +then : + if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1 +then : have_xmlto_text=yes -else +else $as_nop # Try it again with a non-empty XML file. cat > conftest.xml << "EOF" EOF - if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1; then : + if $XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1 +then : have_xmlto_text=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xmlto cannot generate text format, this format skipped" >&5 -$as_echo "$as_me: WARNING: xmlto cannot generate text format, this format skipped" >&2;} +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: xmlto cannot generate text format, this format skipped" >&5 +printf "%s\n" "$as_me: WARNING: xmlto cannot generate text format, this format skipped" >&2;} fi fi fi @@ -18471,9 +19307,10 @@ fi # Check whether --with-fop was given. -if test "${with_fop+set}" = set; then : +if test ${with_fop+y} +then : withval=$with_fop; use_fop=$withval -else +else $as_nop use_fop=no fi @@ -18482,11 +19319,12 @@ fi if test "x$use_fop" = x"auto"; then # Extract the first word of "fop", so it can be a program name with args. set dummy fop; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_FOP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_FOP+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $FOP in [\\/]* | ?:[\\/]*) ac_cv_path_FOP="$FOP" # Let the user override the test with a path. @@ -18496,11 +19334,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_FOP="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_FOP="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18512,17 +19354,17 @@ esac fi FOP=$ac_cv_path_FOP if test -n "$FOP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5 -$as_echo "$FOP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5 +printf "%s\n" "$FOP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$FOP" = "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: fop not found - documentation targets will be skipped" >&5 -$as_echo "$as_me: WARNING: fop not found - documentation targets will be skipped" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: fop not found - documentation targets will be skipped" >&5 +printf "%s\n" "$as_me: WARNING: fop not found - documentation targets will be skipped" >&2;} have_fop=no else have_fop=yes @@ -18530,11 +19372,12 @@ $as_echo "$as_me: WARNING: fop not found - documentation targets will be skipped elif test "x$use_fop" = x"yes" ; then # Extract the first word of "fop", so it can be a program name with args. set dummy fop; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_FOP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_FOP+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $FOP in [\\/]* | ?:[\\/]*) ac_cv_path_FOP="$FOP" # Let the user override the test with a path. @@ -18544,11 +19387,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_FOP="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_FOP="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18560,11 +19407,11 @@ esac fi FOP=$ac_cv_path_FOP if test -n "$FOP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5 -$as_echo "$FOP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5 +printf "%s\n" "$FOP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -18574,8 +19421,8 @@ fi have_fop=yes elif test "x$use_fop" = x"no" ; then if test "x$FOP" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring FOP environment variable since --with-fop=no was specified" >&5 -$as_echo "$as_me: WARNING: ignoring FOP environment variable since --with-fop=no was specified" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ignoring FOP environment variable since --with-fop=no was specified" >&5 +printf "%s\n" "$as_me: WARNING: ignoring FOP environment variable since --with-fop=no was specified" >&2;} fi have_fop=no else @@ -18600,9 +19447,10 @@ fi # Check whether --with-xsltproc was given. -if test "${with_xsltproc+set}" = set; then : +if test ${with_xsltproc+y} +then : withval=$with_xsltproc; use_xsltproc=$withval -else +else $as_nop use_xsltproc=auto fi @@ -18611,11 +19459,12 @@ fi if test "x$use_xsltproc" = x"auto"; then # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XSLTPROC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_XSLTPROC+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $XSLTPROC in [\\/]* | ?:[\\/]*) ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path. @@ -18625,11 +19474,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_XSLTPROC="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18641,17 +19494,17 @@ esac fi XSLTPROC=$ac_cv_path_XSLTPROC if test -n "$XSLTPROC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 -$as_echo "$XSLTPROC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 +printf "%s\n" "$XSLTPROC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$XSLTPROC" = "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xsltproc not found - cannot transform XML documents" >&5 -$as_echo "$as_me: WARNING: xsltproc not found - cannot transform XML documents" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: xsltproc not found - cannot transform XML documents" >&5 +printf "%s\n" "$as_me: WARNING: xsltproc not found - cannot transform XML documents" >&2;} have_xsltproc=no else have_xsltproc=yes @@ -18659,11 +19512,12 @@ $as_echo "$as_me: WARNING: xsltproc not found - cannot transform XML documents" elif test "x$use_xsltproc" = x"yes" ; then # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XSLTPROC+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_XSLTPROC+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $XSLTPROC in [\\/]* | ?:[\\/]*) ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path. @@ -18673,11 +19527,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_XSLTPROC="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18689,11 +19547,11 @@ esac fi XSLTPROC=$ac_cv_path_XSLTPROC if test -n "$XSLTPROC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 -$as_echo "$XSLTPROC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 +printf "%s\n" "$XSLTPROC" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -18703,8 +19561,8 @@ fi have_xsltproc=yes elif test "x$use_xsltproc" = x"no" ; then if test "x$XSLTPROC" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring XSLTPROC environment variable since --with-xsltproc=no was specified" >&5 -$as_echo "$as_me: WARNING: ignoring XSLTPROC environment variable since --with-xsltproc=no was specified" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ignoring XSLTPROC environment variable since --with-xsltproc=no was specified" >&5 +printf "%s\n" "$as_me: WARNING: ignoring XSLTPROC environment variable since --with-xsltproc=no was specified" >&2;} fi have_xsltproc=no else @@ -18721,14 +19579,14 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X.Org SGML entities >= 1.10" >&5 -$as_echo_n "checking for X.Org SGML entities >= 1.10... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X.Org SGML entities >= 1.10" >&5 +printf %s "checking for X.Org SGML entities >= 1.10... " >&6; } XORG_SGML_PATH= if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-sgml-doctools >= 1.10\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-sgml-doctools >= 1.10\""; } >&5 ($PKG_CONFIG --exists --print-errors "xorg-sgml-doctools >= 1.10") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then XORG_SGML_PATH=`$PKG_CONFIG --variable=sgmlrootdir xorg-sgml-doctools` else @@ -18739,13 +19597,13 @@ fi # Define variables STYLESHEET_SRCDIR and XSL_STYLESHEET containing # the path and the name of the doc stylesheet if test "x$XORG_SGML_PATH" != "x" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XORG_SGML_PATH" >&5 -$as_echo "$XORG_SGML_PATH" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XORG_SGML_PATH" >&5 +printf "%s\n" "$XORG_SGML_PATH" >&6; } STYLESHEET_SRCDIR=$XORG_SGML_PATH/X11 XSL_STYLESHEET=$STYLESHEET_SRCDIR/xorg.xsl else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -18760,17 +19618,149 @@ else fi - - -for ac_prog in cpp +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +printf %s "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if test ${ac_cv_prog_CPP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + # Double quotes because $CC needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_RAWCPP+:} false; then : - $as_echo_n "(cached) " >&6 + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + +else $as_nop + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + # Broken: success on invalid input. +continue +else $as_nop + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok +then : + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP else + ac_cv_prog_CPP=$CPP +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +printf "%s\n" "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + Syntax error +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + +else $as_nop + # Broken: fails on valid input. +continue +fi +rm -f conftest.err conftest.i conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +_ACEOF +if ac_fn_c_try_cpp "$LINENO" +then : + # Broken: success on invalid input. +continue +else $as_nop + # Passes both tests. +ac_preproc_ok=: +break +fi +rm -f conftest.err conftest.i conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.i conftest.err conftest.$ac_ext +if $ac_preproc_ok +then : + +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cpp", so it can be a program name with args. +set dummy ${ac_tool_prefix}cpp; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_RAWCPP+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $RAWCPP in [\\/]* | ?:[\\/]*) ac_cv_path_RAWCPP="$RAWCPP" # Let the user override the test with a path. @@ -18781,11 +19771,15 @@ as_dummy="$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/ for as_dir in $as_dummy do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_RAWCPP="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_RAWCPP="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18797,62 +19791,121 @@ esac fi RAWCPP=$ac_cv_path_RAWCPP if test -n "$RAWCPP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RAWCPP" >&5 -$as_echo "$RAWCPP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RAWCPP" >&5 +printf "%s\n" "$RAWCPP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi - test -n "$RAWCPP" && break +fi +if test -z "$ac_cv_path_RAWCPP"; then + ac_pt_RAWCPP=$RAWCPP + # Extract the first word of "cpp", so it can be a program name with args. +set dummy cpp; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_RAWCPP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $ac_pt_RAWCPP in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_RAWCPP="$ac_pt_RAWCPP" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_RAWCPP="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi done -test -n "$RAWCPP" || RAWCPP="${CPP}" + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_RAWCPP=$ac_cv_path_ac_pt_RAWCPP +if test -n "$ac_pt_RAWCPP"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_RAWCPP" >&5 +printf "%s\n" "$ac_pt_RAWCPP" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_pt_RAWCPP" = x; then + RAWCPP="${CPP}" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RAWCPP=$ac_pt_RAWCPP + fi +else + RAWCPP="$ac_cv_path_RAWCPP" +fi # Check for flag to avoid builtin definitions - assumes unix is predefined, # which is not the best choice for supporting other OS'es, but covers most # of the ones we need for now. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -undef" >&5 -$as_echo_n "checking if $RAWCPP requires -undef... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -undef" >&5 +printf %s "checking if $RAWCPP requires -undef... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ Does cpp redefine unix ? _ACEOF if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then RAWCPPFLAGS=-undef - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } # under Cygwin unix is still defined even with -undef elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then RAWCPPFLAGS="-undef -ansi" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, with -ansi" >&5 -$as_echo "yes, with -ansi" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, with -ansi" >&5 +printf "%s\n" "yes, with -ansi" >&6; } else as_fn_error $? "${RAWCPP} defines unix with or without -undef. I don't know what to do." "$LINENO" 5 fi fi rm -f conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -traditional" >&5 -$as_echo_n "checking if $RAWCPP requires -traditional... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $RAWCPP requires -traditional" >&5 +printf %s "checking if $RAWCPP requires -traditional... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ Does cpp preserve "whitespace"? _ACEOF -if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve "'` -eq 1 ; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else - if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then + if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve "'` -eq 1 ; then TRADITIONALCPPFLAGS="-traditional" RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else as_fn_error $? "${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do." "$LINENO" 5 fi @@ -18868,9 +19921,10 @@ rm -f conftest.$ac_ext # Check whether --with-perl was given. -if test "${with_perl+set}" = set; then : +if test ${with_perl+y} +then : withval=$with_perl; use_perl=$withval -else +else $as_nop use_perl=auto fi @@ -18879,11 +19933,12 @@ fi if test "x$use_perl" = x"auto"; then # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PERL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PERL+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $PERL in [\\/]* | ?:[\\/]*) ac_cv_path_PERL="$PERL" # Let the user override the test with a path. @@ -18893,11 +19948,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PERL="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18909,17 +19968,17 @@ esac fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 -$as_echo "$PERL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 +printf "%s\n" "$PERL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$PERL" = "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: perl not found - cannot extract information and report" >&5 -$as_echo "$as_me: WARNING: perl not found - cannot extract information and report" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: perl not found - cannot extract information and report" >&5 +printf "%s\n" "$as_me: WARNING: perl not found - cannot extract information and report" >&2;} have_perl=no else have_perl=yes @@ -18927,11 +19986,12 @@ $as_echo "$as_me: WARNING: perl not found - cannot extract information and repor elif test "x$use_perl" = x"yes" ; then # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PERL+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PERL+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $PERL in [\\/]* | ?:[\\/]*) ac_cv_path_PERL="$PERL" # Let the user override the test with a path. @@ -18941,11 +20001,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PERL="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -18957,11 +20021,11 @@ esac fi PERL=$ac_cv_path_PERL if test -n "$PERL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 -$as_echo "$PERL" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 +printf "%s\n" "$PERL" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -18971,8 +20035,8 @@ fi have_perl=yes elif test "x$use_perl" = x"no" ; then if test "x$PERL" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring PERL environment variable since --with-perl=no was specified" >&5 -$as_echo "$as_me: WARNING: ignoring PERL environment variable since --with-perl=no was specified" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ignoring PERL environment variable since --with-perl=no was specified" >&5 +printf "%s\n" "$as_me: WARNING: ignoring PERL environment variable since --with-perl=no was specified" >&2;} fi have_perl=no else @@ -19001,11 +20065,12 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. @@ -19015,11 +20080,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -19031,11 +20100,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -19044,11 +20113,12 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. @@ -19058,11 +20128,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -19074,11 +20148,11 @@ esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -19086,8 +20160,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -19099,14 +20173,14 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PKG_CONFIG="" fi fi @@ -19117,11 +20191,12 @@ if test x"$CC_FOR_BUILD" = x; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC_FOR_BUILD+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC_FOR_BUILD+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$CC_FOR_BUILD"; then ac_cv_prog_CC_FOR_BUILD="$CC_FOR_BUILD" # Let the user override the test. else @@ -19129,11 +20204,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_CC_FOR_BUILD="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -19144,11 +20223,11 @@ fi fi CC_FOR_BUILD=$ac_cv_prog_CC_FOR_BUILD if test -n "$CC_FOR_BUILD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC_FOR_BUILD" >&5 -$as_echo "$CC_FOR_BUILD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC_FOR_BUILD" >&5 +printf "%s\n" "$CC_FOR_BUILD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -19207,11 +20286,12 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. @@ -19221,11 +20301,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -19237,11 +20321,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -19250,11 +20334,12 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. @@ -19264,11 +20349,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -19280,11 +20369,11 @@ esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -19292,8 +20381,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -19305,14 +20394,14 @@ fi fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 -$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } PKG_CONFIG="" fi fi @@ -19336,43 +20425,46 @@ fi *) unixdef="yes" ;; esac # Check whether --enable-unix-transport was given. -if test "${enable_unix_transport+set}" = set; then : +if test ${enable_unix_transport+y} +then : enableval=$enable_unix_transport; UNIXCONN=$enableval -else +else $as_nop UNIXCONN=$unixdef fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support UNIX socket connections" >&5 -$as_echo_n "checking if Xtrans should support UNIX socket connections... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support UNIX socket connections" >&5 +printf %s "checking if Xtrans should support UNIX socket connections... " >&6; } if test "$UNIXCONN" = "yes"; then -$as_echo "#define UNIXCONN 1" >>confdefs.h +printf "%s\n" "#define UNIXCONN 1" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNIXCONN" >&5 -$as_echo "$UNIXCONN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $UNIXCONN" >&5 +printf "%s\n" "$UNIXCONN" >&6; } # Check whether --enable-tcp-transport was given. -if test "${enable_tcp_transport+set}" = set; then : +if test ${enable_tcp_transport+y} +then : enableval=$enable_tcp_transport; TCPCONN=$enableval -else +else $as_nop TCPCONN=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support TCP socket connections" >&5 -$as_echo_n "checking if Xtrans should support TCP socket connections... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCPCONN" >&5 -$as_echo "$TCPCONN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support TCP socket connections" >&5 +printf %s "checking if Xtrans should support TCP socket connections... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TCPCONN" >&5 +printf "%s\n" "$TCPCONN" >&6; } if test "$TCPCONN" = "yes"; then -$as_echo "#define TCPCONN 1" >>confdefs.h +printf "%s\n" "#define TCPCONN 1" >>confdefs.h # SVR4 hides these in libraries other than libc - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5 -$as_echo_n "checking for library containing socket... " >&6; } -if ${ac_cv_search_socket+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5 +printf %s "checking for library containing socket... " >&6; } +if test ${ac_cv_search_socket+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -19380,55 +20472,58 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char socket (); int -main () +main (void) { return socket (); ; return 0; } _ACEOF -for ac_lib in '' socket; do +for ac_lib in '' socket +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_socket=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_socket+:} false; then : + if test ${ac_cv_search_socket+y} +then : break fi done -if ${ac_cv_search_socket+:} false; then : +if test ${ac_cv_search_socket+y} +then : -else +else $as_nop ac_cv_search_socket=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5 -$as_echo "$ac_cv_search_socket" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5 +printf "%s\n" "$ac_cv_search_socket" >&6; } ac_res=$ac_cv_search_socket -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5 -$as_echo_n "checking for library containing gethostbyname... " >&6; } -if ${ac_cv_search_gethostbyname+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing gethostbyname" >&5 +printf %s "checking for library containing gethostbyname... " >&6; } +if test ${ac_cv_search_gethostbyname+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -19436,56 +20531,59 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char gethostbyname (); int -main () +main (void) { return gethostbyname (); ; return 0; } _ACEOF -for ac_lib in '' nsl; do +for ac_lib in '' nsl +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_gethostbyname=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_gethostbyname+:} false; then : + if test ${ac_cv_search_gethostbyname+y} +then : break fi done -if ${ac_cv_search_gethostbyname+:} false; then : +if test ${ac_cv_search_gethostbyname+y} +then : -else +else $as_nop ac_cv_search_gethostbyname=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5 -$as_echo "$ac_cv_search_gethostbyname" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_gethostbyname" >&5 +printf "%s\n" "$ac_cv_search_gethostbyname" >&6; } ac_res=$ac_cv_search_gethostbyname -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi if test "$ac_cv_search_socket$ac_cv_search_gethostbyname" = "nono"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lws2_32" >&5 -$as_echo_n "checking for main in -lws2_32... " >&6; } -if ${ac_cv_lib_ws2_32_main+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lws2_32" >&5 +printf %s "checking for main in -lws2_32... " >&6; } +if test ${ac_cv_lib_ws2_32_main+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lws2_32 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -19493,28 +20591,28 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int -main () +main (void) { return main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_ws2_32_main=yes -else +else $as_nop ac_cv_lib_ws2_32_main=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ws2_32_main" >&5 -$as_echo "$ac_cv_lib_ws2_32_main" >&6; } -if test "x$ac_cv_lib_ws2_32_main" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBWS2_32 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ws2_32_main" >&5 +printf "%s\n" "$ac_cv_lib_ws2_32_main" >&6; } +if test "x$ac_cv_lib_ws2_32_main" = xyes +then : + printf "%s\n" "#define HAVE_LIBWS2_32 1" >>confdefs.h LIBS="-lws2_32 $LIBS" @@ -19524,27 +20622,29 @@ fi # Needs to come after above checks for libsocket & libnsl for SVR4 systems # Check whether --enable-ipv6 was given. -if test "${enable_ipv6+set}" = set; then : +if test ${enable_ipv6+y} +then : enableval=$enable_ipv6; IPV6CONN=$enableval -else +else $as_nop ac_fn_c_check_func "$LINENO" "getaddrinfo" "ac_cv_func_getaddrinfo" -if test "x$ac_cv_func_getaddrinfo" = xyes; then : +if test "x$ac_cv_func_getaddrinfo" = xyes +then : IPV6CONN=yes -else +else $as_nop IPV6CONN=no fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if IPv6 support should be built" >&5 -$as_echo_n "checking if IPv6 support should be built... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if IPv6 support should be built" >&5 +printf %s "checking if IPv6 support should be built... " >&6; } if test "$IPV6CONN" = "yes"; then -$as_echo "#define IPv6 1" >>confdefs.h +printf "%s\n" "#define IPv6 1" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IPV6CONN" >&5 -$as_echo "$IPV6CONN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $IPV6CONN" >&5 +printf "%s\n" "$IPV6CONN" >&6; } # 4.3BSD-Reno added a new member to struct sockaddr_in ac_fn_c_check_member "$LINENO" "struct sockaddr_in" "sin_len" "ac_cv_member_struct_sockaddr_in_sin_len" " @@ -19553,9 +20653,10 @@ $as_echo "$IPV6CONN" >&6; } #include " -if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = xyes; then : +if test "x$ac_cv_member_struct_sockaddr_in_sin_len" = xyes +then : -$as_echo "#define BSD44SOCKETS 1" >>confdefs.h +printf "%s\n" "#define BSD44SOCKETS 1" >>confdefs.h fi @@ -19565,11 +20666,10 @@ fi $ac_includes_default #include " -if test "x$ac_cv_type_socklen_t" = xyes; then : +if test "x$ac_cv_type_socklen_t" = xyes +then : -cat >>confdefs.h <<_ACEOF -#define HAVE_SOCKLEN_T 1 -_ACEOF +printf "%s\n" "#define HAVE_SOCKLEN_T 1" >>confdefs.h fi @@ -19582,24 +20682,26 @@ $ac_includes_default #include " -if test "x$ac_cv_member_struct_msghdr_msg_control" = xyes; then : +if test "x$ac_cv_member_struct_msghdr_msg_control" = xyes +then : fi # First try for Solaris in C99 compliant mode, which requires XPG6/UNIX03 if test "x$ac_cv_member_struct_msghdr_msg_control" = xno; then unset ac_cv_member_struct_msghdr_msg_control - { $as_echo "$as_me:${as_lineno-$LINENO}: trying again with _XOPEN_SOURCE=600" >&5 -$as_echo "$as_me: trying again with _XOPEN_SOURCE=600" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying again with _XOPEN_SOURCE=600" >&5 +printf "%s\n" "$as_me: trying again with _XOPEN_SOURCE=600" >&6;} ac_fn_c_check_member "$LINENO" "struct msghdr" "msg_control" "ac_cv_member_struct_msghdr_msg_control" " #define _XOPEN_SOURCE 600 $ac_includes_default #include " -if test "x$ac_cv_member_struct_msghdr_msg_control" = xyes; then : +if test "x$ac_cv_member_struct_msghdr_msg_control" = xyes +then : -$as_echo "#define _XOPEN_SOURCE 600" >>confdefs.h +printf "%s\n" "#define _XOPEN_SOURCE 600" >>confdefs.h fi @@ -19608,17 +20710,18 @@ fi # If that didn't work, fall back to XPG5/UNIX98 with C89 if test "x$ac_cv_member_struct_msghdr_msg_control" = xno; then unset ac_cv_member_struct_msghdr_msg_control - { $as_echo "$as_me:${as_lineno-$LINENO}: trying again with _XOPEN_SOURCE=500" >&5 -$as_echo "$as_me: trying again with _XOPEN_SOURCE=500" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying again with _XOPEN_SOURCE=500" >&5 +printf "%s\n" "$as_me: trying again with _XOPEN_SOURCE=500" >&6;} ac_fn_c_check_member "$LINENO" "struct msghdr" "msg_control" "ac_cv_member_struct_msghdr_msg_control" " #define _XOPEN_SOURCE 500 $ac_includes_default #include " -if test "x$ac_cv_member_struct_msghdr_msg_control" = xyes; then : +if test "x$ac_cv_member_struct_msghdr_msg_control" = xyes +then : -$as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h +printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h fi @@ -19629,50 +20732,51 @@ fi fi case $host_os in - solaris*|sco*|sysv4*) localdef="yes" ;; + solaris*) localdef="yes" ;; *) localdef="no" ;; esac # Check whether --enable-local-transport was given. -if test "${enable_local_transport+set}" = set; then : +if test ${enable_local_transport+y} +then : enableval=$enable_local_transport; LOCALCONN=$enableval -else +else $as_nop LOCALCONN=$localdef fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support os-specific local connections" >&5 -$as_echo_n "checking if Xtrans should support os-specific local connections... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LOCALCONN" >&5 -$as_echo "$LOCALCONN" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if Xtrans should support os-specific local connections" >&5 +printf %s "checking if Xtrans should support os-specific local connections... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LOCALCONN" >&5 +printf "%s\n" "$LOCALCONN" >&6; } if test "$LOCALCONN" = "yes"; then -$as_echo "#define LOCALCONN 1" >>confdefs.h +printf "%s\n" "#define LOCALCONN 1" >>confdefs.h fi # Other functions Xtrans may need - for ac_func in strcasecmp strlcpy -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF + ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" +if test "x$ac_cv_func_strcasecmp" = xyes +then : + printf "%s\n" "#define HAVE_STRCASECMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy" +if test "x$ac_cv_func_strlcpy" = xyes +then : + printf "%s\n" "#define HAVE_STRLCPY 1" >>confdefs.h fi -done # Check for dlopen -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if run-time linking is supported" >&5 -$as_echo_n "checking if run-time linking is supported... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 -$as_echo_n "checking for library containing dlopen... " >&6; } -if ${ac_cv_search_dlopen+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5 +printf %s "checking for library containing dlopen... " >&6; } +if test ${ac_cv_search_dlopen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -19680,155 +20784,81 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlopen (); int -main () +main (void) { return dlopen (); ; return 0; } _ACEOF -for ac_lib in '' dl svld; do +for ac_lib in '' dl svld +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_dlopen=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_dlopen+:} false; then : + if test ${ac_cv_search_dlopen+y} +then : break fi done -if ${ac_cv_search_dlopen+:} false; then : +if test ${ac_cv_search_dlopen+y} +then : -else +else $as_nop ac_cv_search_dlopen=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5 -$as_echo "$ac_cv_search_dlopen" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_dlopen" >&5 +printf "%s\n" "$ac_cv_search_dlopen" >&6; } ac_res=$ac_cv_search_dlopen -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi -if test "x$ac_cv_search_dlopen" = xno; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing shl_load" >&5 -$as_echo_n "checking for library containing shl_load... " >&6; } -if ${ac_cv_search_shl_load+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +if test "x$ac_cv_search_dlopen" != xno; then -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char shl_load (); -int -main () -{ -return shl_load (); - ; - return 0; -} -_ACEOF -for ac_lib in '' dld; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_shl_load=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_shl_load+:} false; then : - break -fi -done -if ${ac_cv_search_shl_load+:} false; then : +printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h -else - ac_cv_search_shl_load=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_shl_load" >&5 -$as_echo "$ac_cv_search_shl_load" >&6; } -ac_res=$ac_cv_search_shl_load -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default" +if test "x$ac_cv_header_dlfcn_h" = xyes +then : + printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h fi - if test "x$ac_cv_search_shl_load" != xno; then - -$as_echo "#define HAVE_SHL_LOAD 1" >>confdefs.h - - for ac_header in dl.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default" -if test "x$ac_cv_header_dl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DL_H 1 -_ACEOF - fi - -done - - fi -else - -$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h - - for ac_header in dlfcn.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default" -if test "x$ac_cv_header_dlfcn_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DLFCN_H 1 -_ACEOF - -fi - -done - -fi -if test "x$ac_cv_header_dlfcn_h" = xyes -o "x$ac_cv_header_dl_h" = xyes; then +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if run-time linking is supported" >&5 +printf %s "checking if run-time linking is supported... " >&6; } +if test "x$ac_cv_header_dlfcn_h" = xyes; then HAVE_LOADABLE_MODULES=yes else HAVE_LOADABLE_MODULES=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_LOADABLE_MODULES" >&5 -$as_echo "$HAVE_LOADABLE_MODULES" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $HAVE_LOADABLE_MODULES" >&5 +printf "%s\n" "$HAVE_LOADABLE_MODULES" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if loadable i18n module support should be enabled" >&5 -$as_echo_n "checking if loadable i18n module support should be enabled... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if loadable i18n module support should be enabled" >&5 +printf %s "checking if loadable i18n module support should be enabled... " >&6; } # Check whether --enable-loadable-i18n was given. -if test "${enable_loadable_i18n+set}" = set; then : +if test ${enable_loadable_i18n+y} +then : enableval=$enable_loadable_i18n; XLIB_LOADABLE_I18N=$enableval -else +else $as_nop XLIB_LOADABLE_I18N="no" fi @@ -19837,13 +20867,13 @@ if test x$XLIB_LOADABLE_I18N = xyes; then as_fn_error $? "Loadable module support is required to enable loadable i18n module support" "$LINENO" 5 fi -$as_echo "#define USE_DYNAMIC_LC 1" >>confdefs.h +printf "%s\n" "#define USE_DYNAMIC_LC 1" >>confdefs.h I18N_MODULE_LIBS='${top_builddir}/src/libX11.la' fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XLIB_LOADABLE_I18N" >&5 -$as_echo "$XLIB_LOADABLE_I18N" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XLIB_LOADABLE_I18N" >&5 +printf "%s\n" "$XLIB_LOADABLE_I18N" >&6; } if test x$XLIB_LOADABLE_I18N = xyes; then XLIB_LOADABLE_I18N_TRUE= @@ -19854,66 +20884,81 @@ else fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if loadable Xcursor library support should be enabled" >&5 -$as_echo_n "checking if loadable Xcursor library support should be enabled... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if loadable Xcursor library support should be enabled" >&5 +printf %s "checking if loadable Xcursor library support should be enabled... " >&6; } # Check whether --enable-loadable-xcursor was given. -if test "${enable_loadable_xcursor+set}" = set; then : +if test ${enable_loadable_xcursor+y} +then : enableval=$enable_loadable_xcursor; XLIB_LOADABLE_XCURSOR=$enableval -else +else $as_nop XLIB_LOADABLE_XCURSOR=$HAVE_LOADABLE_MODULES fi if test x$XLIB_LOADABLE_XCURSOR = xyes; then -$as_echo "#define USE_DYNAMIC_XCURSOR 1" >>confdefs.h +printf "%s\n" "#define USE_DYNAMIC_XCURSOR 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XLIB_LOADABLE_XCURSOR" >&5 -$as_echo "$XLIB_LOADABLE_XCURSOR" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XLIB_LOADABLE_XCURSOR" >&5 +printf "%s\n" "$XLIB_LOADABLE_XCURSOR" >&6; } # Check whether --enable-thread-safety-constructor was given. -if test "${enable_thread_safety_constructor+set}" = set; then : +if test ${enable_thread_safety_constructor+y} +then : enableval=$enable_thread_safety_constructor; USE_THREAD_SAFETY_CONSTRUCTOR=$enableval -else +else $as_nop USE_THREAD_SAFETY_CONSTRUCTOR="yes" fi if test "x$USE_THREAD_SAFETY_CONSTRUCTOR" = "xyes"; then -$as_echo "#define USE_THREAD_SAFETY_CONSTRUCTOR 1" >>confdefs.h +printf "%s\n" "#define USE_THREAD_SAFETY_CONSTRUCTOR 1" >>confdefs.h fi # Checks for header files. -for ac_header in sys/filio.h sys/select.h sys/ioctl.h sys/socket.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +ac_fn_c_check_header_compile "$LINENO" "sys/filio.h" "ac_cv_header_sys_filio_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_filio_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_FILIO_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_select_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_SELECT_H 1" >>confdefs.h -done +fi +ac_fn_c_check_header_compile "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_ioctl_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_IOCTL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_socket_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_SOCKET_H 1" >>confdefs.h + +fi # Checks for typedefs, structures, and compiler characteristics. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_popcountl" >&5 -$as_echo_n "checking for __builtin_popcountl... " >&6; } -if ${ax_cv_have___builtin_popcountl+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_popcountl" >&5 +printf %s "checking for __builtin_popcountl... " >&6; } +if test ${ax_cv_have___builtin_popcountl+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { __builtin_popcountl(0) @@ -19922,23 +20967,23 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ax_cv_have___builtin_popcountl=yes -else +else $as_nop ax_cv_have___builtin_popcountl=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have___builtin_popcountl" >&5 -$as_echo "$ax_cv_have___builtin_popcountl" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have___builtin_popcountl" >&5 +printf "%s\n" "$ax_cv_have___builtin_popcountl" >&6; } - if test yes = $ax_cv_have___builtin_popcountl; then : + if test yes = $ax_cv_have___builtin_popcountl +then : -cat >>confdefs.h <<_ACEOF -#define HAVE___BUILTIN_POPCOUNTL 1 -_ACEOF +printf "%s\n" "#define HAVE___BUILTIN_POPCOUNTL 1" >>confdefs.h fi @@ -19946,23 +20991,25 @@ fi # Checks for library functions. -for ac_func in strtol seteuid -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol" +if test "x$ac_cv_func_strtol" = xyes +then : + printf "%s\n" "#define HAVE_STRTOL 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "seteuid" "ac_cv_func_seteuid" +if test "x$ac_cv_func_seteuid" = xyes +then : + printf "%s\n" "#define HAVE_SETEUID 1" >>confdefs.h fi -done ac_fn_c_check_func "$LINENO" "reallocarray" "ac_cv_func_reallocarray" -if test "x$ac_cv_func_reallocarray" = xyes; then : - $as_echo "#define HAVE_REALLOCARRAY 1" >>confdefs.h +if test "x$ac_cv_func_reallocarray" = xyes +then : + printf "%s\n" "#define HAVE_REALLOCARRAY 1" >>confdefs.h -else +else $as_nop case " $LIBOBJS " in *" reallocarray.$ac_objext "* ) ;; *) LIBOBJS="$LIBOBJS reallocarray.$ac_objext" @@ -19971,38 +21018,40 @@ esac fi - # Used in lcFile.c (see also --enable-xlocaledir settings below) XLOCALEDIR_IS_SAFE="no" -ac_fn_c_check_decl "$LINENO" "issetugid" "ac_cv_have_decl_issetugid" "$ac_includes_default" -if test "x$ac_cv_have_decl_issetugid" = xyes; then : +ac_fn_check_decl "$LINENO" "issetugid" "ac_cv_have_decl_issetugid" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS" +if test "x$ac_cv_have_decl_issetugid" = xyes +then : fi - ac_fn_c_check_func "$LINENO" "issetugid" "ac_cv_func_issetugid" -if test "x$ac_cv_func_issetugid" = xyes; then : +if test "x$ac_cv_func_issetugid" = xyes +then : fi if test "$ac_cv_have_decl_issetugid" = yes && test "$ac_cv_func_issetugid" = yes; then XLOCALEDIR_IS_SAFE="yes" -$as_echo "#define HASSETUGID 1" >>confdefs.h +printf "%s\n" "#define HASSETUGID 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "getresuid" "ac_cv_func_getresuid" -if test "x$ac_cv_func_getresuid" = xyes; then : +if test "x$ac_cv_func_getresuid" = xyes +then : XLOCALEDIR_IS_SAFE="yes" -$as_echo "#define HASGETRESUID 1" >>confdefs.h +printf "%s\n" "#define HASGETRESUID 1" >>confdefs.h fi # Used in Font.c ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" -if test "x$ac_cv_func_shmat" = xyes; then : +if test "x$ac_cv_func_shmat" = xyes +then : -$as_echo "#define HAS_SHM 1" >>confdefs.h +printf "%s\n" "#define HAS_SHM 1" >>confdefs.h fi @@ -20029,9 +21078,10 @@ fi # Check whether --with-launchd was given. -if test "${with_launchd+set}" = set; then : +if test ${with_launchd+y} +then : withval=$with_launchd; LAUNCHD=$withval -else +else $as_nop LAUNCHD=auto fi @@ -20039,11 +21089,12 @@ if test "x$LAUNCHD" = xauto; then unset LAUNCHD # Extract the first word of "launchd", so it can be a program name with args. set dummy launchd; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_LAUNCHD+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_LAUNCHD+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$LAUNCHD"; then ac_cv_prog_LAUNCHD="$LAUNCHD" # Let the user override the test. else @@ -20051,11 +21102,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/sbin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_LAUNCHD="yes" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20067,11 +21122,11 @@ fi fi LAUNCHD=$ac_cv_prog_LAUNCHD if test -n "$LAUNCHD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LAUNCHD" >&5 -$as_echo "$LAUNCHD" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LAUNCHD" >&5 +printf "%s\n" "$LAUNCHD" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -20079,26 +21134,28 @@ fi if test "x$LAUNCHD" = xyes ; then -$as_echo "#define HAVE_LAUNCHD 1" >>confdefs.h +printf "%s\n" "#define HAVE_LAUNCHD 1" >>confdefs.h -$as_echo "#define TRANS_REOPEN 1" >>confdefs.h +printf "%s\n" "#define TRANS_REOPEN 1" >>confdefs.h fi # Check whether --enable-xthreads was given. -if test "${enable_xthreads+set}" = set; then : +if test ${enable_xthreads+y} +then : enableval=$enable_xthreads; xthreads=$enableval -else +else $as_nop xthreads=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpwuid_r in -lc" >&5 -$as_echo_n "checking for getpwuid_r in -lc... " >&6; } -if ${ac_cv_lib_c_getpwuid_r+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getpwuid_r in -lc" >&5 +printf %s "checking for getpwuid_r in -lc... " >&6; } +if test ${ac_cv_lib_c_getpwuid_r+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lc $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -20107,32 +21164,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char getpwuid_r (); int -main () +main (void) { return getpwuid_r (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_c_getpwuid_r=yes -else +else $as_nop ac_cv_lib_c_getpwuid_r=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_getpwuid_r" >&5 -$as_echo "$ac_cv_lib_c_getpwuid_r" >&6; } -if test "x$ac_cv_lib_c_getpwuid_r" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_getpwuid_r" >&5 +printf "%s\n" "$ac_cv_lib_c_getpwuid_r" >&6; } +if test "x$ac_cv_lib_c_getpwuid_r" = xyes +then : mtsafeapi="yes" -else +else $as_nop mtsafeapi="no" fi @@ -20140,12 +21196,12 @@ fi case x$xthreads in xyes) -$as_echo "#define XTHREADS 1" >>confdefs.h +printf "%s\n" "#define XTHREADS 1" >>confdefs.h if test x$mtsafeapi = xyes then -$as_echo "#define XUSE_MTSAFE_API 1" >>confdefs.h +printf "%s\n" "#define XUSE_MTSAFE_API 1" >>confdefs.h fi ;; @@ -20153,57 +21209,6 @@ $as_echo "#define XUSE_MTSAFE_API 1" >>confdefs.h ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lc" >&5 -$as_echo_n "checking for pthread_self in -lc... " >&6; } -if ${ac_cv_lib_c_pthread_self+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lc $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char pthread_self (); -int -main () -{ -return pthread_self (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_c_pthread_self=yes -else - ac_cv_lib_c_pthread_self=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_pthread_self" >&5 -$as_echo "$ac_cv_lib_c_pthread_self" >&6; } -if test "x$ac_cv_lib_c_pthread_self" = xyes; then : - thrstubs="no" -else - thrstubs="yes" -fi - - if test x$thrstubs = xyes; then - THRSTUBS_TRUE= - THRSTUBS_FALSE='#' -else - THRSTUBS_TRUE='#' - THRSTUBS_FALSE= -fi - - # XXX incomplete, please fill this in if test x$xthreads = xyes ; then case $host_os in @@ -20224,10 +21229,22 @@ fi -ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll" -if test "x$ac_cv_func_poll" = xyes; then : +if test "x$USE_THREAD_SAFETY_CONSTRUCTOR" = "xyes"; then + USE_THREAD_LIBS="$XTHREADLIB" +else + # This should be kept in sync with libxcb + case $host_os in + linux*|darwin*|solaris*) ;; + *) X11_REQUIRES="$X11_REQUIRES pthread-stubs" ;; + esac +fi -$as_echo "#define USE_POLL 1" >>confdefs.h + +ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll" +if test "x$ac_cv_func_poll" = xyes +then : + +printf "%s\n" "#define USE_POLL 1" >>confdefs.h fi @@ -20235,13 +21252,14 @@ fi # # Find keysymdef.h # -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking keysym definitions" >&5 -$as_echo_n "checking keysym definitions... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking keysym definitions" >&5 +printf %s "checking keysym definitions... " >&6; } # Check whether --with-keysymdefdir was given. -if test "${with_keysymdefdir+set}" = set; then : +if test ${with_keysymdefdir+y} +then : withval=$with_keysymdefdir; KEYSYMDEFDIR=$withval -else +else $as_nop KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11 fi @@ -20258,14 +21276,15 @@ for i in $FILES; do as_fn_error $? "Cannot find keysymdef.h" "$LINENO" 5 fi done -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $KEYSYMDEFS" >&5 -$as_echo "$KEYSYMDEFS" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $KEYSYMDEFS" >&5 +printf "%s\n" "$KEYSYMDEFS" >&6; } # Check whether --enable-xcms was given. -if test "${enable_xcms+set}" = set; then : +if test ${enable_xcms+y} +then : enableval=$enable_xcms; XCMS=$enableval -else +else $as_nop XCMS=yes fi @@ -20279,14 +21298,15 @@ fi if test x"$XCMS" = "xyes"; then -$as_echo "#define XCMS 1" >>confdefs.h +printf "%s\n" "#define XCMS 1" >>confdefs.h fi # Check whether --enable-xlocale was given. -if test "${enable_xlocale+set}" = set; then : +if test ${enable_xlocale+y} +then : enableval=$enable_xlocale; XLOCALE=$enableval -else +else $as_nop XLOCALE=yes fi @@ -20301,51 +21321,53 @@ fi if test x"$XLOCALE" = "xyes"; then -$as_echo "#define XLOCALE 1" >>confdefs.h +printf "%s\n" "#define XLOCALE 1" >>confdefs.h fi # This disables XLOCALEDIR. Set it if you're using BuildLoadableXlibI18n, # don't have either issetugid() or getresuid(), and you need to protect # clients that are setgid or setuid to an id other than 0. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if XLOCALEDIR support should be enabled" >&5 -$as_echo_n "checking if XLOCALEDIR support should be enabled... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if XLOCALEDIR support should be enabled" >&5 +printf %s "checking if XLOCALEDIR support should be enabled... " >&6; } # Check whether --enable-xlocaledir was given. -if test "${enable_xlocaledir+set}" = set; then : +if test ${enable_xlocaledir+y} +then : enableval=$enable_xlocaledir; ENABLE_XLOCALEDIR=$enableval -else +else $as_nop ENABLE_XLOCALEDIR=$XLOCALEDIR_IS_SAFE fi if test "x$ENABLE_XLOCALEDIR" = "xno"; then -$as_echo "#define NO_XLOCALEDIR 1" >>confdefs.h +printf "%s\n" "#define NO_XLOCALEDIR 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_XLOCALEDIR" >&5 -$as_echo "$ENABLE_XLOCALEDIR" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ENABLE_XLOCALEDIR" >&5 +printf "%s\n" "$ENABLE_XLOCALEDIR" >&6; } # Check whether --enable-xf86bigfont was given. -if test "${enable_xf86bigfont+set}" = set; then : +if test ${enable_xf86bigfont+y} +then : enableval=$enable_xf86bigfont; XF86BIGFONT=$enableval -else +else $as_nop XF86BIGFONT="yes" fi if test "x$XF86BIGFONT" = "xyes"; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xf86bigfontproto >= 1.2.0" >&5 -$as_echo_n "checking for xf86bigfontproto >= 1.2.0... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xf86bigfontproto >= 1.2.0" >&5 +printf %s "checking for xf86bigfontproto >= 1.2.0... " >&6; } if test -n "$BIGFONT_CFLAGS"; then pkg_cv_BIGFONT_CFLAGS="$BIGFONT_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xf86bigfontproto >= 1.2.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xf86bigfontproto >= 1.2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "xf86bigfontproto >= 1.2.0") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_BIGFONT_CFLAGS=`$PKG_CONFIG --cflags "xf86bigfontproto >= 1.2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -20359,10 +21381,10 @@ if test -n "$BIGFONT_LIBS"; then pkg_cv_BIGFONT_LIBS="$BIGFONT_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xf86bigfontproto >= 1.2.0\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xf86bigfontproto >= 1.2.0\""; } >&5 ($PKG_CONFIG --exists --print-errors "xf86bigfontproto >= 1.2.0") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_BIGFONT_LIBS=`$PKG_CONFIG --libs "xf86bigfontproto >= 1.2.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -20376,8 +21398,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -20394,24 +21416,25 @@ fi XF86BIGFONT="no" elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } XF86BIGFONT="no" else BIGFONT_CFLAGS=$pkg_cv_BIGFONT_CFLAGS BIGFONT_LIBS=$pkg_cv_BIGFONT_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } -$as_echo "#define XF86BIGFONT 1" >>confdefs.h +printf "%s\n" "#define XF86BIGFONT 1" >>confdefs.h fi fi # Check whether --enable-xkb was given. -if test "${enable_xkb+set}" = set; then : +if test ${enable_xkb+y} +then : enableval=$enable_xkb; XKB=$enableval -else +else $as_nop XKB=yes fi @@ -20428,7 +21451,7 @@ if test x"$XKB" = "xyes"; then XKBPROTO_REQUIRES="kbproto" X11_REQUIRES="${X11_REQUIRES} kbproto inputproto" -$as_echo "#define XKB 1" >>confdefs.h +printf "%s\n" "#define XKB 1" >>confdefs.h else XKBPROTO_REQUIRES="" @@ -20436,48 +21459,36 @@ fi - - - for ac_header in $ac_header_list -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - +ac_func= +for ac_item in $ac_func_c_list +do + if test $ac_func; then + ac_fn_c_check_func "$LINENO" $ac_func ac_cv_func_$ac_func + if eval test \"x\$ac_cv_func_$ac_func\" = xyes; then + echo "#define $ac_item 1" >> confdefs.h + fi + ac_func= + else + ac_func=$ac_item + fi done - - - - - - -for ac_func in getpagesize -do : - ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize" -if test "x$ac_cv_func_getpagesize" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETPAGESIZE 1 -_ACEOF - -fi -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 -$as_echo_n "checking for working mmap... " >&6; } -if ${ac_cv_func_mmap_fixed_mapped+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - ac_cv_func_mmap_fixed_mapped=no -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5 +printf %s "checking for working mmap... " >&6; } +if test ${ac_cv_func_mmap_fixed_mapped+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "$cross_compiling" = yes +then : + case "$host_os" in # (( + # Guess yes on platforms where we know the result. + linux*) ac_cv_func_mmap_fixed_mapped=yes ;; + # If we don't know, assume the worst. + *) ac_cv_func_mmap_fixed_mapped=no ;; + esac +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default @@ -20509,10 +21520,6 @@ $ac_includes_default #include #include -#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H -char *malloc (); -#endif - /* This mess was copied from the GNU getpagesize.h. */ #ifndef HAVE_GETPAGESIZE # ifdef _SC_PAGESIZE @@ -20546,7 +21553,7 @@ char *malloc (); #endif /* no HAVE_GETPAGESIZE */ int -main () +main (void) { char *data, *data2, *data3; const char *cdata2; @@ -20614,12 +21621,15 @@ main () if (*(data + i) != *(data3 + i)) return 14; close (fd); + free (data); + free (data3); return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : ac_cv_func_mmap_fixed_mapped=yes -else +else $as_nop ac_cv_func_mmap_fixed_mapped=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -20627,33 +21637,35 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5 -$as_echo "$ac_cv_func_mmap_fixed_mapped" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_mmap_fixed_mapped" >&5 +printf "%s\n" "$ac_cv_func_mmap_fixed_mapped" >&6; } if test $ac_cv_func_mmap_fixed_mapped = yes; then -$as_echo "#define HAVE_MMAP 1" >>confdefs.h +printf "%s\n" "#define HAVE_MMAP 1" >>confdefs.h fi rm -f conftest.mmap conftest.txt composecache_default=$ac_cv_func_mmap_fixed_mapped ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo" -if test "x$ac_cv_func_nl_langinfo" = xyes; then : +if test "x$ac_cv_func_nl_langinfo" = xyes +then : -else +else $as_nop composecache_default=no fi # Check whether --enable-composecache was given. -if test "${enable_composecache+set}" = set; then : +if test ${enable_composecache+y} +then : enableval=$enable_composecache; COMPOSECACHE=$enableval -else +else $as_nop COMPOSECACHE=$composecache_default fi if test x"$COMPOSECACHE" = "xyes"; then -$as_echo "#define COMPOSECACHE 1" >>confdefs.h +printf "%s\n" "#define COMPOSECACHE 1" >>confdefs.h fi @@ -20664,9 +21676,10 @@ fi # Check whether --with-lint was given. -if test "${with_lint+set}" = set; then : +if test ${with_lint+y} +then : withval=$with_lint; use_lint=$withval -else +else $as_nop use_lint=no fi @@ -20692,11 +21705,12 @@ esac if test "x$use_lint" = x"yes" ; then # Extract the first word of "$lint_name", so it can be a program name with args. set dummy $lint_name; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_LINT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_LINT+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $LINT in [\\/]* | ?:[\\/]*) ac_cv_path_LINT="$LINT" # Let the user override the test with a path. @@ -20706,11 +21720,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_LINT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_LINT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20722,11 +21740,11 @@ esac fi LINT=$ac_cv_path_LINT if test -n "$LINT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINT" >&5 -$as_echo "$LINT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LINT" >&5 +printf "%s\n" "$LINT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -20735,8 +21753,8 @@ fi fi elif test "x$use_lint" = x"no" ; then if test "x$LINT" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring LINT environment variable since --with-lint=no was specified" >&5 -$as_echo "$as_me: WARNING: ignoring LINT environment variable since --with-lint=no was specified" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ignoring LINT environment variable since --with-lint=no was specified" >&5 +printf "%s\n" "$as_me: WARNING: ignoring LINT environment variable since --with-lint=no was specified" >&2;} fi else as_fn_error $? "--with-lint expects 'yes' or 'no'. Use LINT variable to specify path." "$LINENO" 5 @@ -20762,9 +21780,10 @@ fi # Check whether --enable-lint-library was given. -if test "${enable_lint_library+set}" = set; then : +if test ${enable_lint_library+y} +then : enableval=$enable_lint_library; make_lint_lib=$enableval -else +else $as_nop make_lint_lib=no fi @@ -20801,9 +21820,7 @@ X11_DATADIR="${datadir}/X11" X11_DATADIR="$ax_define_dir" -cat >>confdefs.h <<_ACEOF -#define X11_DATADIR "$ax_define_dir" -_ACEOF +printf "%s\n" "#define X11_DATADIR \"$ax_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -20821,9 +21838,7 @@ X11_LIBDIR="${libdir}/X11" X11_LIBDIR="$ax_define_dir" -cat >>confdefs.h <<_ACEOF -#define X11_LIBDIR "$ax_define_dir" -_ACEOF +printf "%s\n" "#define X11_LIBDIR \"$ax_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -20832,17 +21847,17 @@ _ACEOF pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $X11_REQUIRES" >&5 -$as_echo_n "checking for $X11_REQUIRES... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $X11_REQUIRES" >&5 +printf %s "checking for $X11_REQUIRES... " >&6; } if test -n "$X11_CFLAGS"; then pkg_cv_X11_CFLAGS="$X11_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$X11_REQUIRES\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$X11_REQUIRES\""; } >&5 ($PKG_CONFIG --exists --print-errors "$X11_REQUIRES") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_X11_CFLAGS=`$PKG_CONFIG --cflags "$X11_REQUIRES" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -20856,10 +21871,10 @@ if test -n "$X11_LIBS"; then pkg_cv_X11_LIBS="$X11_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$X11_REQUIRES\""; } >&5 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$X11_REQUIRES\""; } >&5 ($PKG_CONFIG --exists --print-errors "$X11_REQUIRES") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then pkg_cv_X11_LIBS=`$PKG_CONFIG --libs "$X11_REQUIRES" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes @@ -20873,8 +21888,8 @@ fi if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -20900,10 +21915,10 @@ Alternatively, you may set the environment variables X11_CFLAGS and X11_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -20917,8 +21932,8 @@ See \`config.log' for more details" "$LINENO" 5; } else X11_CFLAGS=$pkg_cv_X11_CFLAGS X11_LIBS=$pkg_cv_X11_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi X11_CFLAGS="$X11_CFLAGS $XTHREAD_CFLAGS" @@ -20942,9 +21957,7 @@ X11_LOCALEDATADIR="${X11_DATADIR}/locale" XLOCALEDATADIR="$ax_define_dir" -cat >>confdefs.h <<_ACEOF -#define XLOCALEDATADIR "$ax_define_dir" -_ACEOF +printf "%s\n" "#define XLOCALEDATADIR \"$ax_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -20953,9 +21966,10 @@ _ACEOF # Check whether --with-locale-lib-dir was given. -if test "${with_locale_lib_dir+set}" = set; then : +if test ${with_locale_lib_dir+y} +then : withval=$with_locale_lib_dir; X11_LOCALELIBDIR="$withval" -else +else $as_nop X11_LOCALELIBDIR="${X11_LIBDIR}/locale" fi @@ -20969,9 +21983,7 @@ fi XLOCALELIBDIR="$ax_define_dir" -cat >>confdefs.h <<_ACEOF -#define XLOCALELIBDIR "$ax_define_dir" -_ACEOF +printf "%s\n" "#define XLOCALELIBDIR \"$ax_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -20989,9 +22001,7 @@ X11_LOCALEDIR="${X11_LOCALEDATADIR}" XLOCALEDIR="$ax_define_dir" -cat >>confdefs.h <<_ACEOF -#define XLOCALEDIR "$ax_define_dir" -_ACEOF +printf "%s\n" "#define XLOCALEDIR \"$ax_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -21024,9 +22034,7 @@ XKEYSYMDB="${X11_DATADIR}/XKeysymDB" XKEYSYMDB="$ax_define_dir" -cat >>confdefs.h <<_ACEOF -#define XKEYSYMDB "$ax_define_dir" -_ACEOF +printf "%s\n" "#define XKEYSYMDB \"$ax_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -21043,9 +22051,7 @@ XERRORDB="${X11_DATADIR}/XErrorDB" XERRORDB="$ax_define_dir" -cat >>confdefs.h <<_ACEOF -#define XERRORDB "$ax_define_dir" -_ACEOF +printf "%s\n" "#define XERRORDB \"$ax_define_dir\"" >>confdefs.h test "$prefix_NONE" && prefix=NONE test "$exec_prefix_NONE" && exec_prefix=NONE @@ -21053,32 +22059,35 @@ _ACEOF # Check whether --enable-malloc0returnsnull was given. -if test "${enable_malloc0returnsnull+set}" = set; then : +if test ${enable_malloc0returnsnull+y} +then : enableval=$enable_malloc0returnsnull; MALLOC_ZERO_RETURNS_NULL=$enableval -else +else $as_nop MALLOC_ZERO_RETURNS_NULL=auto fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether malloc(0) returns NULL" >&5 -$as_echo_n "checking whether malloc(0) returns NULL... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether malloc(0) returns NULL" >&5 +printf %s "checking whether malloc(0) returns NULL... " >&6; } if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then -if ${xorg_cv_malloc0_returns_null+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +if test ${xorg_cv_malloc0_returns_null+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test "$cross_compiling" = yes +then : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run test program while cross compiling See \`config.log' for more details" "$LINENO" 5; } -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { char *m0, *r0, *c0, *p; @@ -21092,9 +22101,10 @@ main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : xorg_cv_malloc0_returns_null=yes -else +else $as_nop xorg_cv_malloc0_returns_null=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -21105,8 +22115,8 @@ fi MALLOC_ZERO_RETURNS_NULL=$xorg_cv_malloc0_returns_null fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MALLOC_ZERO_RETURNS_NULL" >&5 -$as_echo "$MALLOC_ZERO_RETURNS_NULL" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MALLOC_ZERO_RETURNS_NULL" >&5 +printf "%s\n" "$MALLOC_ZERO_RETURNS_NULL" >&6; } if test "x$MALLOC_ZERO_RETURNS_NULL" = xyes; then MALLOC_ZERO_CFLAGS="-DMALLOC_0_RETURNS_NULL" @@ -21152,8 +22162,8 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -21183,15 +22193,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +printf "%s\n" "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -21205,8 +22215,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;} fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -21223,7 +22233,7 @@ U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -21234,14 +22244,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 -$as_echo_n "checking that generated files are newer than configure... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +printf %s "checking that generated files are newer than configure... " >&6; } if test -n "$am_sleep_pid"; then # Hide warnings about reused PIDs. wait $am_sleep_pid 2>/dev/null fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 -$as_echo "done" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5 +printf "%s\n" "done" >&6; } if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -21298,10 +22308,6 @@ if test -z "${OS2_TRUE}" && test -z "${OS2_FALSE}"; then as_fn_error $? "conditional \"OS2\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${THRSTUBS_TRUE}" && test -z "${THRSTUBS_FALSE}"; then - as_fn_error $? "conditional \"THRSTUBS\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${XCMS_TRUE}" && test -z "${XCMS_FALSE}"; then as_fn_error $? "conditional \"XCMS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -21327,8 +22333,8 @@ fi ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -21351,14 +22357,16 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -21368,46 +22376,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -21416,13 +22424,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -21431,8 +22432,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -21444,30 +22449,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # as_fn_error STATUS ERROR [LINENO LOG_FD] @@ -21480,13 +22465,14 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -21513,18 +22499,20 @@ as_fn_unset () { eval $1=; unset $1;} } as_unset=as_fn_unset + # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -21536,12 +22524,13 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` @@ -21572,7 +22561,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -21594,6 +22583,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -21607,6 +22600,12 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -21648,7 +22647,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -21657,7 +22656,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -21719,8 +22718,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libX11 $as_me 1.8.1, which was -generated by GNU Autoconf 2.69. Invocation command line was +This file was extended by libX11 $as_me 1.8.9, which was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -21779,17 +22778,19 @@ $config_headers Configuration commands: $config_commands -Report bugs to ." +Report bugs to ." _ACEOF +ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` +ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -libX11 config.status 1.8.1 -configured by $0, generated by GNU Autoconf 2.69, +libX11 config.status 1.8.9 +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -21829,15 +22830,15 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; + printf "%s\n" "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; + printf "%s\n" "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -21845,7 +22846,7 @@ do --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; @@ -21854,7 +22855,7 @@ do as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; + printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; @@ -21882,7 +22883,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -21896,7 +22897,7 @@ exec 5>>config.log sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - $as_echo "$ac_log" + printf "%s\n" "$ac_log" } >&5 _ACEOF @@ -22236,9 +23237,9 @@ done # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands + test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files + test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers + test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands fi # Have a temporary directory for convenience. Make it in the build tree @@ -22574,7 +23575,7 @@ do esac || as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done @@ -22582,17 +23583,17 @@ do # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +printf "%s\n" "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | + ac_sed_conf_input=`printf "%s\n" "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -22609,7 +23610,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | +printf "%s\n" X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -22633,9 +23634,9 @@ $as_echo X"$ac_file" | case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -22697,8 +23698,8 @@ ac_sed_dataroot=' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -22742,9 +23743,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -22760,20 +23761,20 @@ which seems to be undefined. Please make sure it is defined" >&2;} # if test x"$ac_file" != x-; then { - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi @@ -22793,7 +23794,7 @@ $as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$_am_arg" : 'X\(//\)[^/]' \| \ X"$_am_arg" : 'X\(//\)$' \| \ X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$_am_arg" | +printf "%s\n" X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -22813,8 +23814,8 @@ $as_echo X"$_am_arg" | s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -$as_echo "$as_me: executing $ac_file commands" >&6;} + :C) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 +printf "%s\n" "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -22846,7 +23847,7 @@ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ X"$mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$mf" | +printf "%s\n" X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -22888,7 +23889,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ X"$file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$file" | +printf "%s\n" X"$file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -23369,6 +24370,7 @@ _LT_EOF esac + ltmain="$ac_aux_dir/ltmain.sh" @@ -23533,8 +24535,8 @@ else fi if test x"$_lt_function_replace_fail" = x":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 -$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +printf "%s\n" "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} fi @@ -23577,18 +24579,18 @@ if test "$no_create" != yes; then $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi echo "" -echo "X11 will be built with the following settings:" +echo "$PACKAGE_STRING will be built with the following settings:" echo " Loadable i18n module support: "$XLIB_LOADABLE_I18N echo " Loadable xcursor library support: "$XLIB_LOADABLE_XCURSOR echo " Threading support: "$xthreads echo " Use Threads safe API: "$mtsafeapi -echo " Threads stubs in libX11: "$thrstubs +echo " Use thread safety constructor: "$USE_THREAD_SAFETY_CONSTRUCTOR echo " XCMS: "$XCMS echo " Internationalization support: "$XLOCALE echo " XF86BigFont support: "$XF86BIGFONT diff --git a/lib/libX11/configure.ac b/lib/libX11/configure.ac index fc6952a6..71e2b2b0 100644 --- a/lib/libX11/configure.ac +++ b/lib/libX11/configure.ac @@ -1,15 +1,15 @@ # Initialize Autoconf -AC_PREREQ([2.60]) -AC_INIT([libX11], [1.8.1], - [https://gitlab.freedesktop.org/xorg/lib/libx11/issues], [libX11]) +AC_PREREQ([2.70]) +AC_INIT([libX11], [1.8.9], + [https://gitlab.freedesktop.org/xorg/lib/libx11/-/issues], [libX11]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_BUILD AC_CANONICAL_HOST # Set common system defines for POSIX extensions, such as _GNU_SOURCE -# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL) +# Must be called before any macros that run the compiler (like LT_INIT) # to avoid autoconf errors. AC_USE_SYSTEM_EXTENSIONS @@ -17,7 +17,7 @@ AC_USE_SYSTEM_EXTENSIONS AM_INIT_AUTOMAKE([foreign dist-xz]) # Initialize libtool -AC_PROG_LIBTOOL +LT_INIT AC_SYS_LARGEFILE @@ -98,20 +98,13 @@ m4_pattern_forbid([^XTRANS_CONNECTION_FLAGS$]) XTRANS_CONNECTION_FLAGS # Check for dlopen -AC_MSG_CHECKING([if run-time linking is supported]) AC_SEARCH_LIBS(dlopen,[dl svld]) -if test "x$ac_cv_search_dlopen" = xno; then - AC_SEARCH_LIBS(shl_load,[dld]) - if test "x$ac_cv_search_shl_load" != xno; then - AC_DEFINE(HAVE_SHL_LOAD,1, - [Use shl_load to load shared libraries]) - AC_CHECK_HEADERS([dl.h]) - fi -else +if test "x$ac_cv_search_dlopen" != xno; then AC_DEFINE(HAVE_DLOPEN,1,[Use dlopen to load shared libraries]) AC_CHECK_HEADERS([dlfcn.h]) fi -if test "x$ac_cv_header_dlfcn_h" = xyes -o "x$ac_cv_header_dl_h" = xyes; then +AC_MSG_CHECKING([if run-time linking is supported]) +if test "x$ac_cv_header_dlfcn_h" = xyes; then HAVE_LOADABLE_MODULES=yes else HAVE_LOADABLE_MODULES=no @@ -222,9 +215,6 @@ xyes) ;; esac -AC_CHECK_LIB(c, pthread_self, [thrstubs="no"], [thrstubs="yes"]) -AM_CONDITIONAL(THRSTUBS, test x$thrstubs = xyes) - # XXX incomplete, please fill this in if test x$xthreads = xyes ; then case $host_os in @@ -245,6 +235,17 @@ fi AC_SUBST(XTHREADLIB) AC_SUBST(XTHREAD_CFLAGS) +if test "x$USE_THREAD_SAFETY_CONSTRUCTOR" = "xyes"; then + USE_THREAD_LIBS="$XTHREADLIB" +else + # This should be kept in sync with libxcb + case $host_os in + linux*|darwin*|solaris*) ;; + *) X11_REQUIRES="$X11_REQUIRES pthread-stubs" ;; + esac +fi +AC_SUBST(USE_THREAD_LIBS) + AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) # @@ -252,7 +253,7 @@ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], ) # AC_MSG_CHECKING([keysym definitions]) AC_ARG_WITH([keysymdefdir], - [AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h (defaults to xproto include dir)])], + [AS_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h (defaults to xproto include dir)])], [KEYSYMDEFDIR=$withval], [KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11]) @@ -432,12 +433,12 @@ AC_CONFIG_FILES([Makefile AC_OUTPUT echo "" -echo "X11 will be built with the following settings:" +echo "$PACKAGE_STRING will be built with the following settings:" echo " Loadable i18n module support: "$XLIB_LOADABLE_I18N echo " Loadable xcursor library support: "$XLIB_LOADABLE_XCURSOR echo " Threading support: "$xthreads echo " Use Threads safe API: "$mtsafeapi -echo " Threads stubs in libX11: "$thrstubs +echo " Use thread safety constructor: "$USE_THREAD_SAFETY_CONSTRUCTOR echo " XCMS: "$XCMS echo " Internationalization support: "$XLOCALE echo " XF86BigFont support: "$XF86BIGFONT diff --git a/lib/libX11/include/Makefile.in b/lib/libX11/include/Makefile.in index 911ddf90..8aba13c1 100644 --- a/lib/libX11/include/Makefile.in +++ b/lib/libX11/include/Makefile.in @@ -222,6 +222,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/include/X11/Xlib.h b/lib/libX11/include/X11/Xlib.h index f62fb470..4952e9e0 100644 --- a/lib/libX11/include/X11/Xlib.h +++ b/lib/libX11/include/X11/Xlib.h @@ -50,13 +50,9 @@ in this Software without prior written authorization from The Open Group. #ifndef X_WCHAR #include #else -#ifdef __UNIXOS2__ -#include -#else /* replace this with #include or typedef appropriate for your system */ typedef unsigned long wchar_t; #endif -#endif extern int @@ -1735,6 +1731,10 @@ extern Status XInitThreads( void ); +extern Status XFreeThreads( + void +); + extern void XLockDisplay( Display* /* display */ ); diff --git a/lib/libX11/include/X11/Xlibint.h b/lib/libX11/include/X11/Xlibint.h index 6d880a65..a5d7e897 100644 --- a/lib/libX11/include/X11/Xlibint.h +++ b/lib/libX11/include/X11/Xlibint.h @@ -43,6 +43,10 @@ from The Open Group. #include /* to declare xEvent */ #include /* for configured options like XTHREADS */ +#ifdef XTHREADS +#include +#endif + /* The Xlib structs are full of implicit padding to properly align members. We can't clean that up without breaking ABI, so tell clang not to bother complaining about it. */ @@ -207,6 +211,10 @@ struct _XDisplay XIOErrorExitHandler exit_handler; void *exit_handler_data; + CARD32 in_ifevent; +#ifdef XTHREADS + xthread_t ifevent_thread; +#endif }; #define XAllocIDs(dpy,ids,n) (*(dpy)->idlist_alloc)(dpy,ids,n) @@ -332,9 +340,6 @@ typedef struct _XSQEvent #endif #include -#ifdef __sgi -#define _SGI_MP_SOURCE /* turn this on to get MP safe errno */ -#endif #include #define _XBCOPYFUNC _Xbcopy #include @@ -581,11 +586,11 @@ extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len); #define MakeBigReq(req,n) \ { \ CARD64 _BRdat; \ - CARD32 _BRlen = req->length - 1; \ + CARD32 _BRlen = (CARD32) (req->length - 1); \ req->length = 0; \ _BRdat = ((CARD32 *)req)[_BRlen]; \ memmove(((char *)req) + 8, ((char *)req) + 4, (_BRlen - 1) << 2); \ - ((CARD32 *)req)[1] = _BRlen + n + 2; \ + ((CARD32 *)req)[1] = _BRlen + (CARD32) (n) + 2; \ Data32(dpy, &_BRdat, 4); \ } #else @@ -596,7 +601,7 @@ extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len); req->length = 0; \ _BRdat = ((CARD32 *)req)[_BRlen]; \ memmove(((char *)req) + 8, ((char *)req) + 4, (_BRlen - 1) << 2); \ - ((CARD32 *)req)[1] = _BRlen + n + 2; \ + ((CARD32 *)req)[1] = _BRlen + (CARD32) (n) + 2; \ Data32(dpy, &_BRdat, 4); \ } #endif @@ -615,10 +620,10 @@ extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len); MakeBigReq(req,n) \ } else { \ n = badlen; \ - req->length += n; \ + req->length = (CARD16) (req->length + n); \ } \ } else \ - req->length += n + req->length = (CARD16) (req->length + n) #else #define SetReqLen(req,n,badlen) \ req->length += n @@ -641,10 +646,10 @@ extern void _XFlushGCCache(Display *dpy, GC gc); #ifndef DataRoutineIsProcedure #define Data(dpy, data, len) {\ if (dpy->bufptr + (len) <= dpy->bufmax) {\ - memcpy(dpy->bufptr, data, (int)(len));\ - dpy->bufptr += ((len) + 3) & ~3;\ + memcpy(dpy->bufptr, data, (size_t)(len));\ + dpy->bufptr += ((size_t)((len) + 3) & (size_t)~3);\ } else\ - _XSend(dpy, data, len);\ + _XSend(dpy, (_Xconst char*)(data), (long)(len));\ } #endif /* DataRoutineIsProcedure */ @@ -667,14 +672,14 @@ extern void _XFlushGCCache(Display *dpy, GC gc); if (dpy->bufptr + (n) > dpy->bufmax) \ _XFlush (dpy); \ ptr = (type) dpy->bufptr; \ - memset(ptr, '\0', n); \ + memset(ptr, '\0', (size_t)(n)); \ dpy->bufptr += (n); #define Data16(dpy, data, len) Data((dpy), (_Xconst char *)(data), (len)) #define _XRead16Pad(dpy, data, len) _XReadPad((dpy), (char *)(data), (len)) #define _XRead16(dpy, data, len) _XRead((dpy), (char *)(data), (len)) #ifdef LONG64 -#define Data32(dpy, data, len) _XData32(dpy, (_Xconst long *)data, len) +#define Data32(dpy, data, len) _XData32(dpy, (_Xconst long *)(data), (unsigned)(len)) extern int _XData32( Display *dpy, _Xconst long *data, @@ -686,7 +691,7 @@ extern void _XRead32( long len ); #else -#define Data32(dpy, data, len) Data((dpy), (_Xconst char *)(data), (len)) +#define Data32(dpy, data, len) Data((dpy), (_Xconst char *)(data), (long)(len)) #define _XRead32(dpy, data, len) _XRead((dpy), (char *)(data), (len)) #endif @@ -1319,12 +1324,6 @@ struct _XConnWatchInfo { /* info from XAddConnectionWatch */ struct _XConnWatchInfo *next; }; -#ifdef __UNIXOS2__ -extern char* __XOS2RedirRoot( - char* -); -#endif - extern int _XTextHeight( XFontStruct* /* font_struct */, _Xconst char* /* string */, diff --git a/lib/libX11/include/X11/Xutil.h b/lib/libX11/include/X11/Xutil.h index 62cdf555..6de64ed4 100644 --- a/lib/libX11/include/X11/Xutil.h +++ b/lib/libX11/include/X11/Xutil.h @@ -404,11 +404,11 @@ extern int XDestroyRegion( Region /* r */ ); -extern int XEmptyRegion( +extern Bool XEmptyRegion( Region /* r */ ); -extern int XEqualRegion( +extern Bool XEqualRegion( Region /* r1 */, Region /* r2 */ ); diff --git a/lib/libX11/install-sh b/lib/libX11/install-sh index 377bb868..ec298b53 100644 --- a/lib/libX11/install-sh +++ b/lib/libX11/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2020-11-14.01; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,22 +64,16 @@ mvprog=${MVPROG-mv} rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. mode=0755 +# Create dirs (including intermediate dirs) using mode 755. +# This is like GNU 'install' as of coreutils 8.32 (2020). +mkdir_umask=22 + +backupsuffix= chgrpcmd= chmodcmd=$chmodprog chowncmd= @@ -97,7 +87,7 @@ dir_arg= dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -114,18 +104,28 @@ Options: --version display version info and exit. -c (ignored) - -C install only if different (preserve the last data modification time) + -C install only if different (preserve data modification time) -d create directories instead of installing files. -g GROUP $chgrpprog installed files to GROUP. -m MODE $chmodprog installed files to MODE. -o USER $chownprog installed files to USER. + -p pass -p to $cpprog. -s $stripprog installed files. + -S SUFFIX attempt to back up existing files, with suffix SUFFIX. -t DIRECTORY install into DIRECTORY. -T report an error if DSTFILE is a directory. Environment variables override the default commands: CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + +By default, rm is invoked with -f; when overridden with RMPROG, +it's up to you to specify -f if you want it. + +If -S is not specified, no backups are attempted. + +Email bug reports to bug-automake@gnu.org. +Automake home page: https://www.gnu.org/software/automake/ " while test $# -ne 0; do @@ -137,46 +137,62 @@ while test $# -ne 0; do -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; + + -p) cpprog="$cpprog -p";; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -S) backupsuffix="$2" + shift;; - -T) no_target_directory=true;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; + + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -207,6 +223,15 @@ if test $# -eq 0; then exit 0 fi +if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 @@ -223,16 +248,16 @@ if test -z "$dir_arg"; then *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -250,6 +275,10 @@ do dstdir=$dst test -d "$dstdir" dstdir_status=$? + # Don't chown directories that already exist. + if test $dstdir_status = 0; then + chowncmd="" + fi else # Waiting for this to be detected by the "$cpprog $src $dsttmp" command @@ -266,178 +295,148 @@ do fi dst=$dst_arg - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. + # If destination is a directory, append the input filename. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst - dst=$dstdir/`basename "$src"` + dstbase=`basename "$src"` + case $dst in + */) dst=$dst$dstbase;; + *) dst=$dst/$dstbase;; + esac dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi fi + case $dstdir in + */) dstdirslash=$dstdir;; + *) dstdirslash=$dstdir/;; + esac + obsolete_mkdir_used=false if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac + posix_mkdir=false + # The $RANDOM variable is not portable (e.g., dash). Use it + # here however when possible just to lower collision chance. + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode + trap ' + ret=$? + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null + exit $ret + ' 0 + + # Because "mkdir -p" follows existing symlinks and we likely work + # directly in world-writeable /tmp, make sure that the '$tmpdir' + # directory is successfully created first before we actually test + # 'mkdir -p'. + if (umask $mkdir_umask && + $mkdirprog $mkdir_mode "$tmpdir" && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + test_tmpdir="$tmpdir/a" + ls_ld_tmpdir=`ls -ld "$test_tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" else - mkdir_mode= + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + trap '' 0;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else - # The umask is ridiculous, or mkdir does not conform to POSIX, + # mkdir does not conform to POSIX, # or it failed possibly due to a race condition. Create the # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -450,14 +449,25 @@ do else # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ + dsttmp=${dstdirslash}_inst.$$_ + rmtmp=${dstdirslash}_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -472,20 +482,24 @@ do # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then rm -f "$dsttmp" else + # If $backupsuffix is set, and the file being installed + # already exists, attempt a backup. Don't worry if it fails, + # e.g., if mv doesn't support -f. + if test -n "$backupsuffix" && test -f "$dst"; then + $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null + fi + # Rename the file to the real destination. $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || @@ -493,24 +507,24 @@ do # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 @@ -519,9 +533,9 @@ do done # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/lib/libX11/man/Compose.man b/lib/libX11/man/Compose.man index aba221ac..4adea990 100644 --- a/lib/libX11/man/Compose.man +++ b/lib/libX11/man/Compose.man @@ -1,4 +1,4 @@ -.\" Copyright 2009 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 2009, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/man/Makefile.in b/lib/libX11/man/Makefile.in index b7d4591d..755aca86 100644 --- a/lib/libX11/man/Makefile.in +++ b/lib/libX11/man/Makefile.in @@ -257,6 +257,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/man/XAddHost.man b/lib/libX11/man/XAddHost.man index bb75aa2d..d71b9c07 100644 --- a/lib/libX11/man/XAddHost.man +++ b/lib/libX11/man/XAddHost.man @@ -29,7 +29,7 @@ .\" .\" X Window System is a trademark of The Open Group. .\" -.\" Copyright 2004 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 2004, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/man/XGetVisualInfo.man b/lib/libX11/man/XGetVisualInfo.man index 5f1342ca..e54529a4 100644 --- a/lib/libX11/man/XGetVisualInfo.man +++ b/lib/libX11/man/XGetVisualInfo.man @@ -115,7 +115,7 @@ structure contains: .LP /\&* Visual information mask bits */ .TS -lw(.5i) lw(2.5i) lw(.8i). +lw(10) lw(2.5i) lw(.8i). T{ \&#define T} T{ diff --git a/lib/libX11/man/XInitThreads.man b/lib/libX11/man/XInitThreads.man index 4ae95228..b629bd28 100644 --- a/lib/libX11/man/XInitThreads.man +++ b/lib/libX11/man/XInitThreads.man @@ -52,6 +52,8 @@ XInitThreads, XLockDisplay, XUnlockDisplay \- multi-threading support .HP Status XInitThreads\^(void); .HP +Status XFreeThreads\^(void); +.HP void XLockDisplay\^(\^Display *\fIdisplay\fP\^); .HP void XUnlockDisplay\^(\^Display *\fIdisplay\fP\^); @@ -76,7 +78,11 @@ are protected by some other access mechanism (for example, a mutual exclusion lock in a toolkit or through explicit client programming), Xlib thread initialization is not required. It is recommended that single-threaded programs not call this function. - +.LP +The +.B XFreeThreads +function frees the memory allocated by +.BR XInitThreads . .LP The .B XLockDisplay diff --git a/lib/libX11/man/XOpenIM.man b/lib/libX11/man/XOpenIM.man index cfc97881..e5dd25be 100644 --- a/lib/libX11/man/XOpenIM.man +++ b/lib/libX11/man/XOpenIM.man @@ -139,7 +139,8 @@ returns NULL if no input method could be opened. .LP The .B XCloseIM -function closes the specified input method. +function closes the specified input method and frees the memory pointed +to by the im argument. .LP The .B XSetIMValues diff --git a/lib/libX11/man/XSetScreenSaver.man b/lib/libX11/man/XSetScreenSaver.man index 46626a46..4b88fb75 100644 --- a/lib/libX11/man/XSetScreenSaver.man +++ b/lib/libX11/man/XSetScreenSaver.man @@ -116,3 +116,81 @@ Other negative values generate a error. If the timeout value is nonzero, .B XSetScreenSaver +enables the screen saver. +An interval of 0 disables the random-pattern motion. +Both values are limited to a 16-bit signed integer range by the wire protocol, +despite the C prototype. +If no input from devices (keyboard, mouse, and so on) is generated +for the specified number of timeout seconds once the screen saver is enabled, +the screen saver is activated. +.LP +For each screen, +if blanking is preferred and the hardware supports video blanking, +the screen simply goes blank. +Otherwise, if either exposures are allowed or the screen can be regenerated +without sending +.B Expose +events to clients, +the screen is tiled with the root window background tile randomly +re-origined each interval seconds. +Otherwise, the screens' states do not change, +and the screen saver is not activated. +The screen saver is deactivated, +and all screen states are restored at the next +keyboard or pointer input or at the next call to +.B XForceScreenSaver +with mode +.BR ScreenSaverReset . +.LP +If the server-dependent screen saver method supports periodic change, +the interval argument serves as a hint about how long the change period +should be, and zero hints that no periodic change should be made. +Examples of ways to change the screen include scrambling the colormap +periodically, moving an icon image around the screen periodically, or tiling +the screen with the root window background tile, randomly re-origined +periodically. +.LP +.B XSetScreenSaver +can generate a +.B BadValue +error. +.LP +If the specified mode is +.B ScreenSaverActive +and the screen saver currently is deactivated, +.B XForceScreenSaver +activates the screen saver even if the screen saver had been disabled +with a timeout of zero. +If the specified mode is +.B ScreenSaverReset +and the screen saver currently is enabled, +.B XForceScreenSaver +deactivates the screen saver if it was activated, +and the activation timer is reset to its initial state +(as if device input had been received). +.LP +.B XForceScreenSaver +can generate a +.B BadValue +error. +.LP +The +.B XActivateScreenSaver +function activates the screen saver. +.LP +The +.B XResetScreenSaver +function resets the screen saver. +.LP +The +.B XGetScreenSaver +function gets the current screen saver values. +.SH DIAGNOSTICS +.TP 1i +.B BadValue +Some numeric value falls outside the range of values accepted by the request. +Unless a specific range is specified for an argument, the full range defined +by the argument's type is accepted. Any argument defined as a set of +alternatives can generate this error. +.SH "SEE ALSO" +\fI\*(xL\fP diff --git a/lib/libX11/man/xkb/Makefile.am b/lib/libX11/man/xkb/Makefile.am index 1f4e3707..411f03b5 100644 --- a/lib/libX11/man/xkb/Makefile.am +++ b/lib/libX11/man/xkb/Makefile.am @@ -20,7 +20,6 @@ libman_PRE = \ XkbAllocCompatMap.man \ XkbAllocControls.man \ XkbAllocDeviceInfo.man \ - XkbAllocDeviceLedInfo.man \ XkbAllocGeomColors.man \ XkbAllocGeomDoodads.man \ XkbAllocGeomKeyAliases.man \ @@ -46,7 +45,6 @@ libman_PRE = \ XkbChangeControls.man \ XkbChangeDeviceInfo.man \ XkbChangeEnabledControls.man \ - XkbChangeIndicators.man \ XkbChangeMap.man \ XkbChangeNames.man \ XkbChangeTypesOfKey.man \ @@ -84,10 +82,8 @@ libman_PRE = \ XkbFreeKeyboard.man \ XkbFreeNames.man \ XkbFreeServerMap.man \ - XkbGetAccessXTimeout.man \ XkbGetAutoRepeatRate.man \ XkbGetAutoResetControls.man \ - XkbGetBounceKeysDelay.man \ XkbGetCompatMap.man \ XkbGetControls.man \ XkbGetControlsChanges.man \ @@ -97,7 +93,6 @@ libman_PRE = \ XkbGetDeviceInfoChanges.man \ XkbGetDeviceLedInfo.man \ XkbGetGeometry.man \ - XkbGetIndicatorChanges.man \ XkbGetIndicatorMap.man \ XkbGetIndicatorState.man \ XkbGetKeyActions.man \ @@ -110,14 +105,11 @@ libman_PRE = \ XkbGetKeyboard.man \ XkbGetKeyboardByName.man \ XkbGetMap.man \ - XkbGetNameChanges.man \ XkbGetNamedDeviceIndicator.man \ XkbGetNamedGeometry.man \ XkbGetNamedIndicator.man \ XkbGetNames.man \ - XkbGetSlowKeysDelay.man \ XkbGetState.man \ - XkbGetStickyKeysOptions.man \ XkbGetUpdatedMap.man \ XkbGetVirtualMods.man \ XkbGetXlibControls.man \ @@ -130,14 +122,13 @@ libman_PRE = \ XkbKeyGroupWidth.man \ XkbKeyGroupsWidth.man \ XkbKeyHasActions.man \ + XkbKeyKeyType.man \ + XkbKeyKeyTypeIndex.man \ XkbKeyNumActions.man \ XkbKeyNumGroups.man \ XkbKeyNumSyms.man \ XkbKeySymEntry.man \ - XkbKeySymsOffset.man \ XkbKeySymsPtr.man \ - XkbKeyType.man \ - XkbKeyTypeIndex.man \ XkbKeyTypesForCoreSymbols.man \ XkbKeycodeToKeysym.man \ XkbKeysymToModifiers.man \ @@ -152,7 +143,6 @@ libman_PRE = \ XkbModActionVMods.man \ XkbNoteControlsChanges.man \ XkbNoteDeviceChanges.man \ - XkbNoteIndicatorChanges.man \ XkbNoteNameChanges.man \ XkbOpenDisplay.man \ XkbOutOfRangeGroupInfo.man \ @@ -165,7 +155,7 @@ libman_PRE = \ XkbResizeKeyActions.man \ XkbResizeKeySyms.man \ XkbResizeKeyType.man \ - XkbSAActionSetCtrls.man \ + XkbActionSetCtrls.man \ XkbSAGroup.man \ XkbSAPtrDfltValue.man \ XkbSARedirectSetVMods.man \ @@ -178,10 +168,8 @@ libman_PRE = \ XkbSASetScreen.man \ XkbSelectEventDetails.man \ XkbSelectEvents.man \ - XkbSetAccessXTimeout.man \ XkbSetAutoRepeatRate.man \ XkbSetAutoResetControls.man \ - XkbSetBounceKeysDelay.man \ XkbSetCompatMap.man \ XkbSetControls.man \ XkbSetDebuggingFlags.man \ diff --git a/lib/libX11/man/xkb/Makefile.in b/lib/libX11/man/xkb/Makefile.in index 54bc6eb5..1ea0a6f2 100644 --- a/lib/libX11/man/xkb/Makefile.in +++ b/lib/libX11/man/xkb/Makefile.in @@ -217,6 +217,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ @@ -317,7 +318,6 @@ libman_PRE = \ XkbAllocCompatMap.man \ XkbAllocControls.man \ XkbAllocDeviceInfo.man \ - XkbAllocDeviceLedInfo.man \ XkbAllocGeomColors.man \ XkbAllocGeomDoodads.man \ XkbAllocGeomKeyAliases.man \ @@ -343,7 +343,6 @@ libman_PRE = \ XkbChangeControls.man \ XkbChangeDeviceInfo.man \ XkbChangeEnabledControls.man \ - XkbChangeIndicators.man \ XkbChangeMap.man \ XkbChangeNames.man \ XkbChangeTypesOfKey.man \ @@ -381,10 +380,8 @@ libman_PRE = \ XkbFreeKeyboard.man \ XkbFreeNames.man \ XkbFreeServerMap.man \ - XkbGetAccessXTimeout.man \ XkbGetAutoRepeatRate.man \ XkbGetAutoResetControls.man \ - XkbGetBounceKeysDelay.man \ XkbGetCompatMap.man \ XkbGetControls.man \ XkbGetControlsChanges.man \ @@ -394,7 +391,6 @@ libman_PRE = \ XkbGetDeviceInfoChanges.man \ XkbGetDeviceLedInfo.man \ XkbGetGeometry.man \ - XkbGetIndicatorChanges.man \ XkbGetIndicatorMap.man \ XkbGetIndicatorState.man \ XkbGetKeyActions.man \ @@ -407,14 +403,11 @@ libman_PRE = \ XkbGetKeyboard.man \ XkbGetKeyboardByName.man \ XkbGetMap.man \ - XkbGetNameChanges.man \ XkbGetNamedDeviceIndicator.man \ XkbGetNamedGeometry.man \ XkbGetNamedIndicator.man \ XkbGetNames.man \ - XkbGetSlowKeysDelay.man \ XkbGetState.man \ - XkbGetStickyKeysOptions.man \ XkbGetUpdatedMap.man \ XkbGetVirtualMods.man \ XkbGetXlibControls.man \ @@ -427,14 +420,13 @@ libman_PRE = \ XkbKeyGroupWidth.man \ XkbKeyGroupsWidth.man \ XkbKeyHasActions.man \ + XkbKeyKeyType.man \ + XkbKeyKeyTypeIndex.man \ XkbKeyNumActions.man \ XkbKeyNumGroups.man \ XkbKeyNumSyms.man \ XkbKeySymEntry.man \ - XkbKeySymsOffset.man \ XkbKeySymsPtr.man \ - XkbKeyType.man \ - XkbKeyTypeIndex.man \ XkbKeyTypesForCoreSymbols.man \ XkbKeycodeToKeysym.man \ XkbKeysymToModifiers.man \ @@ -449,7 +441,6 @@ libman_PRE = \ XkbModActionVMods.man \ XkbNoteControlsChanges.man \ XkbNoteDeviceChanges.man \ - XkbNoteIndicatorChanges.man \ XkbNoteNameChanges.man \ XkbOpenDisplay.man \ XkbOutOfRangeGroupInfo.man \ @@ -462,7 +453,7 @@ libman_PRE = \ XkbResizeKeyActions.man \ XkbResizeKeySyms.man \ XkbResizeKeyType.man \ - XkbSAActionSetCtrls.man \ + XkbActionSetCtrls.man \ XkbSAGroup.man \ XkbSAPtrDfltValue.man \ XkbSARedirectSetVMods.man \ @@ -475,10 +466,8 @@ libman_PRE = \ XkbSASetScreen.man \ XkbSelectEventDetails.man \ XkbSelectEvents.man \ - XkbSetAccessXTimeout.man \ XkbSetAutoRepeatRate.man \ XkbSetAutoResetControls.man \ - XkbSetBounceKeysDelay.man \ XkbSetCompatMap.man \ XkbSetControls.man \ XkbSetDebuggingFlags.man \ diff --git a/lib/libX11/man/xkb/XkbActionCtrls.man b/lib/libX11/man/xkb/XkbActionCtrls.man index e1e4173c..b747103d 100644 --- a/lib/libX11/man/xkb/XkbActionCtrls.man +++ b/lib/libX11/man/xkb/XkbActionCtrls.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,7 +31,7 @@ XkbActionCtrls \- Returns the ctrls fields of act converted to an unsigned int .if t .ti +.5i .SH ARGUMENTS .TP -.I \- act +.I act action from which to extract controls .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSAActionSetCtrls.man b/lib/libX11/man/xkb/XkbActionSetCtrls.man similarity index 94% rename from lib/libX11/man/xkb/XkbSAActionSetCtrls.man rename to lib/libX11/man/xkb/XkbActionSetCtrls.man index f8a0ce65..67b20231 100644 --- a/lib/libX11/man/xkb/XkbSAActionSetCtrls.man +++ b/lib/libX11/man/xkb/XkbActionSetCtrls.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -20,9 +20,9 @@ .\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER .\" DEALINGS IN THE SOFTWARE. .\" -.TH XkbSAActionSetCtrls __libmansuffix__ __xorgversion__ "XKB FUNCTIONS" +.TH XkbActionSetCtrls __libmansuffix__ __xorgversion__ "XKB FUNCTIONS" .SH NAME -XkbSAActionSetCtrls \- Sets the +XkbActionSetCtrls \- Sets the .I ctrls0 through .I ctrls3 @@ -32,17 +32,17 @@ from .I ctrls .SH SYNOPSIS .HP -.B void XkbSAActionSetCtrls +.B void XkbActionSetCtrls .BI "(\^XkbCtrlsAction " "act" "\^," .BI "unsigned int " "ctrls" "\^);" .if n .ti +5n .if t .ti +.5i .SH ARGUMENTS .TP -.I \- act +.I act action in which to set ctrls0-ctrls3 .TP -.I \- ctrls +.I ctrls value to set in ctrls0-ctrls3 .SH DESCRIPTION .LP @@ -121,7 +121,7 @@ fields represent the boolean controls in the .I enabled_ctrls field of the controls structure. Xkb macros, to convert between the two formats. -.I XkbSAActionSetCtrls +.I XkbActionSetCtrls sets the .I ctrls0 through diff --git a/lib/libX11/man/xkb/XkbAddDeviceLedInfo.man b/lib/libX11/man/xkb/XkbAddDeviceLedInfo.man index 3a612e26..426e8581 100644 --- a/lib/libX11/man/xkb/XkbAddDeviceLedInfo.man +++ b/lib/libX11/man/xkb/XkbAddDeviceLedInfo.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ XkbAddDeviceLedInfo \- Initialize an XkbDeviceLedInfoRec structure .if t .ti +.5i .SH ARGUMENTS .TP -.I \- device_info +.I device_info structure in which to add LED info .TP -.I \- led_class +.I led_class input extension class for LED device of interest .TP -.I \- led_id +.I led_id input extension ID for LED device of interest .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAddGeomColor.man b/lib/libX11/man/xkb/XkbAddGeomColor.man index 6ebe22c3..d8f667a3 100644 --- a/lib/libX11/man/xkb/XkbAddGeomColor.man +++ b/lib/libX11/man/xkb/XkbAddGeomColor.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ description .if t .ti +.5i .SH ARGUMENTS .TP -.I \- geom +.I geom geometry to be updated .TP -.I \- spec +.I spec color to be added .TP -.I \- pixel +.I pixel color to be added .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAddGeomDoodad.man b/lib/libX11/man/xkb/XkbAddGeomDoodad.man index b6519fdd..a90483aa 100644 --- a/lib/libX11/man/xkb/XkbAddGeomDoodad.man +++ b/lib/libX11/man/xkb/XkbAddGeomDoodad.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ top-level geometry .if t .ti +.5i .SH ARGUMENTS .TP -.I \- geom +.I geom geometry to which the doodad is added .TP -.I \- section +.I section section, if any, to which the doodad is added .TP -.I \- name +.I name name of the new doodad .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAddGeomKey.man b/lib/libX11/man/xkb/XkbAddGeomKey.man index 2132224d..8c6e6066 100644 --- a/lib/libX11/man/xkb/XkbAddGeomKey.man +++ b/lib/libX11/man/xkb/XkbAddGeomKey.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -30,7 +30,7 @@ XkbAddGeomKey \- Add one key at the end of an existing row of keys .if t .ti +.5i .SH ARGUMENTS .TP -.I \- row +.I row row to be updated .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAddGeomKeyAlias.man b/lib/libX11/man/xkb/XkbAddGeomKeyAlias.man index 63f8924b..521694f1 100644 --- a/lib/libX11/man/xkb/XkbAddGeomKeyAlias.man +++ b/lib/libX11/man/xkb/XkbAddGeomKeyAlias.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ description .if t .ti +.5i .SH ARGUMENTS .TP -.I \- geom +.I geom geometry to be updated .TP -.I \- alias +.I alias alias to be added .TP -.I \- real +.I real real name to be bound to the new alias .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAddGeomOutline.man b/lib/libX11/man/xkb/XkbAddGeomOutline.man index 3479da26..6c58983c 100644 --- a/lib/libX11/man/xkb/XkbAddGeomOutline.man +++ b/lib/libX11/man/xkb/XkbAddGeomOutline.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,10 +31,10 @@ XkbAddGeomOutline \- Add one outline to an existing shape .if t .ti +.5i .SH ARGUMENTS .TP -.I \- shape +.I shape shape to be updated .TP -.I \- sz_points +.I sz_points number of points to be reserved .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAddGeomOverlay.man b/lib/libX11/man/xkb/XkbAddGeomOverlay.man index 1693d12b..444b2e65 100644 --- a/lib/libX11/man/xkb/XkbAddGeomOverlay.man +++ b/lib/libX11/man/xkb/XkbAddGeomOverlay.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,13 +32,13 @@ XkbAddGeomOverlay \- Add one overlay to a section .if t .ti +.5i .SH ARGUMENTS .TP -.I \- section +.I section section to which an overlay will be added .TP -.I \- name +.I name name of the overlay .TP -.I \- sz_rows +.I sz_rows number of rows to reserve in the overlay .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAddGeomOverlayKey.man b/lib/libX11/man/xkb/XkbAddGeomOverlayKey.man index bce3d266..c64e70f8 100644 --- a/lib/libX11/man/xkb/XkbAddGeomOverlayKey.man +++ b/lib/libX11/man/xkb/XkbAddGeomOverlayKey.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ XkbAddGeomOverlayKey \- Add a key to an existing overlay row .if t .ti +.5i .SH ARGUMENTS .TP -.I \- overlay +.I overlay overlay to be updated .TP -.I \- row +.I row row in overlay to be updated .TP -.I \- under +.I under primary name of the key to be considered .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAddGeomOverlayRow.man b/lib/libX11/man/xkb/XkbAddGeomOverlayRow.man index 760f91a3..95b0d421 100644 --- a/lib/libX11/man/xkb/XkbAddGeomOverlayRow.man +++ b/lib/libX11/man/xkb/XkbAddGeomOverlayRow.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,13 +32,13 @@ XkbAddGeomOverlayRow \- Add a row to an existing overlay .if t .ti +.5i .SH ARGUMENTS .TP -.I \- overlay +.I overlay overlay to be updated .TP -.I \- row_under +.I row_under row to be overlaid in the section overlay overlays .TP -.I \- sz_keys +.I sz_keys number of keys to reserve in the row .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAddGeomProperty.man b/lib/libX11/man/xkb/XkbAddGeomProperty.man index 1ec546cd..9b40ab10 100644 --- a/lib/libX11/man/xkb/XkbAddGeomProperty.man +++ b/lib/libX11/man/xkb/XkbAddGeomProperty.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ description .if t .ti +.5i .SH ARGUMENTS .TP -.I \- geom +.I geom geometry to be updated .TP -.I \- name +.I name name of the new property .TP -.I \- value +.I value value for the new property .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAddGeomRow.man b/lib/libX11/man/xkb/XkbAddGeomRow.man index e400cb8f..0646d3e0 100644 --- a/lib/libX11/man/xkb/XkbAddGeomRow.man +++ b/lib/libX11/man/xkb/XkbAddGeomRow.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,10 +31,10 @@ XkbAddGeomRow \- Add a row to a section .if t .ti +.5i .SH ARGUMENTS .TP -.I \- section +.I section section to be updated .TP -.I \- sz_keys +.I sz_keys number of keys to be reserved .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAddGeomSection.man b/lib/libX11/man/xkb/XkbAddGeomSection.man index 9e5ca388..f5da1cce 100644 --- a/lib/libX11/man/xkb/XkbAddGeomSection.man +++ b/lib/libX11/man/xkb/XkbAddGeomSection.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,19 +34,19 @@ XkbAddGeomSection \- Add one section to an existing keyboard geometry .if t .ti +.5i .SH ARGUMENTS .TP -.I \- geom +.I geom geometry to be updated .TP -.I \- name +.I name name of the new section .TP -.I \- sz_rows +.I sz_rows number of rows to reserve in the section .TP -.I \- sz_doodads +.I sz_doodads number of doodads to reserve in the section .TP -.I \- sz_overlays +.I sz_overlays number of overlays to reserve in the section .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAddGeomShape.man b/lib/libX11/man/xkb/XkbAddGeomShape.man index a7950010..2f883495 100644 --- a/lib/libX11/man/xkb/XkbAddGeomShape.man +++ b/lib/libX11/man/xkb/XkbAddGeomShape.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,13 +32,13 @@ XkbAddGeomShape \- Add a shape to a keyboard geometry .if t .ti +.5i .SH ARGUMENTS .TP -.I \- geom +.I geom geometry to be updated .TP -.I \- name +.I name name of the new shape .TP -.I \- sz_outlines +.I sz_outlines number of outlines to be reserved .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAddSymInterpret.man b/lib/libX11/man/xkb/XkbAddSymInterpret.man index 0171602f..5ca629d9 100644 --- a/lib/libX11/man/xkb/XkbAddSymInterpret.man +++ b/lib/libX11/man/xkb/XkbAddSymInterpret.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,16 +34,16 @@ interpretations in an XkbCompatRec .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb keyboard description to be updated .TP -.I \- si +.I si symbol interpretation to be added .TP -.I \- updateMap +.I updateMap True=>apply compatibility map to keys .TP -.I \- changes +.I changes changes are put here .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAllocClientMap.man b/lib/libX11/man/xkb/XkbAllocClientMap.man index 1e2a1943..668f8a80 100644 --- a/lib/libX11/man/xkb/XkbAllocClientMap.man +++ b/lib/libX11/man/xkb/XkbAllocClientMap.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,13 +34,13 @@ record .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb keyboard description in which to allocate client map .TP -.I \- which +.I which mask selecting map components to allocate .TP -.I \- type_count +.I type_count value of num_types field in map to be allocated .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAllocCompatMap.man b/lib/libX11/man/xkb/XkbAllocCompatMap.man index 78a02bd9..d0a184bd 100644 --- a/lib/libX11/man/xkb/XkbAllocCompatMap.man +++ b/lib/libX11/man/xkb/XkbAllocCompatMap.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ XkbAllocCompatMap \- Allocate a new compatibility map if you do not already have .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb keyboard description in which to allocate compat map .TP -.I \- which +.I which mask of compatibility map components to allocate .TP -.I \- num_si +.I num_si number of symbol interpretations to allocate .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAllocControls.man b/lib/libX11/man/xkb/XkbAllocControls.man index 9e9b3556..b5d4bc2b 100644 --- a/lib/libX11/man/xkb/XkbAllocControls.man +++ b/lib/libX11/man/xkb/XkbAllocControls.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,10 +32,10 @@ XkbAllocControls \- Allocates an XkbControlsRec structure in the XkbDescRec .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb Xkb description in which to allocate ctrls rec .TP -.I \- which +.I which mask of components of ctrls to allocate .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAllocDeviceInfo.man b/lib/libX11/man/xkb/XkbAllocDeviceInfo.man index 615e09fe..00e540f0 100644 --- a/lib/libX11/man/xkb/XkbAllocDeviceInfo.man +++ b/lib/libX11/man/xkb/XkbAllocDeviceInfo.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ XkbAllocDeviceInfo \- Obtain an XkbDeviceInfoRec structure .if t .ti +.5i .SH ARGUMENTS .TP -.I \- device_spec +.I device_spec device ID with which structure will be used .TP -.I \- n_buttons +.I n_buttons number of button actions to allocate space for .TP -.I \- sz_leds +.I sz_leds number of LED feedbacks to allocate space for .SH DESCRIPTION .LP @@ -58,10 +58,8 @@ is nonzero, .I sz_leds XkbDeviceLedInfoRec structures are also allocated and linked into the XkbDeviceInfoRec structure. If you request XkbDeviceLedInfoRec structures be allocated using this request, you must initialize them -explicitly. - -To obtain an XkbDeviceLedInfoRec structure, use -.I XkbAllocDeviceLedInfo. +explicitly, by using +.BR XkbAddDeviceLedInfo (__libmansuffix__). .SH STRUCTURES .LP Information about X Input Extension devices is transferred between a client program and the Xkb @@ -97,4 +95,4 @@ extension in an XkbDeviceInfoRec structure: } XkbDeviceLedInfoRec, *XkbDeviceLedInfoPtr; .fi .SH "SEE ALSO" -.BR XkbAllocDeviceLedInfo (__libmansuffix__) +.BR XkbAddDeviceLedInfo (__libmansuffix__) diff --git a/lib/libX11/man/xkb/XkbAllocDeviceLedInfo.man b/lib/libX11/man/xkb/XkbAllocDeviceLedInfo.man deleted file mode 100644 index 0e835d70..00000000 --- a/lib/libX11/man/xkb/XkbAllocDeviceLedInfo.man +++ /dev/null @@ -1,113 +0,0 @@ -'\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. -.\" -.\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the "Software"), -.\" to deal in the Software without restriction, including without limitation -.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, -.\" and/or sell copies of the Software, and to permit persons to whom the -.\" Software is furnished to do so, subject to the following conditions: -.\" -.\" The above copyright notice and this permission notice (including the next -.\" paragraph) shall be included in all copies or substantial portions of the -.\" Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -.\" DEALINGS IN THE SOFTWARE. -.\" -.TH XkbAllocDeviceLedInfo __libmansuffix__ __xorgversion__ "XKB FUNCTIONS" -.SH NAME -XkbAllocDeviceLedInfo \- Obtain an XkbDeviceLedInfoRec structure -.SH SYNOPSIS -.HP -.B Status XkbAllocDeviceLedInfo -.BI "(\^XkbDeviceInfoPtr " "device_info" "\^," -.BI "int " "num_needed" "\^);" -.if n .ti +5n -.if t .ti +.5i -.SH ARGUMENTS -.TP -.I \- device_info -structure in which to allocate LED space -.TP -.I \- num_needed -number of indicators to allocate space for -.SH DESCRIPTION -.LP -.I XkbAllocDeviceLedInfo -allocates space for an XkbDeviceLedInfoRec and places it in -.I device_info. -If -.I num_needed -is nonzero, -.I num_needed -XkbIndicatorMapRec structures are also allocated and linked into the XkbDeviceLedInfoRec structure. If you request XkbIndicatorMapRec structures be allocated using this request, you must initialize them explicitly. All other fields are initialized to zero. - -To initialize an XkbDeviceLedInfoRec structure, use -.I XkbAddDeviceLedInfo. -.SH STRUCTURES -.LP -Information about X Input Extension devices is transferred between a client program and the Xkb -extension in an XkbDeviceInfoRec structure: -.nf - - typedef struct { - char * name; /\&* name for device */ - Atom type; /\&* name for class of devices */ - unsigned short device_spec; /\&* device of interest */ - Bool has_own_state; /\&* True=>this device has its own state */ - unsigned short supported; /\&* bits indicating supported capabilities */ - unsigned short unsupported; /\&* bits indicating unsupported capabilities */ - unsigned short num_btns; /\&* number of entries in btn_acts */ - XkbAction * btn_acts; /\&* button actions */ - unsigned short sz_leds; /\&* total number of entries in LEDs vector */ - unsigned short num_leds; /\&* number of valid entries in LEDs vector */ - unsigned short dflt_kbd_fb; /\&* input extension ID of default (core kbd) indicator */ - unsigned short dflt_led_fb; /\&* input extension ID of default indicator feedback */ - XkbDeviceLedInfoPtr leds; /\&* LED descriptions */ - } XkbDeviceInfoRec, *XkbDeviceInfoPtr; - - - typedef struct { - unsigned short led_class; /\&* class for this LED device*/ - unsigned short led_id; /\&* ID for this LED device */ - unsigned int phys_indicators; /\&* bits for which LEDs physically present */ - unsigned int maps_present; /\&* bits for which LEDs have maps in maps */ - unsigned int names_present; /\&* bits for which LEDs are in names */ - unsigned int state; /\&* 1 bit => corresponding LED is on */ - Atom names[XkbNumIndicators]; /\&* names for LEDs */ - XkbIndicatorMapRec maps; /\&* indicator maps for each LED */ - } XkbDeviceLedInfoRec, *XkbDeviceLedInfoPtr; - -.fi -Each indicator has its own set of attributes that specify whether clients can explicitly set its state and whether it tracks the keyboard state. The attributes of each indicator are held in the maps array, which is an array of XkbIndicatorRec structures: -.nf - - typedef struct { - unsigned char flags; /\&* how the indicator can be changed */ - unsigned char which_groups; /\&* match criteria for groups */ - unsigned char groups; /\&* which keyboard groups the indicator watches */ - unsigned char which_mods; /\&* match criteria for modifiers */ - XkbModsRec mods; /\&* which modifiers the indicator watches */ - unsigned int ctrls; /\&* which controls the indicator watches */ - } XkbIndicatorMapRec, *XkbIndicatorMapPtr; - -.fi -This indicator map specifies for each indicator: - -.IP \(bu 5 -The conditions under which the keyboard modifier state affects the indicator -.IP \(bu 5 -The conditions under which the keyboard group state affects the indicator -.IP \(bu 5 -The conditions under which the state of the boolean controls affects the indicator -.IP \(bu 5 -The effect (if any) of attempts to explicitly change the state of the indicator using the functions XkbSetControls or XChangeKeyboardControl -.SH "SEE ALSO" -.BR XkbAddDeviceLedInfo (__libmansuffix__), -.BR XkbSetControls (__libmansuffix__) diff --git a/lib/libX11/man/xkb/XkbAllocGeomColors.man b/lib/libX11/man/xkb/XkbAllocGeomColors.man index f3224e17..e48c1ba7 100644 --- a/lib/libX11/man/xkb/XkbAllocGeomColors.man +++ b/lib/libX11/man/xkb/XkbAllocGeomColors.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,10 +31,10 @@ XkbAllocGeomColors \- Allocate geometry colors .if t .ti +.5i .SH ARGUMENTS .TP -.I \- geom +.I geom geometry for which colors should be allocated .TP -.I \- num_needed +.I num_needed number of new colors required .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAllocGeomDoodads.man b/lib/libX11/man/xkb/XkbAllocGeomDoodads.man index 882aaf2a..874ee562 100644 --- a/lib/libX11/man/xkb/XkbAllocGeomDoodads.man +++ b/lib/libX11/man/xkb/XkbAllocGeomDoodads.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,10 +32,10 @@ XkbAllocGeomDoodads \- Allocate doodads that are global to a keyboard geometry .if t .ti +.5i .SH ARGUMENTS .TP -.I \- geom +.I geom geometry for which doodads should be allocated .TP -.I \- num_needed +.I num_needed number of new doodads required .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAllocGeomKeyAliases.man b/lib/libX11/man/xkb/XkbAllocGeomKeyAliases.man index 9daa7679..55dab7fb 100644 --- a/lib/libX11/man/xkb/XkbAllocGeomKeyAliases.man +++ b/lib/libX11/man/xkb/XkbAllocGeomKeyAliases.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,10 +31,10 @@ XkbAllocGeomKeyAliases \- Allocate geometry key aliases .if t .ti +.5i .SH ARGUMENTS .TP -.I \- geom +.I geom geometry for which key aliases should be allocated .TP -.I \- num_needed +.I num_needed number of new key aliases required .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAllocGeomKeys.man b/lib/libX11/man/xkb/XkbAllocGeomKeys.man index cfa979d3..ad8375bf 100644 --- a/lib/libX11/man/xkb/XkbAllocGeomKeys.man +++ b/lib/libX11/man/xkb/XkbAllocGeomKeys.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,10 +31,10 @@ XkbAllocGeomKeys \- Allocate space for an arbitrary number of keys to a row .if t .ti +.5i .SH ARGUMENTS .TP -.I \- row +.I row row to which keys should be allocated .TP -.I \- num_needed +.I num_needed number of new keys required .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAllocGeomOutlines.man b/lib/libX11/man/xkb/XkbAllocGeomOutlines.man index 5a191bb3..7cfc051e 100644 --- a/lib/libX11/man/xkb/XkbAllocGeomOutlines.man +++ b/lib/libX11/man/xkb/XkbAllocGeomOutlines.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,10 +32,10 @@ shape .if t .ti +.5i .SH ARGUMENTS .TP -.I \- shape +.I shape shape for which outlines should be allocated .TP -.I \- num_needed +.I num_needed number of new outlines required .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAllocGeomOverlayKeys.man b/lib/libX11/man/xkb/XkbAllocGeomOverlayKeys.man index 157b7ef2..58d16ee3 100644 --- a/lib/libX11/man/xkb/XkbAllocGeomOverlayKeys.man +++ b/lib/libX11/man/xkb/XkbAllocGeomOverlayKeys.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,10 +32,10 @@ XkbAllocGeomOverlayKeys \- Allocate keys in an overlay row .if t .ti +.5i .SH ARGUMENTS .TP -.I \- row +.I row section for which rows should be allocated .TP -.I \- num_needed +.I num_needed number of new rows required .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAllocGeomOverlayRows.man b/lib/libX11/man/xkb/XkbAllocGeomOverlayRows.man index c1c952bb..9101e242 100644 --- a/lib/libX11/man/xkb/XkbAllocGeomOverlayRows.man +++ b/lib/libX11/man/xkb/XkbAllocGeomOverlayRows.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,10 +31,10 @@ XkbAllocGeomOverlayRows \- Allocate rows in a overlay .if t .ti +.5i .SH ARGUMENTS .TP -.I \- overlay +.I overlay section for which rows should be allocated .TP -.I \- num_needed +.I num_needed number of new rows required .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAllocGeomOverlays.man b/lib/libX11/man/xkb/XkbAllocGeomOverlays.man index 4cf95a75..2c7a9afb 100644 --- a/lib/libX11/man/xkb/XkbAllocGeomOverlays.man +++ b/lib/libX11/man/xkb/XkbAllocGeomOverlays.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,10 +31,10 @@ XkbAllocGeomOverlays \- Allocate overlays in a section .if t .ti +.5i .SH ARGUMENTS .TP -.I \- section +.I section section for which overlays should be allocated .TP -.I \- num_needed +.I num_needed number of new overlays required .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAllocGeomPoints.man b/lib/libX11/man/xkb/XkbAllocGeomPoints.man index 91c1637a..70975a14 100644 --- a/lib/libX11/man/xkb/XkbAllocGeomPoints.man +++ b/lib/libX11/man/xkb/XkbAllocGeomPoints.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,10 +31,10 @@ XkbAllocGeomPoints \- Allocate points in an outline .if t .ti +.5i .SH ARGUMENTS .TP -.I \- outline +.I outline outline for which points should be allocated .TP -.I \- num_needed +.I num_needed number of new points required .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAllocGeomProps.man b/lib/libX11/man/xkb/XkbAllocGeomProps.man index 1a859905..4db666c5 100644 --- a/lib/libX11/man/xkb/XkbAllocGeomProps.man +++ b/lib/libX11/man/xkb/XkbAllocGeomProps.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,11 +31,11 @@ XkbAllocGeomProps \- Allocate geometry properties .if t .ti +.5i .SH ARGUMENTS .TP -.I \- geom -_summary_ +.I geom +geometry for which properties should be allocated .TP -.I \- num_needed -_summary_ +.I num_needed +number of new properties required .SH DESCRIPTION .LP Xkb provides a number of functions to allocate and free subcomponents of a diff --git a/lib/libX11/man/xkb/XkbAllocGeomRows.man b/lib/libX11/man/xkb/XkbAllocGeomRows.man index 46772903..bdeec804 100644 --- a/lib/libX11/man/xkb/XkbAllocGeomRows.man +++ b/lib/libX11/man/xkb/XkbAllocGeomRows.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,10 +31,10 @@ XkbAllocGeomRows \- Allocate rows in a section .if t .ti +.5i .SH ARGUMENTS .TP -.I \- section +.I section section for which rows should be allocated .TP -.I \- num_needed +.I num_needed number of new rows required .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAllocGeomSectionDoodads.man b/lib/libX11/man/xkb/XkbAllocGeomSectionDoodads.man index 36664aa0..669c68ae 100644 --- a/lib/libX11/man/xkb/XkbAllocGeomSectionDoodads.man +++ b/lib/libX11/man/xkb/XkbAllocGeomSectionDoodads.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,10 +32,10 @@ XkbAllocGeomSectionDoodads \- Allocate doodads that are specific to a section .if t .ti +.5i .SH ARGUMENTS .TP -.I \- section +.I section section for which doodads should be allocated .TP -.I \- num_needed +.I num_needed number of new doodads required .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAllocGeomSections.man b/lib/libX11/man/xkb/XkbAllocGeomSections.man index 4bbe5431..767c1123 100644 --- a/lib/libX11/man/xkb/XkbAllocGeomSections.man +++ b/lib/libX11/man/xkb/XkbAllocGeomSections.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,10 +31,10 @@ XkbAllocGeomSections \- Allocate geometry sections .if t .ti +.5i .SH ARGUMENTS .TP -.I \- geom +.I geom geometry for which sections should be allocated .TP -.I \- num_needed +.I num_needed number of new sections required .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAllocGeomShapes.man b/lib/libX11/man/xkb/XkbAllocGeomShapes.man index 2b7d50f3..6d658025 100644 --- a/lib/libX11/man/xkb/XkbAllocGeomShapes.man +++ b/lib/libX11/man/xkb/XkbAllocGeomShapes.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,10 +31,10 @@ XkbAllocGeomShapes \- Allocate space for an arbitrary number of geometry shapes .if t .ti +.5i .SH ARGUMENTS .TP -.I \- geom +.I geom geometry for which shapes should be allocated .TP -.I \- num_needed +.I num_needed number of new shapes required .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAllocGeometry.man b/lib/libX11/man/xkb/XkbAllocGeometry.man index 7ff05bcc..998f854d 100644 --- a/lib/libX11/man/xkb/XkbAllocGeometry.man +++ b/lib/libX11/man/xkb/XkbAllocGeometry.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,10 +32,10 @@ XkbAllocGeometry \- Allocate an entire geometry .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb keyboard description for which geometry is to be allocated .TP -.I \- sizes +.I sizes initial sizes for all geometry components .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAllocIndicatorMaps.man b/lib/libX11/man/xkb/XkbAllocIndicatorMaps.man index ee37c150..cf2a6e83 100644 --- a/lib/libX11/man/xkb/XkbAllocIndicatorMaps.man +++ b/lib/libX11/man/xkb/XkbAllocIndicatorMaps.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,7 +32,7 @@ member of the keyboard description record .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb keyboard description structure .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAllocKeyboard.man b/lib/libX11/man/xkb/XkbAllocKeyboard.man index 96522fe3..eb94e285 100644 --- a/lib/libX11/man/xkb/XkbAllocKeyboard.man +++ b/lib/libX11/man/xkb/XkbAllocKeyboard.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/man/xkb/XkbAllocNames.man b/lib/libX11/man/xkb/XkbAllocNames.man index 18aa4c19..2814f6e1 100644 --- a/lib/libX11/man/xkb/XkbAllocNames.man +++ b/lib/libX11/man/xkb/XkbAllocNames.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,16 +34,16 @@ XkbAllocNames \- Allocate symbolic names structures .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb keyboard description for which names are to be allocated .TP -.I \- which +.I which mask of names to be allocated .TP -.I \- num_rg +.I num_rg total number of radio group names needed .TP -.I \- num_key_aliases +.I num_key_aliases total number of key aliases needed .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbAllocServerMap.man b/lib/libX11/man/xkb/XkbAllocServerMap.man index ed242594..b1bc12e2 100644 --- a/lib/libX11/man/xkb/XkbAllocServerMap.man +++ b/lib/libX11/man/xkb/XkbAllocServerMap.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ XkbAllocServerMap \- Allocate and initialize an empty server map description rec .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb keyboard description in which to allocate server map .TP -.I \- which +.I which mask selecting map components to allocate .TP -.I \- count_acts +.I count_acts value of num_acts field in map to be allocated .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbApplyCompatMapToKey.man b/lib/libX11/man/xkb/XkbApplyCompatMapToKey.man index 46d94dbf..640d5e1e 100644 --- a/lib/libX11/man/xkb/XkbApplyCompatMapToKey.man +++ b/lib/libX11/man/xkb/XkbApplyCompatMapToKey.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,13 +34,13 @@ key to get its semantics updated .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb keyboard description to be updated .TP -.I \- key +.I key key to be updated .TP -.I \- changes +.I changes notes changes to the Xkb keyboard description .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbBell.man b/lib/libX11/man/xkb/XkbBell.man index e6e745bb..d0b611aa 100644 --- a/lib/libX11/man/xkb/XkbBell.man +++ b/lib/libX11/man/xkb/XkbBell.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,16 +34,16 @@ XkbBell \- Rings the bell on the default keyboard .if t .ti +.5i .SH ARGUMENTS .TP -.I \- display +.I display connection to the X server .TP -.I \- window +.I window event window, or None .TP -.I \- percent +.I percent relative volume, which can range from -100 to 100 inclusive .TP -.I \- name +.I name a bell name, or NULL .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbBellEvent.man b/lib/libX11/man/xkb/XkbBellEvent.man index a99968ca..8c8f0a94 100644 --- a/lib/libX11/man/xkb/XkbBellEvent.man +++ b/lib/libX11/man/xkb/XkbBellEvent.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -35,16 +35,16 @@ without ringing the bell .if t .ti +.5i .SH ARGUMENTS .TP -.I \- display +.I display connection to the X server .TP -.I \- window +.I window the event window, or None .TP -.I \- percent, +.I percent relative volume, which can range from -100 to 100 inclusive .TP -.I \- name +.I name a bell name, or NULL .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbChangeControls.man b/lib/libX11/man/xkb/XkbChangeControls.man index 44a34828..81f78e74 100644 --- a/lib/libX11/man/xkb/XkbChangeControls.man +++ b/lib/libX11/man/xkb/XkbChangeControls.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -312,7 +312,6 @@ typedef struct _XkbControlsChanges { XkbChangeControls(__libmansuffix__), XkbChangeDeviceInfo(__libmansuffix__), XkbChangeEnabledControls(__libmansuffix__), -XkbChangeIndicators(__libmansuffix__), XkbChangeMap(__libmansuffix__), XkbChangeNames(__libmansuffix__), XkbChangeTypesOfKey(__libmansuffix__) diff --git a/lib/libX11/man/xkb/XkbChangeDeviceInfo.man b/lib/libX11/man/xkb/XkbChangeDeviceInfo.man index 22d0097e..b97e6594 100644 --- a/lib/libX11/man/xkb/XkbChangeDeviceInfo.man +++ b/lib/libX11/man/xkb/XkbChangeDeviceInfo.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,13 +34,13 @@ XkbDeviceChangesRec .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to X server .TP -.I \- device_info +.I device_info local copy of device state and configuration .TP -.I \- changes +.I changes note specifying changes in device_info .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbChangeEnabledControls.man b/lib/libX11/man/xkb/XkbChangeEnabledControls.man index 48fd288e..79755284 100644 --- a/lib/libX11/man/xkb/XkbChangeEnabledControls.man +++ b/lib/libX11/man/xkb/XkbChangeEnabledControls.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,16 +34,16 @@ XkbChangeEnabledControls \- Manipulates the EnabledControls control .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to X server .TP -.I \- device_spec - keyboard device to modify +.I device_spec +keyboard device to modify .TP -.I \- mask +.I mask 1 bit -> controls to enable / disable .TP -.I \- values +.I values 1 bit => enable, 0 bit => disable .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbChangeIndicators.man b/lib/libX11/man/xkb/XkbChangeIndicators.man deleted file mode 100644 index 1d663d75..00000000 --- a/lib/libX11/man/xkb/XkbChangeIndicators.man +++ /dev/null @@ -1,156 +0,0 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. -.\" -.\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the "Software"), -.\" to deal in the Software without restriction, including without limitation -.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, -.\" and/or sell copies of the Software, and to permit persons to whom the -.\" Software is furnished to do so, subject to the following conditions: -.\" -.\" The above copyright notice and this permission notice (including the next -.\" paragraph) shall be included in all copies or substantial portions of the -.\" Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -.\" DEALINGS IN THE SOFTWARE. -.\" -.TH XkbChangeIndicators __libmansuffix__ __xorgversion__ "XKB FUNCTIONS" -.SH NAME -XkbChangeIndicators \- Changes indicator maps or state without passing the -entire keyboard description -.SH SYNOPSIS -.HP -.B Bool XkbChangeIndicators -.BI "(\^Display *" "dpy" "\^," -.BI "XkbDescPtr " "xkb" "\^," -.BI "XkbIndicatorChangesPtr " "changes" "\^," -.BI "unsigned int " "state" "\^);" -.if n .ti +5n -.if t .ti +.5i -.SH ARGUMENTS -.TP -.I \- dpy -connection to the X server -.TP -.I \- xkb -keyboard description from which names are to be taken. -.TP -.I \- changes -indicators to be updated on the server -.TP -.I \- state -new state of indicators listed in changes->state_changes -.SH DESCRIPTION -.LP -The XkbIndicatorChangesRec identifies small modifications to the indicator map. -Use it with the function -.I XkbChangeIndicators -to reduce the amount of traffic sent to the server (see STRUCTURES). - -The -.I state_changes -field is a mask that specifies the indicators that have changed state, and -.I map_changes -is a mask that specifies the indicators whose maps have changed. - -.I XkbChangeIndicators -copies any maps specified by -.I changes -from the keyboard description, -.I xkb, -to the server specified by -.I dpy. -If any bits are set in the -.I state_changes -field of -.I changes, XkbChangeIndicators -also sets the state of those indicators to the values specified in the -.I state -mask. A 1 bit in -.I state -turns the corresponding indicator on, a 0 bit turns it off. - -In addition, it can also generate XkbIndicatorStateNotify and -XkbIndicatorMapNotify events. - -Whenever an indicator changes state, the server sends XkbIndicatorStateNotify events -to all interested clients. Similarly, whenever an indicator's map changes, the -server sends XkbIndicatorMapNotify events to all interested clients. - -To receive XkbIndicatorStateNotify events, use -.I XkbSelectEvents -with both the -.I bits_to_change -and -.I values_for_bits -parameters containing XkbIndicatorStateNotifyMask. To receive XkbIndicatorMapNotify -events, use -.I XkbSelectEvents -with XkbIndicatorMapNotifyMask. - -To receive events for only specific indicators, use -.I XkbSelectEventDetails. -Set the -.I event_type -parameter to XkbIndicatorStateNotify or XkbIndicatorMapNotify, and set both the -.I bits_to_change -and -.I values_for_bits -detail parameters to a mask where each bit specifies one indicator, turning on those -bits that specify the indicators for which you want to receive events. - -.I xkb_type -is either XkbIndicatorStateNotify or XkbIndicatorMapNotify, depending on whether the -event is a kbIndicatorStateNotify event or kbIndicatorMapNotify event. - -The -.I changed -parameter is a mask that is the bitwise inclusive OR of the indicators that have -changed. If the event is of type XkbIndicatorMapNotify, -.I changed -reports the maps that changed. If the event is of type XkbIndicatorStateNotify, -.I changed -reports the indicators that have changed state. -.I state -is a mask that specifies the current state of all indicators, whether they have -changed or not, for both XkbIndicatorStateNotify and IndicatorMapNotify events. -.SH STRUCTURES -.LP -.nf - typedef struct _XkbIndicatorChanges { - unsigned int state_changes; - unsigned int map_changes; - }XkbIndicatorChangesRec,*XkbIndicatorChangesPtr; - -.fi -Both types of indicator events use the same structure: - -.nf - typedef struct _XkbIndicatorNotify { - int type; /\&* Xkb extension base event code */ - unsigned long serial; /\&* X server serial number for event */ - Bool send_event; /\&* True => synthetically generated */ - Display * display; /\&* server connection where event generated */ - Time time; /\&* server time when event generated */ - int xkb_type; /\&* specifies state or map notify */ - int device; /\&* Xkb device ID, will not be XkbUseCoreKbd*/ - unsigned int changed; /\&* mask of indicators with new state or map */ - unsigned int state; /\&* current state of all indicators */ - } XkbIndicatorNotifyEvent; - -.fi -.SH DIAGNOSTICS -.TP 15 -.B BadAtom -A name is neither a valid Atom or None -.TP 15 -.B BadImplementation -Invalid reply from server -.SH "SEE ALSO" -.BR XkbIndicatorMapNotify (__libmansuffix__), -.BR XkbIndicatorStateNotify (__libmansuffix__) diff --git a/lib/libX11/man/xkb/XkbChangeMap.man b/lib/libX11/man/xkb/XkbChangeMap.man index 3d74e23f..7849c3cd 100644 --- a/lib/libX11/man/xkb/XkbChangeMap.man +++ b/lib/libX11/man/xkb/XkbChangeMap.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -35,13 +35,13 @@ keyboard description .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to X server .TP -.I \- xkb +.I xkb description from which new values are taken .TP -.I \- changes +.I changes identifies component parts to update .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbChangeNames.man b/lib/libX11/man/xkb/XkbChangeNames.man index 6b6f7c47..d3064aa9 100644 --- a/lib/libX11/man/xkb/XkbChangeNames.man +++ b/lib/libX11/man/xkb/XkbChangeNames.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -22,24 +22,24 @@ .\" .TH XkbChangeNames __libmansuffix__ __xorgversion__ "XKB FUNCTIONS" .SH NAME -XkbChangeNames \- _summary-line_ +XkbChangeNames \- Change symbolic names in the server .SH SYNOPSIS .HP .B Bool XkbChangeNames .BI "(\^Display *" "dpy" "\^," .BI "unsigned int " "which" "\^," -.BI "XkbDescPtr " "Xkb" "\^);" +.BI "XkbDescPtr " "xkb" "\^);" .if n .ti +5n .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to the X server .TP -.I \- which +.I which mask of names or map components to be updated .TP -.I \- Xkb +.I xkb keyboard description to be updated .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbChangeTypesOfKey.man b/lib/libX11/man/xkb/XkbChangeTypesOfKey.man index 060e75e7..f6d32e02 100644 --- a/lib/libX11/man/xkb/XkbChangeTypesOfKey.man +++ b/lib/libX11/man/xkb/XkbChangeTypesOfKey.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -36,22 +36,22 @@ XkbChangeTypesOfKey \- Change the number of groups and the types bound to a key .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb keyboard description to be changed .TP -.I \- key +.I key keycode for key of interest .TP -.I \- n_groups +.I n_groups new number of groups for key .TP -.I \- groups +.I groups mask indicating groups to change .TP -.I \- new_types_in +.I new_types_in indices for new groups specified in groups .TP -.I \- p_changes +.I p_changes notes changes made to xkb .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbComputeRowBounds.man b/lib/libX11/man/xkb/XkbComputeRowBounds.man index b72ca5bd..2d75c6e9 100644 --- a/lib/libX11/man/xkb/XkbComputeRowBounds.man +++ b/lib/libX11/man/xkb/XkbComputeRowBounds.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,13 +32,13 @@ XkbComputeRowBounds \- Update the bounding box of a row .if t .ti +.5i .SH ARGUMENTS .TP -.I \- geom +.I geom geometry that contains the section .TP -.I \- section +.I section section that contains the row .TP -.I \- row +.I row row to be examined and updated .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbComputeSectionBounds.man b/lib/libX11/man/xkb/XkbComputeSectionBounds.man index ce56c0cf..ce718846 100644 --- a/lib/libX11/man/xkb/XkbComputeSectionBounds.man +++ b/lib/libX11/man/xkb/XkbComputeSectionBounds.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,10 +31,10 @@ XkbComputeSectionBounds \- Update the bounding box of a section .if t .ti +.5i .SH ARGUMENTS .TP -.I \- geom +.I geom geometry that contains the section .TP -.I \- section +.I section section to be examined and updated .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbComputeShapeBounds.man b/lib/libX11/man/xkb/XkbComputeShapeBounds.man index 063ae801..75ac7af0 100644 --- a/lib/libX11/man/xkb/XkbComputeShapeBounds.man +++ b/lib/libX11/man/xkb/XkbComputeShapeBounds.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -30,7 +30,7 @@ XkbComputeShapeBounds \- Updates the bounding box of a shape .if t .ti +.5i .SH ARGUMENTS .TP -.I \- shape +.I shape shape to be examined .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbComputeShapeTop.man b/lib/libX11/man/xkb/XkbComputeShapeTop.man index 50a0d3b1..8454d5e8 100644 --- a/lib/libX11/man/xkb/XkbComputeShapeTop.man +++ b/lib/libX11/man/xkb/XkbComputeShapeTop.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,10 +31,10 @@ XkbComputeShapeTop \- Determines the bounding box of the top surface of a shape .if t .ti +.5i .SH ARGUMENTS .TP -.I \- shape +.I shape shape to be examined .TP -.I \- bounds_rtrn +.I bounds_rtrn backfilled with the bounding box for the shape .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbCopyKeyType.man b/lib/libX11/man/xkb/XkbCopyKeyType.man index bba09e5e..88aa0d61 100644 --- a/lib/libX11/man/xkb/XkbCopyKeyType.man +++ b/lib/libX11/man/xkb/XkbCopyKeyType.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,10 +31,10 @@ XkbCopyKeyType \- Copy one XkbKeyTypeRec structures .if t .ti +.5i .SH ARGUMENTS .TP -.I \- from +.I from pointer to XkbKeyTypeRec to be copied .TP -.I \- into +.I into pointer to XkbKeyTypeRec to be changed .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbCopyKeyTypes.man b/lib/libX11/man/xkb/XkbCopyKeyTypes.man index a93abdb9..975f1a28 100644 --- a/lib/libX11/man/xkb/XkbCopyKeyTypes.man +++ b/lib/libX11/man/xkb/XkbCopyKeyTypes.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,13 +32,13 @@ XkbCopyKeyTypes \- Copy more than one XkbKeyTypeRec structure .if t .ti +.5i .SH ARGUMENTS .TP -.I \- from +.I from pointer to array of XkbKeyTypeRecs to copy .TP -.I \- into +.I into pointer to array of XkbKeyTypeRecs to change .TP -.I \- num_types +.I num_types number of types to copy .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbDeviceBell.man b/lib/libX11/man/xkb/XkbDeviceBell.man index 5bfdc452..407643c0 100644 --- a/lib/libX11/man/xkb/XkbDeviceBell.man +++ b/lib/libX11/man/xkb/XkbDeviceBell.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -37,25 +37,25 @@ XkbDeviceBell \- Rings the bell on an X input extension device or the default ke .if t .ti +.5i .SH ARGUMENTS .TP -.I \- display +.I display connection to the X server .TP -.I \- window +.I window window for which the bell is generated, or None .TP -.I \- device_spec +.I device_spec device ID, or XkbUseCoreKbd .TP -.I \- bell_class +.I bell_class X input extension bell class of the bell to be rung .TP -.I \- bell_id +.I bell_id X input extension bell ID of the bell to be rung .TP -.I \- percent +.I percent bell volume, from -100 to 100 inclusive .TP -.I \- name +.I name a name for the bell, or NULL .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbDeviceBellEvent.man b/lib/libX11/man/xkb/XkbDeviceBellEvent.man index b51d8d67..57387f05 100644 --- a/lib/libX11/man/xkb/XkbDeviceBellEvent.man +++ b/lib/libX11/man/xkb/XkbDeviceBellEvent.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -38,25 +38,25 @@ for the keyboard, without ringing the corresponding bell .if t .ti +.5i .SH ARGUMENTS .TP -.I \- display +.I display connection to the X server .TP -.I \- window +.I window event window, or None .TP -.I \- device_spec +.I device_spec device ID, or XkbUseCoreKbd .TP -.I \- bell_class +.I bell_class input extension bell class for the event .TP -.I \- bell_id +.I bell_id input extension bell ID for the event .TP -.I \- percent +.I percent volume for the bell, which can range from -100 to 100 inclusive .TP -.I \- name +.I name a bell name, or NULL .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFindOverlayForKey.man b/lib/libX11/man/xkb/XkbFindOverlayForKey.man index e80cb838..f5f5ec57 100644 --- a/lib/libX11/man/xkb/XkbFindOverlayForKey.man +++ b/lib/libX11/man/xkb/XkbFindOverlayForKey.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ key that is part of an overlay .if t .ti +.5i .SH ARGUMENTS .TP -.I \- geom +.I geom geometry that contains the section .TP -.I \- section +.I section section to be searched for matching keys .TP -.I \- under +.I under primary name of the key to be considered .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbForceBell.man b/lib/libX11/man/xkb/XkbForceBell.man index 7e63050a..9f546f14 100644 --- a/lib/libX11/man/xkb/XkbForceBell.man +++ b/lib/libX11/man/xkb/XkbForceBell.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,10 +33,10 @@ bell on the default keyboard .if t .ti +.5i .SH ARGUMENTS .TP -.I \- display +.I display connection to the X server .TP -.I \- percent +.I percent volume for the bell, which can range from -100 to 100 inclusive .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbForceDeviceBell.man b/lib/libX11/man/xkb/XkbForceDeviceBell.man index 3d267bd2..e10a5586 100644 --- a/lib/libX11/man/xkb/XkbForceDeviceBell.man +++ b/lib/libX11/man/xkb/XkbForceDeviceBell.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -37,22 +37,22 @@ settings for audible bells .if t .ti +.5i .SH ARGUMENTS .TP -.I \- display +.I display connection to the X server .TP -.I \- window +.I window event window, or None .TP -.I \- device_spec +.I device_spec device ID, or XkbUseCoreKbd .TP -.I \- bell_class +.I bell_class input extension class of the bell to be rung .TP -.I \- bell_id +.I bell_id input extension ID of the bell to be rung .TP -.I \- percent +.I percent relative volume, which can range from -100 to 100 inclusive .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeClientMap.man b/lib/libX11/man/xkb/XkbFreeClientMap.man index a31f15d5..39455673 100644 --- a/lib/libX11/man/xkb/XkbFreeClientMap.man +++ b/lib/libX11/man/xkb/XkbFreeClientMap.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,13 +34,13 @@ structure .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb keyboard description containing client map to free .TP -.I \- which +.I which mask identifying components of map to free .TP -.I \- free_all +.I free_all True => free all client components and map itself .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeCompatMap.man b/lib/libX11/man/xkb/XkbFreeCompatMap.man index 22184d01..6d76f791 100644 --- a/lib/libX11/man/xkb/XkbFreeCompatMap.man +++ b/lib/libX11/man/xkb/XkbFreeCompatMap.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ XkbFreeCompatMap \- Free an entire compatibility map or selected portions of one .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb Xkb description in which to free compatibility map .TP -.I \- which +.I which mask of compatibility map components to free .TP -.I \- free_map +.I free_map True => free XkbCompatMap structure itself .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeComponentList.man b/lib/libX11/man/xkb/XkbFreeComponentList.man index 85aa4ef1..8778b2cc 100644 --- a/lib/libX11/man/xkb/XkbFreeComponentList.man +++ b/lib/libX11/man/xkb/XkbFreeComponentList.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,7 +32,7 @@ XkbFreeComponentList \- Free the structure returned by .if t .ti +.5i .SH ARGUMENTS .TP -.I \- list +.I list pointer to XkbComponentListRec to free .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeControls.man b/lib/libX11/man/xkb/XkbFreeControls.man index 1b0737bd..5403ad09 100644 --- a/lib/libX11/man/xkb/XkbFreeControls.man +++ b/lib/libX11/man/xkb/XkbFreeControls.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ XkbFreeControls \- Frees memory used by the ctrls member of an XkbDescRec struct .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb Xkb description in which to free controls components .TP -.I \- which +.I which mask of components of ctrls to free .TP -.I \- free_all +.I free_all True => free everything + ctrls itself .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeDeviceInfo.man b/lib/libX11/man/xkb/XkbFreeDeviceInfo.man index 80a878f5..587761c3 100644 --- a/lib/libX11/man/xkb/XkbFreeDeviceInfo.man +++ b/lib/libX11/man/xkb/XkbFreeDeviceInfo.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ XkbFreeDeviceInfo \- Free an XkbDeviceInfoRec structure .if t .ti +.5i .SH ARGUMENTS .TP -.I \- device_info +.I device_info pointer to XkbDeviceInfoRec in which to free items .TP -.I \- which +.I which mask of components of device_info to free .TP -.I \- free_all +.I free_all True => free everything, including device_info .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeGeomColors.man b/lib/libX11/man/xkb/XkbFreeGeomColors.man index 76ebf389..f7378fd2 100644 --- a/lib/libX11/man/xkb/XkbFreeGeomColors.man +++ b/lib/libX11/man/xkb/XkbFreeGeomColors.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,16 +33,16 @@ XkbFreeGeomColors \- Free geometry colors .if t .ti +.5i .SH ARGUMENTS .TP -.I \- geom +.I geom geometry in which colors should be freed .TP -.I \- first +.I first first color to be freed .TP -.I \- count +.I count number of colors to be freed .TP -.I \- free_all +.I free_all True => all colors are freed .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeGeomDoodads.man b/lib/libX11/man/xkb/XkbFreeGeomDoodads.man index 9371a8c4..53e83e85 100644 --- a/lib/libX11/man/xkb/XkbFreeGeomDoodads.man +++ b/lib/libX11/man/xkb/XkbFreeGeomDoodads.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,13 +32,13 @@ XkbFreeGeomDoodads \- Free geometry doodads .if t .ti +.5i .SH ARGUMENTS .TP -.I \- doodads +.I doodads doodads to be freed .TP -.I \- count +.I count number of doodads to be freed .TP -.I \- free_all +.I free_all True => all doodads are freed .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeGeomKeyAliases.man b/lib/libX11/man/xkb/XkbFreeGeomKeyAliases.man index 15ad0b24..11cd0c24 100644 --- a/lib/libX11/man/xkb/XkbFreeGeomKeyAliases.man +++ b/lib/libX11/man/xkb/XkbFreeGeomKeyAliases.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,16 +33,16 @@ XkbFreeGeomKeyAliases \- Free geometry key aliases .if t .ti +.5i .SH ARGUMENTS .TP -.I \- geom +.I geom geometry in which key aliases should be freed .TP -.I \- first +.I first first key alias to be freed .TP -.I \- count +.I count number of key aliases to be freed .TP -.I \- free_all +.I free_all True => all key aliases are freed .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeGeomKeys.man b/lib/libX11/man/xkb/XkbFreeGeomKeys.man index a99e2d49..0338ec39 100644 --- a/lib/libX11/man/xkb/XkbFreeGeomKeys.man +++ b/lib/libX11/man/xkb/XkbFreeGeomKeys.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,16 +33,16 @@ XkbFreeGeomKeys \- Free geometry keys .if t .ti +.5i .SH ARGUMENTS .TP -.I \- row +.I row row in which keys should be freed .TP -.I \- first +.I first first key to be freed .TP -.I \- count +.I count number of keys to be freed .TP -.I \- free_all +.I free_all True => all keys are freed .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeGeomOutlines.man b/lib/libX11/man/xkb/XkbFreeGeomOutlines.man index 0aa5a343..d5255fe7 100644 --- a/lib/libX11/man/xkb/XkbFreeGeomOutlines.man +++ b/lib/libX11/man/xkb/XkbFreeGeomOutlines.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,16 +33,16 @@ XkbFreeGeomOutlines \- Free geometry outlines .if t .ti +.5i .SH ARGUMENTS .TP -.I \- shape +.I shape shape in which outlines should be freed .TP -.I \- first +.I first first outline to be freed .TP -.I \- count +.I count number of outlines to be freed .TP -.I \- free_all +.I free_all True => all outlines are freed .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeGeomOverlayKeys.man b/lib/libX11/man/xkb/XkbFreeGeomOverlayKeys.man index f4fb4dcb..5f2314b5 100644 --- a/lib/libX11/man/xkb/XkbFreeGeomOverlayKeys.man +++ b/lib/libX11/man/xkb/XkbFreeGeomOverlayKeys.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,16 +33,16 @@ XkbFreeGeomOverlayKeys \- Free keys in an overlay row .if t .ti +.5i .SH ARGUMENTS .TP -.I \- row +.I row row in which keys should be freed .TP -.I \- first +.I first first key to be freed .TP -.I \- count +.I count number of keys to be freed .TP -.I \- free_all +.I free_all True => all keys are freed .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeGeomOverlayRows.man b/lib/libX11/man/xkb/XkbFreeGeomOverlayRows.man index 0371c017..3f700d18 100644 --- a/lib/libX11/man/xkb/XkbFreeGeomOverlayRows.man +++ b/lib/libX11/man/xkb/XkbFreeGeomOverlayRows.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,16 +33,16 @@ XkbFreeGeomOverlayRows \- Free rows in an overlay .if t .ti +.5i .SH ARGUMENTS .TP -.I \- overlay +.I overlay section in which rows should be freed .TP -.I \- first +.I first first row to be freed .TP -.I \- count +.I count number of rows to be freed .TP -.I \- free_all +.I free_all True => all rows are freed .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeGeomOverlays.man b/lib/libX11/man/xkb/XkbFreeGeomOverlays.man index 399df3c0..f8bb578e 100644 --- a/lib/libX11/man/xkb/XkbFreeGeomOverlays.man +++ b/lib/libX11/man/xkb/XkbFreeGeomOverlays.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,16 +33,16 @@ XkbFreeGeomOverlays \- Free rows in a section .if t .ti +.5i .SH ARGUMENTS .TP -.I \- section +.I section section in which overlays should be freed .TP -.I \- first +.I first first overlay to be freed .TP -.I \- count +.I count number of overlays to be freed .TP -.I \- free_all +.I free_all True => all overlays are freed .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeGeomPoints.man b/lib/libX11/man/xkb/XkbFreeGeomPoints.man index 7f621915..a270b905 100644 --- a/lib/libX11/man/xkb/XkbFreeGeomPoints.man +++ b/lib/libX11/man/xkb/XkbFreeGeomPoints.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,16 +33,16 @@ XkbFreeGeomPoints \- Free points in a outline .if t .ti +.5i .SH ARGUMENTS .TP -.I \- outline +.I outline outline in which points should be freed .TP -.I \- first +.I first first point to be freed .TP -.I \- count +.I count number of points to be freed .TP -.I \- free_all +.I free_all True => all points are freed .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeGeomProperties.man b/lib/libX11/man/xkb/XkbFreeGeomProperties.man index b1d9b92a..91b84ef5 100644 --- a/lib/libX11/man/xkb/XkbFreeGeomProperties.man +++ b/lib/libX11/man/xkb/XkbFreeGeomProperties.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,16 +33,16 @@ XkbFreeGeomProperties \- Free geometry properties .if t .ti +.5i .SH ARGUMENTS .TP -.I \- geom +.I geom geometry in which properties should be freed .TP -.I \- first +.I first first property to be freed .TP -.I \- count +.I count number of properties to be freed .TP -.I \- free_all +.I free_all True => all properties are freed .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeGeomRows.man b/lib/libX11/man/xkb/XkbFreeGeomRows.man index ceb489a2..4d38d22b 100644 --- a/lib/libX11/man/xkb/XkbFreeGeomRows.man +++ b/lib/libX11/man/xkb/XkbFreeGeomRows.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,16 +33,16 @@ XkbFreeGeomRows \- Free rows in a section .if t .ti +.5i .SH ARGUMENTS .TP -.I \- section +.I section section in which rows should be freed .TP -.I \- first +.I first first row to be freed .TP -.I \- count +.I count number of rows to be freed .TP -.I \- free_all +.I free_all True => all rows are freed .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeGeomSections.man b/lib/libX11/man/xkb/XkbFreeGeomSections.man index f67a16a1..3c093526 100644 --- a/lib/libX11/man/xkb/XkbFreeGeomSections.man +++ b/lib/libX11/man/xkb/XkbFreeGeomSections.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,16 +33,16 @@ XkbFreeGeomSections \- Free geometry sections .if t .ti +.5i .SH ARGUMENTS .TP -.I \- geom +.I geom geometry in which sections should be freed .TP -.I \- first +.I first first section to be freed .TP -.I \- count +.I count number of sections to be freed .TP -.I \- free_all +.I free_all True => all sections are freed .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeGeomShapes.man b/lib/libX11/man/xkb/XkbFreeGeomShapes.man index 168860fe..ee89ecd4 100644 --- a/lib/libX11/man/xkb/XkbFreeGeomShapes.man +++ b/lib/libX11/man/xkb/XkbFreeGeomShapes.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,16 +33,16 @@ XkbFreeGeomShapes \- Free geometry shapes .if t .ti +.5i .SH ARGUMENTS .TP -.I \- geom +.I geom geometry in which shapes should be freed .TP -.I \- first +.I first first shape to be freed .TP -.I \- count +.I count number of shapes to be freed .TP -.I \- free_all +.I free_all True => all shapes are freed .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeGeometry.man b/lib/libX11/man/xkb/XkbFreeGeometry.man index 36af778e..4447d416 100644 --- a/lib/libX11/man/xkb/XkbFreeGeometry.man +++ b/lib/libX11/man/xkb/XkbFreeGeometry.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,13 +32,13 @@ XkbFreeGeometry \- Free an entire geometry .if t .ti +.5i .SH ARGUMENTS .TP -.I \- geom +.I geom geometry to be freed .TP -.I \- which +.I which mask of geometry components to be freed .TP -.I \- free_all +.I free_all True => the entire geometry is freed .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeIndicatorMaps.man b/lib/libX11/man/xkb/XkbFreeIndicatorMaps.man index bff887fc..09877975 100644 --- a/lib/libX11/man/xkb/XkbFreeIndicatorMaps.man +++ b/lib/libX11/man/xkb/XkbFreeIndicatorMaps.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,7 +32,7 @@ member of an XkbDescRec structure .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb keyboard description structure .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeKeyboard.man b/lib/libX11/man/xkb/XkbFreeKeyboard.man index 6d90307f..c68dcf7f 100644 --- a/lib/libX11/man/xkb/XkbFreeKeyboard.man +++ b/lib/libX11/man/xkb/XkbFreeKeyboard.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/man/xkb/XkbFreeNames.man b/lib/libX11/man/xkb/XkbFreeNames.man index cdb021ec..a88daaed 100644 --- a/lib/libX11/man/xkb/XkbFreeNames.man +++ b/lib/libX11/man/xkb/XkbFreeNames.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ XkbFreeNames \- Free symbolic names structures .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb keyboard description for which names are to be freed .TP -.I \- which +.I which mask of names components to be freed .TP -.I \- free_map +.I free_map True => XkbNamesRec structure itself should be freed .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbFreeServerMap.man b/lib/libX11/man/xkb/XkbFreeServerMap.man index 8798510b..b4c00eb8 100644 --- a/lib/libX11/man/xkb/XkbFreeServerMap.man +++ b/lib/libX11/man/xkb/XkbFreeServerMap.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,13 +34,13 @@ structure .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb keyboard description containing server map to free .TP -.I \- which +.I which mask identifying components of map to free .TP -.I \- free_all +.I free_all True => free all server map components and server itself .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetAccessXTimeout.man b/lib/libX11/man/xkb/XkbGetAccessXTimeout.man deleted file mode 100644 index 1448e3db..00000000 --- a/lib/libX11/man/xkb/XkbGetAccessXTimeout.man +++ /dev/null @@ -1,140 +0,0 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. -.\" -.\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the "Software"), -.\" to deal in the Software without restriction, including without limitation -.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, -.\" and/or sell copies of the Software, and to permit persons to whom the -.\" Software is furnished to do so, subject to the following conditions: -.\" -.\" The above copyright notice and this permission notice (including the next -.\" paragraph) shall be included in all copies or substantial portions of the -.\" Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -.\" DEALINGS IN THE SOFTWARE. -.\" -.TH XkbGetAccessXTimeout __libmansuffix__ __xorgversion__ "XKB FUNCTIONS" -.SH NAME -XkbGetAccessXTimeout \- Queries the current AccessXTimeout options for a -keyboard device -.SH SYNOPSIS -.HP -.B Bool XkbGetAccessXTimeout -.BI "(\^Display *" "display" "\^," -.BI "unsigned int " "device_spec" "\^," -.BI "unsigned short *" "timeout_rtrn" "\^," -.BI "unsigned int *" "ctrls_mask_rtrn" "\^," -.BI "unsigned int *" "ctrls_values_rtrn" "\^," -.BI "unsigned short *" "options_mask_rtrn" "\^," -.BI "unsigned short *" "options_values_rtrn" "\^);" -.if n .ti +5n -.if t .ti +.5i -.SH ARGUMENTS -.TP -.I \- display -unsigned short -.TP -.I \- device_spec -device to query, or XkbUseCoreKbd -.TP -.I \- timeout_rtrn -delay until AccessXTimeout, seconds -.TP -.I \- ctrls_mask_rtrn -backfilled with controls to modify -.TP -.I \- ctrls_values_rtrn -backfilled with on/off status for controls -.TP -.I \- options_mask_rtrn -backfilled with ax_options to modify -.TP -.I \- options_values_rtrn -backfilled with values for ax_options -.SH DESCRIPTION -.LP -In environments where computers are shared, features such as SlowKeys present a -problem: if -SlowKeys is on, the keyboard can appear to be unresponsive because keys are not -accepted -until they are held for a certain period of time. To help solve this problem, -Xkb provides -an AccessXTimeout control to automatically change the enabled/disabled state of -any boolean -controls and to change the value of the AccessXKeys and AccessXFeedback control -attributes -if the keyboard is idle for a specified period of time. - -When a timeout as specified by AccessXTimeout occurs and a control is -consequently modified, -Xkb generates an XkbControlsNotify event. - -.I XkbGetAccessXTimeout -sends a request to the X server to obtain the current values for the -AccessXTimeout attributes, waits for a reply, and backfills the values into the -appropriate arguments. The parameters -.I options_mask_rtrn -and -.I options_values_rtrn -are backfilled with the options to modify and the values for -.I ax_options, -which is a field in the XkbControlsRec structure. -.I XkbGetAccessXTimeout -returns True if successful; if a compatible version of the Xkb extension is not -available in the server, -.I XkbGetAccessXTimeout -returns False. -.SH "RETURN VALUES" -.TP 15 -True -The -.I XkbGetAccessXTimeout -returns True when it successfully sends a request to the X server to obtain the -current values for the AccessXTimeout attributes, waits for a reply, and -backfills the values into the appropriate arguments. -.TP 15 -False -The -.I XkbGetAccessXTimeout -function returns False if a compatible version of the Xkb extension is not -available in the -server. -.SH STRUCTURES -.LP -.nf -The XkbControlsRec structure is defined as follows: - -\&#define XkbMaxLegalKeyCode 255 -\&#define XkbPerKeyBitArraySize ((XkbMaxLegalKeyCode+1)/8) - -typedef struct { - unsigned char mk_dflt_btn; /\&* default button for keyboard driven mouse */ - unsigned char num_groups; /\&* number of keyboard groups */ - unsigned char groups_wrap; /\&* how to wrap out-of-bounds groups */ - XkbModsRec internal; /\&* defines server internal modifiers */ - XkbModsRec ignore_lock; /\&* modifiers to ignore when checking for grab */ - unsigned int enabled_ctrls; /\&* 1 bit => corresponding boolean control enabled */ - unsigned short repeat_delay; /\&* ms delay until first repeat */ - unsigned short repeat_interval; /\&* ms delay between repeats */ - unsigned short slow_keys_delay; /\&* ms minimum time key must be down to be ok */ - unsigned short debounce_delay; /\&* ms delay before key reactivated */ - unsigned short mk_delay; /\&* ms delay to second mouse motion event */ - unsigned short mk_interval; /\&* ms delay between repeat mouse events */ - unsigned short mk_time_to_max; /\&* # intervals until constant mouse move */ - unsigned short mk_max_speed; /\&* multiplier for maximum mouse speed */ - short mk_curve; /\&* determines mouse move curve type */ - unsigned short ax_options; /\&* 1 bit => Access X option enabled */ - unsigned short ax_timeout; /\&* seconds until Access X disabled */ - unsigned short axt_opts_mask; /\&* 1 bit => options to reset on Access X timeout */ - unsigned short axt_opts_values; /\&* 1 bit => turn option on, 0=> off */ - unsigned int axt_ctrls_mask; /\&* which bits in enabled_ctrls to modify */ - unsigned int axt_ctrls_values; /\&* values for new bits in enabled_ctrls */ - unsigned char per_key_repeat[XkbPerKeyBitArraySize]; /\&* per key auto repeat */ -} XkbControlsRec, *XkbControlsPtr; -.fi diff --git a/lib/libX11/man/xkb/XkbGetAutoRepeatRate.man b/lib/libX11/man/xkb/XkbGetAutoRepeatRate.man index ffbc8b8c..3fb816b8 100644 --- a/lib/libX11/man/xkb/XkbGetAutoRepeatRate.man +++ b/lib/libX11/man/xkb/XkbGetAutoRepeatRate.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,16 +34,16 @@ for a keyboard device .if t .ti +.5i .SH ARGUMENTS .TP -.I \- display +.I display connection to X server .TP -.I \- device_spec +.I device_spec desired device ID, or XkbUseCoreKbd .TP -.I \- timeout_rtrn +.I timeout_rtrn backfilled with initial repeat delay, ms .TP -.I \- interval_rtrn +.I interval_rtrn backfilled with subsequent repeat delay, ms .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetAutoResetControls.man b/lib/libX11/man/xkb/XkbGetAutoResetControls.man index 667db531..53e9a022 100644 --- a/lib/libX11/man/xkb/XkbGetAutoResetControls.man +++ b/lib/libX11/man/xkb/XkbGetAutoResetControls.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,13 +32,13 @@ XkbGetAutoResetControls \- Gets the current values of the auto-reset controls .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy - connection to X server +.I dpy +connection to X server .TP -.I \- auto_ctrls - specifies which bits in auto_values are relevant +.I auto_ctrls +specifies which bits in auto_values are relevant .TP -.I \- auto_values +.I auto_values 1 bit => corresponding control has auto-reset on .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetBounceKeysDelay.man b/lib/libX11/man/xkb/XkbGetBounceKeysDelay.man deleted file mode 100644 index fe4a5a8f..00000000 --- a/lib/libX11/man/xkb/XkbGetBounceKeysDelay.man +++ /dev/null @@ -1,211 +0,0 @@ -'\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. -.\" -.\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the "Software"), -.\" to deal in the Software without restriction, including without limitation -.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, -.\" and/or sell copies of the Software, and to permit persons to whom the -.\" Software is furnished to do so, subject to the following conditions: -.\" -.\" The above copyright notice and this permission notice (including the next -.\" paragraph) shall be included in all copies or substantial portions of the -.\" Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -.\" DEALINGS IN THE SOFTWARE. -.\" -.TH XkbGetBounceKeysDelay __libmansuffix__ __xorgversion__ "XKB FUNCTIONS" -.SH NAME -XkbGetBounceKeysDelay \- Queries the current BounceKeys delay for a keyboard -device. -.SH SYNOPSIS -.HP -.B Bool XkbGetBounceKeysDelay -.BI "(\^Display *" "display" "\^," -.BI "unsigned int " "device_spec" "\^," -.BI "unsigned int *" "delay_rtrn" "\^);" -.if n .ti +5n -.if t .ti +.5i -.SH ARGUMENTS -.TP -.I \- display -connection to X server -.TP -.I \- device_spec -device ID, or XkbUseCoreKbd -.TP -.I \- delay_rtrn -backfilled with bounce keys delay, ms -.SH DESCRIPTION -.LP -The server can generate XkbAccessXNotify events for some of the global keyboard -controls. -The detail field describes what AccessX event just occurred and can be any of -the values in -Table 1. - -.TS -c s -l l -l lw(4i). -Table 1 AccessXNotify Events -_ -detail Reason -_ -XkbAXN_SKPress T{ -A key was pressed when SlowKeys was enabled. -T} -XkbAXN_SKAccept T{ -A key was accepted (held longer than the SlowKeys delay). -T} -XkbAXN_SKRelease T{ -An accepted SlowKeys key was released. -T} -XkbAXN_SKReject T{ -A key was rejected (released before the SlowKeys delay expired). -T} -XkbAXN_BKAccept T{ -A key was accepted by BounceKeys. -T} -XkbAXN_BKReject T{ -A key was rejected (pressed before the BounceKeys delay expired). -T} -XkbAXN_AXKWarning T{ -AccessXKeys is about to turn on/off StickyKeys or BounceKeys. -T} -.TE - - -The -.I keycode -field reports the keycode of the key for which the event occurred. If the action -is related to -.I SlowKeys, -the -.I slowKeysDelay -field contains the current SlowKeys acceptance delay. If the action is related -to BounceKeys, -the -.I debounceDelay -field contains the current BounceKeys debounce delay. - -Selecting for AccessX Events - -To receive XkbAccessXNotify events under all possible conditions, use -.I XkbSelectEvents -and pass XkbAccesXNotifyMask in both -.I bits_to_change -and -.I values_for_bits. - -To receive XkbStateNotify events only under certain conditions, use -.I XkbSelectEventDetails -using XkbAccessXNotify as the -.I event_type -and specifying the desired state changes in -.I bits_to_change -and -.I values_for_bits -using mask bits from Table 2. - -.TS -c s s -l l l -l l lw(3i). -Table 2 AccessXNotify Event Details -_ -XkbAccessXNotify Event Details Value Circumstances -_ -XkbAXN_SKPressMask (1<<0) T{ -Slow key press notification wanted -T} -XkbAXN_SKAcceptMask (1<<1) T{ -Slow key accept notification wanted -T} -XkbAXN_SKRejectMask (1<<2) T{ -Slow key reject notification wanted -T} -XkbAXN_SKReleaseMask (1<<3) T{ -Slow key release notification wanted -T} -XkbAXN_BKAcceptMask (1<<4) T{ -Bounce key accept notification wanted -T} -XkbAXN_BKRejectMask (1<<5) T{ -Bounce key reject notification wanted -T} -XkbAXN_AXKWarningMask (1<<6) T{ -AccessX warning notification wanted -T} -XkbAllAccessXEventsMask (0x7f) T{ -All AccessX features notifications wanted -T} -.TE - -Some users may accidentally "bounce" on a key when they release it. They press -it once, then accidentally press it again after they release it. The BounceKeys -control temporarily disables a key after it has been pressed, effectively -"debouncing" the keyboard. The period of time the key is disabled after it is -released is known as the -.I BounceKeys delay. -BounceKeys is a boolean control. - -When the BounceKeys control is active, the server reports acceptance or -rejection of any key to interested clients by sending an appropriate -AccessXNotify event (see STRUCTURES). - -.I XkbGetBounceKeysDelay -requests the attributes of the BounceKeys control from the server, waits for a -reply, and backfills -.I delay_rtrn -with the BounceKeys delay attribute. -.I XkbGetBounceKeysDelay -returns True if successful; if a compatible version of the Xkb extension is not -available in the server -.I XkbGetSlowKeysDelay -returns False. -.SH "RETURN VALUES" -.TP 15 -True -The -.I XkbGetBounceKeysDelay -function returns True when it successfully requests the attributes of the -BounceKeys control from the server, waits for a -reply, and backfills -.I delay_rtrn -with the BounceKeys delay attribute. -.TP 15 -False -The -.I XkbGetBounceKeysDelay -function returns False if a compatible version of the Xkb extension is not -available in the server. -.SH STRUCTURES -.LP -The structure for the XkbAccessXNotify event type is as follows: - -.nf -typedef struct { - int type; /\&* Xkb extension base event code */ - unsigned long serial; /\&* X server serial number for event */ - Bool send_event; /\&* True => synthetically generated */ - Display * display; /\&* server connection where event generated */ - Time time; /\&* server time when event generated */ - int xkb_type; /\&* XkbAccessXNotify */ - int device; /\&* Xkb device ID, will not be XkbUseCoreKbd */ - int detail; /\&* XkbAXN_* */ - KeyCode keycode; /\&* key of event */ - int slowKeysDelay; /\&* current SlowKeys delay */ - int debounceDelay; /\&* current debounce delay */ -} XkbAccessXNotifyEvent; - -.fi -.SH "SEE ALSO" -.BR XkbGetSlowKeysDelay (__libmansuffix__) - diff --git a/lib/libX11/man/xkb/XkbGetCompatMap.man b/lib/libX11/man/xkb/XkbGetCompatMap.man index d7d0a88b..35cea885 100644 --- a/lib/libX11/man/xkb/XkbGetCompatMap.man +++ b/lib/libX11/man/xkb/XkbGetCompatMap.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,13 +34,13 @@ components from the server .if t .ti +.5i .SH ARGUMENTS .TP -.I \- display +.I display connection to server .TP -.I \- which +.I which mask of compatibility map components to fetch .TP -.I \- xkb +.I xkb keyboard description where results placed .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetControls.man b/lib/libX11/man/xkb/XkbGetControls.man index fc9b8c03..3dd7f71b 100644 --- a/lib/libX11/man/xkb/XkbGetControls.man +++ b/lib/libX11/man/xkb/XkbGetControls.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ XkbGetControls \- Finds the current state of Xkb server controls .if t .ti +.5i .SH ARGUMENTS .TP -.I \- display +.I display connection to X server .TP -.I \- which +.I which mask of controls requested .TP -.I \- xkb +.I xkb keyboard description for controls information .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetControlsChanges.man b/lib/libX11/man/xkb/XkbGetControlsChanges.man index dd3f81bc..48a79551 100644 --- a/lib/libX11/man/xkb/XkbGetControlsChanges.man +++ b/lib/libX11/man/xkb/XkbGetControlsChanges.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,13 +34,13 @@ XkbGetControlsChanges .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to X server .TP -.I \- xkb +.I xkb xkb->ctrls will be updated .TP -.I \- changes +.I changes indicates which parts of xkb->ctrls to update .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetDetectableAutoRepeat.man b/lib/libX11/man/xkb/XkbGetDetectableAutoRepeat.man index 5bffb759..b008d23c 100644 --- a/lib/libX11/man/xkb/XkbGetDetectableAutoRepeat.man +++ b/lib/libX11/man/xkb/XkbGetDetectableAutoRepeat.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,10 +32,10 @@ DetectableAutoRepeat .if t .ti +.5i .SH ARGUMENTS .TP -.I \- display +.I display connection to X server .TP -.I \- supported_rtrn +.I supported_rtrn backfilled True if DetectableAutoRepeat supported .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetDeviceButtonActions.man b/lib/libX11/man/xkb/XkbGetDeviceButtonActions.man index b3f8f747..2bdb1c65 100644 --- a/lib/libX11/man/xkb/XkbGetDeviceButtonActions.man +++ b/lib/libX11/man/xkb/XkbGetDeviceButtonActions.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -36,19 +36,19 @@ Extension device .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to X server .TP -.I \- device_info +.I device_info structure to update with results .TP -.I \- all_buttons +.I all_buttons True => get information for all buttons .TP -.I \- first_button +.I first_button number of first button for which info is desired .TP -.I \- num_buttons +.I num_buttons number of buttons for which info is desired .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetDeviceInfo.man b/lib/libX11/man/xkb/XkbGetDeviceInfo.man index d5a5d020..b79ae6ad 100644 --- a/lib/libX11/man/xkb/XkbGetDeviceInfo.man +++ b/lib/libX11/man/xkb/XkbGetDeviceInfo.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -37,19 +37,19 @@ extension device .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to X server .TP -.I \- which +.I which mask indicating information to return .TP -.I \- device_spec +.I device_spec device ID, or XkbUseCoreKbd .TP -.I \- ind_class +.I ind_class feedback class for indicator requests .TP -.I \- ind_id +.I ind_id feedback ID for indicator requests .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetDeviceInfoChanges.man b/lib/libX11/man/xkb/XkbGetDeviceInfoChanges.man index 69b5fb56..ab681002 100644 --- a/lib/libX11/man/xkb/XkbGetDeviceInfoChanges.man +++ b/lib/libX11/man/xkb/XkbGetDeviceInfoChanges.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -35,13 +35,13 @@ device .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to X server .TP -.I \- device_info +.I device_info structure to update with results .TP -.I \- changes +.I changes contains notes of changes that have occurred .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetDeviceLedInfo.man b/lib/libX11/man/xkb/XkbGetDeviceLedInfo.man index 81e06621..704ca019 100644 --- a/lib/libX11/man/xkb/XkbGetDeviceLedInfo.man +++ b/lib/libX11/man/xkb/XkbGetDeviceLedInfo.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -36,19 +36,19 @@ with an LED feedback of an input extension device .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to X server .TP -.I \- device_info +.I device_info structure to update with results .TP -.I \- led_class +.I led_class LED feedback class assigned by input extension .TP -.I \- led_id +.I led_id LED feedback ID assigned by input extension .TP -.I \- which +.I which mask indicating desired information .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetGeometry.man b/lib/libX11/man/xkb/XkbGetGeometry.man index afe33460..38624c33 100644 --- a/lib/libX11/man/xkb/XkbGetGeometry.man +++ b/lib/libX11/man/xkb/XkbGetGeometry.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,10 +32,10 @@ description .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to the X server .TP -.I \- xkb +.I xkb keyboard description that contains the ID for the keyboard and into which the geometry should be loaded .SH DESCRIPTION diff --git a/lib/libX11/man/xkb/XkbGetIndicatorChanges.man b/lib/libX11/man/xkb/XkbGetIndicatorChanges.man deleted file mode 100644 index 881c6693..00000000 --- a/lib/libX11/man/xkb/XkbGetIndicatorChanges.man +++ /dev/null @@ -1,153 +0,0 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. -.\" -.\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the "Software"), -.\" to deal in the Software without restriction, including without limitation -.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, -.\" and/or sell copies of the Software, and to permit persons to whom the -.\" Software is furnished to do so, subject to the following conditions: -.\" -.\" The above copyright notice and this permission notice (including the next -.\" paragraph) shall be included in all copies or substantial portions of the -.\" Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -.\" DEALINGS IN THE SOFTWARE. -.\" -.TH XkbGetIndicatorChanges __libmansuffix__ __xorgversion__ "XKB FUNCTIONS" -.SH NAME -XkbGetIndicatorChanges \- Updates a local copy of the keyboard description with -the actual values of one or more calls to XkbNoteIndicatorChanges -.SH SYNOPSIS -.HP -.B Status XkbGetIndicatorChanges -.BI "(\^Display *" "dpy" "\^," -.BI "XkbDescPtr " "xkb" "\^," -.BI "XkbIndicatorChangesPtr " "changes" "\^," -.BI "unsigned int " "state" "\^);" -.if n .ti +5n -.if t .ti +.5i -.SH ARGUMENTS -.TP -.I \- dpy -connection to the X server -.TP -.I \- xkb -keyboard description to hold the new values -.TP -.I \- changes -indicator maps/state to be obtained from the server -.TP -.I \- state -backfilled with the state of the indicators -.SH DESCRIPTION -.LP -Whenever an indicator changes state, the server sends XkbIndicatorStateNotify events to all -interested clients. Similarly, whenever an indicator's map changes, the server sends -XkbIndicatorMapNotify events to all interested clients. - -To receive XkbIndicatorStateNotify events, use -.I XkbSelectEvents -with both the -.I bits_to_change -and -.I values_for_bits -parameters containing XkbIndicatorStateNotifyMask. To receive XkbIndicatorMapNotify events, -use -.I XkbSelectEvents -with XkbIndicatorMapNotifyMask. - -To receive events for only specific indicators, use -.I XkbSelectEventDetails. -Set the -.I event_type -parameter to XkbIndicatorStateNotify or XkbIndicatorMapNotify, and set both the -.I bits_to_change -and -.I values_for_bits -detail parameters to a mask where each bit specifies one indicator, turning on those bits that -specify the indicators for which you want to receive events. - -Both types of indicator events use the same structure: -.nf - -typedef struct _XkbIndicatorNotify { - int type; /\&* Xkb extension base event code */ - unsigned long serial; /\&* X server serial number for event */ - Bool send_event; /\&* True => synthetically generated */ - Display * display; /\&* server connection where event generated */ - Time time; /\&* server time when event generated */ - int xkb_type; /\&* specifies state or map notify */ - int device; /\&* Xkb device ID, will not be XkbUseCoreKbd */ - unsigned int changed; /\&* mask of indicators with new state or map */ - unsigned int state; /\&* current state of all indicators */ -} XkbIndicatorNotifyEvent; - -.fi -.I xkb_type -is either XkbIndicatorStateNotify or XkbIndicatorMapNotify, depending on whether the event is -a kbIndicatorStateNotify event or kbIndicatorMapNotify event. - -The -.I changed -parameter is a mask that is the bitwise inclusive OR of the indicators that have changed. If -the event is of type XkbIndicatorMapNotify, -.I changed -reports the maps that changed. If the event is of type XkbIndicatorStateNotify, -.I changed -reports the indicators that have changed state. -.I state -is a mask that specifies the current state of all indicators, whether they have changed or -not, for both XkbIndicatorStateNotify and IndicatorMapNotify events. - -When your client application receives either a XkbIndicatorStateNotify event or -XkbIndicatorMapNotify event, you can note the changes in a changes structure by calling -.I XkbNoteIndicatorChanges. - -.I XkbGetIndicatorChanges -examines the -.I changes -parameter, pulls over the necessary information from the server, and copies the -results into the -.I xkb -keyboard description. If any bits are set in the -.I state_changes -field of -.I changes, XkbGetIndicatorChanges -also places the state of those indicators in -.I state. -If the -.I indicators -field of -.I xkb -is NULL, -.I XkbGetIndicatorChanges -allocates and initializes it. To free the -.I indicators -field, use -.I XkbFreeIndicators. -.SH DIAGNOSTICS -.TP 15 -.B BadAlloc -Unable to allocate storage -.TP 15 -.B BadImplementation -Invalid reply from server -.TP 15 -.B BadMatch -A compatible version of Xkb was not available in the server or an argument has -correct type and range, but is otherwise invalid -.SH "SEE ALSO" -.BR XkbFreeIndicators (__libmansuffix__), -.BR XkbGetIndicatorChanges (__libmansuffix__), -.BR XkbNoteIndicatorChanges (__libmansuffix__), -.BR XkbSelectEvents (__libmansuffix__), -.BR XkbSelectEventDetail (__libmansuffix__) - - - diff --git a/lib/libX11/man/xkb/XkbGetIndicatorMap.man b/lib/libX11/man/xkb/XkbGetIndicatorMap.man index 7da82797..52e40bc0 100644 --- a/lib/libX11/man/xkb/XkbGetIndicatorMap.man +++ b/lib/libX11/man/xkb/XkbGetIndicatorMap.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ specify the indicators .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to the X server .TP -.I \- which +.I which mask of indicators for which maps should be returned .TP -.I \- desc +.I desc keyboard description to be updated .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetIndicatorState.man b/lib/libX11/man/xkb/XkbGetIndicatorState.man index 85047528..1e6030b4 100644 --- a/lib/libX11/man/xkb/XkbGetIndicatorState.man +++ b/lib/libX11/man/xkb/XkbGetIndicatorState.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,13 +32,13 @@ XkbGetIndicatorState \- Obtains the current state of the keyboard indicators .if t .ti +.5i .SH ARGUMENTS .TP -.I \- display +.I display connection to the X server .TP -.I \- device_spec +.I device_spec device ID, or XkbUseCoreKbd .TP -.I \- state_return +.I state_return backfilled with a mask of the indicator state .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetKeyActions.man b/lib/libX11/man/xkb/XkbGetKeyActions.man index 726add48..3c1076ed 100644 --- a/lib/libX11/man/xkb/XkbGetKeyActions.man +++ b/lib/libX11/man/xkb/XkbGetKeyActions.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,16 +34,16 @@ keys in a keyboard description .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to X server .TP -.I \- first +.I first keycode of first key of interest .TP -.I \- num +.I num number of keys desired .TP -.I \- xkb +.I xkb pointer to keyboard description where result is stored .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetKeyBehaviors.man b/lib/libX11/man/xkb/XkbGetKeyBehaviors.man index 02b638b7..02522d4c 100644 --- a/lib/libX11/man/xkb/XkbGetKeyBehaviors.man +++ b/lib/libX11/man/xkb/XkbGetKeyBehaviors.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,16 +34,16 @@ a keyboard description from the server .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to server .TP -.I \- first +.I first keycode of first key to get .TP -.I \- num +.I num number of keys for which behaviors are desired .TP -.I \- xkb +.I xkb Xkb description to contain the result .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetKeyExplicitComponents.man b/lib/libX11/man/xkb/XkbGetKeyExplicitComponents.man index 8026d30b..c9be4c75 100644 --- a/lib/libX11/man/xkb/XkbGetKeyExplicitComponents.man +++ b/lib/libX11/man/xkb/XkbGetKeyExplicitComponents.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -35,16 +35,16 @@ array) for a subset of the keys in a keyboard description .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to server .TP -.I \- first +.I first keycode of first key to fetch .TP -.I \- num +.I num number of keys for which to get explicit info .TP -.I \- xkb +.I xkb Xkb description in which to put results .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetKeyModifierMap.man b/lib/libX11/man/xkb/XkbGetKeyModifierMap.man index 03a0ff97..5a999364 100644 --- a/lib/libX11/man/xkb/XkbGetKeyModifierMap.man +++ b/lib/libX11/man/xkb/XkbGetKeyModifierMap.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,16 +34,16 @@ keyboard description .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to X server .TP -.I \- first +.I first keycode of first key to get .TP -.I \- num +.I num number of keys for which information is desired .TP -.I \- xkb +.I xkb keyboard description to update .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetKeySyms.man b/lib/libX11/man/xkb/XkbGetKeySyms.man index a68da7f6..59efd6ad 100644 --- a/lib/libX11/man/xkb/XkbGetKeySyms.man +++ b/lib/libX11/man/xkb/XkbGetKeySyms.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,16 +34,16 @@ description .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to X server .TP -.I \- first +.I first keycode of first key to get .TP -.I \- num +.I num number of keycodes for which syms desired .TP -.I \- xkb +.I xkb Xkb description to be updated .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetKeyTypes.man b/lib/libX11/man/xkb/XkbGetKeyTypes.man index d685209c..d904ac6f 100644 --- a/lib/libX11/man/xkb/XkbGetKeyTypes.man +++ b/lib/libX11/man/xkb/XkbGetKeyTypes.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -35,16 +35,16 @@ keyboard mapping .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to X server .TP -.I \- first +.I first index to first type to get, 0 => 1st type .TP -.I \- num +.I num number of key types to be returned .TP -.I \- xkb +.I xkb keyboard description containing client map to update .SH DESCRIPTION .LP @@ -77,6 +77,6 @@ The Xkb extension has not been properly initialized .B BadValue An argument is out of range .SH "SEE ALSO" -.BR XkbKeyType (__libmansuffix__), -.BR XkbKeyTypeIndex (__libmansuffix__) +.BR XkbKeyKeyType (__libmansuffix__), +.BR XkbKeyKeyTypeIndex (__libmansuffix__) diff --git a/lib/libX11/man/xkb/XkbGetKeyVirtualModMap.man b/lib/libX11/man/xkb/XkbGetKeyVirtualModMap.man index 2416b6f3..e82b84c7 100644 --- a/lib/libX11/man/xkb/XkbGetKeyVirtualModMap.man +++ b/lib/libX11/man/xkb/XkbGetKeyVirtualModMap.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,16 +34,16 @@ for a subset of the keys in a keyboard description .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to server .TP -.I \- first +.I first keycode of first key to fetch .TP -.I \- num +.I num number of keys for which virtual mod maps are desired .TP -.I \- xkb +.I xkb Xkb description where results will be placed .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetKeyboard.man b/lib/libX11/man/xkb/XkbGetKeyboard.man index ef44afb7..c5daf5b0 100644 --- a/lib/libX11/man/xkb/XkbGetKeyboard.man +++ b/lib/libX11/man/xkb/XkbGetKeyboard.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -47,7 +47,7 @@ determines events to be selected / deselected 1=>select, 0->deselect; for events in bits_to_change .SH DESCRIPTION .LP -.I XkbGetKeyboard +.B XkbGetKeyboard allocates and returns a pointer to a keyboard description. It queries the server for those components specified in the .I which @@ -76,17 +76,32 @@ XkbGeometryMask geom (1L<<6) XkbAllComponentsMask All Fields (1L<<7) .TE -.I XkbGetKeyboard +.B XkbGetKeyboard is used to read the current description for one or more components of a keyboard device. It calls -.I XkbGetKeyboardByName +.BR XkbGetKeyboardByName (__libmansuffix__) as follows: .I XkbGetKeyboardByName(dpy, device_spec, NULL, .I which, which, False). +.LP +If successful, +.B XkbGetKeyboard +returns a pointer to a newly allocated +.B XkbDescRec +structure, +which is described in +.BR XkbGetKeyboardByName (__libmansuffix__), +and which should be freed with +.BR XkbFreeKeyboard (__libmansuffix__). +If +.B XkbGetKeyboard +does not succeed, it returns +.BR NULL . .SH DIAGNOSTICS .TP 15 .SM BadAlloc Unable to allocate storage - +.SH "SEE ALSO" +.BR XkbGetKeyboardByName (__libmansuffix__) diff --git a/lib/libX11/man/xkb/XkbGetKeyboardByName.man b/lib/libX11/man/xkb/XkbGetKeyboardByName.man index ed50a13a..4eabdb7a 100644 --- a/lib/libX11/man/xkb/XkbGetKeyboardByName.man +++ b/lib/libX11/man/xkb/XkbGetKeyboardByName.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -38,22 +38,22 @@ replace an active one .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to X server .TP -.I \- device_spec +.I device_spec device ID, or XkbUseCoreKbd .TP -.I \- names +.I names names of components to fetch .TP -.I \- want +.I want desired structures in returned record .TP -.I \- need +.I need mandatory structures in returned record .TP -.I \- load +.I load True => load into .I device_spec .SH DESCRIPTION diff --git a/lib/libX11/man/xkb/XkbGetMap.man b/lib/libX11/man/xkb/XkbGetMap.man index 45b55e73..b5d2f3fc 100644 --- a/lib/libX11/man/xkb/XkbGetMap.man +++ b/lib/libX11/man/xkb/XkbGetMap.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -35,13 +35,13 @@ client map and server map .if t .ti +.5i .SH ARGUMENTS .TP -.I \- display +.I display connection to X server .TP -.I \- which +.I which mask selecting subcomponents to populate .TP -.I \- device_spec +.I device_spec device_id, or XkbUseCoreKbd .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetNameChanges.man b/lib/libX11/man/xkb/XkbGetNameChanges.man deleted file mode 100644 index 359c7c96..00000000 --- a/lib/libX11/man/xkb/XkbGetNameChanges.man +++ /dev/null @@ -1,70 +0,0 @@ -'\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. -.\" -.\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the "Software"), -.\" to deal in the Software without restriction, including without limitation -.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, -.\" and/or sell copies of the Software, and to permit persons to whom the -.\" Software is furnished to do so, subject to the following conditions: -.\" -.\" The above copyright notice and this permission notice (including the next -.\" paragraph) shall be included in all copies or substantial portions of the -.\" Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -.\" DEALINGS IN THE SOFTWARE. -.\" -.TH XkbGetNameChanges __libmansuffix__ __xorgversion__ "XKB FUNCTIONS" -.SH NAME -XkbGetNameChanges \- Update the local copy of the keyboard description with the -actual values of the results of one or more calls to -.I XkbNoteNameChanges -.SH SYNOPSIS -.HP -.B Status XkbGetNameChanges -.BI "(\^Display *" "dpy" "\^," -.BI "XkbDescPtr " "xkb" "\^," -.BI "XkbNameChangesPtr " "changes" "\^);" -.if n .ti +5n -.if t .ti +.5i -.SH ARGUMENTS -.TP -.I \- dpy -connection to the X server -.TP -.I \- xkb -keyboard description to which names are copied -.TP -.I \- changes -names components to be obtained from the server -.SH DESCRIPTION -.LP -.I XkbGetNameChanges -examines the -.I changes -parameter, retrieves the necessary information from the server, and places the -results into the -.I xkb -keyboard description. - -.I XkbGetNamesChanges -can generate BadAlloc, BadImplementation, and BadMatch errors. -.SH DIAGNOSTICS -.TP 15 -.B BadAlloc -Unable to allocate storage -.TP 15 -.B BadImplementation -Invalid reply from server -.TP 15 -.B BadMatch -A compatible version of Xkb was not available in the server or an argument has -correct type and range, but is otherwise invalid -.SH "SEE ALSO" -.BR XkbNoteNameChanges (__libmansuffix__) diff --git a/lib/libX11/man/xkb/XkbGetNamedGeometry.man b/lib/libX11/man/xkb/XkbGetNamedGeometry.man index c7572a0d..c8a4bb1b 100644 --- a/lib/libX11/man/xkb/XkbGetNamedGeometry.man +++ b/lib/libX11/man/xkb/XkbGetNamedGeometry.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,13 +32,13 @@ by name .BI "Atom " "name" "\^);" .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to the X server .TP -.I \- xkb +.I xkb keyboard description into which the geometry should be loaded .TP -.I \- name +.I name name of the geometry to be loaded .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetNamedIndicator.man b/lib/libX11/man/xkb/XkbGetNamedIndicator.man index be65056b..35a2990b 100644 --- a/lib/libX11/man/xkb/XkbGetNamedIndicator.man +++ b/lib/libX11/man/xkb/XkbGetNamedIndicator.man @@ -1,4 +1,4 @@ -.\" Copyright 1999, 2017, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, 2017, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -47,31 +47,31 @@ indicator by name .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to the X server .TP -.I \- dev_spec +.I dev_spec keyboard device ID, or XkbUseCoreKbd .TP -.I \- led_class +.I led_class feedback class, or XkbDfltXIClass .TP -.I \- led_id +.I led_id feedback ID, or XkbDfltXIId .TP -.I \- name +.I name name of the indicator to be retrieved .TP -.I \- ndx_rtrn +.I ndx_rtrn backfilled with the index of the retrieved indicator .TP -.I \- state_rtrn +.I state_rtrn backfilled with the current state of the retrieved indicator .TP -.I \- map_rtrn - backfilled with the mapping for the retrieved indicator +.I map_rtrn +backfilled with the mapping for the retrieved indicator .TP -.I \- real_rtrn +.I real_rtrn backfilled with True if the named indicator is real (physical) .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetNames.man b/lib/libX11/man/xkb/XkbGetNames.man index 9d5ca5e7..40a882d2 100644 --- a/lib/libX11/man/xkb/XkbGetNames.man +++ b/lib/libX11/man/xkb/XkbGetNames.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -28,18 +28,18 @@ XkbGetNames \- Obtain symbolic names from the server .B Status XkbGetNames .BI "(\^Display *" "dpy" "\^," .BI "unsigned int " "which" "\^," -.BI "XkbDescPtr " "Xkb" "\^);" +.BI "XkbDescPtr " "xkb" "\^);" .if n .ti +5n .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to the X server .TP -.I \- which +.I which mask of names or map components to be updated .TP -.I \- Xkb +.I xkb keyboard description to be updated .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetSlowKeysDelay.man b/lib/libX11/man/xkb/XkbGetSlowKeysDelay.man deleted file mode 100644 index 485b3a1c..00000000 --- a/lib/libX11/man/xkb/XkbGetSlowKeysDelay.man +++ /dev/null @@ -1,214 +0,0 @@ -'\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. -.\" -.\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the "Software"), -.\" to deal in the Software without restriction, including without limitation -.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, -.\" and/or sell copies of the Software, and to permit persons to whom the -.\" Software is furnished to do so, subject to the following conditions: -.\" -.\" The above copyright notice and this permission notice (including the next -.\" paragraph) shall be included in all copies or substantial portions of the -.\" Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -.\" DEALINGS IN THE SOFTWARE. -.\" -.TH XkbGetSlowKeysDelay __libmansuffix__ __xorgversion__ "XKB FUNCTIONS" -.SH NAME -XkbGetSlowKeysDelay \- Gets the SlowKeys acceptance delay for a keyboard device -.SH SYNOPSIS -.HP -.B Bool XkbGetSlowKeysDelay -.BI "(\^Display *" "display" "\^," -.BI "unsigned int " "device_spec" "\^," -.BI "unsigned int *" "delay_rtrn" "\^);" -.if n .ti +5n -.if t .ti +.5i -.SH ARGUMENTS -.TP -.I \- display -connection to X server -.TP -.I \- device_spec -device ID, or XkbUseCoreKbd -.TP -.I \- delay_rtrn -backfilled with SlowKeys delay, ms -.SH DESCRIPTION -.LP -Some users may accidentally bump keys while moving a hand or typing stick toward -the key they want. Usually, the keys that are accidentally bumped are just hit -for a very short period of time. The SlowKeys control helps filter these -accidental bumps by telling the server to wait a specified period, called the -.I SlowKeys acceptance delay, -before delivering key events. If the key is released before this period elapses, -no key events are generated. Users can then bump any number of keys on their way -to the one they want without accidentally getting those characters. Once they -have reached the key they want, they can then hold the desired key long enough -for the computer to accept it. SlowKeys is a boolean control with one -configurable attribute. - -When the SlowKeys control is active, the server reports the initial key press, -subsequent acceptance or rejection, and release of any key to interested clients -by sending an appropriate AccessXNotify event (see section 10.6.4). - -The server can generate XkbAccessXNotify events for some of the global keyboard -controls. -The detail field describes what AccessX event just occurred and can be any of -the values in -Table 1. -The server can generate XkbAccessXNotify events for some of the global keyboard -controls. -The detail field describes what AccessX event just occurred and can be any of -the values in -Table 1. - -.TS -c s -l l -l lw(4i). -Table 1 AccessXNotify Events -_ -detail Reason -_ -XkbAXN_SKPress T{ -A key was pressed when SlowKeys was enabled. -T} -XkbAXN_SKAccept T{ -A key was accepted (held longer than the SlowKeys delay). -T} -XkbAXN_SKRelease T{ -An accepted SlowKeys key was released. -T} -XkbAXN_SKReject T{ -A key was rejected (released before the SlowKeys delay expired). -T} -XkbAXN_BKAccept T{ -A key was accepted by BounceKeys. -T} -XkbAXN_BKReject T{ -A key was rejected (pressed before the BounceKeys delay expired). -T} -XkbAXN_AXKWarning T{ -AccessXKeys is about to turn on/off StickyKeys or BounceKeys. -T} -.TE - - -The -.I keycode -field reports the keycode of the key for which the event occurred. If the action -is related to -.I SlowKeys, -the -.I slowKeysDelay -field contains the current SlowKeys acceptance delay. If the action is related -to BounceKeys, -the -.I debounceDelay -field contains the current BounceKeys debounce delay. - -Selecting for AccessX Events - -To receive XkbAccessXNotify events under all possible conditions, use -.I XkbSelectEvents -and pass XkbAccesXNotifyMask in both -.I bits_to_change -and -.I values_for_bits. - -To receive XkbStateNotify events only under certain conditions, use -.I XkbSelectEventDetails -using XkbAccessXNotify as the -.I event_type -and specifying the desired state changes in -.I bits_to_change -and -.I values_for_bits -using mask bits from Table 2. - -.TS -c s s -l l l -l l lw(3i). -Table 2 AccessXNotify Event Details -_ -XkbAccessXNotify Event Details Value Circumstances -_ -XkbAXN_SKPressMask (1<<0) T{ -Slow key press notification wanted -T} -XkbAXN_SKAcceptMask (1<<1) T{ -Slow key accept notification wanted -T} -XkbAXN_SKRejectMask (1<<2) T{ -Slow key reject notification wanted -T} -XkbAXN_SKReleaseMask (1<<3) T{ -Slow key release notification wanted -T} -XkbAXN_BKAcceptMask (1<<4) T{ -Bounce key accept notification wanted -T} -XkbAXN_BKRejectMask (1<<5) T{ -Bounce key reject notification wanted -T} -XkbAXN_AXKWarningMask (1<<6) T{ -AccessX warning notification wanted -T} -XkbAllAccessXEventsMask (0x7f) T{ -All AccessX features notifications wanted -T} -.TE - -.I XkbGetSlowKeysDelay -requests the attributes of the SlowKeys control from the server, waits for a -reply and backfills -.I delay_rtrn -with the SlowKeys delay attribute. -.I XkbGetSlowKeysDelay -returns True if successful; , -.I XkbGetSlowKeysDelay -returns False. -.SH "RETURN VALUES" -.TP 15 -True -The -.I XkbGetSlowKeysDelay -function returns True if the request of the Slowkeys control from the server was -successful. -.I -.TP 15 -False -The -.I XkbGetSlowKeysDelay -function returns False if a compatible version of the Xkb extension is not -available in the server. -.SH STRUCTURES -.LP -The structure for the XkbAccessXNotify event type is as follows: - -.nf -typedef struct { - int type; /\&* Xkb extension base event code */ - unsigned long serial; /\&* X server serial number for event */ - Bool send_event; /\&* True => synthetically generated */ - Display * display; /\&* server connection where event generated */ - Time time; /\&* server time when event generated */ - int xkb_type; /\&* XkbAccessXNotify */ - int device; /\&* Xkb device ID, will not be XkbUseCoreKbd */ - int detail; /\&* XkbAXN_* */ - KeyCode keycode; /\&* key of event */ - int slowKeysDelay; /\&* current SlowKeys delay */ - int debounceDelay; /\&* current debounce delay */ -} XkbAccessXNotifyEvent; - -.fi - diff --git a/lib/libX11/man/xkb/XkbGetState.man b/lib/libX11/man/xkb/XkbGetState.man index 4547e592..e46002db 100644 --- a/lib/libX11/man/xkb/XkbGetState.man +++ b/lib/libX11/man/xkb/XkbGetState.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/man/xkb/XkbGetStickyKeysOptions.man b/lib/libX11/man/xkb/XkbGetStickyKeysOptions.man deleted file mode 100644 index d691e9bf..00000000 --- a/lib/libX11/man/xkb/XkbGetStickyKeysOptions.man +++ /dev/null @@ -1,115 +0,0 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. -.\" -.\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the "Software"), -.\" to deal in the Software without restriction, including without limitation -.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, -.\" and/or sell copies of the Software, and to permit persons to whom the -.\" Software is furnished to do so, subject to the following conditions: -.\" -.\" The above copyright notice and this permission notice (including the next -.\" paragraph) shall be included in all copies or substantial portions of the -.\" Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -.\" DEALINGS IN THE SOFTWARE. -.\" -.TH XkbGetStickyKeysOptions __libmansuffix__ __xorgversion__ "XKB FUNCTIONS" -.SH NAME -XkbGetStickyKeysOptions \- Queries the current StickyKeys attributes for a keyboard device -.SH SYNOPSIS -.HP -.B Bool XkbGetStickyKeysOptions -.BI "(\^Display *" "display" "\^," -.BI "unsigned int " "device_spec" "\^," -.BI "unsigned int *" "options_rtrn" "\^);" -.if n .ti +5n -.if t .ti +.5i -.SH ARGUMENTS -.TP -.I \- display -connection to X server -.TP -.I \- device_spec -device ID, or XkbUseCoreKbd -.TP -.I \- options_rtrn -backfilled with StickyKeys option mask -.SH DESCRIPTION -.LP -The StickyKeys control has two options that can be accessed via the -.I ax_options -of an XkbControlsRec structure. The first option, TwoKeys, specifies whether StickyKeys should -automatically turn off when two keys are pressed at the same time. This feature is useful for -shared computers so people who do not want them do not need to turn StickyKeys off if a previous -user left StickyKeys on. The second option, LatchToLock, specifies whether or not StickyKeys -locks a modifier when pressed twice in a row. - -.I XkbGetStickyKeysOptions -requests the attributes of the StickyKeys control from the server, waits for a reply, and -backfills -.I options_rtrn -with a mask indicating whether the individual StickyKeys options are on or off. Valid bits in -.I options_rtrn -are: -.nf - - XkbAX_TwoKeysMask - XkbAX_LatchToLockMask - -.fi -.I XkbGetStickyKeysOptions -returns True if successful; if a compatible version of the Xkb extension is not available in the -server -.I XkbGetStickyKeysOptions -returns False. -.SH "RETURN VALUES" -.TP 15 -True -The -.I XkbGetStickyKeysOptions -function returns True if the request for the attributes of the StickyKeys control from the -server was successful. -.TP 15 -False -The -.I XkbGetStickyKeysOptions -function returns False if a compatible version of the Xkb extension is not available in the -server. -.SH STRUCTURES -.nf -The XkbControlsRec structure is defined as follows: - - #define XkbMaxLegalKeyCode 255 - #define XkbPerKeyBitArraySize ((XkbMaxLegalKeyCode+1)/8) - - typedef struct { - unsigned char mk_dflt_btn; /\&* default button for keyboard driven mouse */ - unsigned char num_groups; /\&* number of keyboard groups */ - unsigned char groups_wrap; /\&* how to wrap out-of-bounds groups */ - XkbModsRec internal; /\&* defines server internal modifiers */ - XkbModsRec ignore_lock; /\&* modifiers to ignore when checking for grab */ - unsigned int enabled_ctrls; /\&* 1 bit => corresponding boolean control enabled */ - unsigned short repeat_delay; /\&* ms delay until first repeat */ - unsigned short repeat_interval; /\&* ms delay between repeats */ - unsigned short slow_keys_delay; /\&* ms minimum time key must be down to be ok */ - unsigned short debounce_delay; /\&* ms delay before key reactivated */ - unsigned short mk_delay; /\&* ms delay to second mouse motion event */ - unsigned short mk_interval; /\&* ms delay between repeat mouse events */ - unsigned short mk_time_to_max; /\&* # intervals until constant mouse move */ - unsigned short mk_max_speed; /\&* multiplier for maximum mouse speed */ - short mk_curve; /\&* determines mouse move curve type */ - unsigned short ax_options; /\&* 1 bit => Access X option enabled */ - unsigned short ax_timeout; /\&* seconds until Access X disabled */ - unsigned short axt_opts_mask; /\&* 1 bit => options to reset on Access X timeout */ - unsigned short axt_opts_values; /\&* 1 bit => turn option on, 0=> off */ - unsigned int axt_ctrls_mask; /\&* which bits in enabled_ctrls to modify */ - unsigned int axt_ctrls_values; /\&* values for new bits in enabled_ctrls */ - unsigned char per_key_repeat[XkbPerKeyBitArraySize]; /\&* per key auto repeat */ - } XkbControlsRec, *XkbControlsPtr; -.fi diff --git a/lib/libX11/man/xkb/XkbGetUpdatedMap.man b/lib/libX11/man/xkb/XkbGetUpdatedMap.man index 5ac077f9..fd391c2e 100644 --- a/lib/libX11/man/xkb/XkbGetUpdatedMap.man +++ b/lib/libX11/man/xkb/XkbGetUpdatedMap.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,13 +34,13 @@ keyboard description .if t .ti +.5i .SH ARGUMENTS .TP -.I \- display +.I display connection to X server .TP -.I \- which +.I which mask selecting subcomponents to populate .TP -.I \- xkb +.I xkb keyboard description to be updated .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetVirtualMods.man b/lib/libX11/man/xkb/XkbGetVirtualMods.man index e1755805..a8602dff 100644 --- a/lib/libX11/man/xkb/XkbGetVirtualMods.man +++ b/lib/libX11/man/xkb/XkbGetVirtualMods.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,13 +34,13 @@ array) in a keyboard description .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to server .TP -.I \- which +.I which mask indicating virtual modifier bindings to get .TP -.I \- xkb +.I xkb Xkb description where results will be placed .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbGetXlibControls.man b/lib/libX11/man/xkb/XkbGetXlibControls.man index 95ccb1ed..4b72fadf 100644 --- a/lib/libX11/man/xkb/XkbGetXlibControls.man +++ b/lib/libX11/man/xkb/XkbGetXlibControls.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,7 +31,7 @@ XkbGetXlibControls \- Determines the current state of the Library Controls .if t .ti +.5i .SH ARGUMENTS .TP -.I \- display +.I display connection to X server .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbIgnoreExtension.man b/lib/libX11/man/xkb/XkbIgnoreExtension.man index c65e4a93..1ecf3868 100644 --- a/lib/libX11/man/xkb/XkbIgnoreExtension.man +++ b/lib/libX11/man/xkb/XkbIgnoreExtension.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/man/xkb/XkbInitCanonicalKeyTypes.man b/lib/libX11/man/xkb/XkbInitCanonicalKeyTypes.man index 45dde7bc..bd00cb3e 100644 --- a/lib/libX11/man/xkb/XkbInitCanonicalKeyTypes.man +++ b/lib/libX11/man/xkb/XkbInitCanonicalKeyTypes.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,13 +34,13 @@ client map to their default values .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb keyboard description containing client map to initialize .TP -.I \- which +.I which mask of types to initialize .TP -.I \- keypadVMod +.I keypadVMod index of NumLock virtual modifier .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbKeyAction.man b/lib/libX11/man/xkb/XkbKeyAction.man index 39b3773a..10a6fe59 100644 --- a/lib/libX11/man/xkb/XkbKeyAction.man +++ b/lib/libX11/man/xkb/XkbKeyAction.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,13 +32,13 @@ XkbKeyAction \- Returns the key action .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb Xkb description of interest .TP -.I \- keycode +.I keycode keycode of interest .TP -.I \- idx +.I idx index for group and shift level .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbKeyActionEntry.man b/lib/libX11/man/xkb/XkbKeyActionEntry.man index 56fa61c7..5d54ab58 100644 --- a/lib/libX11/man/xkb/XkbKeyActionEntry.man +++ b/lib/libX11/man/xkb/XkbKeyActionEntry.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -36,16 +36,16 @@ keycode .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb Xkb description of interest .TP -.I \- keycode +.I keycode keycode of interest .TP -.I \- shift +.I shift shift level within group .TP -.I \- grp +.I grp group index for group of interest .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbKeyActionsPtr.man b/lib/libX11/man/xkb/XkbKeyActionsPtr.man index cfd30db3..809fbb0c 100644 --- a/lib/libX11/man/xkb/XkbKeyActionsPtr.man +++ b/lib/libX11/man/xkb/XkbKeyActionsPtr.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,10 +34,10 @@ the key corresponding to keycode .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb Xkb description of interest .TP -.I \- keycode +.I keycode keycode of interest .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbKeyGroupInfo.man b/lib/libX11/man/xkb/XkbKeyGroupInfo.man index ba299d22..c57ebad3 100644 --- a/lib/libX11/man/xkb/XkbKeyGroupInfo.man +++ b/lib/libX11/man/xkb/XkbKeyGroupInfo.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,10 +34,10 @@ keycode .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb Xkb description of interest .TP -.I \- keycode +.I keycode keycode of interest .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbKeyGroupWidth.man b/lib/libX11/man/xkb/XkbKeyGroupWidth.man index 8d2f9da4..33d4d9a7 100644 --- a/lib/libX11/man/xkb/XkbKeyGroupWidth.man +++ b/lib/libX11/man/xkb/XkbKeyGroupWidth.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -36,13 +36,13 @@ for the key corresponding to .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb Xkb description of interest .TP -.I \- keycode +.I keycode keycode of interest .TP -.I \- grp +.I grp group of interest .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbKeyGroupsWidth.man b/lib/libX11/man/xkb/XkbKeyGroupsWidth.man index 84609d0d..c42afa6b 100644 --- a/lib/libX11/man/xkb/XkbKeyGroupsWidth.man +++ b/lib/libX11/man/xkb/XkbKeyGroupsWidth.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,10 +33,10 @@ corresponding to .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb Xkb description of interest .TP -.I \- keycode +.I keycode keycode of interest .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbKeyHasActions.man b/lib/libX11/man/xkb/XkbKeyHasActions.man index f95aaa54..4d05d926 100644 --- a/lib/libX11/man/xkb/XkbKeyHasActions.man +++ b/lib/libX11/man/xkb/XkbKeyHasActions.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,10 +33,10 @@ has any actions associated with it .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb Xkb description of interest .TP -.I \- keycode +.I keycode keycode of interest .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbKeyType.man b/lib/libX11/man/xkb/XkbKeyKeyType.man similarity index 88% rename from lib/libX11/man/xkb/XkbKeyType.man rename to lib/libX11/man/xkb/XkbKeyKeyType.man index 6fcd2168..1dfd224a 100644 --- a/lib/libX11/man/xkb/XkbKeyType.man +++ b/lib/libX11/man/xkb/XkbKeyKeyType.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -20,12 +20,12 @@ .\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER .\" DEALINGS IN THE SOFTWARE. .\" -.TH XkbKeyType __libmansuffix__ __xorgversion__ "XKB FUNCTIONS" +.TH XkbKeyKeyType __libmansuffix__ __xorgversion__ "XKB FUNCTIONS" .SH NAME -XkbKeyType \- Obtain the index of a key type or the pointer to a key type +XkbKeyKeyType \- Obtain the index of a key type or the pointer to a key type .SH SYNOPSIS .HP -.B XkbKeyTypePtr XkbKeyType +.B XkbKeyTypePtr XkbKeyKeyType .BI "(\^XkbDescPtr " "xkb" "\^," .BI "KeyCode " "keycode" "\^," .BI "int " "group" "\^);" @@ -33,17 +33,17 @@ XkbKeyType \- Obtain the index of a key type or the pointer to a key type .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb Xkb description of interest .TP -.I \- keycode +.I keycode keycode of interest .TP -.I \- group +.I group group index .SH DESCRIPTION .LP -.I XkbKeyType +.I XkbKeyKeyType returns a pointer to the key type in the .I types vector of the client map in diff --git a/lib/libX11/man/xkb/XkbKeyTypeIndex.man b/lib/libX11/man/xkb/XkbKeyKeyTypeIndex.man similarity index 83% rename from lib/libX11/man/xkb/XkbKeyTypeIndex.man rename to lib/libX11/man/xkb/XkbKeyKeyTypeIndex.man index e198e728..677c085f 100644 --- a/lib/libX11/man/xkb/XkbKeyTypeIndex.man +++ b/lib/libX11/man/xkb/XkbKeyKeyTypeIndex.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -20,12 +20,12 @@ .\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER .\" DEALINGS IN THE SOFTWARE. .\" -.TH XkbKeyTypeIndex __libmansuffix__ __xorgversion__ "XKB FUNCTIONS" +.TH XkbKeyKeyTypeIndex __libmansuffix__ __xorgversion__ "XKB FUNCTIONS" .SH NAME -XkbKeyTypeIndex \- Obtain the index of a key type or the pointer to a key type +XkbKeyKeyTypeIndex \- Obtain the index of a key type or the pointer to a key type .SH SYNOPSIS .HP -.B int XkbKeyTypeIndex +.B int XkbKeyKeyTypeIndex .BI "(\^XkbDescPtr " "xkb" "\^," .BI "KeyCode " "keycode" "\^," .BI "int " "group" "\^);" @@ -33,17 +33,17 @@ XkbKeyTypeIndex \- Obtain the index of a key type or the pointer to a key type .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb Xkb description of interest .TP -.I \- keycode +.I keycode keycode of interest .TP -.I \- group +.I group group index .SH DESCRIPTION .LP -.I XkbKeyTypeIndex +.I XkbKeyKeyTypeIndex computes an index into the .I types vector of the client map in diff --git a/lib/libX11/man/xkb/XkbKeyNumActions.man b/lib/libX11/man/xkb/XkbKeyNumActions.man index be7d7806..7d249dde 100644 --- a/lib/libX11/man/xkb/XkbKeyNumActions.man +++ b/lib/libX11/man/xkb/XkbKeyNumActions.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,10 +33,10 @@ keycode .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb Xkb description of interest .TP -.I \- keycode +.I keycode keycode of interest .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbKeyNumGroups.man b/lib/libX11/man/xkb/XkbKeyNumGroups.man index 32e75c9a..fbb7c31f 100644 --- a/lib/libX11/man/xkb/XkbKeyNumGroups.man +++ b/lib/libX11/man/xkb/XkbKeyNumGroups.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,10 +33,10 @@ corresponding to keycode .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb Xkb description of interest .TP -.I \- keycode +.I keycode keycode of interest .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbKeyNumSyms.man b/lib/libX11/man/xkb/XkbKeyNumSyms.man index 74b48127..f8539307 100644 --- a/lib/libX11/man/xkb/XkbKeyNumSyms.man +++ b/lib/libX11/man/xkb/XkbKeyNumSyms.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,10 +34,10 @@ to .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb Xkb description of interest .TP -.I \- keycode +.I keycode keycode of interest .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbKeySymEntry.man b/lib/libX11/man/xkb/XkbKeySymEntry.man index 8c8a7900..fa221d56 100644 --- a/lib/libX11/man/xkb/XkbKeySymEntry.man +++ b/lib/libX11/man/xkb/XkbKeySymEntry.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -38,16 +38,16 @@ from the two-dimensional array of keysyms for the key corresponding to .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb Xkb description of interest .TP -.I \- keycode +.I keycode keycode of interest .TP -.I \- shift +.I shift shift level of interest .TP -.I \- grp +.I grp group of interest .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbKeySymsOffset.man b/lib/libX11/man/xkb/XkbKeySymsOffset.man deleted file mode 100644 index 123c5460..00000000 --- a/lib/libX11/man/xkb/XkbKeySymsOffset.man +++ /dev/null @@ -1,66 +0,0 @@ -'\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. -.\" -.\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the "Software"), -.\" to deal in the Software without restriction, including without limitation -.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, -.\" and/or sell copies of the Software, and to permit persons to whom the -.\" Software is furnished to do so, subject to the following conditions: -.\" -.\" The above copyright notice and this permission notice (including the next -.\" paragraph) shall be included in all copies or substantial portions of the -.\" Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -.\" DEALINGS IN THE SOFTWARE. -.\" -.TH XkbKeySymsOffset __libmansuffix__ __xorgversion__ "XKB FUNCTIONS" -.SH NAME -XkbKeySymsOffset \- Returns the offset of the two-dimensional array of keysyms -for the key corresponding to -.I keycode -.SH SYNOPSIS -.HP -.B int XkbKeySymsOffset -.BI "(\^XkbDescPtr " "xkb" "\^," -.BI "KeyCode " "keycode" "\^);" -.if n .ti +5n -.if t .ti +.5i -.SH ARGUMENTS -.TP -.I \- xkb -Xkb description of interest -.TP -.I \- keycode -keycode of interest -.SH DESCRIPTION -.LP -The key width and number of groups associated with a key are used to form a -small two-dimensional array of KeySyms for a key. This array may be different -sizes for different keys. The array for a single key is stored as a linear list, -in row-major order. The arrays for all of the keys are stored in the -.I syms -field of the client map. There is one row for each group associated with a key -and one column for each level. The index corresponding to a given group and -shift level is computed as: -.nf - - idx = group_index * key_width + shift_level - -.fi -The -.I offset -field of the -.I key_sym_map -entry for a key is used to access the beginning of the array. - -.I XkbKeySymsOffset -returns the offset of the two-dimensional array of keysyms for the key -corresponding to -.I keycode. diff --git a/lib/libX11/man/xkb/XkbKeySymsPtr.man b/lib/libX11/man/xkb/XkbKeySymsPtr.man index f423165a..191a7b67 100644 --- a/lib/libX11/man/xkb/XkbKeySymsPtr.man +++ b/lib/libX11/man/xkb/XkbKeySymsPtr.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,10 +34,10 @@ the key corresponding to .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb Xkb description of interest .TP -.I \- keycode +.I keycode keycode of interest .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbKeyTypesForCoreSymbols.man b/lib/libX11/man/xkb/XkbKeyTypesForCoreSymbols.man index e7678d5c..3d6b40b9 100644 --- a/lib/libX11/man/xkb/XkbKeyTypesForCoreSymbols.man +++ b/lib/libX11/man/xkb/XkbKeyTypesForCoreSymbols.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -37,22 +37,22 @@ symbols bound to a key in a core keyboard mapping .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb keyboard description in which to place symbols .TP -.I \- map_width +.I map_width width of core protocol keymap in xkb_syms_rtrn .TP -.I \- core_syms +.I core_syms core protocol format array of KeySyms .TP -.I \- protected +.I protected explicit key types .TP -.I \- types_inout +.I types_inout backfilled with the canonical types bound to groups one and two for the key .TP -.I \- xkb_syms_rtrn +.I xkb_syms_rtrn backfilled with symbols bound to the key in the Xkb mapping .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbKeycodeToKeysym.man b/lib/libX11/man/xkb/XkbKeycodeToKeysym.man index 32efa01d..849f45d2 100644 --- a/lib/libX11/man/xkb/XkbKeycodeToKeysym.man +++ b/lib/libX11/man/xkb/XkbKeycodeToKeysym.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,16 +34,16 @@ group and shift level .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to X server .TP -.I \- kc +.I kc key of interest .TP -.I \- group +.I group group of interest .TP -.I \- level +.I level shift level of interest .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbKeysymToModifiers.man b/lib/libX11/man/xkb/XkbKeysymToModifiers.man index acc432a7..1fcfb682 100644 --- a/lib/libX11/man/xkb/XkbKeysymToModifiers.man +++ b/lib/libX11/man/xkb/XkbKeysymToModifiers.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,10 +32,10 @@ on the core keyboard .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to X server .TP -.I \- ks +.I ks keysym of interest .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbLatchGroup.man b/lib/libX11/man/xkb/XkbLatchGroup.man index 8e7c431a..3cc1fd35 100644 --- a/lib/libX11/man/xkb/XkbLatchGroup.man +++ b/lib/libX11/man/xkb/XkbLatchGroup.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/man/xkb/XkbLatchModifiers.man b/lib/libX11/man/xkb/XkbLatchModifiers.man index 940dc6d0..a810139e 100644 --- a/lib/libX11/man/xkb/XkbLatchModifiers.man +++ b/lib/libX11/man/xkb/XkbLatchModifiers.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/man/xkb/XkbLibraryVersion.man b/lib/libX11/man/xkb/XkbLibraryVersion.man index fc00e78c..cbc64cc6 100644 --- a/lib/libX11/man/xkb/XkbLibraryVersion.man +++ b/lib/libX11/man/xkb/XkbLibraryVersion.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/man/xkb/XkbListComponents.man b/lib/libX11/man/xkb/XkbListComponents.man index babdf5e5..95d97f52 100644 --- a/lib/libX11/man/xkb/XkbListComponents.man +++ b/lib/libX11/man/xkb/XkbListComponents.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,16 +34,16 @@ XkbListComponents \- List of components for one or more component types .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to X server .TP -.I \- device_spec +.I device_spec device ID, or XkbUseCoreKbd .TP -.I \- ptrns +.I ptrns namelist for components of interest .TP -.I \- max_inout +.I max_inout max # returned names, # left over .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbLockGroup.man b/lib/libX11/man/xkb/XkbLockGroup.man index 413d5300..09bf7269 100644 --- a/lib/libX11/man/xkb/XkbLockGroup.man +++ b/lib/libX11/man/xkb/XkbLockGroup.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/man/xkb/XkbLockModifiers.man b/lib/libX11/man/xkb/XkbLockModifiers.man index 3d038235..2286ed01 100644 --- a/lib/libX11/man/xkb/XkbLockModifiers.man +++ b/lib/libX11/man/xkb/XkbLockModifiers.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/man/xkb/XkbLookupKeyBinding.man b/lib/libX11/man/xkb/XkbLookupKeyBinding.man index 7671ad58..25354c66 100644 --- a/lib/libX11/man/xkb/XkbLookupKeyBinding.man +++ b/lib/libX11/man/xkb/XkbLookupKeyBinding.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -35,22 +35,22 @@ XkbLookupKeyBinding \- Find the string bound to a key by XRebindKeySym .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to server .TP -.I \- sym +.I sym connection to server .TP -.I \- state +.I state state for which string is to be looked up .TP -.I \- buf +.I buf buffer into which returned string is written .TP -.I \- nbytes +.I nbytes size of buffer in bytes .TP -.I \- extra_rtrn +.I extra_rtrn backfilled with number bytes overflow .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbLookupKeySym.man b/lib/libX11/man/xkb/XkbLookupKeySym.man index 8a8f0c10..2aeb0c81 100644 --- a/lib/libX11/man/xkb/XkbLookupKeySym.man +++ b/lib/libX11/man/xkb/XkbLookupKeySym.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,19 +34,19 @@ XkbLookupKeySym \- Find the symbol associated with a key for a particular state .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to X server .TP -.I \- key +.I key key for which symbols are to be found .TP -.I \- state +.I state state for which symbol should be found .TP -.I \- mods_rtrn +.I mods_rtrn backfilled with consumed modifiers .TP -.I \- sym_rtrn +.I sym_rtrn backfilled with symbol associated with key + state .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbModActionVMods.man b/lib/libX11/man/xkb/XkbModActionVMods.man index bdf47db4..8d7e2e7c 100644 --- a/lib/libX11/man/xkb/XkbModActionVMods.man +++ b/lib/libX11/man/xkb/XkbModActionVMods.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,7 +32,7 @@ Xkb modifier description .if t .ti +.5i .SH ARGUMENTS .TP -.I \- act +.I act action from which to extract virtual mods .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbNoteControlsChanges.man b/lib/libX11/man/xkb/XkbNoteControlsChanges.man index ad17d5df..372e5ef8 100644 --- a/lib/libX11/man/xkb/XkbNoteControlsChanges.man +++ b/lib/libX11/man/xkb/XkbNoteControlsChanges.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,13 +34,13 @@ event .if t .ti +.5i .SH ARGUMENTS .TP -.I \- changes +.I changes records changes indicated by new .TP -.I \- new +.I new tells which things have changed .TP -.I \- wanted +.I wanted tells which parts of new to record in changes .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbNoteDeviceChanges.man b/lib/libX11/man/xkb/XkbNoteDeviceChanges.man index ab36913c..ff538802 100644 --- a/lib/libX11/man/xkb/XkbNoteDeviceChanges.man +++ b/lib/libX11/man/xkb/XkbNoteDeviceChanges.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ XkbNoteDeviceChanges \- Note device changes reported in an XkbExtensionDeviceNot .if t .ti +.5i .SH ARGUMENTS .TP -.I \- old +.I old structure tracking state changes .TP -.I \- new +.I new event indicating state changes .TP -.I \- wanted +.I wanted mask indicating changes to note .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbNoteIndicatorChanges.man b/lib/libX11/man/xkb/XkbNoteIndicatorChanges.man deleted file mode 100644 index 4a85e6ac..00000000 --- a/lib/libX11/man/xkb/XkbNoteIndicatorChanges.man +++ /dev/null @@ -1,123 +0,0 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. -.\" -.\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the "Software"), -.\" to deal in the Software without restriction, including without limitation -.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, -.\" and/or sell copies of the Software, and to permit persons to whom the -.\" Software is furnished to do so, subject to the following conditions: -.\" -.\" The above copyright notice and this permission notice (including the next -.\" paragraph) shall be included in all copies or substantial portions of the -.\" Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -.\" DEALINGS IN THE SOFTWARE. -.\" -.TH XkbNoteIndicatorChanges __libmansuffix__ __xorgversion__ "XKB FUNCTIONS" -.SH NAME -XkbNoteIndicatorChanges \- Notes the changes in a changes structure -.SH SYNOPSIS -.HP -.B void XkbNoteIndicatorChanges -.BI "(\^XkbIndicatorChangesPtr " "old" "\^," -.BI "XkbIndicatorNotifyEvent *" "new" "\^," -.BI "unsigned int " "wanted" "\^);" -.if n .ti +5n -.if t .ti +.5i -.SH ARGUMENTS -.TP -.I \- old -XkbIndicatorChanges structure to be updated -.TP -.I \- new -event from which changes are to be copied -.TP -.I \- wanted -which changes are to be noted -.SH DESCRIPTION -.LP -Whenever an indicator changes state, the server sends XkbIndicatorStateNotify events to all -interested clients. Similarly, whenever an indicator's map changes, the server sends -XkbIndicatorMapNotify events to all interested clients. - -To receive XkbIndicatorStateNotify events, use -.I XkbSelectEvents -with both the -.I bits_to_change -and -.I values_for_bits -parameters containing XkbIndicatorStateNotifyMask. To receive XkbIndicatorMapNotify events, -use -.I XkbSelectEvents -with XkbIndicatorMapNotifyMask. - -To receive events for only specific indicators, use -.I XkbSelectEventDetails. -Set the -.I event_type -parameter to XkbIndicatorStateNotify or XkbIndicatorMapNotify, and set both the -.I bits_to_change -and -.I values_for_bits -detail parameters to a mask where each bit specifies one indicator, turning on those bits that -specify the indicators for which you want to receive events. - -The -.I changed -parameter is a mask that is the bitwise inclusive OR of the indicators that have changed. If -the event is of type XkbIndicatorMapNotify, -.I changed -reports the maps that changed. If the event is of type XkbIndicatorStateNotify, -.I changed -reports the indicators that have changed state. -.I state -is a mask that specifies the current state of all indicators, whether they have changed or -not, for both XkbIndicatorStateNotify and IndicatorMapNotify events. - -When your client application receives either a XkbIndicatorStateNotify event or -XkbIndicatorMapNotify event, you can note the changes in a changes structure by calling -.I XkbNoteIndicatorChanges. - - -The -.I wanted -parameter is the bitwise inclusive OR of XkbIndicatorMapMask and -XkbIndicatorStateMask. -.I XkbNoteIndicatorChanges -copies any changes reported in -.I new -and specified in -.I wanted -into the changes record specified by -.I old. -.SH STRUCTURES -Both types of indicator events use the same structure: -.nf - -typedef struct _XkbIndicatorNotify { - int type; /\&* Xkb extension base event code */ - unsigned long serial; /\&* X server serial number for event */ - Bool send_event; /\&* True => synthetically generated */ - Display * display; /\&* server connection where event generated */ - Time time; /\&* server time when event generated */ - int xkb_type; /\&* specifies state or map notify */ - int device; /\&* Xkb device ID, will not be XkbUseCoreKbd */ - unsigned int changed; /\&* mask of indicators with new state or map */ - unsigned int state; /\&* current state of all indicators */ -} XkbIndicatorNotifyEvent; - -.fi -.I xkb_type -is either XkbIndicatorStateNotify or XkbIndicatorMapNotify, depending on whether the event is -a kbIndicatorStateNotify event or kbIndicatorMapNotify event. -.SH "SEE ALSO" -.BR XkbIndicatorMapMask (__libmansuffix__), -.BR XkbIndicatorStateMask (__libmansuffix__), -.BR XkbSelectEventDetails (__libmansuffix__), -.BR XkbSelectEvents (__libmansuffix__) diff --git a/lib/libX11/man/xkb/XkbNoteNameChanges.man b/lib/libX11/man/xkb/XkbNoteNameChanges.man index fe028f03..f0efd17b 100644 --- a/lib/libX11/man/xkb/XkbNoteNameChanges.man +++ b/lib/libX11/man/xkb/XkbNoteNameChanges.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ XkbNoteNameChanges \- Note the changed names in a changes structure .if t .ti +.5i .SH ARGUMENTS .TP -.I \- old +.I old XkbNameChanges structure to be updated .TP -.I \- new +.I new event from which changes are to be copied .TP -.I \- wanted +.I wanted types of names for which changes are to be noted .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbOpenDisplay.man b/lib/libX11/man/xkb/XkbOpenDisplay.man index 41b20c0c..ff84f313 100644 --- a/lib/libX11/man/xkb/XkbOpenDisplay.man +++ b/lib/libX11/man/xkb/XkbOpenDisplay.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/man/xkb/XkbOutOfRangeGroupInfo.man b/lib/libX11/man/xkb/XkbOutOfRangeGroupInfo.man index d281edb7..4803f67d 100644 --- a/lib/libX11/man/xkb/XkbOutOfRangeGroupInfo.man +++ b/lib/libX11/man/xkb/XkbOutOfRangeGroupInfo.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,7 +32,7 @@ from the group_info field of an XkbSymMapRec structure .if t .ti +.5i .SH ARGUMENTS .TP -.I \- grp_inf +.I grp_inf Xkb description of interest .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbOutOfRangeGroupNumber.man b/lib/libX11/man/xkb/XkbOutOfRangeGroupNumber.man index ce9419de..bab5b29d 100644 --- a/lib/libX11/man/xkb/XkbOutOfRangeGroupNumber.man +++ b/lib/libX11/man/xkb/XkbOutOfRangeGroupNumber.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,7 +32,7 @@ as a group index, from the group_info field of an XkbSymMapRec structure .if t .ti +.5i .SH ARGUMENTS .TP -.I \- grp_inf +.I grp_inf Xkb description of interest .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbPtrActionX.man b/lib/libX11/man/xkb/XkbPtrActionX.man index 409437d3..02bb0cd0 100644 --- a/lib/libX11/man/xkb/XkbPtrActionX.man +++ b/lib/libX11/man/xkb/XkbPtrActionX.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,7 +32,7 @@ signed int .if t .ti +.5i .SH ARGUMENTS .TP -.I \- act +.I act action from which to extract X .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbPtrActionY.man b/lib/libX11/man/xkb/XkbPtrActionY.man index ccea0eb3..799d7161 100644 --- a/lib/libX11/man/xkb/XkbPtrActionY.man +++ b/lib/libX11/man/xkb/XkbPtrActionY.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,7 +32,7 @@ signed int .if t .ti +.5i .SH ARGUMENTS .TP -.I \- act +.I act action from which to extract Y .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbQueryExtension.man b/lib/libX11/man/xkb/XkbQueryExtension.man index 9f73dd0a..af2f6351 100644 --- a/lib/libX11/man/xkb/XkbQueryExtension.man +++ b/lib/libX11/man/xkb/XkbQueryExtension.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/man/xkb/XkbRefreshKeyboardMapping.man b/lib/libX11/man/xkb/XkbRefreshKeyboardMapping.man index 29173b65..46987975 100644 --- a/lib/libX11/man/xkb/XkbRefreshKeyboardMapping.man +++ b/lib/libX11/man/xkb/XkbRefreshKeyboardMapping.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,7 +31,7 @@ library .if t .ti +.5i .SH ARGUMENTS .TP -.I \- event +.I event event initiating remapping .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbResizeDeviceButtonActions.man b/lib/libX11/man/xkb/XkbResizeDeviceButtonActions.man index e88b346e..d0618cf3 100644 --- a/lib/libX11/man/xkb/XkbResizeDeviceButtonActions.man +++ b/lib/libX11/man/xkb/XkbResizeDeviceButtonActions.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,10 +32,10 @@ XkbResizeDeviceButtonActions \- Allocate additional space for button actions in .if t .ti +.5i .SH ARGUMENTS .TP -.I \- device_info +.I device_info structure in which to allocate button actions .TP -.I \- new_total +.I new_total new total number of button actions needed .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbResizeKeyActions.man b/lib/libX11/man/xkb/XkbResizeKeyActions.man index b316aaaf..b5cf3498 100644 --- a/lib/libX11/man/xkb/XkbResizeKeyActions.man +++ b/lib/libX11/man/xkb/XkbResizeKeyActions.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ XkbResizeKeyActions \- Change the number of actions bound to a key .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb keyboard description to change .TP -.I \- key +.I key keycode of key to change .TP -.I \- needed +.I needed new number of actions required .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbResizeKeySyms.man b/lib/libX11/man/xkb/XkbResizeKeySyms.man index 9219ee51..788a2b55 100644 --- a/lib/libX11/man/xkb/XkbResizeKeySyms.man +++ b/lib/libX11/man/xkb/XkbResizeKeySyms.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ XkbResizeKeySyms \- Change the number of symbols bound to a key .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb keyboard description to be changed .TP -.I \- key +.I key keycode for key to modify .TP -.I \- needed +.I needed new number of keysyms required for key .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbResizeKeyType.man b/lib/libX11/man/xkb/XkbResizeKeyType.man index a19158a6..cbed3d8c 100644 --- a/lib/libX11/man/xkb/XkbResizeKeyType.man +++ b/lib/libX11/man/xkb/XkbResizeKeyType.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -35,19 +35,19 @@ XkbResizeKeyType \- Change the number of levels in a key type .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb keyboard description containing client map to update .TP -.I \- type_ndx +.I type_ndx index in xkb->map->types of type to change .TP -.I \- map_count +.I map_count total # of map entries needed for the type .TP -.I \- want_preserve +.I want_preserve True => list of preserved modifiers is necessary .TP -.I \- new_num_lvls +.I new_num_lvls new max # of levels for type .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSAGroup.man b/lib/libX11/man/xkb/XkbSAGroup.man index 6f95688e..3703263b 100644 --- a/lib/libX11/man/xkb/XkbSAGroup.man +++ b/lib/libX11/man/xkb/XkbSAGroup.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -29,7 +29,7 @@ XkbSAGroup \- Returns the group_XXX field of act converted to a signed int .BI "(\^XkbAction " "act" "\^);" .SH ARGUMENTS .TP -.I \- act +.I act action from which to extract group .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSAPtrDfltValue.man b/lib/libX11/man/xkb/XkbSAPtrDfltValue.man index 14ffcb94..d795c4c4 100644 --- a/lib/libX11/man/xkb/XkbSAPtrDfltValue.man +++ b/lib/libX11/man/xkb/XkbSAPtrDfltValue.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,7 +31,7 @@ XkbSAPtrDfltValue \- Returns the valueXXX field of act converted to a signed int .if t .ti +.5i .SH ARGUMENTS .TP -.I \- act +.I act action from which to extract group .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSARedirectSetVMods.man b/lib/libX11/man/xkb/XkbSARedirectSetVMods.man index de3c0e51..49a5c811 100644 --- a/lib/libX11/man/xkb/XkbSARedirectSetVMods.man +++ b/lib/libX11/man/xkb/XkbSARedirectSetVMods.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,10 +31,10 @@ XkbSARedirectSetVMods \- Sets the vmods0 and vmods1 of act from v .if t .ti +.5i .SH ARGUMENTS .TP -.I \- act +.I act action in which to set vmods .TP -.I \- v +.I v new value for virtual modifiers .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSARedirectSetVModsMask.man b/lib/libX11/man/xkb/XkbSARedirectSetVModsMask.man index ff83da0a..088ae51e 100644 --- a/lib/libX11/man/xkb/XkbSARedirectSetVModsMask.man +++ b/lib/libX11/man/xkb/XkbSARedirectSetVModsMask.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,10 +33,10 @@ from vm .if t .ti +.5i .SH ARGUMENTS .TP -.I \- act +.I act action in which to set vmods .TP -.I \- vm +.I vm new value for virtual modifier mask .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSARedirectVMods.man b/lib/libX11/man/xkb/XkbSARedirectVMods.man index 90908688..cb176755 100644 --- a/lib/libX11/man/xkb/XkbSARedirectVMods.man +++ b/lib/libX11/man/xkb/XkbSARedirectVMods.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,7 +31,7 @@ an unsigned int .if t .ti +.5i .SH ARGUMENTS .TP -.I \- act +.I act action from which to extract vmods .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSARedirectVModsMask.man b/lib/libX11/man/xkb/XkbSARedirectVModsMask.man index 8317b0b3..ae97e6f4 100644 --- a/lib/libX11/man/xkb/XkbSARedirectVModsMask.man +++ b/lib/libX11/man/xkb/XkbSARedirectVModsMask.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,7 +31,7 @@ converted to an unsigned int .if t .ti +.5i .SH ARGUMENTS .TP -.I \- act +.I act action from which to extract vmods .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSAScreen.man b/lib/libX11/man/xkb/XkbSAScreen.man index 6d07758a..e45e8157 100644 --- a/lib/libX11/man/xkb/XkbSAScreen.man +++ b/lib/libX11/man/xkb/XkbSAScreen.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -31,7 +31,7 @@ XkbSAScreen \- Returns the screenXXX field of act converted to a signed int .if t .ti +.5i .SH ARGUMENTS .TP -.I \- act +.I act action from which to extract screen .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSASetGroup.man b/lib/libX11/man/xkb/XkbSASetGroup.man index 0eef50a3..54f99f21 100644 --- a/lib/libX11/man/xkb/XkbSASetGroup.man +++ b/lib/libX11/man/xkb/XkbSASetGroup.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -30,10 +30,10 @@ XkbSASetGroup \- Sets the group_XXX field of act from the group index grp .BI "int " "grp" "\^);" .SH ARGUMENTS .TP -.I \- act +.I act action from which to set group .TP -.I \- grp +.I grp group index to set in group_XXX .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSASetPtrDfltValue.man b/lib/libX11/man/xkb/XkbSASetPtrDfltValue.man index d32f32c6..09da49a4 100644 --- a/lib/libX11/man/xkb/XkbSASetPtrDfltValue.man +++ b/lib/libX11/man/xkb/XkbSASetPtrDfltValue.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,10 +32,10 @@ XkbSASetPtrDfltValue \- Sets the valueXXX field of act from val .if t .ti +.5i .SH ARGUMENTS .TP -.I \- act +.I act action in which to set valueXXX .TP -.I \- val +.I val value to set in valueXXX .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSASetScreen.man b/lib/libX11/man/xkb/XkbSASetScreen.man index 0ab650b3..582acaa1 100644 --- a/lib/libX11/man/xkb/XkbSASetScreen.man +++ b/lib/libX11/man/xkb/XkbSASetScreen.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,10 +32,10 @@ XkbSASetScreen \- Sets the screenXXX field of act from s .if t .ti +.5i .SH ARGUMENTS .TP -.I \- act +.I act action in which to set screenXXX .TP -.I \- s +.I s value to set in screenXXX .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSelectEventDetails.man b/lib/libX11/man/xkb/XkbSelectEventDetails.man index cd341f96..bd9800d3 100644 --- a/lib/libX11/man/xkb/XkbSelectEventDetails.man +++ b/lib/libX11/man/xkb/XkbSelectEventDetails.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/man/xkb/XkbSelectEvents.man b/lib/libX11/man/xkb/XkbSelectEvents.man index 09999b92..87c0f560 100644 --- a/lib/libX11/man/xkb/XkbSelectEvents.man +++ b/lib/libX11/man/xkb/XkbSelectEvents.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/man/xkb/XkbSetAccessXTimeout.man b/lib/libX11/man/xkb/XkbSetAccessXTimeout.man deleted file mode 100644 index c1043788..00000000 --- a/lib/libX11/man/xkb/XkbSetAccessXTimeout.man +++ /dev/null @@ -1,193 +0,0 @@ -'\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. -.\" -.\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the "Software"), -.\" to deal in the Software without restriction, including without limitation -.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, -.\" and/or sell copies of the Software, and to permit persons to whom the -.\" Software is furnished to do so, subject to the following conditions: -.\" -.\" The above copyright notice and this permission notice (including the next -.\" paragraph) shall be included in all copies or substantial portions of the -.\" Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -.\" DEALINGS IN THE SOFTWARE. -.\" -.TH XkbSetAccessXTimeout __libmansuffix__ __xorgversion__ "XKB FUNCTIONS" -.SH NAME -XkbSetAccessXTimeout \- Configures the AccessXTimeout options for a keyboard -device -.SH SYNOPSIS -.HP -.B Bool XkbSetAccessXTimeout -.BI "(\^Display *" "display" "\^," -.BI "unsigned int " "device_spec" "\^," -.BI "unsigned short " "timeout" "\^," -.BI "unsigned int " "ctrls_mask" "\^," -.BI "unsigned int " "ctrls_values" "\^," -.BI "unsigned short " "opts_mask" "\^," -.BI "unsigned short " "opts_values" "\^);" -.if n .ti +5n -.if t .ti +.5i -.SH ARGUMENTS -.TP -.I \- display -connection to X server -.TP -.I \- device_spec -device to configure, or XkbUseCoreKbd -.TP -.I \- timeout -seconds idle until AccessXTimeout occurs -.TP -.I \- ctrls_mask -boolean controls to modify -.TP -.I \- ctrls_values -new bits for controls selected by ctrls_mask -.TP -.I \- opts_mask -ax_options to change -.TP -.I \- opts_values -new bits for ax_options selected by opts_mask -.SH DESCRIPTION -.LP -In environments where computers are shared, features such as SlowKeys present a -problem: if SlowKeys is on, the keyboard can appear to be unresponsive because -keys are not accepted until they are held for a certain period of time. To help -solve this problem, Xkb provides an AccessXTimeout control to automatically -change the enabled/disabled state of any boolean controls and to change the -value of the AccessXKeys and AccessXFeedback control attributes if the keyboard -is idle for a specified period of time. - -When a timeout as specified by AccessXTimeout occurs and a control is -consequently modified, Xkb generates an XkbControlsNotify event. For more -information on XkbControlsNotify events. - -.I timeout -specifies the number of seconds the keyboard must be idle before the controls -are modified. -.I ctrls_mask -specifies what controls are to be enabled or disabled, and -.I ctrls_values -specifies whether those controls are to be enabled or disabled. The bit values -correspond to those for enabling and disabling boolean controls using -.I XkbChangeEnabledControls. - The -.I opts_mask -field specifies which attributes of the AccessXKeys and AccessXFeedback controls -are to be changed, and -.I opts_values -specifies the new values for those options. The bit values correspond to those -for the -.I ax_options -field of an XkbDescRec. - -.I XkbSetAccessXTimeout -sends a request to configure the AccessXTimeout control to the server. It does -not wait for a reply, and normally returns True. If a compatible version of the -Xkb extension is not available in the server, -.I XkbSetAccessXTimeout -returns False. -.SH "RETURN VALUES" -.TP 15 -True -The -.I XkbSetAccessXTimeout -function returns True when a compatible version of the Xkb extension is available in the server. -.TP 15 -False -The -.I XkbSetAccessXTimeout -function returns False when a compatible version of the Xkb extension is not available in the server. -.SH STRUCTURES -.LP -The complete description of an Xkb keyboard is given by an XkbDescRec. The component -structures in the XkbDescRec represent the major Xkb components. - -.nf -typedef struct { - struct _XDisplay * display; /\&* connection to X server */ - unsigned short flags; /\&* private to Xkb, do not modify */ - unsigned short device_spec; /\&* device of interest */ - KeyCode min_key_code; /\&* minimum keycode for device */ - KeyCode max_key_code; /\&* maximum keycode for device */ - XkbControlsPtr ctrls; /\&* controls */ - XkbServerMapPtr server; /\&* server keymap */ - XkbClientMapPtr map; /\&* client keymap */ - XkbIndicatorPtr indicators; /\&* indicator map */ - XkbNamesPtr names; /\&* names for all components */ - XkbCompatMapPtr compat; /\&* compatibility map */ - XkbGeometryPtr geom; /\&* physical geometry of keyboard */ -} XkbDescRec, *XkbDescPtr; - -.fi -The -.I display -field points to an X display structure. The -.I flags field is private to the library: modifying -.I flags -may yield unpredictable results. The -.I device_spec -field specifies the device identifier of the keyboard input device, or -XkbUseCoreKeyboard, which specifies the core keyboard device. The -.I min_key_code -and -.I max_key_code -fields specify the least and greatest keycode that can be returned by the keyboard. - -Each structure component has a corresponding mask bit that is used in function calls to -indicate that the structure should be manipulated in some manner, such as allocating it -or freeing it. These masks and their relationships to the fields in the XkbDescRec are -shown in Table 1. - -.TS -c s s -l l l -l l l. -Table 1 Mask Bits for XkbDescRec -_ -Mask Bit XkbDescRec Field Value -_ -XkbControlsMask ctrls (1L<<0) -XkbServerMapMask server (1L<<1) -XkbIClientMapMask map (1L<<2) -XkbIndicatorMapMask indicators (1L<<3) -XkbNamesMask names (1L<<4) -XkbCompatMapMask compat (1L<<5) -XkbGeometryMask geom (1L<<6) -XkbAllComponentsMask All Fields (0x7f) -.TE - -The structure for the XkbControlsNotify event is defined as follows: -.nf - - typedef struct { - int type; /\&* Xkb extension base event code */ - unsigned long serial; /\&* X server serial number for event */ - Bool send_event; /\&* True => synthetically generated */ - Display * display; /\&* server connection where event generated */ - Time time; /\&* server time when event generated */ - int xkb_type; /\&* XkbCompatMapNotify */ - int device; /\&* Xkb device ID, will not be XkbUseCoreKbd */ - unsigned int changed_ctrls; /\&* bits indicating which controls data have changed*/ - unsigned int enabled_ctrls; /\&* controls currently enabled in server */ - unsigned int enabled_ctrl_changes; /\&* bits indicating enabled/disabled controls */ - int num_groups; /\&* current number of keyboard groups */ - KeyCode keycode; /\&* != 0 => keycode of key causing change */ - char event_type; /\&* Type of event causing change */ - char req_major; /\&* major event code of event causing change */ - char req_minor; /\&* minor event code of event causing change */ - } XkbControlsNotifyEvent; - -.fi -.SH "SEE ALSO" -.BR XkbChangeEnabledControls (__libmansuffix__) diff --git a/lib/libX11/man/xkb/XkbSetAutoRepeatRate.man b/lib/libX11/man/xkb/XkbSetAutoRepeatRate.man index 3deec37a..327e9c52 100644 --- a/lib/libX11/man/xkb/XkbSetAutoRepeatRate.man +++ b/lib/libX11/man/xkb/XkbSetAutoRepeatRate.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,16 +34,16 @@ keyboard device .if t .ti +.5i .SH ARGUMENTS .TP -.I \- display +.I display connection to X server .TP -.I \- device_spec +.I device_spec device to configure, or XkbUseCoreKbd .TP -.I \- timeout +.I timeout initial delay, ms .TP -.I \- interval +.I interval delay between repeats, ms .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSetAutoResetControls.man b/lib/libX11/man/xkb/XkbSetAutoResetControls.man index ecaf891f..128da0e3 100644 --- a/lib/libX11/man/xkb/XkbSetAutoResetControls.man +++ b/lib/libX11/man/xkb/XkbSetAutoResetControls.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,16 +34,16 @@ attributes .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to X server .TP -.I \- changes +.I changes controls for which to change auto-reset values .TP -.I \- auto_ctrls +.I auto_ctrls controls from changes that should auto reset .TP -.I \- auto_values +.I auto_values 1 bit => auto-reset on .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSetBounceKeysDelay.man b/lib/libX11/man/xkb/XkbSetBounceKeysDelay.man deleted file mode 100644 index e6f11b1d..00000000 --- a/lib/libX11/man/xkb/XkbSetBounceKeysDelay.man +++ /dev/null @@ -1,206 +0,0 @@ -'\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. -.\" -.\" Permission is hereby granted, free of charge, to any person obtaining a -.\" copy of this software and associated documentation files (the "Software"), -.\" to deal in the Software without restriction, including without limitation -.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, -.\" and/or sell copies of the Software, and to permit persons to whom the -.\" Software is furnished to do so, subject to the following conditions: -.\" -.\" The above copyright notice and this permission notice (including the next -.\" paragraph) shall be included in all copies or substantial portions of the -.\" Software. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -.\" DEALINGS IN THE SOFTWARE. -.\" -.TH XkbSetBounceKeysDelay __libmansuffix__ __xorgversion__ "XKB FUNCTIONS" -.SH NAME -XkbSetBounceKeysDelay \- Sets the BounceKeys delay for a keyboard device -.SH SYNOPSIS -.HP -.B Bool XkbSetBounceKeysDelay -.BI "(\^Display *" "display" "\^," -.BI "unsigned int " "device_spec" "\^," -.BI "unsigned int *" "delay" "\^);" -.if n .ti +5n -.if t .ti +.5i -.SH ARGUMENTS -.TP -.I \- display -connection to X server -.TP -.I \- device_spec -device ID, or XkbUseCoreKbd -.TP -.I \- delay -backfilled with bounce keys delay, ms -.SH DESCRIPTION -.LP -The server can generate XkbAccessXNotify events for some of the global keyboard -controls. -The detail field describes what AccessX event just occurred and can be any of -the values in -Table 1. - -.TS -c s -l l -l lw(4i). -Table 1 AccessXNotify Events -_ -detail Reason -_ -XkbAXN_SKPress T{ -A key was pressed when SlowKeys was enabled. -T} -XkbAXN_SKAccept T{ -A key was accepted (held longer than the SlowKeys delay). -T} -XkbAXN_SKRelease T{ -An accepted SlowKeys key was released. -T} -XkbAXN_SKReject T{ -A key was rejected (released before the SlowKeys delay expired). -T} -XkbAXN_BKAccept T{ -A key was accepted by BounceKeys. -T} -XkbAXN_BKReject T{ -A key was rejected (pressed before the BounceKeys delay expired). -T} -XkbAXN_AXKWarning T{ -AccessXKeys is about to turn on/off StickyKeys or BounceKeys. -T} -.TE - -The -.I keycode -field reports the keycode of the key for which the event occurred. If the action -is related to -.I SlowKeys, -the -.I slowKeysDelay -field contains the current SlowKeys acceptance delay. If the action is related -to BounceKeys, -the -.I debounceDelay -field contains the current BounceKeys debounce delay. - -Selecting for AccessX Events - -To receive XkbAccessXNotify events under all possible conditions, use -.I XkbSelectEvents -and pass XkbAccesXNotifyMask in both -.I bits_to_change -and -.I values_for_bits. - -To receive XkbStateNotify events only under certain conditions, use -.I XkbSelectEventDetails -using XkbAccessXNotify as the -.I event_type -and specifying the desired state changes in -.I bits_to_change -and -.I values_for_bits -using mask bits from Table 2. - -.TS -c s s -l l l -l l lw(3i). -Table 2 AccessXNotify Event Details -_ -XkbAccessXNotify Event Details Value Circumstances -_ -XkbAXN_SKPressMask (1<<0) T{ -Slow key press notification wanted -T} -XkbAXN_SKAcceptMask (1<<1) T{ -Slow key accept notification wanted -T} -XkbAXN_SKRejectMask (1<<2) T{ -Slow key reject notification wanted -T} -XkbAXN_SKReleaseMask (1<<3) T{ -Slow key release notification wanted -T} -XkbAXN_BKAcceptMask (1<<4) T{ -Bounce key accept notification wanted -T} -XkbAXN_BKRejectMask (1<<5) T{ -Bounce key reject notification wanted -T} -XkbAXN_AXKWarningMask (1<<6) T{ -AccessX warning notification wanted -T} -XkbAllAccessXEventsMask (0x7f) T{ -All AccessX features notifications wanted -T} -.TE - -Some users may accidentally "bounce" on a key when they release it. They press -it once, then accidentally press it again after they release it. The BounceKeys -control temporarily disables a key after it has been pressed, effectively -"debouncing" the keyboard. The period of time the key is disabled after it is -released is known as the -.I BounceKeys delay. -BounceKeys is a boolean control. - -When the BounceKeys control is active, the server reports acceptance or -rejection of any key to interested clients by sending an appropriate -AccessXNotify event. - -.I XkbSetBounceKeysDelay -sends a request to configure the BounceKeys control to the server. It does not -wait for a reply and normally returns True. Specifying a value of zero for the -delay parameter causes -.I XkbSetBounceKeysDelay -to generate a BadValue protocol error. If a compatible version of the Xkb -extension is not available in the server, -.I XkbSetBounceKeysDelay -returns False. -.SH "RETURN VALUES" -.TP 15 -True -The -.I XkbSetBounceKeysDelay -function returns True when it sends a request to configure the BounceKeys -control to the server. -.TP 15 -False -The -.I XkbSetBounceKeysDelay -function returns False if a compatible version of the Xkb extension is not -available in the server. -.SH STRUCTURES -.LP -The structure for the XkbAccessXNotify event type is as follows: - -.nf -typedef struct { - int type; /\&* Xkb extension base event code */ - unsigned long serial; /\&* X server serial number for event */ - Bool send_event; /\&* True => synthetically generated */ - Display * display; /\&* server connection where event generated */ - Time time; /\&* server time when event generated */ - int xkb_type; /\&* XkbAccessXNotify */ - int device; /\&* Xkb device ID, will not be XkbUseCoreKbd */ - int detail; /\&* XkbAXN_* */ - KeyCode keycode; /\&* key of event */ - int slowKeysDelay; /\&* current SlowKeys delay */ - int debounceDelay; /\&* current debounce delay */ -} XkbAccessXNotifyEvent; - -.fi -.SH DIAGNOSTICS -.TP 15 -.B BadValue -An argument is out of range diff --git a/lib/libX11/man/xkb/XkbSetCompatMap.man b/lib/libX11/man/xkb/XkbSetCompatMap.man index 50f0224b..c6e0be32 100644 --- a/lib/libX11/man/xkb/XkbSetCompatMap.man +++ b/lib/libX11/man/xkb/XkbSetCompatMap.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/man/xkb/XkbSetControls.man b/lib/libX11/man/xkb/XkbSetControls.man index 8993ad08..ebcb7acf 100644 --- a/lib/libX11/man/xkb/XkbSetControls.man +++ b/lib/libX11/man/xkb/XkbSetControls.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,13 +34,13 @@ structure in a local copy of the keyboard description .if t .ti +.5i .SH ARGUMENTS .TP -.I \- display +.I display connection to X server .TP -.I \- which +.I which mask of controls requested .TP -.I \- xkb +.I xkb keyboard description for controls information .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSetDebuggingFlags.man b/lib/libX11/man/xkb/XkbSetDebuggingFlags.man index 358ccf83..c27952cf 100644 --- a/lib/libX11/man/xkb/XkbSetDebuggingFlags.man +++ b/lib/libX11/man/xkb/XkbSetDebuggingFlags.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -38,28 +38,28 @@ XkbSetDebuggingFlags \- Change the values of any of the debug controls .if t .ti +.5i .SH ARGUMENTS .TP -.I \- display +.I display connection to X server .TP -.I \- mask +.I mask mask selecting debug output flags to change .TP -.I \- flags +.I flags values for debug output flags selected by mask .TP -.I \- msg +.I msg message to print right now .TP -.I \- ctrls_mask +.I ctrls_mask mask selecting debug controls to change .TP -.I \- ctrls +.I ctrls values for debug controls selected by ctrls_mask .TP -.I \- ret_flags +.I ret_flags resulting state of all debug output flags .TP -.I \- ret_ctrls +.I ret_ctrls resulting state of all debug controls .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSetDetectableAutoRepeat.man b/lib/libX11/man/xkb/XkbSetDetectableAutoRepeat.man index c54b349b..3f3340ea 100644 --- a/lib/libX11/man/xkb/XkbSetDetectableAutoRepeat.man +++ b/lib/libX11/man/xkb/XkbSetDetectableAutoRepeat.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -30,13 +30,13 @@ XkbSetDetectableAutoRepeat \- Sets DetectableAutoRepeat .BI "Bool *" "supported_rtrn" "\^);" .SH ARGUMENTS .TP -.I \- display +.I display connection to X server .TP -.I \- detectable +.I detectable True => set DetectableAutoRepeat .TP -.I \- supported_rtrn +.I supported_rtrn backfilled True if DetectableAutoRepeat supported .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSetDeviceButtonActions.man b/lib/libX11/man/xkb/XkbSetDeviceButtonActions.man index 122fc45f..ed6b2ccc 100644 --- a/lib/libX11/man/xkb/XkbSetDeviceButtonActions.man +++ b/lib/libX11/man/xkb/XkbSetDeviceButtonActions.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -32,16 +32,16 @@ XkbSetDeviceButtonActions \- Change only the button actions for an input extensi .BI "unsigned int " "num_buttons" "\^);" .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to X server .TP -.I \- device +.I device structure defining the device and modifications .TP -.I \- first_button +.I first_button number of first button to update, 0 relative .TP -.I \- num_buttons +.I num_buttons number of buttons to update .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSetDeviceInfo.man b/lib/libX11/man/xkb/XkbSetDeviceInfo.man index 062dbcae..0e4b7f3d 100644 --- a/lib/libX11/man/xkb/XkbSetDeviceInfo.man +++ b/lib/libX11/man/xkb/XkbSetDeviceInfo.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,13 +34,13 @@ Extension device .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to X server .TP -.I \- which +.I which mask indicating characteristics to modify .TP -.I \- device_info +.I device_info structure defining the device and modifications .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSetIgnoreLockMods.man b/lib/libX11/man/xkb/XkbSetIgnoreLockMods.man index 7e6acd57..e1673629 100644 --- a/lib/libX11/man/xkb/XkbSetIgnoreLockMods.man +++ b/lib/libX11/man/xkb/XkbSetIgnoreLockMods.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -37,22 +37,22 @@ reported in matching events to passive grabs .if t .ti +.5i .SH ARGUMENTS .TP -.I \- display +.I display connection to the X server .TP -.I \- device_spec +.I device_spec device ID, or XkbUseCoreKbd .TP -.I \- affect_real +.I affect_real mask of real modifiers affected by this call .TP -.I \- real_values +.I real_values values for affected real modifiers (1=>set, 0=>unset) .TP -.I \- affect_virtual +.I affect_virtual mask of virtual modifiers affected by this call .TP -.I \- virtual_values +.I virtual_values values for affected virtual modifiers (1=>set, 0=>unset) .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSetIndicatorMap.man b/lib/libX11/man/xkb/XkbSetIndicatorMap.man index 5d5a48b2..24db4e79 100644 --- a/lib/libX11/man/xkb/XkbSetIndicatorMap.man +++ b/lib/libX11/man/xkb/XkbSetIndicatorMap.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -35,13 +35,13 @@ or more indicators .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to the X server .TP -.I \- which +.I which mask of indicators to change .TP -.I \- desc +.I desc keyboard description from which the maps are taken .SH DESCRIPTION .LP @@ -102,7 +102,9 @@ Indicator Drives Keyboard _ which_mods New State Effect on Keyboard Modifiers _ -XkbIM_UseNone or XkbIM_UseBase On or Off No Effect +XkbIM_UseNone or +.br +XkbIM_UseBase On or Off No Effect XkbIM_UseLatched On T{ Any modifiers specified in the mask field of mods are added to the latched modifiers. @@ -111,7 +113,11 @@ XkbIM_UseLatched Off T{ Any modifiers specified in the mask field of mods are removed from the latched modifiers. T} -XkbIM_UseLocked, XkbIM_UseCompat, or XkbIM_UseEffective On T{ +XkbIM_UseLocked, +.br +XkbIM_UseCompat, or +.br +XkbIM_UseEffective On T{ Any modifiers specified in the mask field of mods are added to the locked modifiers. T} @@ -119,7 +125,9 @@ XkbIM_UseLocked Off T{ Any modifiers specified in the mask field of mods are removed from the locked modifiers. T} -XkbIM_UseCompat or XkbIM_UseEffective Off T{ +XkbIM_UseCompat or +.br +XkbIM_UseEffective Off T{ Any modifiers specified in the mask field of mods are removed from both the locked and latched modifiers. T} @@ -129,8 +137,8 @@ If XkbIM_LEDDrivesKB is set and XkbIM_NoExplicit is not, and if you call a function that updates the server's image of the indicator map (such as .I XkbSetIndicatorMap or -.I XkbSetNamedIndicator), - Xkb changes the keyboard state and controls to reflect the other fields of the +.IR XkbSetNamedIndicator ), +Xkb changes the keyboard state and controls to reflect the other fields of the indicator map. If you attempt to explicitly change the value of an indicator for which XkbIM_LEDDrivesKB is absent or for which XkbIM_NoExplicit is present, keyboard state or controls are unaffected. diff --git a/lib/libX11/man/xkb/XkbSetMap.man b/lib/libX11/man/xkb/XkbSetMap.man index dee27cdc..bff7c284 100644 --- a/lib/libX11/man/xkb/XkbSetMap.man +++ b/lib/libX11/man/xkb/XkbSetMap.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/man/xkb/XkbSetModActionVMods.man b/lib/libX11/man/xkb/XkbSetModActionVMods.man index cb2178b1..c130a594 100644 --- a/lib/libX11/man/xkb/XkbSetModActionVMods.man +++ b/lib/libX11/man/xkb/XkbSetModActionVMods.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,10 +33,10 @@ format of an Xkb modifier description .if t .ti +.5i .SH ARGUMENTS .TP -.I \- act +.I act action in which to set vmods .TP -.I \- vmods +.I vmods virtual mods to set .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSetNamedIndicator.man b/lib/libX11/man/xkb/XkbSetNamedIndicator.man index 81df50fc..2bf7bd3c 100644 --- a/lib/libX11/man/xkb/XkbSetNamedIndicator.man +++ b/lib/libX11/man/xkb/XkbSetNamedIndicator.man @@ -1,4 +1,4 @@ -.\" Copyright 1999, 2017, Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, 2017, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -48,31 +48,31 @@ indicator map for the indicator .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to the X server .TP -.I \- device_spec +.I device_spec device ID, or XkbUseCoreKbd .TP -.I \- led_class +.I led_class feedback class, or XkbDfltXIClass .TP -.I \- led_id +.I led_id feedback ID, or XkbDfltXIId .TP -.I \- name +.I name name of the indicator to change .TP -.I \- change_state +.I change_state whether to change the indicator state or not .TP -.I \- state +.I state desired new state for the indicator .TP -.I \- create_new +.I create_new whether a new indicator with the specified name should be created when necessary .TP -.I \- map +.I map new map for the indicator .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSetNames.man b/lib/libX11/man/xkb/XkbSetNames.man index 82c9ccdb..6295e439 100644 --- a/lib/libX11/man/xkb/XkbSetNames.man +++ b/lib/libX11/man/xkb/XkbSetNames.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -35,19 +35,19 @@ XkbSetNames \- Change the symbolic names in the server .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to the X server .TP -.I \- which +.I which mask of names or map components to be changed .TP -.I \- first_type +.I first_type first type whose name is to be changed .TP -.I \- num_types +.I num_types number of types for which names are to be changed .TP -.I \- xkb +.I xkb keyboard description from which names are to be taken .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSetPtrActionX.man b/lib/libX11/man/xkb/XkbSetPtrActionX.man index d2910c88..60896bf5 100644 --- a/lib/libX11/man/xkb/XkbSetPtrActionX.man +++ b/lib/libX11/man/xkb/XkbSetPtrActionX.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,10 +33,10 @@ integer value x .if t .ti +.5i .SH ARGUMENTS .TP -.I \- act +.I act action in which to set X .TP -.I \- x +.I x new value to set .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSetPtrActionY.man b/lib/libX11/man/xkb/XkbSetPtrActionY.man index 410a4d4b..acbf0231 100644 --- a/lib/libX11/man/xkb/XkbSetPtrActionY.man +++ b/lib/libX11/man/xkb/XkbSetPtrActionY.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,10 +33,10 @@ integer value y .if t .ti +.5i .SH ARGUMENTS .TP -.I \- act +.I act action in which to set Y .TP -.I \- y +.I y new value to set .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSetServerInternalMods.man b/lib/libX11/man/xkb/XkbSetServerInternalMods.man index 193d216f..ac8be546 100644 --- a/lib/libX11/man/xkb/XkbSetServerInternalMods.man +++ b/lib/libX11/man/xkb/XkbSetServerInternalMods.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -37,22 +37,22 @@ before events are delivered to the client .if t .ti +.5i .SH ARGUMENTS .TP -.I \- display +.I display connection to the X server .TP -.I \- device_spec +.I device_spec device ID, or XkbUseCoreKbd .TP -.I \- affect_real +.I affect_real mask of real modifiers affected by this call .TP -.I \- real_values +.I real_values values for affected real modifiers (1=>set, 0=>unset) .TP -.I \- affect_virtual +.I affect_virtual mask of virtual modifiers affected by this call .TP -.I \- virtual_values +.I virtual_values values for affected virtual modifiers (1=>set, 0=>unset) .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbSetXlibControls.man b/lib/libX11/man/xkb/XkbSetXlibControls.man index 05a28989..1d62bf2e 100644 --- a/lib/libX11/man/xkb/XkbSetXlibControls.man +++ b/lib/libX11/man/xkb/XkbSetXlibControls.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ XkbSetXlibControls \- Changes the state of the Library Controls .if t .ti +.5i .SH ARGUMENTS .TP -.I \- display +.I display connection to X server .TP -.I \- bits_to_change +.I bits_to_change selects controls to be modified .TP -.I \- values_for_bits +.I values_for_bits turns selected controls on (1) or off (0) .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbTranslateKeyCode.man b/lib/libX11/man/xkb/XkbTranslateKeyCode.man index e234412f..e1fdd674 100644 --- a/lib/libX11/man/xkb/XkbTranslateKeyCode.man +++ b/lib/libX11/man/xkb/XkbTranslateKeyCode.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -34,19 +34,19 @@ XkbTranslateKeyCode \- Translate a keycode to a key symbol and modifiers .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb keyboard description to use for translation .TP -.I \- key +.I key keycode to translate .TP -.I \- mods +.I mods modifiers to apply when translating key .TP -.I \- mods_rtrn +.I mods_rtrn backfilled with consumed modifiers .TP -.I \- keysym_rtrn +.I keysym_rtrn keysym resulting from translation .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbTranslateKeySym.man b/lib/libX11/man/xkb/XkbTranslateKeySym.man index 9a23ce28..cbefa0ad 100644 --- a/lib/libX11/man/xkb/XkbTranslateKeySym.man +++ b/lib/libX11/man/xkb/XkbTranslateKeySym.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -36,22 +36,22 @@ given keyboard state .if t .ti +.5i .SH ARGUMENTS .TP -.I \- dpy +.I dpy connection to X server .TP -.I \- sym_inout +.I sym_inout symbol to be translated; result of translation .TP -.I \- mods +.I mods modifiers to apply to sym_inout .TP -.I \- buf +.I buf buffer into which returned string is written .TP -.I \- nbytes +.I nbytes size of buffer in bytes .TP -.I \- extra_rtrn +.I extra_rtrn number of bytes overflow .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbUpdateMapFromCore.man b/lib/libX11/man/xkb/XkbUpdateMapFromCore.man index e65d598d..df883229 100644 --- a/lib/libX11/man/xkb/XkbUpdateMapFromCore.man +++ b/lib/libX11/man/xkb/XkbUpdateMapFromCore.man @@ -1,5 +1,5 @@ '\" t -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -37,22 +37,22 @@ expressed by a core format mapping .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb keyboard description to update .TP -.I \- first_key +.I first_key keycode of first key description to update .TP -.I \- num_keys +.I num_keys number of key descriptions to update .TP -.I \- map_width +.I map_width width of core protocol keymap .TP -.I \- core_keysyms +.I core_keysyms symbols in core protocol keymap .TP -.I \- changes +.I changes backfilled with changes made to Xkb .SH DESCRIPTION .LP diff --git a/lib/libX11/man/xkb/XkbVirtualModsToReal.man b/lib/libX11/man/xkb/XkbVirtualModsToReal.man index 9c1ebbf4..e383663e 100644 --- a/lib/libX11/man/xkb/XkbVirtualModsToReal.man +++ b/lib/libX11/man/xkb/XkbVirtualModsToReal.man @@ -1,4 +1,4 @@ -.\" Copyright 1999 Oracle and/or its affiliates. All rights reserved. +.\" Copyright (c) 1999, Oracle and/or its affiliates. .\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), @@ -33,13 +33,13 @@ protocol modifiers .if t .ti +.5i .SH ARGUMENTS .TP -.I \- xkb +.I xkb keyboard description for input device .TP -.I \- virtual_mask +.I virtual_mask virtual modifier mask to translate .TP -.I \- mask_rtrn +.I mask_rtrn backfilled with real modifiers .SH DESCRIPTION .LP diff --git a/lib/libX11/modules/Makefile.in b/lib/libX11/modules/Makefile.in index cd0e867b..849078a9 100644 --- a/lib/libX11/modules/Makefile.in +++ b/lib/libX11/modules/Makefile.in @@ -227,6 +227,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/modules/im/Makefile.in b/lib/libX11/modules/im/Makefile.in index e423b9f2..7e59a0c3 100644 --- a/lib/libX11/modules/im/Makefile.in +++ b/lib/libX11/modules/im/Makefile.in @@ -227,6 +227,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/modules/im/ximcp/Makefile.in b/lib/libX11/modules/im/ximcp/Makefile.in index 098ebc17..da2fe0f9 100644 --- a/lib/libX11/modules/im/ximcp/Makefile.in +++ b/lib/libX11/modules/im/ximcp/Makefile.in @@ -270,6 +270,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/modules/im/ximcp/imDefIc.c b/lib/libX11/modules/im/ximcp/imDefIc.c index d552aa9e..354c7f08 100644 --- a/lib/libX11/modules/im/ximcp/imDefIc.c +++ b/lib/libX11/modules/im/ximcp/imDefIc.c @@ -1,5 +1,5 @@ /* - * Copyright 1991, 1992 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1991, 1992, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/modules/im/ximcp/imDefIm.c b/lib/libX11/modules/im/ximcp/imDefIm.c index ccdf14c1..fe4d18ba 100644 --- a/lib/libX11/modules/im/ximcp/imDefIm.c +++ b/lib/libX11/modules/im/ximcp/imDefIm.c @@ -1,5 +1,5 @@ /* - * Copyright 1990, 1991, 1992 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1990, 1991, 1992, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -980,34 +980,30 @@ _XimProtoIMFree( Xim im) { /* XIMPrivateRec */ - if (im->private.proto.im_onkeylist) { - Xfree(im->private.proto.im_onkeylist); - im->private.proto.im_onkeylist = NULL; - } - if (im->private.proto.im_offkeylist) { - Xfree(im->private.proto.im_offkeylist); - im->private.proto.im_offkeylist = NULL; - } + + Xfree(im->private.proto.im_onkeylist); + im->private.proto.im_onkeylist = NULL; + + Xfree(im->private.proto.im_offkeylist); + im->private.proto.im_offkeylist = NULL; + if (im->private.proto.intrproto) { - _XimFreeProtoIntrCallback(im); - im->private.proto.intrproto = NULL; - } - if (im->private.proto.im_inner_resources) { - Xfree(im->private.proto.im_inner_resources); - im->private.proto.im_inner_resources = NULL; - } - if (im->private.proto.ic_inner_resources) { - Xfree(im->private.proto.ic_inner_resources); - im->private.proto.ic_inner_resources = NULL; - } - if (im->private.proto.hold_data) { - Xfree(im->private.proto.hold_data); - im->private.proto.hold_data = NULL; - } - if (im->private.proto.locale_name) { - Xfree(im->private.proto.locale_name); - im->private.proto.locale_name = NULL; + _XimFreeProtoIntrCallback(im); + im->private.proto.intrproto = NULL; } + + Xfree(im->private.proto.im_inner_resources); + im->private.proto.im_inner_resources = NULL; + + Xfree(im->private.proto.ic_inner_resources); + im->private.proto.ic_inner_resources = NULL; + + Xfree(im->private.proto.hold_data); + im->private.proto.hold_data = NULL; + + Xfree(im->private.proto.locale_name); + im->private.proto.locale_name = NULL; + if (im->private.proto.ctom_conv) { _XlcCloseConverter(im->private.proto.ctom_conv); im->private.proto.ctom_conv = NULL; @@ -1047,48 +1043,37 @@ _XimProtoIMFree( } #endif /* XIM_CONNECTABLE */ - if (im->private.proto.saved_imvalues) { - Xfree(im->private.proto.saved_imvalues); - im->private.proto.saved_imvalues = NULL; - } - if (im->private.proto.default_styles) { - Xfree(im->private.proto.default_styles); - im->private.proto.default_styles = NULL; - } + Xfree(im->private.proto.saved_imvalues); + im->private.proto.saved_imvalues = NULL; + + Xfree(im->private.proto.default_styles); + im->private.proto.default_styles = NULL; /* core */ - if (im->core.res_name) { - Xfree(im->core.res_name); - im->core.res_name = NULL; - } - if (im->core.res_class) { - Xfree(im->core.res_class); - im->core.res_class = NULL; - } - if (im->core.im_values_list) { - Xfree(im->core.im_values_list); - im->core.im_values_list = NULL; - } - if (im->core.ic_values_list) { - Xfree(im->core.ic_values_list); - im->core.ic_values_list = NULL; - } - if (im->core.im_name) { - Xfree(im->core.im_name); - im->core.im_name = NULL; - } - if (im->core.styles) { - Xfree(im->core.styles); - im->core.styles = NULL; - } - if (im->core.im_resources) { - Xfree(im->core.im_resources); - im->core.im_resources = NULL; - } - if (im->core.ic_resources) { - Xfree(im->core.ic_resources); - im->core.ic_resources = NULL; - } + + Xfree(im->core.res_name); + im->core.res_name = NULL; + + Xfree(im->core.res_class); + im->core.res_class = NULL; + + Xfree(im->core.im_values_list); + im->core.im_values_list = NULL; + + Xfree(im->core.ic_values_list); + im->core.ic_values_list = NULL; + + Xfree(im->core.im_name); + im->core.im_name = NULL; + + Xfree(im->core.styles); + im->core.styles = NULL; + + Xfree(im->core.im_resources); + im->core.im_resources = NULL; + + Xfree(im->core.ic_resources); + im->core.ic_resources = NULL; return; } diff --git a/lib/libX11/modules/im/ximcp/imInsClbk.c b/lib/libX11/modules/im/ximcp/imInsClbk.c index 95b379cb..c10e347f 100644 --- a/lib/libX11/modules/im/ximcp/imInsClbk.c +++ b/lib/libX11/modules/im/ximcp/imInsClbk.c @@ -212,6 +212,9 @@ _XimRegisterIMInstantiateCallback( if( xim ) { lock = True; xim->methods->close( (XIM)xim ); + /* XIMs must be freed manually after being opened; close just + does the protocol to deinitialize the IM. */ + XFree( xim ); lock = False; icb->call = True; callback( display, client_data, NULL ); diff --git a/lib/libX11/modules/im/ximcp/imLcIc.c b/lib/libX11/modules/im/ximcp/imLcIc.c index 63545899..a3b6c1f5 100644 --- a/lib/libX11/modules/im/ximcp/imLcIc.c +++ b/lib/libX11/modules/im/ximcp/imLcIc.c @@ -61,10 +61,16 @@ _XimLocalDestroyIC( if (ic->core.focus_window) _XUnregisterFilter(ic->core.im->core.display, ic->core.focus_window, _XimLocalFilter, (XPointer)ic); - if(ic->private.local.ic_resources) { - Xfree(ic->private.local.ic_resources); - ic->private.local.ic_resources = NULL; - } + + Xfree(ic->private.local.ic_resources); + ic->private.local.ic_resources = NULL; + + Xfree(ic->core.res_name); + ic->core.res_name=NULL; + + Xfree(ic->core.res_class); + ic->core.res_class = NULL; + return; } @@ -138,12 +144,13 @@ _XimLocalCreateIC( XIMArg *values) { Xic ic; - XimDefICValues ic_values; + XimDefICValues ic_values={ 0 }; XIMResourceList res; unsigned int num; int len; - if((ic = Xcalloc(1, sizeof(XicRec))) == (Xic)NULL) { + ic = Xcalloc(1, sizeof(XicRec)); + if( ic == (Xic)NULL) { return ((XIC)NULL); } @@ -158,15 +165,15 @@ _XimLocalCreateIC( num = im->core.ic_num_resources; len = sizeof(XIMResource) * num; - if((res = Xmalloc(len)) == (XIMResourceList)NULL) { + res = Xmalloc(len); + if( res == (XIMResourceList)NULL) { goto Set_Error; } (void)memcpy((char *)res, (char *)im->core.ic_resources, len); ic->private.local.ic_resources = res; ic->private.local.ic_num_resources = num; - bzero((char *)&ic_values, sizeof(XimDefICValues)); - if(_XimCheckLocalInputStyle(ic, (XPointer)&ic_values, values, + if(_XimCheckLocalInputStyle(ic, (XPointer)&ic_values, values, im->core.styles, res, num) == False) { goto Set_Error; } @@ -190,10 +197,10 @@ _XimLocalCreateIC( return((XIC)ic); Set_Error : - if (ic->private.local.ic_resources) { - Xfree(ic->private.local.ic_resources); - ic->private.local.ic_resources = NULL; - } + + Xfree(ic->private.local.ic_resources); + ic->private.local.ic_resources = NULL; + Xfree(ic); return((XIC)NULL); } diff --git a/lib/libX11/modules/im/ximcp/imLcPrs.c b/lib/libX11/modules/im/ximcp/imLcPrs.c index 795ea719..ea6d429a 100644 --- a/lib/libX11/modules/im/ximcp/imLcPrs.c +++ b/lib/libX11/modules/im/ximcp/imLcPrs.c @@ -678,7 +678,7 @@ parseline( b->treesize = newsize; /* Re-derive top after realloc() to avoid undefined behaviour (and crashes on architectures that track pointer bounds). */ - if (top >= (DTIndex *) old && top < (DTIndex *) &old[oldsize]) + if (old && top >= (DTIndex *) old && top < (DTIndex *) &old[oldsize]) top = (DTIndex *) (((char *)new) + (((char *)top)-(char *)old)); } p = &b->tree[b->treeused]; diff --git a/lib/libX11/modules/im/ximcp/imRm.c b/lib/libX11/modules/im/ximcp/imRm.c index cb9e1b2c..29f498a1 100644 --- a/lib/libX11/modules/im/ximcp/imRm.c +++ b/lib/libX11/modules/im/ximcp/imRm.c @@ -510,13 +510,21 @@ _XimDefaultResName( Xic ic = (Xic)parm; Xim im = (Xim)ic->core.im; char **out; - + char *string; + if(im->core.res_name == (char *)NULL) { return True; } + string=strdup(im->core.res_name); + if ( string == NULL) + return False; + out = (char **)((char *)top + info->offset); - *out = im->core.res_name; + + Xfree(*out); /* free old im->core.res_name */ + *out =string; + return True; } @@ -529,14 +537,22 @@ _XimDefaultResClass( { Xic ic = (Xic)parm; Xim im = (Xim)ic->core.im; + char *string; char **out; if(im->core.res_class == (char *)NULL) { return True; } + string=strdup(im->core.res_class); + if (string == NULL) + return False; + out = (char **)((char *)top + info->offset); - *out = im->core.res_class; + + Xfree(*out); /* free old im->core.res_class */ + *out = string; + return True; } @@ -820,9 +836,8 @@ _XimEncodeString( } out = (char **)((char *)top + info->offset); - if(*out) { - Xfree(*out); - } + + Xfree(*out); *out = string; return True; } @@ -1947,7 +1962,7 @@ static const XimICMode ic_mode[] = { 0, 0}, {OFFSET_XNSPOTLOCATION, - 0, /*(XIM_MODE_PRE_SET | XIM_MODE_PRE_GET),*/ + (XIM_MODE_PRE_SET | XIM_MODE_PRE_GET), (XIM_MODE_PRE_CREATE | XIM_MODE_PRE_SET | XIM_MODE_PRE_GET), 0, (XIM_MODE_PRE_SET | XIM_MODE_PRE_GET), diff --git a/lib/libX11/modules/im/ximcp/imTrX.c b/lib/libX11/modules/im/ximcp/imTrX.c index ec256752..ca718980 100644 --- a/lib/libX11/modules/im/ximcp/imTrX.c +++ b/lib/libX11/modules/im/ximcp/imTrX.c @@ -1,5 +1,5 @@ /* - * Copyright 1992 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1992, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/modules/im/ximcp/imTrans.c b/lib/libX11/modules/im/ximcp/imTrans.c index 232f8165..571f6ad5 100644 --- a/lib/libX11/modules/im/ximcp/imTrans.c +++ b/lib/libX11/modules/im/ximcp/imTrans.c @@ -1,5 +1,5 @@ /* - * Copyright 1992 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1992, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/modules/im/ximcp/imTransR.c b/lib/libX11/modules/im/ximcp/imTransR.c index 50b549e7..b089ad77 100644 --- a/lib/libX11/modules/im/ximcp/imTransR.c +++ b/lib/libX11/modules/im/ximcp/imTransR.c @@ -1,5 +1,5 @@ /* - * Copyright 1992 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1992, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/modules/lc/Makefile.in b/lib/libX11/modules/lc/Makefile.in index 176b6e42..c4c3624c 100644 --- a/lib/libX11/modules/lc/Makefile.in +++ b/lib/libX11/modules/lc/Makefile.in @@ -227,6 +227,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/modules/lc/Utf8/Makefile.in b/lib/libX11/modules/lc/Utf8/Makefile.in index 07b4d483..ec1726a0 100644 --- a/lib/libX11/modules/lc/Utf8/Makefile.in +++ b/lib/libX11/modules/lc/Utf8/Makefile.in @@ -262,6 +262,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/modules/lc/def/Makefile.in b/lib/libX11/modules/lc/def/Makefile.in index 8f59016a..faa9de6d 100644 --- a/lib/libX11/modules/lc/def/Makefile.in +++ b/lib/libX11/modules/lc/def/Makefile.in @@ -260,6 +260,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/modules/lc/def/lcDefConv.c b/lib/libX11/modules/lc/def/lcDefConv.c index 51ad2f8e..cf68344c 100644 --- a/lib/libX11/modules/lc/def/lcDefConv.c +++ b/lib/libX11/modules/lc/def/lcDefConv.c @@ -44,7 +44,7 @@ #define MB_LEN_MAX 6 #endif -#if !defined(Lynx_22) && !defined(X_LOCALE) +#ifndef X_LOCALE #define STDCVT #endif diff --git a/lib/libX11/modules/lc/gen/Makefile.in b/lib/libX11/modules/lc/gen/Makefile.in index 255c6c56..63912ef6 100644 --- a/lib/libX11/modules/lc/gen/Makefile.in +++ b/lib/libX11/modules/lc/gen/Makefile.in @@ -260,6 +260,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/modules/lc/gen/lcGenConv.c b/lib/libX11/modules/lc/gen/lcGenConv.c index dff4269c..e1a13a28 100644 --- a/lib/libX11/modules/lc/gen/lcGenConv.c +++ b/lib/libX11/modules/lc/gen/lcGenConv.c @@ -53,7 +53,7 @@ #include "XlcGeneric.h" #include -#if !defined(Lynx_22) && !defined(X_LOCALE) +#ifndef X_LOCALE #define STDCVT #endif diff --git a/lib/libX11/modules/om/Makefile.in b/lib/libX11/modules/om/Makefile.in index 67b9bdbe..260d1f63 100644 --- a/lib/libX11/modules/om/Makefile.in +++ b/lib/libX11/modules/om/Makefile.in @@ -227,6 +227,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/modules/om/generic/Makefile.in b/lib/libX11/modules/om/generic/Makefile.in index decf5d6e..51414943 100644 --- a/lib/libX11/modules/om/generic/Makefile.in +++ b/lib/libX11/modules/om/generic/Makefile.in @@ -263,6 +263,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/nls/Makefile.in b/lib/libX11/nls/Makefile.in index 4a2ab249..fac58dc3 100644 --- a/lib/libX11/nls/Makefile.in +++ b/lib/libX11/nls/Makefile.in @@ -228,6 +228,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/nls/am_ET.UTF-8/Compose.pre b/lib/libX11/nls/am_ET.UTF-8/Compose.pre index b02f2b8e..1c8cffbe 100644 --- a/lib/libX11/nls/am_ET.UTF-8/Compose.pre +++ b/lib/libX11/nls/am_ET.UTF-8/Compose.pre @@ -2,7 +2,7 @@ XCOMM XCOMM UTF-8 (Unicode) compose sequences for the Ethiopian layout. XCOMM Designed as part of the OLPC project. XCOMM -XCOMM 2007 Sergey Udaltsov +XCOMM Original author: Sergey Udaltsov , 2007. XCOMM @@ -14,325 +14,325 @@ XCOMM Group I XCOMM XCOMM Modifier: /u/ - : "ሁ" U1201 # key h (base character ሀ) - : "ሉ" U1209 # key l (base character ለ) - : "ሙ" U1219 # key m (base character መ) - : "ሩ" U1229 # key r (base character ረ) - : "ሱ" U1231 # key s (base character ሰ) - : "ቁ" U1241 # key q (base character ቀ) - : "ቡ" U1261 # key b (base character በ) - : "ቱ" U1271 # key t (base character ተ) - : "ኑ" U1291 # key n (base character ነ) - : "ኡ" U12A1 # key x (base character አ) - : "ኩ" U12A9 # key k (base character ከ) - : "ዉ" U12C9 # key w (base character ወ) - : "ዙ" U12D9 # key z (base character ዘ) - : "ዩ" U12E9 # key y (base character የ) - : "ዱ" U12F1 # key d (base character ደ) - : "ጁ" U1301 # key j (base character ጀ) - : "ጉ" U1309 # key g (base character ገ) - : "ፁ" U1341 # key [ (base character ፀ) - : "ፉ" U1349 # key f (base character ፈ) - : "ፑ" U1351 # key p (base character ፐ) - : "ሹ" U1239 # key v (base character ሸ) - : "ጩ" U1329 # key ] (base character ጨ) + : "ሁ" U1201 # key h (base character ሀ) + : "ሉ" U1209 # key l (base character ለ) + : "ሙ" U1219 # key m (base character መ) + : "ሩ" U1229 # key r (base character ረ) + : "ሱ" U1231 # key s (base character ሰ) + : "ቁ" U1241 # key q (base character ቀ) + : "ቡ" U1261 # key b (base character በ) + : "ቱ" U1271 # key t (base character ተ) + : "ኑ" U1291 # key n (base character ነ) + : "ኡ" U12A1 # key x (base character አ) + : "ኩ" U12A9 # key k (base character ከ) + : "ዉ" U12C9 # key w (base character ወ) + : "ዙ" U12D9 # key z (base character ዘ) + : "ዩ" U12E9 # key y (base character የ) + : "ዱ" U12F1 # key d (base character ደ) + : "ጁ" U1301 # key j (base character ጀ) + : "ጉ" U1309 # key g (base character ገ) + : "ፁ" U1341 # key [ (base character ፀ) + : "ፉ" U1349 # key f (base character ፈ) + : "ፑ" U1351 # key p (base character ፐ) + : "ሹ" U1239 # key v (base character ሸ) + : "ጩ" U1329 # key ] (base character ጨ) XCOMM Modifier: /i/ - : "ሂ" U1202 # key h (base character ሀ) - : "ሊ" U120A # key l (base character ለ) - : "ሚ" U121A # key m (base character መ) - : "ሪ" U122A # key r (base character ረ) - : "ሲ" U1232 # key s (base character ሰ) - : "ቂ" U1242 # key q (base character ቀ) - : "ቢ" U1262 # key b (base character በ) - : "ቲ" U1272 # key t (base character ተ) - : "ኒ" U1292 # key n (base character ነ) - : "ኢ" U12A2 # key x (base character አ) - : "ኪ" U12AA # key k (base character ከ) - : "ዊ" U12CA # key w (base character ወ) - : "ዚ" U12DA # key z (base character ዘ) - : "ዪ" U12EA # key y (base character የ) - : "ዲ" U12F2 # key d (base character ደ) - : "ጂ" U1302 # key j (base character ጀ) - : "ጊ" U130A # key g (base character ገ) - : "ፂ" U1342 # key [ (base character ፀ) - : "ፊ" U134A # key f (base character ፈ) - : "ፒ" U1352 # key p (base character ፐ) - : "ሺ" U123A # key v (base character ሸ) - : "ጪ" U132A # key ] (base character ጨ) + : "ሂ" U1202 # key h (base character ሀ) + : "ሊ" U120A # key l (base character ለ) + : "ሚ" U121A # key m (base character መ) + : "ሪ" U122A # key r (base character ረ) + : "ሲ" U1232 # key s (base character ሰ) + : "ቂ" U1242 # key q (base character ቀ) + : "ቢ" U1262 # key b (base character በ) + : "ቲ" U1272 # key t (base character ተ) + : "ኒ" U1292 # key n (base character ነ) + : "ኢ" U12A2 # key x (base character አ) + : "ኪ" U12AA # key k (base character ከ) + : "ዊ" U12CA # key w (base character ወ) + : "ዚ" U12DA # key z (base character ዘ) + : "ዪ" U12EA # key y (base character የ) + : "ዲ" U12F2 # key d (base character ደ) + : "ጂ" U1302 # key j (base character ጀ) + : "ጊ" U130A # key g (base character ገ) + : "ፂ" U1342 # key [ (base character ፀ) + : "ፊ" U134A # key f (base character ፈ) + : "ፒ" U1352 # key p (base character ፐ) + : "ሺ" U123A # key v (base character ሸ) + : "ጪ" U132A # key ] (base character ጨ) XCOMM Modifier: /a/ - : "ሃ" U1203 # key h (base character ሀ) - : "ላ" U120B # key l (base character ለ) - : "ማ" U121B # key m (base character መ) - : "ራ" U122B # key r (base character ረ) - : "ሳ" U1233 # key s (base character ሰ) - : "ቃ" U1243 # key q (base character ቀ) - : "ባ" U1263 # key b (base character በ) - : "ታ" U1273 # key t (base character ተ) - : "ና" U1293 # key n (base character ነ) - : "ኣ" U12A3 # key x (base character አ) - : "ካ" U12AB # key k (base character ከ) - : "ዋ" U12CB # key w (base character ወ) - : "ዛ" U12DB # key z (base character ዘ) - : "ያ" U12EB # key y (base character የ) - : "ዳ" U12F3 # key d (base character ደ) - : "ጃ" U1303 # key j (base character ጀ) - : "ጋ" U130B # key g (base character ገ) - : "ፃ" U1343 # key [ (base character ፀ) - : "ፋ" U134B # key f (base character ፈ) - : "ፓ" U1353 # key p (base character ፐ) - : "ሻ" U123B # key v (base character ሸ) - : "ጫ" U132B # key ] (base character ጨ) + : "ሃ" U1203 # key h (base character ሀ) + : "ላ" U120B # key l (base character ለ) + : "ማ" U121B # key m (base character መ) + : "ራ" U122B # key r (base character ረ) + : "ሳ" U1233 # key s (base character ሰ) + : "ቃ" U1243 # key q (base character ቀ) + : "ባ" U1263 # key b (base character በ) + : "ታ" U1273 # key t (base character ተ) + : "ና" U1293 # key n (base character ነ) + : "ኣ" U12A3 # key x (base character አ) + : "ካ" U12AB # key k (base character ከ) + : "ዋ" U12CB # key w (base character ወ) + : "ዛ" U12DB # key z (base character ዘ) + : "ያ" U12EB # key y (base character የ) + : "ዳ" U12F3 # key d (base character ደ) + : "ጃ" U1303 # key j (base character ጀ) + : "ጋ" U130B # key g (base character ገ) + : "ፃ" U1343 # key [ (base character ፀ) + : "ፋ" U134B # key f (base character ፈ) + : "ፓ" U1353 # key p (base character ፐ) + : "ሻ" U123B # key v (base character ሸ) + : "ጫ" U132B # key ] (base character ጨ) XCOMM Modifier: /e/ - : "ሄ" U1204 # key h (base character ሀ) - : "ሌ" U120C # key l (base character ለ) - : "ሜ" U121C # key m (base character መ) - : "ሬ" U122C # key r (base character ረ) - : "ሴ" U1234 # key s (base character ሰ) - : "ቄ" U1244 # key q (base character ቀ) - : "ቤ" U1264 # key b (base character በ) - : "ቴ" U1274 # key t (base character ተ) - : "ኔ" U1294 # key n (base character ነ) - : "ኤ" U12A4 # key x (base character አ) - : "ኬ" U12AC # key k (base character ከ) - : "ዌ" U12CC # key w (base character ወ) - : "ዜ" U12DC # key z (base character ዘ) - : "ዬ" U12EC # key y (base character የ) - : "ዴ" U12F4 # key d (base character ደ) - : "ጄ" U1304 # key j (base character ጀ) - : "ጌ" U130C # key g (base character ገ) - : "ፄ" U1344 # key [ (base character ፀ) - : "ፌ" U134C # key f (base character ፈ) - : "ፔ" U1354 # key p (base character ፐ) - : "ሼ" U123C # key v (base character ሸ) - : "ጬ" U132C # key ] (base character ጨ) + : "ሄ" U1204 # key h (base character ሀ) + : "ሌ" U120C # key l (base character ለ) + : "ሜ" U121C # key m (base character መ) + : "ሬ" U122C # key r (base character ረ) + : "ሴ" U1234 # key s (base character ሰ) + : "ቄ" U1244 # key q (base character ቀ) + : "ቤ" U1264 # key b (base character በ) + : "ቴ" U1274 # key t (base character ተ) + : "ኔ" U1294 # key n (base character ነ) + : "ኤ" U12A4 # key x (base character አ) + : "ኬ" U12AC # key k (base character ከ) + : "ዌ" U12CC # key w (base character ወ) + : "ዜ" U12DC # key z (base character ዘ) + : "ዬ" U12EC # key y (base character የ) + : "ዴ" U12F4 # key d (base character ደ) + : "ጄ" U1304 # key j (base character ጀ) + : "ጌ" U130C # key g (base character ገ) + : "ፄ" U1344 # key [ (base character ፀ) + : "ፌ" U134C # key f (base character ፈ) + : "ፔ" U1354 # key p (base character ፐ) + : "ሼ" U123C # key v (base character ሸ) + : "ጬ" U132C # key ] (base character ጨ) -XCOMM Modifier: /c/ - : "ህ" U1205 # key h (base character ሀ) - : "ል" U120D # key l (base character ለ) - : "ም" U121D # key m (base character መ) - : "ር" U122D # key r (base character ረ) - : "ስ" U1235 # key s (base character ሰ) - : "ቅ" U1245 # key q (base character ቀ) - : "ብ" U1265 # key b (base character በ) - : "ት" U1275 # key t (base character ተ) - : "ን" U1295 # key n (base character ነ) - : "እ" U12A5 # key x (base character አ) - : "ክ" U12AD # key k (base character ከ) - : "ው" U12CD # key w (base character ወ) - : "ዝ" U12DD # key z (base character ዘ) - : "ይ" U12ED # key y (base character የ) - : "ድ" U12F5 # key d (base character ደ) - : "ጅ" U1305 # key j (base character ጀ) - : "ግ" U130D # key g (base character ገ) - : "ፅ" U1345 # key [ (base character ፀ) - : "ፍ" U134D # key f (base character ፈ) - : "ፕ" U1355 # key p (base character ፐ) - : "ሽ" U123D # key v (base character ሸ) - : "ጭ" U132D # key ] (base character ጨ) +XCOMM Modifier: /C/ + : "ህ" U1205 # key h (base character ሀ) + : "ል" U120D # key l (base character ለ) + : "ም" U121D # key m (base character መ) + : "ር" U122D # key r (base character ረ) + : "ስ" U1235 # key s (base character ሰ) + : "ቅ" U1245 # key q (base character ቀ) + : "ብ" U1265 # key b (base character በ) + : "ት" U1275 # key t (base character ተ) + : "ን" U1295 # key n (base character ነ) + : "እ" U12A5 # key x (base character አ) + : "ክ" U12AD # key k (base character ከ) + : "ው" U12CD # key w (base character ወ) + : "ዝ" U12DD # key z (base character ዘ) + : "ይ" U12ED # key y (base character የ) + : "ድ" U12F5 # key d (base character ደ) + : "ጅ" U1305 # key j (base character ጀ) + : "ግ" U130D # key g (base character ገ) + : "ፅ" U1345 # key [ (base character ፀ) + : "ፍ" U134D # key f (base character ፈ) + : "ፕ" U1355 # key p (base character ፐ) + : "ሽ" U123D # key v (base character ሸ) + : "ጭ" U132D # key ] (base character ጨ) XCOMM Modifier: /o/ - : "ሆ" U1206 # key h (base character ሀ) - : "ሎ" U120E # key l (base character ለ) - : "ሞ" U121E # key m (base character መ) - : "ሮ" U122E # key r (base character ረ) - : "ሶ" U1236 # key s (base character ሰ) - : "ቆ" U1246 # key q (base character ቀ) - : "ቦ" U1266 # key b (base character በ) - : "ቶ" U1276 # key t (base character ተ) - : "ኖ" U1296 # key n (base character ነ) - : "ኦ" U12A6 # key x (base character አ) - : "ኮ" U12AE # key k (base character ከ) - : "ዎ" U12CE # key w (base character ወ) - : "ዞ" U12DE # key z (base character ዘ) - : "ዮ" U12EE # key y (base character የ) - : "ዶ" U12F6 # key d (base character ደ) - : "ጆ" U1306 # key j (base character ጀ) - : "ጎ" U130E # key g (base character ገ) - : "ፆ" U1346 # key [ (base character ፀ) - : "ፎ" U134E # key f (base character ፈ) - : "ፖ" U1356 # key p (base character ፐ) - : "ሾ" U123E # key v (base character ሸ) - : "ጮ" U132E # key ] (base character ጨ) + : "ሆ" U1206 # key h (base character ሀ) + : "ሎ" U120E # key l (base character ለ) + : "ሞ" U121E # key m (base character መ) + : "ሮ" U122E # key r (base character ረ) + : "ሶ" U1236 # key s (base character ሰ) + : "ቆ" U1246 # key q (base character ቀ) + : "ቦ" U1266 # key b (base character በ) + : "ቶ" U1276 # key t (base character ተ) + : "ኖ" U1296 # key n (base character ነ) + : "ኦ" U12A6 # key x (base character አ) + : "ኮ" U12AE # key k (base character ከ) + : "ዎ" U12CE # key w (base character ወ) + : "ዞ" U12DE # key z (base character ዘ) + : "ዮ" U12EE # key y (base character የ) + : "ዶ" U12F6 # key d (base character ደ) + : "ጆ" U1306 # key j (base character ጀ) + : "ጎ" U130E # key g (base character ገ) + : "ፆ" U1346 # key [ (base character ፀ) + : "ፎ" U134E # key f (base character ፈ) + : "ፖ" U1356 # key p (base character ፐ) + : "ሾ" U123E # key v (base character ሸ) + : "ጮ" U132E # key ] (base character ጨ) XCOMM Modifier: /A/ - : "ሏ" U120F # key l (base character ለ) - : "ሟ" U121F # key m (base character መ) - : "ሯ" U122F # key r (base character ረ) - : "ሷ" U1237 # key s (base character ሰ) - : "ቋ" U124B # key q (base character ቀ) - : "ቧ" U1267 # key b (base character በ) - : "ቷ" U1277 # key t (base character ተ) - : "ኗ" U1297 # key n (base character ነ) - : "ኧ" U12A7 # key x (base character አ) - : "ኳ" U12B3 # key k (base character ከ) - : "ዟ" U12DF # key z (base character ዘ) - : "ዷ" U12F7 # key d (base character ደ) - : "ጇ" U1307 # key j (base character ጀ) - : "ጓ" U1313 # key g (base character ገ) - : "ፏ" U134F # key f (base character ፈ) - : "ፗ" U1357 # key p (base character ፐ) - : "ሿ" U123F # key v (base character ሸ) - : "ጯ" U132F # key ] (base character ጨ) + : "ሏ" U120F # key l (base character ለ) + : "ሟ" U121F # key m (base character መ) + : "ሯ" U122F # key r (base character ረ) + : "ሷ" U1237 # key s (base character ሰ) + : "ቋ" U124B # key q (base character ቀ) + : "ቧ" U1267 # key b (base character በ) + : "ቷ" U1277 # key t (base character ተ) + : "ኗ" U1297 # key n (base character ነ) + : "ኧ" U12A7 # key x (base character አ) + : "ኳ" U12B3 # key k (base character ከ) + : "ዟ" U12DF # key z (base character ዘ) + : "ዷ" U12F7 # key d (base character ደ) + : "ጇ" U1307 # key j (base character ጀ) + : "ጓ" U1313 # key g (base character ገ) + : "ፏ" U134F # key f (base character ፈ) + : "ፗ" U1357 # key p (base character ፐ) + : "ሿ" U123F # key v (base character ሸ) + : "ጯ" U132F # key ] (base character ጨ) XCOMM Modifier: /U/ - : "ቍ" U124D # key q (base character ቀ) - : "ኵ" U12B5 # key k (base character ከ) - : "ጕ" U1315 # key g (base character ገ) + : "ቍ" U124D # key q (base character ቀ) + : "ኵ" U12B5 # key k (base character ከ) + : "ጕ" U1315 # key g (base character ገ) XCOMM Modifier: /I/ - : "ቊ" U124A # key q (base character ቀ) - : "ኲ" U12B2 # key k (base character ከ) - : "ጒ" U1312 # key g (base character ገ) + : "ቊ" U124A # key q (base character ቀ) + : "ኲ" U12B2 # key k (base character ከ) + : "ጒ" U1312 # key g (base character ገ) XCOMM Modifier: /E/ - : "ቌ" U124C # key q (base character ቀ) - : "ኴ" U12B4 # key k (base character ከ) - : "ጔ" U1314 # key g (base character ገ) + : "ቌ" U124C # key q (base character ቀ) + : "ኴ" U12B4 # key k (base character ከ) + : "ጔ" U1314 # key g (base character ገ) XCOMM Modifier: /O/ - : "ቈ" U1248 # key q (base character ቀ) - : "ኰ" U12B0 # key k (base character ከ) - : "ጐ" U1310 # key g (base character ገ) + : "ቈ" U1248 # key q (base character ቀ) + : "ኰ" U12B0 # key k (base character ከ) + : "ጐ" U1310 # key g (base character ገ) XCOMM XCOMM Group II XCOMM XCOMM Modifier: /u/ - : "ሑ" U1211 # key h (base character ሐ) - : "ሡ" U1221 # key s (base character ሠ) - : "ቑ" U1251 # key q (base character ቐ) - : "ቹ" U1279 # key c (base character ቸ) - : "ጡ" U1321 # key t (base character ጠ) - : "ኙ" U1299 # key n (base character ኘ) - : "ዑ" U12D1 # key x (base character ዐ) - : "ኹ" U12B9 # key k (base character ኸ) - : "ዡ" U12E1 # key z (base character ዠ) - : "ዹ" U12F9 # key d (base character ዸ) - : "ጙ" U1319 # key g (base character ጘ) - : "ጹ" U1339 # key [ (base character ጸ) - : "ጱ" U1331 # key p (base character ጰ) - : "ኁ" U1281 # key ] (base character ኀ) - : "ቩ" U1269 # key v (base character ቨ) + : "ሑ" U1211 # key h (base character ሐ) + : "ሡ" U1221 # key s (base character ሠ) + : "ቑ" U1251 # key q (base character ቐ) + : "ቹ" U1279 # key c (base character ቸ) + : "ጡ" U1321 # key t (base character ጠ) + : "ኙ" U1299 # key n (base character ኘ) + : "ዑ" U12D1 # key x (base character ዐ) + : "ኹ" U12B9 # key k (base character ኸ) + : "ዡ" U12E1 # key z (base character ዠ) + : "ዹ" U12F9 # key d (base character ዸ) + : "ጙ" U1319 # key g (base character ጘ) + : "ጹ" U1339 # key [ (base character ጸ) + : "ጱ" U1331 # key p (base character ጰ) + : "ኁ" U1281 # key ] (base character ኀ) + : "ቩ" U1269 # key v (base character ቨ) XCOMM Modifier: /i/ - : "ሒ" U1212 # key h (base character ሐ) - : "ሢ" U1222 # key s (base character ሠ) - : "ቒ" U1252 # key q (base character ቐ) - : "ቺ" U127A # key c (base character ቸ) - : "ጢ" U1322 # key t (base character ጠ) - : "ኚ" U129A # key n (base character ኘ) - : "ዒ" U12D2 # key x (base character ዐ) - : "ኺ" U12BA # key k (base character ኸ) - : "ዢ" U12E2 # key z (base character ዠ) - : "ዺ" U12FA # key d (base character ዸ) - : "ጚ" U131A # key g (base character ጘ) - : "ጺ" U133A # key [ (base character ጸ) - : "ጲ" U1332 # key p (base character ጰ) - : "ኂ" U1282 # key ] (base character ኀ) - : "ቪ" U126A # key v (base character ቨ) + : "ሒ" U1212 # key h (base character ሐ) + : "ሢ" U1222 # key s (base character ሠ) + : "ቒ" U1252 # key q (base character ቐ) + : "ቺ" U127A # key c (base character ቸ) + : "ጢ" U1322 # key t (base character ጠ) + : "ኚ" U129A # key n (base character ኘ) + : "ዒ" U12D2 # key x (base character ዐ) + : "ኺ" U12BA # key k (base character ኸ) + : "ዢ" U12E2 # key z (base character ዠ) + : "ዺ" U12FA # key d (base character ዸ) + : "ጚ" U131A # key g (base character ጘ) + : "ጺ" U133A # key [ (base character ጸ) + : "ጲ" U1332 # key p (base character ጰ) + : "ኂ" U1282 # key ] (base character ኀ) + : "ቪ" U126A # key v (base character ቨ) XCOMM Modifier: /a/ - : "ሓ" U1213 # key h (base character ሐ) - : "ሣ" U1223 # key s (base character ሠ) - : "ቓ" U1253 # key q (base character ቐ) - : "ቻ" U127B # key c (base character ቸ) - : "ጣ" U1323 # key t (base character ጠ) - : "ኛ" U129B # key n (base character ኘ) - : "ዓ" U12D3 # key x (base character ዐ) - : "ኻ" U12BB # key k (base character ኸ) - : "ዣ" U12E3 # key z (base character ዠ) - : "ዻ" U12FB # key d (base character ዸ) - : "ጛ" U131B # key g (base character ጘ) - : "ጻ" U133B # key [ (base character ጸ) - : "ጳ" U1333 # key p (base character ጰ) - : "ኃ" U1283 # key ] (base character ኀ) - : "ቫ" U126B # key v (base character ቨ) + : "ሓ" U1213 # key h (base character ሐ) + : "ሣ" U1223 # key s (base character ሠ) + : "ቓ" U1253 # key q (base character ቐ) + : "ቻ" U127B # key c (base character ቸ) + : "ጣ" U1323 # key t (base character ጠ) + : "ኛ" U129B # key n (base character ኘ) + : "ዓ" U12D3 # key x (base character ዐ) + : "ኻ" U12BB # key k (base character ኸ) + : "ዣ" U12E3 # key z (base character ዠ) + : "ዻ" U12FB # key d (base character ዸ) + : "ጛ" U131B # key g (base character ጘ) + : "ጻ" U133B # key [ (base character ጸ) + : "ጳ" U1333 # key p (base character ጰ) + : "ኃ" U1283 # key ] (base character ኀ) + : "ቫ" U126B # key v (base character ቨ) XCOMM Modifier: /e/ - : "ሔ" U1214 # key h (base character ሐ) - : "ሤ" U1224 # key s (base character ሠ) - : "ቔ" U1254 # key q (base character ቐ) - : "ቼ" U127C # key c (base character ቸ) - : "ጤ" U1324 # key t (base character ጠ) - : "ኜ" U129C # key n (base character ኘ) - : "ዔ" U12D4 # key x (base character ዐ) - : "ኼ" U12BC # key k (base character ኸ) - : "ዤ" U12E4 # key z (base character ዠ) - : "ዼ" U12FC # key d (base character ዸ) - : "ጜ" U131C # key g (base character ጘ) - : "ጼ" U133C # key [ (base character ጸ) - : "ጴ" U1334 # key p (base character ጰ) - : "ኄ" U1284 # key ] (base character ኀ) - : "ቬ" U126C # key v (base character ቨ) + : "ሔ" U1214 # key h (base character ሐ) + : "ሤ" U1224 # key s (base character ሠ) + : "ቔ" U1254 # key q (base character ቐ) + : "ቼ" U127C # key c (base character ቸ) + : "ጤ" U1324 # key t (base character ጠ) + : "ኜ" U129C # key n (base character ኘ) + : "ዔ" U12D4 # key x (base character ዐ) + : "ኼ" U12BC # key k (base character ኸ) + : "ዤ" U12E4 # key z (base character ዠ) + : "ዼ" U12FC # key d (base character ዸ) + : "ጜ" U131C # key g (base character ጘ) + : "ጼ" U133C # key [ (base character ጸ) + : "ጴ" U1334 # key p (base character ጰ) + : "ኄ" U1284 # key ] (base character ኀ) + : "ቬ" U126C # key v (base character ቨ) -XCOMM Modifier: /c/ - : "ሕ" U1215 # key h (base character ሐ) - : "ሥ" U1225 # key s (base character ሠ) - : "ቕ" U1255 # key q (base character ቐ) - : "ች" U127D # key c (base character ቸ) - : "ጥ" U1325 # key t (base character ጠ) - : "ኝ" U129D # key n (base character ኘ) - : "ዕ" U12D5 # key x (base character ዐ) - : "ኽ" U12BD # key k (base character ኸ) - : "ዥ" U12E5 # key z (base character ዠ) - : "ዽ" U12FD # key d (base character ዸ) - : "ጝ" U131D # key g (base character ጘ) - : "ጽ" U133D # key [ (base character ጸ) - : "ጵ" U1335 # key p (base character ጰ) - : "ኅ" U1285 # key ] (base character ኀ) - : "ቭ" U126D # key v (base character ቨ) +XCOMM Modifier: /C/ + : "ሕ" U1215 # key h (base character ሐ) + : "ሥ" U1225 # key s (base character ሠ) + : "ቕ" U1255 # key q (base character ቐ) + : "ች" U127D # key c (base character ቸ) + : "ጥ" U1325 # key t (base character ጠ) + : "ኝ" U129D # key n (base character ኘ) + : "ዕ" U12D5 # key x (base character ዐ) + : "ኽ" U12BD # key k (base character ኸ) + : "ዥ" U12E5 # key z (base character ዠ) + : "ዽ" U12FD # key d (base character ዸ) + : "ጝ" U131D # key g (base character ጘ) + : "ጽ" U133D # key [ (base character ጸ) + : "ጵ" U1335 # key p (base character ጰ) + : "ኅ" U1285 # key ] (base character ኀ) + : "ቭ" U126D # key v (base character ቨ) XCOMM Modifier: /o/ - : "ሖ" U1216 # key h (base character ሐ) - : "ሦ" U1226 # key s (base character ሠ) - : "ቖ" U1256 # key q (base character ቐ) - : "ቾ" U127E # key c (base character ቸ) - : "ጦ" U1326 # key t (base character ጠ) - : "ኞ" U129E # key n (base character ኘ) - : "ዖ" U12D6 # key x (base character ዐ) - : "ኾ" U12BE # key k (base character ኸ) - : "ዦ" U12E6 # key z (base character ዠ) - : "ዾ" U12FE # key d (base character ዸ) - : "ጞ" U131E # key g (base character ጘ) - : "ጾ" U133E # key [ (base character ጸ) - : "ጶ" U1336 # key p (base character ጰ) - : "ኆ" U1286 # key ] (base character ኀ) - : "ቮ" U126E # key v (base character ቨ) + : "ሖ" U1216 # key h (base character ሐ) + : "ሦ" U1226 # key s (base character ሠ) + : "ቖ" U1256 # key q (base character ቐ) + : "ቾ" U127E # key c (base character ቸ) + : "ጦ" U1326 # key t (base character ጠ) + : "ኞ" U129E # key n (base character ኘ) + : "ዖ" U12D6 # key x (base character ዐ) + : "ኾ" U12BE # key k (base character ኸ) + : "ዦ" U12E6 # key z (base character ዠ) + : "ዾ" U12FE # key d (base character ዸ) + : "ጞ" U131E # key g (base character ጘ) + : "ጾ" U133E # key [ (base character ጸ) + : "ጶ" U1336 # key p (base character ጰ) + : "ኆ" U1286 # key ] (base character ኀ) + : "ቮ" U126E # key v (base character ቨ) XCOMM Modifier: /A/ - : "ሗ" U1217 # key h (base character ሐ) - : "ሧ" U1227 # key s (base character ሠ) - : "ቛ" U125B # key q (base character ቐ) - : "ቿ" U127F # key c (base character ቸ) - : "ጧ" U1327 # key t (base character ጠ) - : "ኟ" U129F # key n (base character ኘ) - : "ዃ" U12C3 # key k (base character ኸ) - : "ዧ" U12E7 # key z (base character ዠ) - : "ዿ" U12FF # key d (base character ዸ) - : "ጿ" U133F # key [ (base character ጸ) - : "ጷ" U1337 # key p (base character ጰ) - : "ኋ" U128B # key ] (base character ኀ) - : "ቯ" U126F # key v (base character ቨ) + : "ሗ" U1217 # key h (base character ሐ) + : "ሧ" U1227 # key s (base character ሠ) + : "ቛ" U125B # key q (base character ቐ) + : "ቿ" U127F # key c (base character ቸ) + : "ጧ" U1327 # key t (base character ጠ) + : "ኟ" U129F # key n (base character ኘ) + : "ዃ" U12C3 # key k (base character ኸ) + : "ዧ" U12E7 # key z (base character ዠ) + : "ዿ" U12FF # key d (base character ዸ) + : "ጿ" U133F # key [ (base character ጸ) + : "ጷ" U1337 # key p (base character ጰ) + : "ኋ" U128B # key ] (base character ኀ) + : "ቯ" U126F # key v (base character ቨ) XCOMM Modifier: /U/ - : "ቝ" U125D # key q (base character ቐ) - : "ዅ" U12C5 # key k (base character ኸ) + : "ቝ" U125D # key q (base character ቐ) + : "ዅ" U12C5 # key k (base character ኸ) XCOMM Modifier: /I/ - : "ቚ" U125A # key q (base character ቐ) - : "ዂ" U12C2 # key k (base character ኸ) + : "ቚ" U125A # key q (base character ቐ) + : "ዂ" U12C2 # key k (base character ኸ) XCOMM Modifier: /E/ - : "ቜ" U125C # key q (base character ቐ) - : "ዄ" U12C4 # key k (base character ኸ) + : "ቜ" U125C # key q (base character ቐ) + : "ዄ" U12C4 # key k (base character ኸ) XCOMM Modifier: /O/ - : "ቘ" U1258 # key q (base character ቐ) - : "ዀ" U12C0 # key k (base character ኸ) + : "ቘ" U1258 # key q (base character ቐ) + : "ዀ" U12C0 # key k (base character ኸ) XCOMM XCOMM Group III diff --git a/lib/libX11/nls/compose-check.pl b/lib/libX11/nls/compose-check.pl index 399bfa99..9e52f1b4 100644 --- a/lib/libX11/nls/compose-check.pl +++ b/lib/libX11/nls/compose-check.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl # -# Copyright 2009 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, Oracle and/or its affiliates. # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/nls/compose.dir.pre b/lib/libX11/nls/compose.dir.pre index 4ce1ee34..89239453 100644 --- a/lib/libX11/nls/compose.dir.pre +++ b/lib/libX11/nls/compose.dir.pre @@ -430,8 +430,8 @@ en_US.UTF-8/Compose: si_LK.UTF-8 en_US.UTF-8/Compose: sk_SK.UTF-8 en_US.UTF-8/Compose: sl_SI.UTF-8 en_US.UTF-8/Compose: sq_AL.UTF-8 -en_US.UTF-8/Compose: sr_ME.UTF-8 -en_US.UTF-8/Compose: sr_RS.UTF-8 +sr_RS.UTF-8/Compose: sr_ME.UTF-8 +sr_RS.UTF-8/Compose: sr_RS.UTF-8 en_US.UTF-8/Compose: ss_ZA.UTF-8 en_US.UTF-8/Compose: st_ZA.UTF-8 en_US.UTF-8/Compose: sv_FI.UTF-8 diff --git a/lib/libX11/nls/en_US.UTF-8/Compose.pre b/lib/libX11/nls/en_US.UTF-8/Compose.pre index ea87d842..680f4fab 100644 --- a/lib/libX11/nls/en_US.UTF-8/Compose.pre +++ b/lib/libX11/nls/en_US.UTF-8/Compose.pre @@ -14,6 +14,8 @@ XCOMM Spacing versions of accents (mostly) : "`" grave # GRAVE ACCENT : "^" asciicircum # CIRCUMFLEX ACCENT : "^" asciicircum # CIRCUMFLEX ACCENT + : "^" asciicircum # CIRCUMFLEX ACCENT + : "^" asciicircum # CIRCUMFLEX ACCENT : "°" degree # DEGREE SIGN : "°" degree # DEGREE SIGN : "°" degree # DEGREE SIGN @@ -22,13 +24,14 @@ XCOMM Spacing versions of accents (mostly) : "¯" macron # MACRON : "¯" macron # MACRON : "¯" macron # MACRON - : "¯" macron # MACRON + : "¯" macron # MACRON + : "¯" macron # MACRON : "¯" macron # MACRON : "¯" macron # MACRON : "˘" breve # BREVE : "˘" breve # BREVE - : "˘" breve # BREVE : "˘" breve # BREVE + : "˘" breve # BREVE : "˙" abovedot # DOT ABOVE : "˙" abovedot # DOT ABOVE : "˙" abovedot # DOT ABOVE @@ -40,8 +43,8 @@ XCOMM Spacing versions of accents (mostly) : "˝" U2dd # DOUBLE ACUTE ACCENT : "ˇ" caron # CARON : "ˇ" caron # CARON - : "ˇ" caron # CARON : "ˇ" caron # CARON + : "ˇ" caron # CARON : "¸" cedilla # CEDILLA : "¸" cedilla # CEDILLA : "¸" cedilla # CEDILLA @@ -56,17 +59,17 @@ XCOMM Spacing versions of accents (mostly) XCOMM ASCII characters that may be difficult to access on some keyboards. : "#" numbersign # NUMBER SIGN : "@" at # COMMERCIAL AT + : "[" bracketleft # LEFT SQUARE BRACKET - : "\\" backslash # REVERSE SOLIDUS - : "\\" backslash # REVERSE SOLIDUS - : "\\" backslash # REVERSE SOLIDUS : "]" bracketright # RIGHT SQUARE BRACKET - : "^" asciicircum # CIRCUMFLEX ACCENT - : "^" asciicircum # CIRCUMFLEX ACCENT + : "\\" backslash # REVERSE SOLIDUS + : "\\" backslash # REVERSE SOLIDUS : "{" braceleft # LEFT CURLY BRACKET : "{" braceleft # LEFT CURLY BRACKET + : "}" braceright # RIGHT CURLY BRACKET + : "}" braceright # RIGHT CURLY BRACKET : "|" bar # VERTICAL LINE : "|" bar # VERTICAL LINE @@ -75,9 +78,6 @@ XCOMM ASCII characters that may be difficult to access on some keyboards. : "|" bar # VERTICAL LINE : "|" bar # VERTICAL LINE - : "}" braceright # RIGHT CURLY BRACKET - : "}" braceright # RIGHT CURLY BRACKET - : "<" less # LESS-THAN : "<" less # LESS-THAN : ">" greater # GREATER-THAN @@ -88,17 +88,11 @@ XCOMM Two special spaces : " " U2008 # PUNCTUATION SPACE : "©" copyright # COPYRIGHT SIGN - : "©" copyright # COPYRIGHT SIGN - : "©" copyright # COPYRIGHT SIGN : "©" copyright # COPYRIGHT SIGN - : "©" copyright # COPYRIGHT SIGN : "©" copyright # COPYRIGHT SIGN : "®" registered # REGISTERED SIGN - : "®" registered # REGISTERED SIGN - : "®" registered # REGISTERED SIGN : "®" registered # REGISTERED SIGN - : "®" registered # REGISTERED SIGN : "®" registered # REGISTERED SIGN : "🄯" U1F12F # COPYLEFT SYMBOL @@ -118,6 +112,8 @@ XCOMM Special punctuation : "‽" U203D # INTERROBANG : "⸘" U2E18 # INVERTED INTERROBANG : "­" U00ad # SOFT HYPHEN + : "†" U2020 # DAGGER + : "‡" U2021 # DOUBLE DAGGER : "‰" U2030 # PER MILLE SIGN XCOMM Some ligatures @@ -139,8 +135,8 @@ XCOMM Some ligatures XCOMM Quotation marks : "«" guillemotleft # LEFT-POINTING DOUBLE ANGLE QUOTATION MARK : "»" guillemotright # RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK - : "›" U203a # SINGLE RIGHT-POINTING ANGLE QUOTATION MARK : "‹" U2039 # SINGLE LEFT-POINTING ANGLE QUOTATION MARK + : "›" U203a # SINGLE RIGHT-POINTING ANGLE QUOTATION MARK : "‘" U2018 # LEFT SINGLE QUOTATION MARK : "‘" U2018 # LEFT SINGLE QUOTATION MARK : "’" U2019 # RIGHT SINGLE QUOTATION MARK @@ -155,6 +151,22 @@ XCOMM Quotation marks : "„" U201e # DOUBLE LOW-9 QUOTATION MARK XCOMM Currencies + : "$" dollar # DOLLAR SIGN + : "$" dollar # DOLLAR SIGN + : "¢" cent # CENT SIGN + : "¢" cent # CENT SIGN + : "¢" cent # CENT SIGN + : "¢" cent # CENT SIGN + : "£" sterling # POUND SIGN + : "£" sterling # POUND SIGN + : "£" sterling # POUND SIGN + : "£" sterling # POUND SIGN + : "¥" yen # YEN SIGN + : "¥" yen # YEN SIGN + : "¥" yen # YEN SIGN + : "¥" yen # YEN SIGN + : "฿" U0e3f # THAI CURRENCY SYMBOL BAHT + : "฿" U0e3f # THAI CURRENCY SYMBOL BAHT : "₠" U20a0 # EURO-CURRENCY SIGN : "₡" U20a1 # COLON SIGN : "₡" U20a1 # COLON SIGN @@ -185,52 +197,28 @@ XCOMM "₪" U20aa NEW SHEQEL SIGN : "€" EuroSign # EURO SIGN : "€" EuroSign # EURO SIGN : "€" EuroSign # EURO SIGN -

: "₽" U20bd # ROUBLE SIGN -

: "₽" U20bd # ROUBLE SIGN -

: "₽" U20bd # ROUBLE SIGN -

: "₽" U20bd # ROUBLE SIGN - : "₽" U20bd # ROUBLE SIGN - : "₽" U20bd # ROUBLE SIGN - : "₽" U20bd # ROUBLE SIGN - : "₽" U20bd # ROUBLE SIGN -XCOMM "₭" U20ad KIP SIGN -XCOMM "₮" U20ae TUGRIK SIGN -XCOMM "₯" U20af DRACHMA SIGN -XCOMM "₰" U20b0 GERMAN PENNY SIGN + : "₭" U20ad # KIP SIGN + : "₭" U20ad # KIP SIGN + : "₮" U20ae # TUGRIK SIGN + : "₮" U20ae # TUGRIK SIGN XCOMM "₱" U20b1 PESO SIGN -XCOMM "₲" U20b2 GUARANI SIGN -XCOMM "₳" U20b3 AUSTRAL SIGN + : "₲" U20b2 # GUARANI SIGN + : "₲" U20b2 # GUARANI SIGN XCOMM "₴" U20b4 HRYVNIA SIGN -XCOMM "₵" U20b5 CEDI SIGN + : "₵" U20b5 # CEDI SIGN + : "₵" U20b5 # CEDI SIGN : "₹" U20b9 # INDIAN RUPEE SIGN : "₹" U20b9 # INDIAN RUPEE SIGN : "₹" U20b9 # INDIAN RUPEE SIGN : "₹" U20b9 # INDIAN RUPEE SIGN - - : "¢" cent # CENT SIGN - : "¢" cent # CENT SIGN - : "¢" cent # CENT SIGN - : "¢" cent # CENT SIGN - : "¢" cent # CENT SIGN - : "¢" cent # CENT SIGN - : "£" sterling # POUND SIGN - : "£" sterling # POUND SIGN - : "£" sterling # POUND SIGN - : "£" sterling # POUND SIGN - : "¥" yen # YEN SIGN - : "¥" yen # YEN SIGN - : "¥" yen # YEN SIGN - : "¥" yen # YEN SIGN - : "¥" yen # YEN SIGN - : "¥" yen # YEN SIGN - : "¥" yen # YEN SIGN - : "¥" yen # YEN SIGN - -XCOMM Long S - : "ſ" U017f # LATIN SMALL LETTER LONG S - : "ſ" U017f # LATIN SMALL LETTER LONG S - : "ẛ" U1e9b # LATIN SMALL LETTER LONG S WITH DOT ABOVE - : "ẛ" U1e9b # LATIN SMALL LETTER LONG S WITH DOT ABOVE +

: "₽" U20bd # ROUBLE SIGN +

: "₽" U20bd # ROUBLE SIGN +

: "₽" U20bd # ROUBLE SIGN +

: "Ƥ" U01A4 # LATIN CAPITAL LETTER P WITH HOOK

: "ƥ" U01A5 # LATIN SMALL LETTER P WITH HOOK : "ʠ" U02A0 # LATIN SMALL LETTER Q WITH HOOK - : "ɝ" U025D # LATIN SMALL LETTER REVERSED OPEN E WITH HOOK : "ɼ" U027C # LATIN SMALL LETTER R WITH LONG LEG : "ʂ" U0282 # LATIN SMALL LETTER S WITH HOOK : "ɚ" U025A # LATIN SMALL LETTER SCHWA WITH HOOK : "Ƭ" U01AC # LATIN CAPITAL LETTER T WITH HOOK : "ƭ" U01AD # LATIN SMALL LETTER T WITH HOOK - : "ɻ" U027B # LATIN SMALL LETTER TURNED R WITH HOOK : "Ʋ" U01B2 # LATIN CAPITAL LETTER V WITH HOOK : "ʋ" U028B # LATIN SMALL LETTER V WITH HOOK : "Ⱳ" U2C72 # LATIN CAPITAL LETTER W WITH HOOK @@ -5360,50 +4712,32 @@ XCOMM French-Dvorak Bépo compositions : "̉" U0309 # COMBINING HOOK ABOVE : "̉" U0309 # COMBINING HOOK ABOVE : "Ớ" Ohornacute # LATIN CAPITAL LETTER O WITH HORN AND ACUTE - : "Ợ" Ohornbelowdot # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW - : "Ờ" Ohorngrave # LATIN CAPITAL LETTER O WITH HORN AND GRAVE - : "Ở" Ohornhook # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE - : "Ỡ" Ohorntilde # LATIN CAPITAL LETTER O WITH HORN AND TILDE : "ớ" ohornacute # LATIN SMALL LETTER O WITH HORN AND ACUTE - : "ợ" ohornbelowdot # LATIN SMALL LETTER O WITH HORN AND DOT BELOW + : "Ờ" Ohorngrave # LATIN CAPITAL LETTER O WITH HORN AND GRAVE : "ờ" ohorngrave # LATIN SMALL LETTER O WITH HORN AND GRAVE - : "ở" ohornhook # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE - : "ỡ" ohorntilde # LATIN SMALL LETTER O WITH HORN AND TILDE : "Ứ" Uhornacute # LATIN CAPITAL LETTER U WITH HORN AND ACUTE - : "Ự" Uhornbelowdot # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW - : "Ừ" Uhorngrave # LATIN CAPITAL LETTER U WITH HORN AND GRAVE - : "Ử" Uhornhook # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE - : "Ữ" Uhorntilde # LATIN CAPITAL LETTER U WITH HORN AND TILDE : "ứ" uhornacute # LATIN SMALL LETTER U WITH HORN AND ACUTE - : "ự" uhornbelowdot # LATIN SMALL LETTER U WITH HORN AND DOT BELOW + : "Ừ" Uhorngrave # LATIN CAPITAL LETTER U WITH HORN AND GRAVE : "ừ" uhorngrave # LATIN SMALL LETTER U WITH HORN AND GRAVE - : "ử" uhornhook # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE - : "ữ" uhorntilde # LATIN SMALL LETTER U WITH HORN AND TILDE : "̛" U031B # COMBINING HORN : "̛" U031B # COMBINING HORN : "̛" U031B # COMBINING HORN : "Ḗ" U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE - : "Ḕ" U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE : "ḗ" U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE + : "Ḕ" U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE : "ḕ" U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE : "Ṓ" U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE - : "Ṑ" U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE : "ṓ" U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE + : "Ṑ" U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE : "ṑ" U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE : "Ǖ" U01D5 # LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON : "ǖ" U01D6 # LATIN SMALL LETTER U WITH DIAERESIS AND MACRON : "̄" U0304 # COMBINING MACRON - : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON - : "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON : "̨" U0328 # COMBINING OGONEK - : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE - : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE - : "̊" U030A # COMBINING RING ABOVE <2> : "ƻ" U01BB # LATIN LETTER TWO WITH STROKE : "≠" notequal # NOT EQUAL TO : "Ⱥ" U023A # LATIN CAPITAL LETTER A WITH STROKE : "ⱥ" U2C65 # LATIN SMALL LETTER A WITH STROKE - : "Ƀ" U0243 # LATIN CAPITAL LETTER B WITH STROKE : "Ȼ" U023B # LATIN CAPITAL LETTER C WITH STROKE : "ȼ" U023C # LATIN SMALL LETTER C WITH STROKE : "Ɇ" U0246 # LATIN CAPITAL LETTER E WITH STROKE @@ -5430,87 +4764,27 @@ XCOMM French-Dvorak Bépo compositions : "̸" U0338 # COMBINING LONG SOLIDUS OVERLAY : "/" slash # SOLIDUS : "Ṍ" U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE - : "Ṏ" U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS - : "Ȭ" U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON : "ṍ" U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE + : "Ṏ" U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS : "ṏ" U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS - : "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON : "Ṹ" U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE : "ṹ" U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE : "≃" similarequal # ASYMPTOTICALLY EQUAL TO : "≲" U2272 # LESS-THAN OR EQUIVALENT TO : "≳" U2273 # GREATER-THAN OR EQUIVALENT TO : "̃" U0303 # COMBINING TILDE - : "Ṥ" U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE - : "ṥ" U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE - : "Ṩ" U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE - : "ṩ" U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE - : "Ṧ" U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE - : "ṧ" U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE - : "Ǡ" U01E0 # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON - : "ǡ" U01E1 # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON - : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON - : "ȱ" U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON : "ɟ" U025F # LATIN SMALL LETTER DOTLESS J WITH STROKE : "ɟ" U025F # LATIN SMALL LETTER DOTLESS J WITH STROKE - : "Ắ" Abreveacute # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE - : "ắ" abreveacute # LATIN SMALL LETTER A WITH BREVE AND ACUTE - : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE - : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE : "Ấ" Acircumflexacute # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE : "ấ" acircumflexacute # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE : "Ế" Ecircumflexacute # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE : "ế" ecircumflexacute # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE : "Ố" Ocircumflexacute # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE : "ố" ocircumflexacute # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE - : "Ḯ" U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE - : "ḯ" U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE - : "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE - : "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE - : "Ớ" Ohornacute # LATIN CAPITAL LETTER O WITH HORN AND ACUTE - : "ớ" ohornacute # LATIN SMALL LETTER O WITH HORN AND ACUTE - : "Ứ" Uhornacute # LATIN CAPITAL LETTER U WITH HORN AND ACUTE - : "ứ" uhornacute # LATIN SMALL LETTER U WITH HORN AND ACUTE - : "Ḗ" U1E16 # LATIN CAPITAL LETTER E WITH MACRON AND ACUTE - : "ḗ" U1E17 # LATIN SMALL LETTER E WITH MACRON AND ACUTE - : "Ṓ" U1E52 # LATIN CAPITAL LETTER O WITH MACRON AND ACUTE - : "ṓ" U1E53 # LATIN SMALL LETTER O WITH MACRON AND ACUTE - : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE - : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE - : "Ṍ" U1E4C # LATIN CAPITAL LETTER O WITH TILDE AND ACUTE - : "ṍ" U1E4D # LATIN SMALL LETTER O WITH TILDE AND ACUTE - : "Ṹ" U1E78 # LATIN CAPITAL LETTER U WITH TILDE AND ACUTE - : "ṹ" U1E79 # LATIN SMALL LETTER U WITH TILDE AND ACUTE - : "Ặ" Abrevebelowdot # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW - : "ặ" abrevebelowdot # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW - : "Ậ" Acircumflexbelowdot # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW - : "ậ" acircumflexbelowdot # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW - : "Ệ" Ecircumflexbelowdot # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW - : "ệ" ecircumflexbelowdot # LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW - : "Ộ" Ocircumflexbelowdot # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW - : "ộ" ocircumflexbelowdot # LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW : "Ợ" Ohornbelowdot # LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW : "ợ" ohornbelowdot # LATIN SMALL LETTER O WITH HORN AND DOT BELOW : "Ự" Uhornbelowdot # LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW : "ự" uhornbelowdot # LATIN SMALL LETTER U WITH HORN AND DOT BELOW - : "Ḹ" U1E38 # LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON - : "ḹ" U1E39 # LATIN SMALL LETTER L WITH DOT BELOW AND MACRON - : "Ṝ" U1E5C # LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON - : "ṝ" U1E5D # LATIN SMALL LETTER R WITH DOT BELOW AND MACRON - : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE - : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE - : "Ằ" Abrevegrave # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE - : "ằ" abrevegrave # LATIN SMALL LETTER A WITH BREVE AND GRAVE - : "Ẳ" Abrevehook # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE - : "ẳ" abrevehook # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE - : "Ẵ" Abrevetilde # LATIN CAPITAL LETTER A WITH BREVE AND TILDE - : "ẵ" abrevetilde # LATIN SMALL LETTER A WITH BREVE AND TILDE - : "Ǚ" U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON - : "ǚ" U01DA # LATIN SMALL LETTER U WITH DIAERESIS AND CARON - : "₵" U20B5 # CEDI SIGN - : "₵" U20B5 # CEDI SIGN - : "₵" U20B5 # CEDI SIGN - : "₵" U20B5 # CEDI SIGN : "Ầ" Acircumflexgrave # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE : "ầ" acircumflexgrave # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE : "Ề" Ecircumflexgrave # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE @@ -5523,40 +4797,6 @@ XCOMM French-Dvorak Bépo compositions : "ể" ecircumflexhook # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE : "Ổ" Ocircumflexhook # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE : "ổ" ocircumflexhook # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE - : "Ẫ" Acircumflextilde # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE - : "ẫ" acircumflextilde # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE - : "Ễ" Ecircumflextilde # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE - : "ễ" ecircumflextilde # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE - : "Ỗ" Ocircumflextilde # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE - : "ỗ" ocircumflextilde # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE - : "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE - : "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE - : "Ǟ" U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON - : "ǟ" U01DF # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON - : "Ȫ" U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON - : "ȫ" U022B # LATIN SMALL LETTER O WITH DIAERESIS AND MACRON - : "Ṏ" U1E4E # LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS - : "ṏ" U1E4F # LATIN SMALL LETTER O WITH TILDE AND DIAERESIS - : "Ờ" Ohorngrave # LATIN CAPITAL LETTER O WITH HORN AND GRAVE - : "ờ" ohorngrave # LATIN SMALL LETTER O WITH HORN AND GRAVE - : "Ừ" Uhorngrave # LATIN CAPITAL LETTER U WITH HORN AND GRAVE - : "ừ" uhorngrave # LATIN SMALL LETTER U WITH HORN AND GRAVE - : "Ḕ" U1E14 # LATIN CAPITAL LETTER E WITH MACRON AND GRAVE - : "ḕ" U1E15 # LATIN SMALL LETTER E WITH MACRON AND GRAVE - : "Ṑ" U1E50 # LATIN CAPITAL LETTER O WITH MACRON AND GRAVE - : "ṑ" U1E51 # LATIN SMALL LETTER O WITH MACRON AND GRAVE - : "Ở" Ohornhook # LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE - : "ở" ohornhook # LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE - : "Ử" Uhornhook # LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE - : "ử" uhornhook # LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE - : "Ỡ" Ohorntilde # LATIN CAPITAL LETTER O WITH HORN AND TILDE - : "ỡ" ohorntilde # LATIN SMALL LETTER O WITH HORN AND TILDE - : "Ữ" Uhorntilde # LATIN CAPITAL LETTER U WITH HORN AND TILDE - : "ữ" uhorntilde # LATIN SMALL LETTER U WITH HORN AND TILDE - : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON - : "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON - : "Ȭ" U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON - : "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON : "ϒ" U03D2 # GREEK UPSILON WITH HOOK SYMBOL : "ϒ" U03D2 # GREEK UPSILON WITH HOOK SYMBOL : "Ᾱ" U1FB9 # GREEK CAPITAL LETTER ALPHA WITH MACRON @@ -5575,166 +4815,166 @@ XCOMM French-Dvorak Bépo compositions : "ϼ" U03FC # GREEK RHO WITH STROKE SYMBOL XCOMM Cyrillic (NFDs -- Normalized Form Canonical Decomposition) - : "а̏" # CYRILLIC SMALL LETTER A WITH COMBINING DOUBLE GRAVE ACCENT - : "а̏" # CYRILLIC SMALL LETTER A WITH COMBINING DOUBLE GRAVE ACCENT - : "а̑" # CYRILLIC SMALL LETTER A WITH COMBINING INVERTED BREVE - : "а̀" # CYRILLIC SMALL LETTER A WITH COMBINING GRAVE ACCENT - : "а̀" # CYRILLIC SMALL LETTER A WITH COMBINING GRAVE ACCENT - : "а́" # CYRILLIC SMALL LETTER A WITH COMBINING ACUTE ACCENT - : "а́" # CYRILLIC SMALL LETTER A WITH COMBINING ACUTE ACCENT - : "а́" # CYRILLIC SMALL LETTER A WITH COMBINING ACUTE ACCENT - : "а̄" # CYRILLIC SMALL LETTER A WITH COMBINING MACRON - : "а̄" # CYRILLIC SMALL LETTER A WITH COMBINING MACRON - : "а̄" # CYRILLIC SMALL LETTER A WITH COMBINING MACRON - : "а̂" # CYRILLIC SMALL LETTER A WITH COMBINING CIRCUMFLEX ACCENT - : "а̂" # CYRILLIC SMALL LETTER A WITH COMBINING CIRCUMFLEX ACCENT - : "А̏" # CYRILLIC CAPITAL LETTER A WITH COMBINING DOUBLE GRAVE ACCENT - : "А̏" # CYRILLIC CAPITAL LETTER A WITH COMBINING DOUBLE GRAVE ACCENT - : "А̑" # CYRILLIC CAPITAL LETTER A WITH COMBINING INVERTED BREVE - : "А̀" # CYRILLIC CAPITAL LETTER A WITH COMBINING GRAVE ACCENT - : "А̀" # CYRILLIC CAPITAL LETTER A WITH COMBINING GRAVE ACCENT - : "А́" # CYRILLIC CAPITAL LETTER A WITH COMBINING ACUTE ACCENT - : "А́" # CYRILLIC CAPITAL LETTER A WITH COMBINING ACUTE ACCENT - : "А́" # CYRILLIC CAPITAL LETTER A WITH COMBINING ACUTE ACCENT - : "А̄" # CYRILLIC CAPITAL LETTER A WITH COMBINING MACRON - : "А̄" # CYRILLIC CAPITAL LETTER A WITH COMBINING MACRON - : "А̄" # CYRILLIC CAPITAL LETTER A WITH COMBINING MACRON - : "А̂" # CYRILLIC CAPITAL LETTER A WITH COMBINING CIRCUMFLEX ACCENT - : "А̂" # CYRILLIC CAPITAL LETTER A WITH COMBINING CIRCUMFLEX ACCENT - : "е̏" # CYRILLIC SMALL LETTER IE WITH COMBINING DOUBLE GRAVE ACCENT - : "е̏" # CYRILLIC SMALL LETTER IE WITH COMBINING DOUBLE GRAVE ACCENT - : "е̑" # CYRILLIC SMALL LETTER IE WITH COMBINING INVERTED BREVE - : "е́" # CYRILLIC SMALL LETTER IE WITH COMBINING ACUTE ACCENT - : "е́" # CYRILLIC SMALL LETTER IE WITH COMBINING ACUTE ACCENT - : "е́" # CYRILLIC SMALL LETTER IE WITH COMBINING ACUTE ACCENT - : "е̄" # CYRILLIC SMALL LETTER IE WITH COMBINING MACRON - : "е̄" # CYRILLIC SMALL LETTER IE WITH COMBINING MACRON - : "е̄" # CYRILLIC SMALL LETTER IE WITH COMBINING MACRON - : "е̂" # CYRILLIC SMALL LETTER IE WITH COMBINING CIRCUMFLEX ACCENT - : "е̂" # CYRILLIC SMALL LETTER IE WITH COMBINING CIRCUMFLEX ACCENT - : "Е̏" # CYRILLIC CAPITAL LETTER IE WITH COMBINING DOUBLE GRAVE ACCENT - : "Е̏" # CYRILLIC CAPITAL LETTER IE WITH COMBINING DOUBLE GRAVE ACCENT - : "Е̑" # CYRILLIC CAPITAL LETTER IE WITH COMBINING INVERTED BREVE - : "Е́" # CYRILLIC CAPITAL LETTER IE WITH COMBINING ACUTE ACCENT - : "Е́" # CYRILLIC CAPITAL LETTER IE WITH COMBINING ACUTE ACCENT - : "Е́" # CYRILLIC CAPITAL LETTER IE WITH COMBINING ACUTE ACCENT - : "Е̄" # CYRILLIC CAPITAL LETTER IE WITH COMBINING MACRON - : "Е̄" # CYRILLIC CAPITAL LETTER IE WITH COMBINING MACRON - : "Е̄" # CYRILLIC CAPITAL LETTER IE WITH COMBINING MACRON - : "Е̂" # CYRILLIC CAPITAL LETTER IE WITH COMBINING CIRCUMFLEX ACCENT - : "Е̂" # CYRILLIC CAPITAL LETTER IE WITH COMBINING CIRCUMFLEX ACCENT - : "и̏" # CYRILLIC SMALL LETTER I WITH COMBINING DOUBLE GRAVE ACCENT - : "и̏" # CYRILLIC SMALL LETTER I WITH COMBINING DOUBLE GRAVE ACCENT - : "и̑" # CYRILLIC SMALL LETTER I WITH COMBINING INVERTED BREVE - : "и́" # CYRILLIC SMALL LETTER I WITH COMBINING ACUTE ACCENT - : "и́" # CYRILLIC SMALL LETTER I WITH COMBINING ACUTE ACCENT - : "и́" # CYRILLIC SMALL LETTER I WITH COMBINING ACUTE ACCENT - : "и̂" # CYRILLIC SMALL LETTER I WITH COMBINING CIRCUMFLEX ACCENT - : "и̂" # CYRILLIC SMALL LETTER I WITH COMBINING CIRCUMFLEX ACCENT - : "И̏" # CYRILLIC CAPITAL LETTER I WITH COMBINING DOUBLE GRAVE ACCENT - : "И̏" # CYRILLIC CAPITAL LETTER I WITH COMBINING DOUBLE GRAVE ACCENT - : "И̑" # CYRILLIC CAPITAL LETTER I WITH COMBINING INVERTED BREVE - : "И́" # CYRILLIC CAPITAL LETTER I WITH COMBINING ACUTE ACCENT - : "И́" # CYRILLIC CAPITAL LETTER I WITH COMBINING ACUTE ACCENT - : "И́" # CYRILLIC CAPITAL LETTER I WITH COMBINING ACUTE ACCENT - : "И̂" # CYRILLIC CAPITAL LETTER I WITH COMBINING CIRCUMFLEX ACCENT - : "И̂" # CYRILLIC CAPITAL LETTER I WITH COMBINING CIRCUMFLEX ACCENT - : "о̏" # CYRILLIC SMALL LETTER O WITH COMBINING DOUBLE GRAVE ACCENT - : "о̏" # CYRILLIC SMALL LETTER O WITH COMBINING DOUBLE GRAVE ACCENT - : "о̑" # CYRILLIC SMALL LETTER O WITH COMBINING INVERTED BREVE - : "о̀" # CYRILLIC SMALL LETTER O WITH COMBINING GRAVE ACCENT - : "о̀" # CYRILLIC SMALL LETTER O WITH COMBINING GRAVE ACCENT - : "о́" # CYRILLIC SMALL LETTER O WITH COMBINING ACUTE ACCENT - : "о́" # CYRILLIC SMALL LETTER O WITH COMBINING ACUTE ACCENT - : "о́" # CYRILLIC SMALL LETTER O WITH COMBINING ACUTE ACCENT - : "о̄" # CYRILLIC SMALL LETTER O WITH COMBINING MACRON - : "о̄" # CYRILLIC SMALL LETTER O WITH COMBINING MACRON - : "о̄" # CYRILLIC SMALL LETTER O WITH COMBINING MACRON - : "о̂" # CYRILLIC SMALL LETTER O WITH COMBINING CIRCUMFLEX ACCENT - : "о̂" # CYRILLIC SMALL LETTER O WITH COMBINING CIRCUMFLEX ACCENT - : "О̏" # CYRILLIC CAPITAL LETTER O WITH COMBINING DOUBLE GRAVE ACCENT - : "О̏" # CYRILLIC CAPITAL LETTER O WITH COMBINING DOUBLE GRAVE ACCENT - : "О̑" # CYRILLIC CAPITAL LETTER O WITH COMBINING INVERTED BREVE - : "О̀" # CYRILLIC CAPITAL LETTER O WITH COMBINING GRAVE ACCENT - : "О̀" # CYRILLIC CAPITAL LETTER O WITH COMBINING GRAVE ACCENT - : "О́" # CYRILLIC CAPITAL LETTER O WITH COMBINING ACUTE ACCENT - : "О́" # CYRILLIC CAPITAL LETTER O WITH COMBINING ACUTE ACCENT - : "О́" # CYRILLIC CAPITAL LETTER O WITH COMBINING ACUTE ACCENT - : "О̄" # CYRILLIC CAPITAL LETTER O WITH COMBINING MACRON - : "О̄" # CYRILLIC CAPITAL LETTER O WITH COMBINING MACRON - : "О̄" # CYRILLIC CAPITAL LETTER O WITH COMBINING MACRON - : "О̂" # CYRILLIC CAPITAL LETTER O WITH COMBINING CIRCUMFLEX ACCENT - : "О̂" # CYRILLIC CAPITAL LETTER O WITH COMBINING CIRCUMFLEX ACCENT - : "у̏" # CYRILLIC SMALL LETTER U WITH COMBINING DOUBLE GRAVE ACCENT - : "у̏" # CYRILLIC SMALL LETTER U WITH COMBINING DOUBLE GRAVE ACCENT - : "у̑" # CYRILLIC SMALL LETTER U WITH COMBINING INVERTED BREVE - : "у̀" # CYRILLIC SMALL LETTER U WITH COMBINING GRAVE ACCENT - : "у̀" # CYRILLIC SMALL LETTER U WITH COMBINING GRAVE ACCENT - : "у́" # CYRILLIC SMALL LETTER U WITH COMBINING ACUTE ACCENT - : "у́" # CYRILLIC SMALL LETTER U WITH COMBINING ACUTE ACCENT - : "у́" # CYRILLIC SMALL LETTER U WITH COMBINING ACUTE ACCENT - : "у̂" # CYRILLIC SMALL LETTER U WITH COMBINING CIRCUMFLEX ACCENT - : "у̂" # CYRILLIC SMALL LETTER U WITH COMBINING CIRCUMFLEX ACCENT - : "У̏" # CYRILLIC CAPITAL LETTER U WITH COMBINING DOUBLE GRAVE ACCENT - : "У̏" # CYRILLIC CAPITAL LETTER U WITH COMBINING DOUBLE GRAVE ACCENT - : "У̑" # CYRILLIC CAPITAL LETTER U WITH COMBINING INVERTED BREVE - : "У̀" # CYRILLIC CAPITAL LETTER U WITH COMBINING GRAVE ACCENT - : "У̀" # CYRILLIC CAPITAL LETTER U WITH COMBINING GRAVE ACCENT - : "У́" # CYRILLIC CAPITAL LETTER U WITH COMBINING ACUTE ACCENT - : "У́" # CYRILLIC CAPITAL LETTER U WITH COMBINING ACUTE ACCENT - : "У́" # CYRILLIC CAPITAL LETTER U WITH COMBINING ACUTE ACCENT - : "У̂" # CYRILLIC CAPITAL LETTER U WITH COMBINING CIRCUMFLEX ACCENT - : "У̂" # CYRILLIC CAPITAL LETTER U WITH COMBINING CIRCUMFLEX ACCENT - : "р̏" # CYRILLIC SMALL LETTER ER WITH COMBINING DOUBLE GRAVE ACCENT - : "р̏" # CYRILLIC SMALL LETTER ER WITH COMBINING DOUBLE GRAVE ACCENT - : "р̑" # CYRILLIC SMALL LETTER ER WITH COMBINING INVERTED BREVE - : "р̀" # CYRILLIC SMALL LETTER ER WITH COMBINING GRAVE ACCENT - : "р̀" # CYRILLIC SMALL LETTER ER WITH COMBINING GRAVE ACCENT - : "р́" # CYRILLIC SMALL LETTER ER WITH COMBINING ACUTE ACCENT - : "р́" # CYRILLIC SMALL LETTER ER WITH COMBINING ACUTE ACCENT - : "р́" # CYRILLIC SMALL LETTER ER WITH COMBINING ACUTE ACCENT - : "р̄" # CYRILLIC SMALL LETTER ER WITH COMBINING MACRON - : "р̄" # CYRILLIC SMALL LETTER ER WITH COMBINING MACRON - : "р̄" # CYRILLIC SMALL LETTER ER WITH COMBINING MACRON - : "р̂" # CYRILLIC SMALL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT - : "р̂" # CYRILLIC SMALL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT - : "Р̏" # CYRILLIC CAPITAL LETTER ER WITH COMBINING DOUBLE GRAVE ACCENT - : "Р̏" # CYRILLIC CAPITAL LETTER ER WITH COMBINING DOUBLE GRAVE ACCENT - : "Р̑" # CYRILLIC CAPITAL LETTER ER WITH COMBINING INVERTED BREVE - : "Р̀" # CYRILLIC CAPITAL LETTER ER WITH COMBINING GRAVE ACCENT - : "Р̀" # CYRILLIC CAPITAL LETTER ER WITH COMBINING GRAVE ACCENT - : "Р́" # CYRILLIC CAPITAL LETTER ER WITH COMBINING ACUTE ACCENT - : "Р́" # CYRILLIC CAPITAL LETTER ER WITH COMBINING ACUTE ACCENT - : "Р́" # CYRILLIC CAPITAL LETTER ER WITH COMBINING ACUTE ACCENT - : "Р̄" # CYRILLIC CAPITAL LETTER ER WITH COMBINING MACRON - : "Р̄" # CYRILLIC CAPITAL LETTER ER WITH COMBINING MACRON - : "Р̄" # CYRILLIC CAPITAL LETTER ER WITH COMBINING MACRON - : "Р̂" # CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT - : "Р̂" # CYRILLIC CAPITAL LETTER ER WITH COMBINING CIRCUMFLEX ACCENT - : "ы́" # CYRILLIC SMALL LETTER YERU WITH COMBINING ACUTE ACCENT - : "ы́" # CYRILLIC SMALL LETTER YERU WITH COMBINING ACUTE ACCENT - : "ы́" # CYRILLIC SMALL LETTER YERU WITH COMBINING ACUTE ACCENT - : "Ы́" # CYRILLIC CAPITAL LETTER YERU WITH COMBINING ACUTE ACCENT - : "Ы́" # CYRILLIC CAPITAL LETTER YERU WITH COMBINING ACUTE ACCENT - : "Ы́" # CYRILLIC CAPITAL LETTER YERU WITH COMBINING ACUTE ACCENT - : "э́" # CYRILLIC SMALL LETTER E WITH COMBINING ACUTE ACCENT - : "э́" # CYRILLIC SMALL LETTER E WITH COMBINING ACUTE ACCENT - : "э́" # CYRILLIC SMALL LETTER E WITH COMBINING ACUTE ACCENT - : "Э́" # CYRILLIC CAPITAL LETTER E WITH COMBINING ACUTE ACCENT - : "Э́" # CYRILLIC CAPITAL LETTER E WITH COMBINING ACUTE ACCENT - : "Э́" # CYRILLIC CAPITAL LETTER E WITH COMBINING ACUTE ACCENT - : "ю́" # CYRILLIC SMALL LETTER YU WITH COMBINING ACUTE ACCENT - : "ю́" # CYRILLIC SMALL LETTER YU WITH COMBINING ACUTE ACCENT - : "ю́" # CYRILLIC SMALL LETTER YU WITH COMBINING ACUTE ACCENT - : "Ю́́" # CYRILLIC CAPITAL LETTER YU WITH COMBINING ACUTE ACCENT - : "Ю́́" # CYRILLIC CAPITAL LETTER YU WITH COMBINING ACUTE ACCENT - : "Ю́́" # CYRILLIC CAPITAL LETTER YU WITH COMBINING ACUTE ACCENT - : "я́" # CYRILLIC SMALL LETTER YA WITH COMBINING ACUTE ACCENT - : "я́" # CYRILLIC SMALL LETTER YA WITH COMBINING ACUTE ACCENT - : "я́" # CYRILLIC SMALL LETTER YA WITH COMBINING ACUTE ACCENT - : "Я́" # CYRILLIC CAPITAL LETTER YA WITH COMBINING ACUTE ACCENT - : "Я́" # CYRILLIC CAPITAL LETTER YA WITH COMBINING ACUTE ACCENT - : "Я́" # CYRILLIC CAPITAL LETTER YA WITH COMBINING ACUTE ACCENT + : "а̏" # CYRILLIC SMALL LETTER A plus COMBINING DOUBLE GRAVE + : "а̏" # CYRILLIC SMALL LETTER A plus COMBINING DOUBLE GRAVE + : "а̑" # CYRILLIC SMALL LETTER A plus COMBINING INVERTED BREVE + : "а̀" # CYRILLIC SMALL LETTER A plus COMBINING GRAVE + : "а̀" # CYRILLIC SMALL LETTER A plus COMBINING GRAVE + : "а́" # CYRILLIC SMALL LETTER A plus COMBINING ACUTE + : "а́" # CYRILLIC SMALL LETTER A plus COMBINING ACUTE + : "а́" # CYRILLIC SMALL LETTER A plus COMBINING ACUTE + : "а̄" # CYRILLIC SMALL LETTER A plus COMBINING MACRON + : "а̄" # CYRILLIC SMALL LETTER A plus COMBINING MACRON + : "а̄" # CYRILLIC SMALL LETTER A plus COMBINING MACRON + : "а̂" # CYRILLIC SMALL LETTER A plus COMBINING CIRCUMFLEX + : "а̂" # CYRILLIC SMALL LETTER A plus COMBINING CIRCUMFLEX + : "А̏" # CYRILLIC CAPITAL LETTER A plus COMBINING DOUBLE GRAVE + : "А̏" # CYRILLIC CAPITAL LETTER A plus COMBINING DOUBLE GRAVE + : "А̑" # CYRILLIC CAPITAL LETTER A plus COMBINING INVERTED BREVE + : "А̀" # CYRILLIC CAPITAL LETTER A plus COMBINING GRAVE + : "А̀" # CYRILLIC CAPITAL LETTER A plus COMBINING GRAVE + : "А́" # CYRILLIC CAPITAL LETTER A plus COMBINING ACUTE + : "А́" # CYRILLIC CAPITAL LETTER A plus COMBINING ACUTE + : "А́" # CYRILLIC CAPITAL LETTER A plus COMBINING ACUTE + : "А̄" # CYRILLIC CAPITAL LETTER A plus COMBINING MACRON + : "А̄" # CYRILLIC CAPITAL LETTER A plus COMBINING MACRON + : "А̄" # CYRILLIC CAPITAL LETTER A plus COMBINING MACRON + : "А̂" # CYRILLIC CAPITAL LETTER A plus COMBINING CIRCUMFLEX + : "А̂" # CYRILLIC CAPITAL LETTER A plus COMBINING CIRCUMFLEX + : "е̏" # CYRILLIC SMALL LETTER IE plus COMBINING DOUBLE GRAVE + : "е̏" # CYRILLIC SMALL LETTER IE plus COMBINING DOUBLE GRAVE + : "е̑" # CYRILLIC SMALL LETTER IE plus COMBINING INVERTED BREVE + : "е́" # CYRILLIC SMALL LETTER IE plus COMBINING ACUTE + : "е́" # CYRILLIC SMALL LETTER IE plus COMBINING ACUTE + : "е́" # CYRILLIC SMALL LETTER IE plus COMBINING ACUTE + : "е̄" # CYRILLIC SMALL LETTER IE plus COMBINING MACRON + : "е̄" # CYRILLIC SMALL LETTER IE plus COMBINING MACRON + : "е̄" # CYRILLIC SMALL LETTER IE plus COMBINING MACRON + : "е̂" # CYRILLIC SMALL LETTER IE plus COMBINING CIRCUMFLEX + : "е̂" # CYRILLIC SMALL LETTER IE plus COMBINING CIRCUMFLEX + : "Е̏" # CYRILLIC CAPITAL LETTER IE plus COMBINING DOUBLE GRAVE + : "Е̏" # CYRILLIC CAPITAL LETTER IE plus COMBINING DOUBLE GRAVE + : "Е̑" # CYRILLIC CAPITAL LETTER IE plus COMBINING INVERTED BREVE + : "Е́" # CYRILLIC CAPITAL LETTER IE plus COMBINING ACUTE + : "Е́" # CYRILLIC CAPITAL LETTER IE plus COMBINING ACUTE + : "Е́" # CYRILLIC CAPITAL LETTER IE plus COMBINING ACUTE + : "Е̄" # CYRILLIC CAPITAL LETTER IE plus COMBINING MACRON + : "Е̄" # CYRILLIC CAPITAL LETTER IE plus COMBINING MACRON + : "Е̄" # CYRILLIC CAPITAL LETTER IE plus COMBINING MACRON + : "Е̂" # CYRILLIC CAPITAL LETTER IE plus COMBINING CIRCUMFLEX + : "Е̂" # CYRILLIC CAPITAL LETTER IE plus COMBINING CIRCUMFLEX + : "и̏" # CYRILLIC SMALL LETTER I plus COMBINING DOUBLE GRAVE + : "и̏" # CYRILLIC SMALL LETTER I plus COMBINING DOUBLE GRAVE + : "и̑" # CYRILLIC SMALL LETTER I plus COMBINING INVERTED BREVE + : "и́" # CYRILLIC SMALL LETTER I plus COMBINING ACUTE + : "и́" # CYRILLIC SMALL LETTER I plus COMBINING ACUTE + : "и́" # CYRILLIC SMALL LETTER I plus COMBINING ACUTE + : "и̂" # CYRILLIC SMALL LETTER I plus COMBINING CIRCUMFLEX + : "и̂" # CYRILLIC SMALL LETTER I plus COMBINING CIRCUMFLEX + : "И̏" # CYRILLIC CAPITAL LETTER I plus COMBINING DOUBLE GRAVE + : "И̏" # CYRILLIC CAPITAL LETTER I plus COMBINING DOUBLE GRAVE + : "И̑" # CYRILLIC CAPITAL LETTER I plus COMBINING INVERTED BREVE + : "И́" # CYRILLIC CAPITAL LETTER I plus COMBINING ACUTE + : "И́" # CYRILLIC CAPITAL LETTER I plus COMBINING ACUTE + : "И́" # CYRILLIC CAPITAL LETTER I plus COMBINING ACUTE + : "И̂" # CYRILLIC CAPITAL LETTER I plus COMBINING CIRCUMFLEX + : "И̂" # CYRILLIC CAPITAL LETTER I plus COMBINING CIRCUMFLEX + : "о̏" # CYRILLIC SMALL LETTER O plus COMBINING DOUBLE GRAVE + : "о̏" # CYRILLIC SMALL LETTER O plus COMBINING DOUBLE GRAVE + : "о̑" # CYRILLIC SMALL LETTER O plus COMBINING INVERTED BREVE + : "о̀" # CYRILLIC SMALL LETTER O plus COMBINING GRAVE + : "о̀" # CYRILLIC SMALL LETTER O plus COMBINING GRAVE + : "о́" # CYRILLIC SMALL LETTER O plus COMBINING ACUTE + : "о́" # CYRILLIC SMALL LETTER O plus COMBINING ACUTE + : "о́" # CYRILLIC SMALL LETTER O plus COMBINING ACUTE + : "о̄" # CYRILLIC SMALL LETTER O plus COMBINING MACRON + : "о̄" # CYRILLIC SMALL LETTER O plus COMBINING MACRON + : "о̄" # CYRILLIC SMALL LETTER O plus COMBINING MACRON + : "о̂" # CYRILLIC SMALL LETTER O plus COMBINING CIRCUMFLEX + : "о̂" # CYRILLIC SMALL LETTER O plus COMBINING CIRCUMFLEX + : "О̏" # CYRILLIC CAPITAL LETTER O plus COMBINING DOUBLE GRAVE + : "О̏" # CYRILLIC CAPITAL LETTER O plus COMBINING DOUBLE GRAVE + : "О̑" # CYRILLIC CAPITAL LETTER O plus COMBINING INVERTED BREVE + : "О̀" # CYRILLIC CAPITAL LETTER O plus COMBINING GRAVE + : "О̀" # CYRILLIC CAPITAL LETTER O plus COMBINING GRAVE + : "О́" # CYRILLIC CAPITAL LETTER O plus COMBINING ACUTE + : "О́" # CYRILLIC CAPITAL LETTER O plus COMBINING ACUTE + : "О́" # CYRILLIC CAPITAL LETTER O plus COMBINING ACUTE + : "О̄" # CYRILLIC CAPITAL LETTER O plus COMBINING MACRON + : "О̄" # CYRILLIC CAPITAL LETTER O plus COMBINING MACRON + : "О̄" # CYRILLIC CAPITAL LETTER O plus COMBINING MACRON + : "О̂" # CYRILLIC CAPITAL LETTER O plus COMBINING CIRCUMFLEX + : "О̂" # CYRILLIC CAPITAL LETTER O plus COMBINING CIRCUMFLEX + : "у̏" # CYRILLIC SMALL LETTER U plus COMBINING DOUBLE GRAVE + : "у̏" # CYRILLIC SMALL LETTER U plus COMBINING DOUBLE GRAVE + : "у̑" # CYRILLIC SMALL LETTER U plus COMBINING INVERTED BREVE + : "у̀" # CYRILLIC SMALL LETTER U plus COMBINING GRAVE + : "у̀" # CYRILLIC SMALL LETTER U plus COMBINING GRAVE + : "у́" # CYRILLIC SMALL LETTER U plus COMBINING ACUTE + : "у́" # CYRILLIC SMALL LETTER U plus COMBINING ACUTE + : "у́" # CYRILLIC SMALL LETTER U plus COMBINING ACUTE + : "у̂" # CYRILLIC SMALL LETTER U plus COMBINING CIRCUMFLEX + : "у̂" # CYRILLIC SMALL LETTER U plus COMBINING CIRCUMFLEX + : "У̏" # CYRILLIC CAPITAL LETTER U plus COMBINING DOUBLE GRAVE + : "У̏" # CYRILLIC CAPITAL LETTER U plus COMBINING DOUBLE GRAVE + : "У̑" # CYRILLIC CAPITAL LETTER U plus COMBINING INVERTED BREVE + : "У̀" # CYRILLIC CAPITAL LETTER U plus COMBINING GRAVE + : "У̀" # CYRILLIC CAPITAL LETTER U plus COMBINING GRAVE + : "У́" # CYRILLIC CAPITAL LETTER U plus COMBINING ACUTE + : "У́" # CYRILLIC CAPITAL LETTER U plus COMBINING ACUTE + : "У́" # CYRILLIC CAPITAL LETTER U plus COMBINING ACUTE + : "У̂" # CYRILLIC CAPITAL LETTER U plus COMBINING CIRCUMFLEX + : "У̂" # CYRILLIC CAPITAL LETTER U plus COMBINING CIRCUMFLEX + : "р̏" # CYRILLIC SMALL LETTER ER plus COMBINING DOUBLE GRAVE + : "р̏" # CYRILLIC SMALL LETTER ER plus COMBINING DOUBLE GRAVE + : "р̑" # CYRILLIC SMALL LETTER ER plus COMBINING INVERTED BREVE + : "р̀" # CYRILLIC SMALL LETTER ER plus COMBINING GRAVE + : "р̀" # CYRILLIC SMALL LETTER ER plus COMBINING GRAVE + : "р́" # CYRILLIC SMALL LETTER ER plus COMBINING ACUTE + : "р́" # CYRILLIC SMALL LETTER ER plus COMBINING ACUTE + : "р́" # CYRILLIC SMALL LETTER ER plus COMBINING ACUTE + : "р̄" # CYRILLIC SMALL LETTER ER plus COMBINING MACRON + : "р̄" # CYRILLIC SMALL LETTER ER plus COMBINING MACRON + : "р̄" # CYRILLIC SMALL LETTER ER plus COMBINING MACRON + : "р̂" # CYRILLIC SMALL LETTER ER plus COMBINING CIRCUMFLEX + : "р̂" # CYRILLIC SMALL LETTER ER plus COMBINING CIRCUMFLEX + : "Р̏" # CYRILLIC CAPITAL LETTER ER plus COMBINING DOUBLE GRAVE + : "Р̏" # CYRILLIC CAPITAL LETTER ER plus COMBINING DOUBLE GRAVE + : "Р̑" # CYRILLIC CAPITAL LETTER ER plus COMBINING INVERTED BREVE + : "Р̀" # CYRILLIC CAPITAL LETTER ER plus COMBINING GRAVE + : "Р̀" # CYRILLIC CAPITAL LETTER ER plus COMBINING GRAVE + : "Р́" # CYRILLIC CAPITAL LETTER ER plus COMBINING ACUTE + : "Р́" # CYRILLIC CAPITAL LETTER ER plus COMBINING ACUTE + : "Р́" # CYRILLIC CAPITAL LETTER ER plus COMBINING ACUTE + : "Р̄" # CYRILLIC CAPITAL LETTER ER plus COMBINING MACRON + : "Р̄" # CYRILLIC CAPITAL LETTER ER plus COMBINING MACRON + : "Р̄" # CYRILLIC CAPITAL LETTER ER plus COMBINING MACRON + : "Р̂" # CYRILLIC CAPITAL LETTER ER plus COMBINING CIRCUMFLEX + : "Р̂" # CYRILLIC CAPITAL LETTER ER plus COMBINING CIRCUMFLEX + : "ы́" # CYRILLIC SMALL LETTER YERU plus COMBINING ACUTE + : "ы́" # CYRILLIC SMALL LETTER YERU plus COMBINING ACUTE + : "ы́" # CYRILLIC SMALL LETTER YERU plus COMBINING ACUTE + : "Ы́" # CYRILLIC CAPITAL LETTER YERU plus COMBINING ACUTE + : "Ы́" # CYRILLIC CAPITAL LETTER YERU plus COMBINING ACUTE + : "Ы́" # CYRILLIC CAPITAL LETTER YERU plus COMBINING ACUTE + : "э́" # CYRILLIC SMALL LETTER E plus COMBINING ACUTE + : "э́" # CYRILLIC SMALL LETTER E plus COMBINING ACUTE + : "э́" # CYRILLIC SMALL LETTER E plus COMBINING ACUTE + : "Э́" # CYRILLIC CAPITAL LETTER E plus COMBINING ACUTE + : "Э́" # CYRILLIC CAPITAL LETTER E plus COMBINING ACUTE + : "Э́" # CYRILLIC CAPITAL LETTER E plus COMBINING ACUTE + : "ю́" # CYRILLIC SMALL LETTER YU plus COMBINING ACUTE + : "ю́" # CYRILLIC SMALL LETTER YU plus COMBINING ACUTE + : "ю́" # CYRILLIC SMALL LETTER YU plus COMBINING ACUTE + : "Ю́" # CYRILLIC CAPITAL LETTER YU plus COMBINING ACUTE + : "Ю́" # CYRILLIC CAPITAL LETTER YU plus COMBINING ACUTE + : "Ю́" # CYRILLIC CAPITAL LETTER YU plus COMBINING ACUTE + : "я́" # CYRILLIC SMALL LETTER YA plus COMBINING ACUTE + : "я́" # CYRILLIC SMALL LETTER YA plus COMBINING ACUTE + : "я́" # CYRILLIC SMALL LETTER YA plus COMBINING ACUTE + : "Я́" # CYRILLIC CAPITAL LETTER YA plus COMBINING ACUTE + : "Я́" # CYRILLIC CAPITAL LETTER YA plus COMBINING ACUTE + : "Я́" # CYRILLIC CAPITAL LETTER YA plus COMBINING ACUTE /* * APL support, by Geoff Streeter, 2012-01-04 @@ -5752,7 +4992,10 @@ XCOMM Characters from "Mathematical Operators" : "√" U221a # v / SQUARE ROOT : "√" U221a # / v SQUARE ROOT <8> <8> : "∞" U221e # 8 8 INFINITY + : "∴" U2234 # : . THEREFORE + : "∵" U2235 # . : BECAUSE : "≈" U2248 # ~ ~ ALMOST EQUAL TO + : "≈" U2248 # ~ ~ ALMOST EQUAL TO : "≡" U2261 # = _ IDENTICAL TO : "≢" U2262 # _ ≠ NOT IDENTICAL TO : "≢" U2262 # ≠ _ NOT IDENTICAL TO @@ -5766,14 +5009,12 @@ XCOMM Characters from "Mathematical Operators" : "⊇" U2287 # ⊃ _ SUPERSET OF OR EQUAL TO : "⊖" U2296 # ○ - CIRCLED MINUS : "⊖" U2296 # - ○ CIRCLED MINUS - : "⊙" U2299 # ○ - CIRCLED DOT - : "⊙" U2299 # - ○ CIRCLED DOT + : "⊙" U2299 # ○ . CIRCLED DOT OPERATOR + : "⊙" U2299 # . ○ CIRCLED DOT OPERATOR : "⋄" U22c4 # < > DIAMOND OPERATOR : "⋄" U22c4 # > < DIAMOND OPERATOR : "⋄" U22c4 # ∧ ∨ DIAMOND OPERATOR : "⋄" U22c4 # ∨ ∧ DIAMOND OPERATOR - : "∴" therefore # : . THEREFORE - : "∵" because # . : BECAUSE XCOMM Characters from "Miscellaneous Technical" : "⌶" U2336 # ⊥ ⊤ APL FUNCTIONAL SYMBOL I-BEAM @@ -5906,103 +5147,103 @@ XCOMM Characters from "Miscellaneous Technical" : "⍹" U2379 # _ ⍵ APL FUNCTIONAL SYMBOL OMEGA UNDERBAR XCOMM Diacritics used in African languages - : "ɛ́" # LATIN SMALL LETTER EPSILON WITH ACUTE - : "ɛ̀" # LATIN SMALL LETTER EPSILON WITH GRAVE - : "ɛ̂" # LATIN SMALL LETTER EPSILON WITH CIRCUMFLEX - : "ɛ̌" # LATIN SMALL LETTER EPSILON WITH CARON - : "ɛ̄" # LATIN SMALL LETTER EPSILON WITH MACRON - : "ɛ̃" # LATIN SMALL LETTER EPSILON WITH TILDE - : "ɛ̃́" # LATIN SMALL LETTER EPSILON WITH TILDE AND ACUTE - : "ɛ̃̀" # LATIN SMALL LETTER EPSILON WITH TILDE AND GRAVE - : "Ɛ́" # LATIN CAPITAL LETTER EPSILON WITH ACUTE - : "Ɛ̀" # LATIN CAPITAL LETTER EPSILON WITH GRAVE - : "Ɛ̂" # LATIN CAPITAL LETTER EPSILON WITH CIRCUMFLEX - : "Ɛ̌" # LATIN CAPITAL LETTER EPSILON WITH CARON - : "Ɛ̄" # LATIN CAPITAL LETTER EPSILON WITH MACRON - : "Ɛ̃" # LATIN CAPITAL LETTER EPSILON WITH TILDE - : "Ɛ̃́" # LATIN CAPITAL LETTER EPSILON WITH TILDE AND ACUTE - : "Ɛ̃̀" # LATIN CAPITAL LETTER EPSILON WITH TILDE AND GRAVE - : "ɩ́" # LATIN SMALL LETTER IOTA WITH ACUTE - : "ɩ̀" # LATIN SMALL LETTER IOTA WITH GRAVE - : "ɩ̂" # LATIN SMALL LETTER IOTA WITH CIRCUMFLEX - : "ɩ̌" # LATIN SMALL LETTER IOTA WITH CARON - : "ɩ̄" # LATIN SMALL LETTER IOTA WITH MACRON - : "Ɩ́" # LATIN CAPITAL LETTER IOTA WITH ACUTE - : "Ɩ̀" # LATIN CAPITAL LETTER IOTA WITH GRAVE - : "Ɩ̂" # LATIN CAPITAL LETTER IOTA WITH CIRCUMFLEX - : "Ɩ̌" # LATIN CAPITAL LETTER IOTA WITH CARON - : "Ɩ̄" # LATIN CAPITAL LETTER IOTA WITH MACRON - : "ɔ́" # LATIN SMALL LETTER OPEN O WITH ACUTE - : "ɔ̀" # LATIN SMALL LETTER OPEN O WITH GRAVE - : "ɔ̂" # LATIN SMALL LETTER OPEN O WITH CIRCUMFLEX - : "ɔ̌" # LATIN SMALL LETTER OPEN O WITH CARON - : "ɔ̄" # LATIN SMALL LETTER OPEN O WITH MACRON - : "ɔ̃" # LATIN SMALL LETTER OPEN O WITH TILDE - : "ɔ̃́" # LATIN SMALL LETTER OPEN O WITH TILDE AND ACUTE - : "ɔ̃̀" # LATIN SMALL LETTER OPEN O WITH TILDE AND GRAVE - : "Ɔ́" # LATIN CAPITAL LETTER OPEN O WITH ACUTE - : "Ɔ̀" # LATIN CAPITAL LETTER OPEN O WITH GRAVE - : "Ɔ̂" # LATIN CAPITAL LETTER OPEN O WITH CIRCUMFLEX - : "Ɔ̌" # LATIN CAPITAL LETTER OPEN O WITH CARON - : "Ɔ̄" # LATIN CAPITAL LETTER OPEN O WITH MACRON - : "Ɔ̃" # LATIN CAPITAL LETTER OPEN O WITH TILDE - : "Ɔ̃́" # LATIN CAPITAL LETTER OPEN O WITH TILDE AND ACUTE - : "Ɔ̃̀" # LATIN CAPITAL LETTER OPEN O WITH TILDE AND GRAVE - : "ǝ́" # LATIN SMALL LETTER TURNED E WITH ACUTE - : "ǝ̀" # LATIN SMALL LETTER TURNED E WITH GRAVE - : "ǝ̂" # LATIN SMALL LETTER TURNED E WITH CIRCUMFLEX - : "ǝ̌" # LATIN SMALL LETTER TURNED E WITH CARON - : "ǝ̄" # LATIN SMALL LETTER TURNED E WITH MACRON - : "ǝ̃" # LATIN SMALL LETTER TURNED E WITH TILDE - : "ǝ̃́" # LATIN SMALL LETTER TURNED E WITH TILDE AND ACUTE - : "ǝ̃̀" # LATIN SMALL LETTER TURNED E WITH TILDE AND GRAVE - : "Ǝ́" # LATIN CAPITAL LETTER TURNED E WITH ACUTE - : "Ǝ̀" # LATIN CAPITAL LETTER TURNED E WITH GRAVE - : "Ǝ̂" # LATIN CAPITAL LETTER TURNED E WITH CIRCUMFLEX - : "Ǝ̌" # LATIN CAPITAL LETTER TURNED E WITH CARON - : "Ǝ̄" # LATIN CAPITAL LETTER TURNED E WITH MACRON - : "Ǝ̃" # LATIN CAPITAL LETTER TURNED E WITH TILDE - : "Ǝ̃́" # LATIN CAPITAL LETTER TURNED E WITH TILDE AND ACUTE - : "Ǝ̃̀" # LATIN CAPITAL LETTER TURNED E WITH TILDE AND GRAVE - : "ʋ́" # LATIN SMALL LETTER V WITH HOOK WITH ACUTE - : "ʋ̀" # LATIN SMALL LETTER V WITH HOOK WITH GRAVE - : "ʋ̂" # LATIN SMALL LETTER V WITH HOOK WITH CIRCUMFLEX - : "ʋ̌" # LATIN SMALL LETTER V WITH HOOK WITH CARON - : "ʋ̄" # LATIN SMALL LETTER V WITH HOOK WITH MACRON - : "Ʋ́" # LATIN CAPITAL LETTER V WITH HOOK WITH ACUTE - : "Ʋ̀" # LATIN CAPITAL LETTER V WITH HOOK WITH GRAVE - : "Ʋ̂" # LATIN CAPITAL LETTER V WITH HOOK WITH CIRCUMFLEX - : "Ʋ̌" # LATIN CAPITAL LETTER V WITH HOOK WITH CARON - : "Ʋ̄" # LATIN CAPITAL LETTER V WITH HOOK WITH MACRON - : "ʊ́" # LATIN SMALL LETTER UPSILON WITH ACUTE - : "ʊ̀" # LATIN SMALL LETTER UPSILONK WITH GRAVE - : "ʊ̂" # LATIN SMALL LETTER UPSILON WITH CIRCUMFLEX - : "ʊ̌" # LATIN SMALL LETTER UPSILON WITH CARON - : "ʊ̄" # LATIN SMALL LETTER UPSILON WITH MACRON - : "Ʊ́" # LATIN CAPITAL LETTER UPSILON WITH ACUTE - : "Ʊ̀" # LATIN CAPITAL LETTER UPSILONK WITH GRAVE - : "Ʊ̂" # LATIN CAPITAL LETTER UPSILON WITH CIRCUMFLEX - : "Ʊ̌" # LATIN CAPITAL LETTER UPSILON WITH CARON - : "Ʊ̄" # LATIN CAPITAL LETTER UPSILON WITH MACRON - : "ã́" # LATIN SMALL LETTER A WITH TILDE AND ACUTE - : "ã̀" # LATIN SMALL LETTER A WITH TILDE AND GRAVE - : "Ã́" # LATIN CAPITAL LETTER A WITH TILDE AND ACUTE - : "Ã̀" # LATIN CAPITAL LETTER A WITH TILDE AND GRAVE - : "ẽ́" # LATIN SMALL LETTER E WITH TILDE AND ACUTE - : "ẽ̀" # LATIN SMALL LETTER E WITH TILDE AND GRAVE - : "Ẽ́" # LATIN CAPITAL LETTER E WITH TILDE AND ACUTE - : "Ẽ̀" # LATIN CAPITAL LETTER E WITH TILDE AND GRAVE - : "ĩ́" # LATIN SMALL LETTER I WITH TILDE AND ACUTE - : "ĩ̀" # LATIN SMALL LETTER I WITH TILDE AND GRAVE - : "Ĩ́" # LATIN CAPITAL LETTER I WITH TILDE AND ACUTE - : "Ĩ̀" # LATIN CAPITAL LETTER I WITH TILDE AND GRAVE - : "õ̀" # LATIN SMALL LETTER O WITH TILDE AND GRAVE - : "Õ̀" # LATIN CAPITAL LETTER O WITH TILDE AND GRAVE - : "ũ̀" # LATIN SMALL LETTER U WITH TILDE AND GRAVE - : "Ũ̀" # LATIN CAPITAL LETTER U WITH TILDE AND GRAVE - : "m̀" # LATIN SMALL LETTER M WITH GRAVE - : "M̀" # LATIN CAPITAL LETTER M WITH GRAVE - : "ŋ́" # LATIN SMALL LETTER ENG WITH ACUTE - : "ŋ̀" # LATIN SMALL LETTER ENG WITH GRAVE - : "Ŋ́" # LATIN CAPITAL LETTER ENG WITH ACUTE - : "Ŋ̀" # LATIN CAPITAL LETTER ENG WITH GRAVE + : "ɛ́" # LATIN SMALL LETTER EPSILON plus COMBINING ACUTE + : "ɛ̀" # LATIN SMALL LETTER EPSILON plus COMBINING GRAVE + : "ɛ̂" # LATIN SMALL LETTER EPSILON plus COMBINING CIRCUMFLEX + : "ɛ̌" # LATIN SMALL LETTER EPSILON plus COMBINING CARON + : "ɛ̄" # LATIN SMALL LETTER EPSILON plus COMBINING MACRON + : "ɛ̃" # LATIN SMALL LETTER EPSILON plus COMBINING TILDE + : "ɛ̃́" # LATIN SMALL LETTER EPSILON plus COMBINING TILDE and COMBINING ACUTE + : "ɛ̃̀" # LATIN SMALL LETTER EPSILON plus COMBINING TILDE and COMBINING GRAVE + : "Ɛ́" # LATIN CAPITAL LETTER EPSILON plus COMBINING ACUTE + : "Ɛ̀" # LATIN CAPITAL LETTER EPSILON plus COMBINING GRAVE + : "Ɛ̂" # LATIN CAPITAL LETTER EPSILON plus COMBINING CIRCUMFLEX + : "Ɛ̌" # LATIN CAPITAL LETTER EPSILON plus COMBINING CARON + : "Ɛ̄" # LATIN CAPITAL LETTER EPSILON plus COMBINING MACRON + : "Ɛ̃" # LATIN CAPITAL LETTER EPSILON plus COMBINING TILDE + : "Ɛ̃́" # LATIN CAPITAL LETTER EPSILON plus COMBINING TILDE and COMBINING ACUTE + : "Ɛ̃̀" # LATIN CAPITAL LETTER EPSILON plus COMBINING TILDE and COMBINING GRAVE + : "ɩ́" # LATIN SMALL LETTER IOTA plus COMBINING ACUTE + : "ɩ̀" # LATIN SMALL LETTER IOTA plus COMBINING GRAVE + : "ɩ̂" # LATIN SMALL LETTER IOTA plus COMBINING CIRCUMFLEX + : "ɩ̌" # LATIN SMALL LETTER IOTA plus COMBINING CARON + : "ɩ̄" # LATIN SMALL LETTER IOTA plus COMBINING MACRON + : "Ɩ́" # LATIN CAPITAL LETTER IOTA plus COMBINING ACUTE + : "Ɩ̀" # LATIN CAPITAL LETTER IOTA plus COMBINING GRAVE + : "Ɩ̂" # LATIN CAPITAL LETTER IOTA plus COMBINING CIRCUMFLEX + : "Ɩ̌" # LATIN CAPITAL LETTER IOTA plus COMBINING CARON + : "Ɩ̄" # LATIN CAPITAL LETTER IOTA plus COMBINING MACRON + : "ɔ́" # LATIN SMALL LETTER OPEN O plus COMBINING ACUTE + : "ɔ̀" # LATIN SMALL LETTER OPEN O plus COMBINING GRAVE + : "ɔ̂" # LATIN SMALL LETTER OPEN O plus COMBINING CIRCUMFLEX + : "ɔ̌" # LATIN SMALL LETTER OPEN O plus COMBINING CARON + : "ɔ̄" # LATIN SMALL LETTER OPEN O plus COMBINING MACRON + : "ɔ̃" # LATIN SMALL LETTER OPEN O plus COMBINING TILDE + : "ɔ̃́" # LATIN SMALL LETTER OPEN O plus COMBINING TILDE and COMBINING ACUTE + : "ɔ̃̀" # LATIN SMALL LETTER OPEN O plus COMBINING TILDE and COMBINING GRAVE + : "Ɔ́" # LATIN CAPITAL LETTER OPEN O plus COMBINING ACUTE + : "Ɔ̀" # LATIN CAPITAL LETTER OPEN O plus COMBINING GRAVE + : "Ɔ̂" # LATIN CAPITAL LETTER OPEN O plus COMBINING CIRCUMFLEX + : "Ɔ̌" # LATIN CAPITAL LETTER OPEN O plus COMBINING CARON + : "Ɔ̄" # LATIN CAPITAL LETTER OPEN O plus COMBINING MACRON + : "Ɔ̃" # LATIN CAPITAL LETTER OPEN O plus COMBINING TILDE + : "Ɔ̃́" # LATIN CAPITAL LETTER OPEN O plus COMBINING TILDE and COMBINING ACUTE + : "Ɔ̃̀" # LATIN CAPITAL LETTER OPEN O plus COMBINING TILDE and COMBINING GRAVE + : "ǝ́" # LATIN SMALL LETTER TURNED E plus COMBINING ACUTE + : "ǝ̀" # LATIN SMALL LETTER TURNED E plus COMBINING GRAVE + : "ǝ̂" # LATIN SMALL LETTER TURNED E plus COMBINING CIRCUMFLEX + : "ǝ̌" # LATIN SMALL LETTER TURNED E plus COMBINING CARON + : "ǝ̄" # LATIN SMALL LETTER TURNED E plus COMBINING MACRON + : "ǝ̃" # LATIN SMALL LETTER TURNED E plus COMBINING TILDE + : "ǝ̃́" # LATIN SMALL LETTER TURNED E plus COMBINING TILDE and COMBINING ACUTE + : "ǝ̃̀" # LATIN SMALL LETTER TURNED E plus COMBINING TILDE and COMBINING GRAVE + : "Ǝ́" # LATIN CAPITAL LETTER TURNED E plus COMBINING ACUTE + : "Ǝ̀" # LATIN CAPITAL LETTER TURNED E plus COMBINING GRAVE + : "Ǝ̂" # LATIN CAPITAL LETTER TURNED E plus COMBINING CIRCUMFLEX + : "Ǝ̌" # LATIN CAPITAL LETTER TURNED E plus COMBINING CARON + : "Ǝ̄" # LATIN CAPITAL LETTER TURNED E plus COMBINING MACRON + : "Ǝ̃" # LATIN CAPITAL LETTER TURNED E plus COMBINING TILDE + : "Ǝ̃́" # LATIN CAPITAL LETTER TURNED E plus COMBINING TILDE and COMBINING ACUTE + : "Ǝ̃̀" # LATIN CAPITAL LETTER TURNED E plus COMBINING TILDE and COMBINING GRAVE + : "ʋ́" # LATIN SMALL LETTER V WITH HOOK plus COMBINING ACUTE + : "ʋ̀" # LATIN SMALL LETTER V WITH HOOK plus COMBINING GRAVE + : "ʋ̂" # LATIN SMALL LETTER V WITH HOOK plus COMBINING CIRCUMFLEX + : "ʋ̌" # LATIN SMALL LETTER V WITH HOOK plus COMBINING CARON + : "ʋ̄" # LATIN SMALL LETTER V WITH HOOK plus COMBINING MACRON + : "Ʋ́" # LATIN CAPITAL LETTER V WITH HOOK plus COMBINING ACUTE + : "Ʋ̀" # LATIN CAPITAL LETTER V WITH HOOK plus COMBINING GRAVE + : "Ʋ̂" # LATIN CAPITAL LETTER V WITH HOOK plus COMBINING CIRCUMFLEX + : "Ʋ̌" # LATIN CAPITAL LETTER V WITH HOOK plus COMBINING CARON + : "Ʋ̄" # LATIN CAPITAL LETTER V WITH HOOK plus COMBINING MACRON + : "ʊ́" # LATIN SMALL LETTER UPSILON plus COMBINING ACUTE + : "ʊ̀" # LATIN SMALL LETTER UPSILONK plus COMBINING GRAVE + : "ʊ̂" # LATIN SMALL LETTER UPSILON plus COMBINING CIRCUMFLEX + : "ʊ̌" # LATIN SMALL LETTER UPSILON plus COMBINING CARON + : "ʊ̄" # LATIN SMALL LETTER UPSILON plus COMBINING MACRON + : "Ʊ́" # LATIN CAPITAL LETTER UPSILON plus COMBINING ACUTE + : "Ʊ̀" # LATIN CAPITAL LETTER UPSILONK plus COMBINING GRAVE + : "Ʊ̂" # LATIN CAPITAL LETTER UPSILON plus COMBINING CIRCUMFLEX + : "Ʊ̌" # LATIN CAPITAL LETTER UPSILON plus COMBINING CARON + : "Ʊ̄" # LATIN CAPITAL LETTER UPSILON plus COMBINING MACRON + : "ã́" # LATIN SMALL LETTER A plus COMBINING TILDE and COMBINING ACUTE + : "ã̀" # LATIN SMALL LETTER A plus COMBINING TILDE and COMBINING GRAVE + : "Ã́" # LATIN CAPITAL LETTER A plus COMBINING TILDE and COMBINING ACUTE + : "Ã̀" # LATIN CAPITAL LETTER A plus COMBINING TILDE and COMBINING GRAVE + : "ẽ́" # LATIN SMALL LETTER E plus COMBINING TILDE and COMBINING ACUTE + : "ẽ̀" # LATIN SMALL LETTER E plus COMBINING TILDE and COMBINING GRAVE + : "Ẽ́" # LATIN CAPITAL LETTER E plus COMBINING TILDE and COMBINING ACUTE + : "Ẽ̀" # LATIN CAPITAL LETTER E plus COMBINING TILDE and COMBINING GRAVE + : "ĩ́" # LATIN SMALL LETTER I plus COMBINING TILDE and COMBINING ACUTE + : "ĩ̀" # LATIN SMALL LETTER I plus COMBINING TILDE and COMBINING GRAVE + : "Ĩ́" # LATIN CAPITAL LETTER I plus COMBINING TILDE and COMBINING ACUTE + : "Ĩ̀" # LATIN CAPITAL LETTER I plus COMBINING TILDE and COMBINING GRAVE + : "õ̀" # LATIN SMALL LETTER O plus COMBINING TILDE and COMBINING GRAVE + : "Õ̀" # LATIN CAPITAL LETTER O plus COMBINING TILDE and COMBINING GRAVE + : "ũ̀" # LATIN SMALL LETTER U plus COMBINING TILDE and COMBINING GRAVE + : "Ũ̀" # LATIN CAPITAL LETTER U plus COMBINING TILDE and COMBINING GRAVE + : "m̀" # LATIN SMALL LETTER M plus COMBINING GRAVE + : "M̀" # LATIN CAPITAL LETTER M plus COMBINING GRAVE + : "ŋ́" # LATIN SMALL LETTER ENG plus COMBINING ACUTE + : "ŋ̀" # LATIN SMALL LETTER ENG plus COMBINING GRAVE + : "Ŋ́" # LATIN CAPITAL LETTER ENG plus COMBINING ACUTE + : "Ŋ̀" # LATIN CAPITAL LETTER ENG plus COMBINING GRAVE diff --git a/lib/libX11/nls/en_US.UTF-8/XLC_LOCALE.pre b/lib/libX11/nls/en_US.UTF-8/XLC_LOCALE.pre index 35d009f2..7b794a9a 100644 --- a/lib/libX11/nls/en_US.UTF-8/XLC_LOCALE.pre +++ b/lib/libX11/nls/en_US.UTF-8/XLC_LOCALE.pre @@ -83,7 +83,7 @@ fs7 { primary ISO8859-7:GR } } -XCOMM fs9 class (ISO8859 families) +XCOMM fs8 class (ISO8859 families) fs8 { charset { name ISO8859-9:GR @@ -92,7 +92,7 @@ fs8 { primary ISO8859-9:GR } } -XCOMM fs13 class (ISO8859 families) +XCOMM fs9 class (ISO8859 families) fs9 { charset { name ISO8859-13:GR @@ -101,7 +101,7 @@ fs9 { primary ISO8859-13:GR } } -XCOMM fs14 class (ISO8859 families) +XCOMM fs10 class (ISO8859 families) fs10 { charset { name ISO8859-14:GR @@ -110,7 +110,7 @@ fs10 { primary ISO8859-14:GR } } -XCOMM fs15 class (ISO8859 families) +XCOMM fs11 class (ISO8859 families) fs11 { charset { name ISO8859-15:GR @@ -119,7 +119,7 @@ fs11 { primary ISO8859-15:GR } } -XCOMM fs16 class (Kanji) +XCOMM fs12 class (Kanji) fs12 { charset { name JISX0208.1983-0:GL @@ -128,7 +128,7 @@ fs12 { primary JISX0208.1983-0:GL } } -XCOMM fs17 class (Korean Character) +XCOMM fs13 class (Korean Character) fs13 { charset { name KSC5601.1987-0:GL @@ -137,7 +137,7 @@ fs13 { primary KSC5601.1987-0:GL } } -XCOMM fs18 class (Chinese Han Character) +XCOMM fs14 class (Chinese Han Character) fs14 { charset { name GB2312.1980-0:GL @@ -146,7 +146,7 @@ fs14 { primary GB2312.1980-0:GL } } -XCOMM fs20 class (Half Kana) +XCOMM fs15 class (Half Kana) fs15 { charset { name JISX0201.1976-0:GR @@ -157,7 +157,7 @@ fs15 { } } XCOMM ISO10646 should come last so the fonts above will actually be used -XCOMM fs24 class +XCOMM fs16 class fs16 { charset { name ISO10646-1 @@ -223,76 +223,69 @@ XCOMM cs6 class cs6 { side GR length 1 - ct_encoding KOI8-R:GR + ct_encoding ISO8859-7:GR } XCOMM cs7 class cs7 { - side GR - length 1 - ct_encoding ISO8859-7:GR -} - -XCOMM cs9 class -cs8 { side GR length 1 ct_encoding ISO8859-9:GR } -XCOMM cs13 class -cs9 { +XCOMM cs8 class +cs8 { side GR length 1 ct_encoding ISO8859-13:GR } -XCOMM cs14 class -cs10 { +XCOMM cs9 class +cs9 { side GR length 1 ct_encoding ISO8859-14:GR } -XCOMM cs15 class -cs11 { +XCOMM cs10 class +cs10 { side GR length 1 ct_encoding ISO8859-15:GR } -XCOMM cs16 class -cs12 { +XCOMM cs11 class +cs11 { side GR length 2 ct_encoding JISX0208.1983-0:GL; JISX0208.1983-0:GR;\ JISX0208.1983-1:GL; JISX0208.1983-1:GR } -XCOMM cs17 class -cs13 { +XCOMM cs12 class +cs12 { side GL length 2 ct_encoding KSC5601.1987-0:GL; KSC5601.1987-0:GR;\ KSC5601.1987-1:GL; KSC5601.1987-1:GR } -XCOMM cs18 class -cs14 { +XCOMM cs13 class +cs13 { side GR length 2 ct_encoding GB2312.1980-0:GL; GB2312.1980-0:GR } -XCOMM cs20 class -cs15 { +XCOMM cs14 class +cs14 { side GR length 1 ct_encoding JISX0201.1976-0:GR } -XCOMM cs24 class -cs16 { +XCOMM cs15 class +cs15 { side none ct_encoding ISO10646-1 } diff --git a/lib/libX11/nls/ja.SJIS/XLC_LOCALE.pre b/lib/libX11/nls/ja.SJIS/XLC_LOCALE.pre index 5064f154..be320cba 100644 --- a/lib/libX11/nls/ja.SJIS/XLC_LOCALE.pre +++ b/lib/libX11/nls/ja.SJIS/XLC_LOCALE.pre @@ -2,7 +2,6 @@ XCOMM XCOMM XLocale Database Sample for ja_JP.sjis XCOMM -#ifndef __uxp__ XCOMM XCOMM XLC_FONTSET category @@ -167,216 +166,3 @@ XCOMM } END XLC_XLOCALE -#else /* __uxp__ */ - -XCOMM For UXP/DS plat form -XCOMM -XCOMM XLC_CHARSET_DEFINE category -XCOMM -XLC_CHARSET_DEFINE -csd0 { - charset_name u90x03.1991-0 - side GL - length 2 - gc_number 94 - string_encoding False - sequence \x1b\x25\x28\x32 - encoding_name fujitsu.U90X03 -} - -csd1 { - charset_name u90x03.1991-0 - side GR - length 2 - gc_number 94 - string_encoding False - sequence \x1b\x25\x2f\x32 - encoding_name fujitsu.U90X03 -} -END XLC_CHARSET_DEFINE - -XCOMM -XCOMM XLC_FONTSET category -XCOMM -XLC_FONTSET -XCOMM fs0 class (7 bit ASCII) -fs0 { - charset { - name JISX0201.1976-0:GL - } - font { - primary JISX0201.1976-0:GL - substitute ISO8859-1:GL - vertical_rotate all - } -} -XCOMM fs1 class (Kanji) -fs1 { - charset { - name JISX0208.1983-0:GL - } - font { - primary fujitsu.u90x01.1991-0:GL - substitute u90x01.1991-0:GL;\ - JISX0208.1983-0:GL; JISX0208.1983-0:GR;\ - JISX0208.1983-1:GL; JISX0208.1983-1:GR;\ - JISX0208.1990-0:GL; JISX0208.1990-0:GR - vertical_map u90x01.1991-0.2:GL,\ - [\x2122,\x2125]->\x7d21,[\x2131,\x2132]->\x7d25,\ - [\x213c,\x213e]->\x7d27,[\x2141,\x215b]->\x7d2a,\ - [\x2421,\x2421]->\x7d45,[\x2423,\x2423]->\x7d46,\ - [\x2425,\x2425]->\x7d47,[\x2427,\x2427]->\x7d48,\ - [\x2429,\x2429]->\x7d49,[\x2443,\x2443]->\x7d4a,\ - [\x2463,\x2463]->\x7d4b,[\x2465,\x2465]->\x7d4c,\ - [\x2467,\x2467]->\x7d4d,[\x246e,\x246e]->\x7d4e,\ - [\x2521,\x2521]->\x7d4f,[\x2523,\x2523]->\x7d50,\ - [\x2525,\x2525]->\x7d51,[\x2527,\x2527]->\x7d52,\ - [\x2529,\x2529]->\x7d53,[\x2543,\x2543]->\x7d54,\ - [\x2563,\x2563]->\x7d55,[\x2565,\x2565]->\x7d56,\ - [\x2567,\x2567]->\x7d57,[\x256e,\x256e]->\x7d58,\ - [\x2575,\x2576]->\x7d59,[\x2475,\x2476]->\x7d5b - } -} -XCOMM fs2 class (Half Kana) -fs2 { - charset { - name JISX0201.1976-0:GR - } - font { - primary JISX0201.1976-0:GR - vertical_rotate all - } -} -XCOMM fs3 class (Supplementary Kanji) -fs3 { - charset { - name u90x03.1991-0:GL; u90x03.1991-0:GR - udc_area \x6521,\x787e - } - font { - primary fujitsu.u90x03.1991-0:GL - substitute u90x03.1991-0:GL;\ - JISX0208.1983-0:GL; JISX0208.1983-0:GR;\ - JISX0208.1983-1:GL; JISX0208.1983-1:GR;\ - JISX0208.1990-0:GL; JISX0208.1990-0:GR - } -} -END XLC_FONTSET - -XCOMM -XCOMM XLC_XLOCALE category -XCOMM -XLC_XLOCALE - -encoding_name ja.sjis -mb_cur_max 2 -state_depend_encoding False - -wc_encoding_mask \x30000000 -wc_shift_bits 7 - - -XCOMM cs0 class -cs0 { - side GL:Default - length 1 - wc_encoding \x00000000 - ct_encoding JISX0201.1976-0:GL; ISO8859-1:GL -} - -XCOMM cs1 class -cs1 { - side none - length 2 - byte1 \x81,\x9f;\xe0,\xef - byte2 \x40,\x7e;\x80,\xfc - - wc_encoding \x30000000 - - ct_encoding JISX0208.1983-0:GL; JISX0208.1983-0:GR;\ - JISX0208.1983-1:GL; JISX0208.1983-1:GR - mb_conversion \ - [\x8140,\x817e]->\x2121,[\x8180,\x819e]->\x2160,[\x819f,\x81fc]->\x2221,\ - [\x8240,\x827e]->\x2321,[\x8280,\x829e]->\x2360,[\x829f,\x82fc]->\x2421,\ - [\x8340,\x837e]->\x2521,[\x8380,\x839e]->\x2560,[\x839f,\x83fc]->\x2621,\ - [\x8440,\x847e]->\x2721,[\x8480,\x849e]->\x2760,[\x849f,\x84fc]->\x2821,\ - [\x8540,\x857e]->\x2921,[\x8580,\x859e]->\x2960,[\x859f,\x85fc]->\x2a21,\ - [\x8640,\x867e]->\x2b21,[\x8680,\x869e]->\x2b60,[\x869f,\x86fc]->\x2c21,\ - [\x8740,\x877e]->\x2d21,[\x8780,\x879e]->\x2d60,[\x879f,\x87fc]->\x2e21,\ - [\x8840,\x887e]->\x2f21,[\x8880,\x889e]->\x2f60,[\x889f,\x88fc]->\x3021,\ - [\x8940,\x897e]->\x3121,[\x8980,\x899e]->\x3160,[\x899f,\x89fc]->\x3221,\ - [\x8a40,\x8a7e]->\x3321,[\x8a80,\x8a9e]->\x3360,[\x8a9f,\x8afc]->\x3421,\ - [\x8b40,\x8b7e]->\x3521,[\x8b80,\x8b9e]->\x3560,[\x8b9f,\x8bfc]->\x3621,\ - [\x8c40,\x8c7e]->\x3721,[\x8c80,\x8c9e]->\x3760,[\x8c9f,\x8cfc]->\x3821,\ - [\x8d40,\x8d7e]->\x3921,[\x8d80,\x8d9e]->\x3960,[\x8d9f,\x8dfc]->\x3a21,\ - [\x8e40,\x8e7e]->\x3b21,[\x8e80,\x8e9e]->\x3b60,[\x8e9f,\x8efc]->\x3c21,\ - [\x8f40,\x8f7e]->\x3d21,[\x8f80,\x8f9e]->\x3d60,[\x8f9f,\x8ffc]->\x3e21,\ - [\x9040,\x907e]->\x3f21,[\x9080,\x909e]->\x3f60,[\x909f,\x90fc]->\x4021,\ - [\x9140,\x917e]->\x4121,[\x9180,\x919e]->\x4160,[\x919f,\x91fc]->\x4221,\ - [\x9240,\x927e]->\x4321,[\x9280,\x929e]->\x4360,[\x929f,\x92fc]->\x4421,\ - [\x9340,\x937e]->\x4521,[\x9380,\x939e]->\x4560,[\x939f,\x93fc]->\x4621,\ - [\x9440,\x947e]->\x4721,[\x9480,\x949e]->\x4760,[\x949f,\x94fc]->\x4821,\ - [\x9540,\x957e]->\x4921,[\x9580,\x959e]->\x4960,[\x959f,\x95fc]->\x4a21,\ - [\x9640,\x967e]->\x4b21,[\x9680,\x969e]->\x4b60,[\x969f,\x96fc]->\x4c21,\ - [\x9740,\x977e]->\x4d21,[\x9780,\x979e]->\x4d60,[\x979f,\x97fc]->\x4e21,\ - [\x9840,\x987e]->\x4f21,[\x9880,\x989e]->\x4f60,[\x989f,\x98fc]->\x5021,\ - [\x9940,\x997e]->\x5121,[\x9980,\x999e]->\x5160,[\x999f,\x99fc]->\x5221,\ - [\x9a40,\x9a7e]->\x5321,[\x9a80,\x9a9e]->\x5360,[\x9a9f,\x9afc]->\x5421,\ - [\x9b40,\x9b7e]->\x5521,[\x9b80,\x9b9e]->\x5560,[\x9b9f,\x9bfc]->\x5621,\ - [\x9c40,\x9c7e]->\x5721,[\x9c80,\x9c9e]->\x5760,[\x9c9f,\x9cfc]->\x5821,\ - [\x9d40,\x9d7e]->\x5921,[\x9d80,\x9d9e]->\x5960,[\x9d9f,\x9dfc]->\x5a21,\ - [\x9e40,\x9e7e]->\x5b21,[\x9e80,\x9e9e]->\x5b60,[\x9e9f,\x9efc]->\x5c21,\ - [\x9f40,\x9f7e]->\x5d21,[\x9f80,\x9f9e]->\x5d60,[\x9f9f,\x9ffc]->\x5e21,\ - [\xe040,\xe07e]->\x5f21,[\xe080,\xe09e]->\x5f60,[\xe09f,\xe0fc]->\x6021,\ - [\xe140,\xe17e]->\x6121,[\xe180,\xe19e]->\x6160,[\xe19f,\xe1fc]->\x6221,\ - [\xe240,\xe27e]->\x6321,[\xe280,\xe29e]->\x6360,[\xe29f,\xe2fc]->\x6421,\ - [\xe340,\xe37e]->\x6521,[\xe380,\xe39e]->\x6560,[\xe39f,\xe3fc]->\x6621,\ - [\xe440,\xe47e]->\x6721,[\xe480,\xe49e]->\x6760,[\xe49f,\xe4fc]->\x6821,\ - [\xe540,\xe57e]->\x6921,[\xe580,\xe59e]->\x6960,[\xe59f,\xe5fc]->\x6a21,\ - [\xe640,\xe67e]->\x6b21,[\xe680,\xe69e]->\x6b60,[\xe69f,\xe6fc]->\x6c21,\ - [\xe740,\xe77e]->\x6d21,[\xe780,\xe79e]->\x6d60,[\xe79f,\xe7fc]->\x6e21,\ - [\xe840,\xe87e]->\x6f21,[\xe880,\xe89e]->\x6f60,[\xe89f,\xe8fc]->\x7021,\ - [\xe940,\xe97e]->\x7121,[\xe980,\xe99e]->\x7160,[\xe99f,\xe9fc]->\x7221,\ - [\xea40,\xea7e]->\x7321,[\xea80,\xea9e]->\x7360,[\xea9f,\xeafc]->\x7421,\ - [\xeb40,\xeb7e]->\x7521,[\xeb80,\xeb9e]->\x7560,[\xeb9f,\xebfc]->\x7621,\ - [\xec40,\xec7e]->\x7721,[\xec80,\xec9e]->\x7760,[\xec9f,\xecfc]->\x7821,\ - [\xed40,\xed7e]->\x7921,[\xed80,\xed9e]->\x7960,[\xed9f,\xedfc]->\x7a21,\ - [\xee40,\xee7e]->\x7b21,[\xee80,\xee9e]->\x7b60,[\xee9f,\xeefc]->\x7c21,\ - [\xef40,\xef7e]->\x7d21,[\xef80,\xef9e]->\x7d60,[\xef9f,\xeffc]->\x7e21 -} - -XCOMM cs2 class -cs2 { - side GR - length 1 - wc_encoding \x10000000 - ct_encoding JISX0201.1976-0:GR -} - -XCOMM cs3 class -cs3 { - side none - length 2 - byte1 \xf0,\xfc - byte2 \x40,\x7e;\x80,\xfc - wc_encoding \x20000000 - ct_encoding u90x03.1991-0:GL; u90x03.1991-0:GR - mb_conversion \ - [\xf040,\xf07e]->\x6521,[\xf080,\xf09e]->\x6560,[\xf09f,\xf0fc]->\x6621,\ - [\xf140,\xf17e]->\x6721,[\xf180,\xf19e]->\x6760,[\xf19f,\xf1fc]->\x6821,\ - [\xf240,\xf27e]->\x6921,[\xf280,\xf29e]->\x6960,[\xf29f,\xf2fc]->\x6a21,\ - [\xf340,\xf37e]->\x6b21,[\xf380,\xf39e]->\x6b60,[\xf39f,\xf3fc]->\x6c21,\ - [\xf440,\xf47e]->\x6d21,[\xf480,\xf49e]->\x6d60,[\xf49f,\xf4fc]->\x6e21,\ - [\xf540,\xf57e]->\x6f21,[\xf580,\xf59e]->\x6f60,[\xf59f,\xf5fc]->\x7021,\ - [\xf640,\xf67e]->\x7121,[\xf680,\xf69e]->\x7160,[\xf69f,\xf6fc]->\x7221,\ - [\xf740,\xf77e]->\x7321,[\xf780,\xf79e]->\x7360,[\xf79f,\xf7fc]->\x7421,\ - [\xf840,\xf87e]->\x7521,[\xf880,\xf89e]->\x7560,[\xf89f,\xf8fc]->\x7621,\ - [\xf940,\xf97e]->\x7721,[\xf980,\xf99e]->\x7760,[\xf99f,\xf9fc]->\x7821,\ - [\xfa40,\xfa7e]->\x7921,[\xfa80,\xfa9e]->\x7960,[\xfa9f,\xfafc]->\x7a21,\ - [\xfb40,\xfb7e]->\x7b21,[\xfb80,\xfb9e]->\x7b60,[\xfb9f,\xfbfc]->\x7c21,\ - [\xfc40,\xfc7e]->\x7d21,[\xfc80,\xfc9e]->\x7d60,[\xfc9f,\xfcfc]->\x7e21 -} - -END XLC_XLOCALE - -#endif /* __uxp__ */ diff --git a/lib/libX11/nls/pt_BR.UTF-8/Compose.pre b/lib/libX11/nls/pt_BR.UTF-8/Compose.pre index 29846c63..4355722f 100644 --- a/lib/libX11/nls/pt_BR.UTF-8/Compose.pre +++ b/lib/libX11/nls/pt_BR.UTF-8/Compose.pre @@ -8,10 +8,6 @@ XCOMM by Benno Schulenberg XCOMM Use the sequences from en_US.UTF-8 as the basis: include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" -XCOMM This one should probably be deleted, because in -XCOMM en_US.UTF8 this is lowercase schwa, not uppercase: - : "Ə" U018f - XCOMM Two nice additions -- maybe add to en_US.UTF8? : "〝" U301d # REVERSED DOUBLE PRIME QUOTATION MARK : "〞" U301e # DOUBLE PRIME QUOTATION MARK diff --git a/lib/libX11/specs/Makefile.am b/lib/libX11/specs/Makefile.am index 6d49014a..c1099130 100644 --- a/lib/libX11/specs/Makefile.am +++ b/lib/libX11/specs/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, Oracle and/or its affiliates. # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/specs/Makefile.in b/lib/libX11/specs/Makefile.in index 2c61e9ab..5466c16e 100644 --- a/lib/libX11/specs/Makefile.in +++ b/lib/libX11/specs/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, Oracle and/or its affiliates. # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -250,6 +250,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/specs/XIM/Makefile.in b/lib/libX11/specs/XIM/Makefile.in index 33f53e5e..80de2ab5 100644 --- a/lib/libX11/specs/XIM/Makefile.in +++ b/lib/libX11/specs/XIM/Makefile.in @@ -243,6 +243,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/specs/XKB/Makefile.in b/lib/libX11/specs/XKB/Makefile.in index dc18eeec..fa10910d 100644 --- a/lib/libX11/specs/XKB/Makefile.in +++ b/lib/libX11/specs/XKB/Makefile.in @@ -250,6 +250,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/specs/XKB/ch08.xml b/lib/libX11/specs/XKB/ch08.xml index aa308c0b..0e532e8a 100644 --- a/lib/libX11/specs/XKB/ch08.xml +++ b/lib/libX11/specs/XKB/ch08.xml @@ -1346,15 +1346,11 @@ field of the indicators structure. The only way to change the field is to change the keyboard map. -There are two ways to make changes to indicator maps and state: either change a +To make changes to indicator maps and state, change a local copy of the indicator maps and use XkbSetIndicatorMap or -XkbSetNamedDeviceIndicator, -or, to reduce network traffic, use an -XkbIndicatorChangesRec -structure and use -XkbChangeIndicators. +XkbSetNamedDeviceIndicator. @@ -1852,135 +1848,7 @@ and returns the value which was returned by - -The XkbIndicatorChangesRec Structure - -XkbIndicatorChangesRec - - -The -XkbIndicatorChangesRec -identifies small modifications to the indicator map. Use it with the function -XkbChangeIndicators -to reduce the amount of traffic sent to the server. - - - -typedef struct _XkbIndicatorChanges { - unsigned int state_changes; - unsigned int map_changes; -} XkbIndicatorChangesRec,*XkbIndicatorChangesPtr; - - - -The -state_changes -field is a mask that specifies the indicators that have changed state, and -map_changes -is a mask that specifies the indicators whose maps have changed. - - - - -To change indicator maps or state without passing the entire keyboard -description, use -XkbChangeIndicators. - - -XkbChangeIndicators - - - Bool XkbChangeIndicators - - - Display *dpy - XkbDescPtr xkb - XkbIndicatorChangesPtr changes - unsigned int state - - - - - - dpy - - - - connection to the X server - - - - - - xkb - - - - keyboard description from which names are to be taken. - - - - - - changes - - - - indicators to be updated on the server - - - - - - state - - - - new state of indicators listed in changes->state_changes - - - - - - -XkbChangeIndicators -copies any maps specified by -changes -from the keyboard description, -xkb, -to the server specified by -dpy. -If any bits are set in the -state_changes -field of -changes, -XkbChangeIndicators -also sets the state of those indicators to the values specified in the -state -mask. A 1 bit in -state -turns the corresponding indicator on, a 0 bit turns it off. - - - - -XkbChangeIndicators -can generate -BadAtom -and -BadImplementation -errors. In addition, it can also generate -XkbIndicatorStateNotify -and -XkbIndicatorMapNotify -events (see section 8.5). - - - - Tracking Changes to Indicator State or Map @@ -2091,189 +1959,6 @@ have changed or not, for both and XkbIndicatorMapNotify events. - -When your client application receives either a -XkbIndicatorStateNotify -event or -XkbIndicatorMapNotify -event, you can note the changes in a changes structure by calling -XkbNoteIndicatorChanges. - - -XkbNoteIndicatorChanges - - - void XkbNoteIndicatorChanges - - - XkbIndicatorChangesPtr old - XkbIndicatorNotifyEvent *new - unsigned int wanted - - - - - - old - - - - XkbIndicatorChanges structure to be updated - - - - - - new - - - - event from which changes are to be copied - - - - - - wanted - - - - which changes are to be noted - - - - - - -The -wanted -parameter is the bitwise inclusive OR of -XkbIndicatorMapMask -and -XkbIndicatorStateMask. -XkbNoteIndicatorChanges -copies any changes reported in -new -and specified in -wanted -into the changes record specified by -old. - - - - -To update a local copy of the keyboard description with the actual values, pass -the results of one or more calls to -XkbNoteIndicatorChanges -to -XkbGetIndicatorChanges: - - - -XkbGetIndicatorChanges - - - Status XkbGetIndicatorChanges - - - Display *dpy - XkbDescPtr xkb - XkbIndicatorChangesPtr changes - unsigned int *state - - - - - - dpy - - - - connection to the X server - - - - - - xkb - - - - keyboard description to hold the new values - - - - - - changes - - - - indicator maps/state to be obtained from the server - - - - - - state - - - - backfilled with the state of the indicators - - - - - - -XkbGetIndicatorChanges -examines the -changes -parameter, pulls over the necessary information from the server, and copies -the results into the -xkb -keyboard description. If any bits are set in the -state_changes -field of -changes, -XkbGetIndicatorChanges -also places the state of those indicators in -state. -If the -indicators -field of -xkb -is -NULL, -XkbGetIndicatorChanges -allocates and initializes it. To free the -indicators -field, use -XkbFreeIndicatorMaps -(see section 8.6). - - - - -XkbGetIndicatorChanges -can generate -BadAlloc, -BadImplementation, -and -BadMatch -errors. - - - Allocating and Freeing Indicator Maps diff --git a/lib/libX11/specs/XKB/ch10.xml b/lib/libX11/specs/XKB/ch10.xml index 72727f22..01f5adce 100644 --- a/lib/libX11/specs/XKB/ch10.xml +++ b/lib/libX11/specs/XKB/ch10.xml @@ -1617,275 +1617,22 @@ event. For more information on events, refer to section 10.11. - -Use -XkbGetAccessXTimeout -to query the current +There are no convenience functions in Xkb for manipulating this control. The AccessXTimeout -options for a keyboard device. - - -XkbGetAccessXTimeout - - - Bool XkbGetAccessXTimeout - - - Display *display - unsigned int device_spec - unsigned short *timeout_rtrn - unsigned int *ctrls_mask_rtrn - unsigned int *ctrls_values_rtrn - unsigned short *opts_mask_rtrn - unsigned short *opts_values_rtrn - - - - - - display - - - - connection to X server - - - - - - device_spec - - - - device to query, or XkbUseCoreKbd - - - - - - timeout_rtrn - - - - delay until AccessXTimeout, seconds - - - - - - ctrls_mask_rtrn - - - - backfilled with controls to modify - - - - - - ctrls_values_rtrn - - - - backfilled with on/off status for controls - - - - - - opts_mask_rtrn - - - - backfilled with ax_options to modify - - - - - - opts_values_rtrn - - - - backfilled with values for ax_options - - - - - - -XkbGetAccessXTimeout -sends a request to the X server to obtain the current values for the -AccessXTimeout -attributes, waits for a reply, and backfills the values into the appropriate -arguments. -The parameters -opts_mask_rtrn +control settings are carried in the +ax_timeout, +axt_opts_mask, +axt_opts_values, +axt_ctrls_mask, and -opts_values_rtrn -are backfilled with the options to modify and the values for -ax_options, -which is a field in the +axt_ctrls_values +fields of an XkbControlsRec -structure (see section 10.8). -XkbGetAccessXTimeout -returns -True -if successful; if a compatible version of the Xkb extension is not available -in the server, -XkbGetAccessXTimeout -returns -False. +structure, discussed in section 10.8. - -To configure the -AccessXTimeout -options for a keyboard device, use -XkbSetAccessXTimeout. - - - -XkbSetAccessXTimeout - - - Bool XkbSetAccessXTimeout - - - Display *display - unsigned int device_spec - unsigned short timeout - unsigned int ctrls_mask - unsigned int ctrls_values - unsigned short opts_mask - unsigned short opts_values - - - - - - display - - - - connection to X server - - - - - - device_spec - - - - device to configure, or XkbUseCoreKbd - - - - - - timeout - - - - seconds idle until AccessXTimeout occurs - - - - - - ctrls_mask - - - - boolean controls to modify - - - - - - ctrls_values - - - - new bits for controls selected by ctrls_mask - - - - - - opts_mask - - - - ax_options to change - - - - - - opts_values - - - - new bits for ax_options selected by opts_mask - - - - - - -timeout -specifies the number of seconds the keyboard must be idle before the controls -are modified. -ctrls_mask -specifies what controls are to be enabled or disabled, and -ctrls_values -specifies whether those controls are to be enabled or disabled. The bit values -correspond to those for enabling and disabling boolean controls -(see section 10.1.1). The -opts_mask -field specifies which attributes of the -AccessXKeys -and -AccessXFeedback -controls are to be changed, and -opts_values -specifies the new values for those options. The bit values correspond to those -for the -ax_options -field of an -XkbDescRec -(see section 10.8). - - - - -XkbSetAccessXTimeout -sends a request to configure the -AccessXTimeout -control to the server. -It does not wait for a reply, and normally returns -True. -If a compatible version of the Xkb extension is not available in the server, -XkbSetAccessXTimeout -returns -False. - - @@ -2285,159 +2032,15 @@ event (see section 10.6.4). -To get the +There are no convenience functions in Xkb for manipulating this control. The SlowKeys -acceptance delay for a keyboard device, use -XkbGetSlowKeysDelay. +control settings are carried in the +slow_keys_delay +field of an +XkbControlsRec +structure, discussed in section 10.8. -XkbGetSlowKeysDelay - - - Bool XkbGetSlowKeysDelay - - - Display *display - unsigned int device_spec - unsigned int *delay_rtrn - - - - - - display - - - - connection to X server - - - - - - device_spec - - - - device ID, or XkbUseCoreKbd - - - - - - delay_rtrn - - - - backfilled with SlowKeys delay, ms - - - - - - -XkbGetSlowKeysDelay -requests the attributes of the -SlowKeys -control from the server, waits for a reply and backfills -delay_rtrn -with the -SlowKeys -delay attribute. -XkbGetSlowKeysDelay -returns -True -if successful; if a compatible version of the Xkb extension is not available -in the server, -XkbGetSlowKeysDelay -returns -False. - - - - -To set the -SlowKeys -acceptance delay for a keyboard device, use -XkbSetSlowKeysDelay. - - - -XkbSetSlowKeysDelay - - - Bool XkbSetSlowKeysDelay - - - Display *display - unsigned int device_spec - unsigned int delay - - - - - - display - - - - connection to X server - - - - - - device_spec - - - - device to configure, or XkbUseCoreKbd - - - - - - delay - - - - SlowKeys delay, ms - - - - - - -XkbSetSlowKeysDelay -sends a request to configure the -SlowKeys -control to the server. -It does not wait for a reply, and normally returns -True. -Specifying a value of -0 -for the -delay -parameter causes -XkbSetSlowKeysDelay -to generate a -BadValue -protocol error. If a compatible version of the Xkb extension is not available -in the server -XkbSetSlowKeysDelay -returns -False. - - - The BounceKeys Control @@ -2466,157 +2069,13 @@ event (see section 10.6.4). -Use -XkbGetBounceKeysDelay -to query the current +There are no convenience functions in Xkb for manipulating this control. The BounceKeys -delay for a keyboard device. - - -XkbGetBounceKeysDelay - - - Bool XkbGetBounceKeysDelay - - - Display *display - unsigned int device_spec - unsigned int *delay_rtrn - - - - - - display - - - - connection to X server - - - - - - device_spec - - - - device ID, or XkbUseCoreKbd - - - - - - delay_rtrn - - - - backfilled with bounce keys delay, ms - - - - - - -XkbGetBounceKeysDelay -requests the attributes of the -BounceKeys -control from the server, waits for a reply, and backfills -delay_rtrn -with the -BounceKeys -delay attribute. -XkbGetBounceKeysDelay -returns -True -if successful; if a compatible version of the Xkb extension is not available -in the server -XkbGetSlowKeysDelay -returns -False. - - - - -To set the -BounceKeys -delay for a keyboard device, use -XkbSetBounceKeysDelay. - - - -XkbSetBounceKeysDelay - - - Bool XkbSetBounceKeysDelay - - - Display *display - unsigned int device_spec - unsigned int delay - - - - - - display - - - - connection to X server - - - - - - device_spec - - - - device to configure, or XkbUseCoreKbd - - - - - - delay - - - - bounce keys delay, ms - - - - - - -XkbSetBounceKeysDelay -sends a request to configure the -BounceKeys -control to the server. -It does not wait for a reply and normally returns -True. -Specifying a value of -zero -for the -delay -parameter causes -XkbSetBounceKeysDelay -to generate a -BadValue -protocol error. If a compatible version of the Xkb extension is not available -in the server, -XkbSetBounceKeysDelay -returns -False. +control settings are carried in the +debounce_delay +field of an +XkbControlsRec +structure, discussed in section 10.8. @@ -2756,183 +2215,14 @@ specifies whether or not locks a modifier when pressed twice in a row. - -Use -XkbGetStickyKeysOptions -to query the current +There are no convenience functions in Xkb for manipulating this control. The StickyKeys -attributes for a keyboard device. - - -XkbGetStickyKeysOptions - - - Bool XkbGetStickyKeysOptions - - - Display *display - unsigned int device_spec - unsigned int *options_rtrn - - - - - - display - - - - connection to X server - - - - - - device_spec - - - - device ID, or XkbUseCoreKbd - - - - - - options_rtrn - - - - backfilled with StickyKeys option mask - - - - - - -XkbGetStickyKeysOptions -requests the attributes of the -StickyKeys -control from the server, waits for a reply, and backfills -options_rtrn -with a mask indicating whether the individual -StickyKeys -options are on or off. Valid bits in -options_rtrn -are: - - - XkbAX_TwoKeysMask - XkbAX_LatchToLockMask - - - - -XkbGetStickyKeysOptions -returns -True -if successful; if a compatible version of the Xkb extension is not available -in the server -XkbGetStickyKeysOptions -returns -False. - - - - -To set the -StickyKeys -attributes for a keyboard device, use -XkbSetStickyKeysOptions. - - - -XkbSetStickyKeysOptions - - - Bool XkbSetStickyKeysOptions - - - Display *display - unsigned int device_spec - unsigned int mask - unsigned int values - - - - - - display - - - - connection to X server - - - - - - device_spec - - - - device to configure, or XkbUseCoreKbd - - - - - - mask - - - - selects StickyKeys attributes to modify - - - - - - values - - - - values for selected attributes - - - - - - -XkbSetStickyKeysOptions -sends a request to configure the -StickyKeys -control to the server. -It does not wait for a reply and normally returns -True. -The valid bits to use for both the -mask -and -values -parameters are: - - - XkbAX_TwoKeysMask - XkbAX_LatchToLockMask - - - - -If a compatible version of the Xkb extension is not available in the server, -XkbSetStickyKeysOptions -returns -False. +control settings are carried in the +ax_options +field of an +XkbControlsRec +structure, discussed in section 10.8. diff --git a/lib/libX11/specs/XKB/ch15.xml b/lib/libX11/specs/XKB/ch15.xml index a6f3f7c6..12b6404a 100644 --- a/lib/libX11/specs/XKB/ch15.xml +++ b/lib/libX11/specs/XKB/ch15.xml @@ -1304,10 +1304,10 @@ currently four); if a key has fewer than XkbNumKbdGroups groups, the extra key types are reported but ignored. -XkbKeyTypeIndex - +XkbKeyKeyTypeIndex + - int XkbKeyTypeIndex + int XkbKeyKeyTypeIndex @@ -1351,7 +1351,7 @@ groups, the extra key types are reported but ignored. -XkbKeyTypeIndex +XkbKeyKeyTypeIndex computes an index into the types vector of the client map in @@ -1364,10 +1364,10 @@ index. -XkbKeyType - +XkbKeyKeyType + - XkbKeyTypePtr XkbKeyType + XkbKeyTypePtr XkbKeyKeyType @@ -1411,7 +1411,7 @@ index. -XkbKeyType +XkbKeyKeyType returns a pointer to the key type in the types vector of the client map in @@ -1726,8 +1726,6 @@ entry for a key is used to access the beginning of the array. Xkb provides the following macros for accessing the width -and -offset for individual keys, as well as macros for accessing the two-dimensional array of symbols bound to the key: @@ -1829,49 +1827,6 @@ for the key corresponding to -XkbKeySymsOffset - - - int XkbKeySymsOffset - - - XkbDescPtr xkb - KeyCode keycode - - - - - - xkb - - - - Xkb description of interest - - - - - - keycode - - - - keycode of interest - - - - - - -XkbKeySymsOffset -returns the offset of the two-dimensional array of keysyms for the key -corresponding to -keycode. - - - XkbKeyNumSyms diff --git a/lib/libX11/specs/XKB/ch16.xml b/lib/libX11/specs/XKB/ch16.xml index 3f5e42f0..6b2a0381 100644 --- a/lib/libX11/specs/XKB/ch16.xml +++ b/lib/libX11/specs/XKB/ch16.xml @@ -2852,10 +2852,10 @@ converted to an unsigned int. -XkbSAActionSetCtrls - +XkbActionSetCtrls + - void XkbSAActionSetCtrls + void XkbActionSetCtrls @@ -2888,7 +2888,7 @@ converted to an unsigned int. -XkbSAActionSetCtrls +XkbActionSetCtrls sets the ctrls0 through diff --git a/lib/libX11/specs/XKB/ch18.xml b/lib/libX11/specs/XKB/ch18.xml index 0f283ecf..0b47dba9 100644 --- a/lib/libX11/specs/XKB/ch18.xml +++ b/lib/libX11/specs/XKB/ch18.xml @@ -993,85 +993,6 @@ into the changes record specified by - -To update the local copy of the keyboard description with the actual values, -pass to -XkbGetNameChanges -the results of one or more calls to -XkbNoteNameChanges. - - - -XkbGetNameChanges - - - Status XkbGetNameChanges - - - Display *dpy - XkbDescPtr xkb - XkbNameChangesPtr changes - - - - - - dpy - - - - connection to the X server - - - - - - xkb - - - - keyboard description to which names are copied - - - - - - changes - - - - names components to be obtained from the server - - - - - - -XkbGetNameChanges -examines the -changes -parameter, retrieves the necessary information from the server, and places the -results into the -xkb -keyboard description. - - - - -XkbGetNameChanges -can generate -BadAlloc, -BadImplementation, -and -BadMatch -errors. - - - Allocating and Freeing Symbolic Names diff --git a/lib/libX11/specs/XKB/ch21.xml b/lib/libX11/specs/XKB/ch21.xml index 7d122d92..35e594ea 100644 --- a/lib/libX11/specs/XKB/ch21.xml +++ b/lib/libX11/specs/XKB/ch21.xml @@ -1028,64 +1028,6 @@ explicitly. - -To obtain an -XkbDeviceLedInfoRec -structure, use XkbAllocDeviceLedInfo. - - - -XkbAllocDeviceLedInfo - - - Status XkbAllocDeviceLedInfo - - - XkbDeviceInfoPtr device_info - int num_needed - - - - - - device_info - - - - structure in which to allocate LED space - - - - - - num_needed - - - - number of indicators to allocate space for - - - - - - -XkbAllocDeviceLedInfo -allocates space for an -XkbDeviceLedInfoRec -and places it in -device_info. -If num_needed is nonzero, -num_needed -XkbIndicatorMapRec -structures are also allocated and linked into the -XkbDeviceLedInfoRec -structure. If you request -XkbIndicatorMapRec -structures be allocated using this request, you must initialize them -explicitly. All other fields are initialized to zero. - - - To initialize an XkbDeviceLedInfoRec diff --git a/lib/libX11/specs/i18n/Makefile.am b/lib/libX11/specs/i18n/Makefile.am index a69a51e9..05ae1f8e 100644 --- a/lib/libX11/specs/i18n/Makefile.am +++ b/lib/libX11/specs/i18n/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, Oracle and/or its affiliates. # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/specs/i18n/Makefile.in b/lib/libX11/specs/i18n/Makefile.in index 903061cd..c07196f7 100644 --- a/lib/libX11/specs/i18n/Makefile.in +++ b/lib/libX11/specs/i18n/Makefile.in @@ -15,7 +15,7 @@ @SET_MAKE@ # -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, Oracle and/or its affiliates. # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), @@ -250,6 +250,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/specs/i18n/compose/Makefile.in b/lib/libX11/specs/i18n/compose/Makefile.in index 6e799c61..c1313724 100644 --- a/lib/libX11/specs/i18n/compose/Makefile.in +++ b/lib/libX11/specs/i18n/compose/Makefile.in @@ -244,6 +244,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/specs/i18n/compose/compose-chart.pl b/lib/libX11/specs/i18n/compose/compose-chart.pl index a96dfee5..197d3f15 100644 --- a/lib/libX11/specs/i18n/compose/compose-chart.pl +++ b/lib/libX11/specs/i18n/compose/compose-chart.pl @@ -1,6 +1,6 @@ #! /usr/bin/perl # -# Copyright 2009, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2009, 2010, Oracle and/or its affiliates. # # Permission is hereby granted, free of charge, to any person obtaining a # copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/specs/i18n/framework/Makefile.in b/lib/libX11/specs/i18n/framework/Makefile.in index cba425d9..e66a0537 100644 --- a/lib/libX11/specs/i18n/framework/Makefile.in +++ b/lib/libX11/specs/i18n/framework/Makefile.in @@ -241,6 +241,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/specs/i18n/localedb/Makefile.in b/lib/libX11/specs/i18n/localedb/Makefile.in index cdce43e1..b426f027 100644 --- a/lib/libX11/specs/i18n/localedb/Makefile.in +++ b/lib/libX11/specs/i18n/localedb/Makefile.in @@ -241,6 +241,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/specs/i18n/trans/Makefile.in b/lib/libX11/specs/i18n/trans/Makefile.in index c07a9809..6586bd5f 100644 --- a/lib/libX11/specs/i18n/trans/Makefile.in +++ b/lib/libX11/specs/i18n/trans/Makefile.in @@ -241,6 +241,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/specs/libX11/CH13.xml b/lib/libX11/specs/libX11/CH13.xml index 5ca59790..6be4f1c2 100644 --- a/lib/libX11/specs/libX11/CH13.xml +++ b/lib/libX11/specs/libX11/CH13.xml @@ -8045,7 +8045,11 @@ set to XIMPreeditPosition. When specified to any input method other than XIMPreeditPosition, -this XIC value is ignored. +this XIC value is ignored. Some Xlib implementations +will allow this to be set when +XNInputStyle is set to +XIMPreeditCallbacks. Behavior in that case is +implementation defined. diff --git a/lib/libX11/specs/libX11/Makefile.in b/lib/libX11/specs/libX11/Makefile.in index 6f3039b6..8b1d6897 100644 --- a/lib/libX11/specs/libX11/Makefile.in +++ b/lib/libX11/specs/libX11/Makefile.in @@ -244,6 +244,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/src/ChProp.c b/lib/libX11/src/ChProp.c index 190a224f..1089a4c9 100644 --- a/lib/libX11/src/ChProp.c +++ b/lib/libX11/src/ChProp.c @@ -45,16 +45,16 @@ XChangeProperty ( LockDisplay(dpy); GetReq (ChangeProperty, req); - req->window = w; - req->property = property; - req->type = type; - req->mode = mode; + req->window = (CARD32) w; + req->property = (CARD32) property; + req->type = (CARD32) type; + req->mode = (CARD8) mode; if (nelements < 0) { req->nUnits = 0; req->format = 0; /* ask for garbage, get garbage */ } else { - req->nUnits = nelements; - req->format = format; + req->nUnits = (CARD32) nelements; + req->format = (CARD8) format; } switch (req->format) { diff --git a/lib/libX11/src/ChkIfEv.c b/lib/libX11/src/ChkIfEv.c index 876a850e..66636696 100644 --- a/lib/libX11/src/ChkIfEv.c +++ b/lib/libX11/src/ChkIfEv.c @@ -49,7 +49,11 @@ Bool XCheckIfEvent ( unsigned long qe_serial = 0; int n; /* time through count */ - LockDisplay(dpy); + LockDisplay(dpy); +#ifdef XTHREADS + dpy->ifevent_thread = xthread_self(); +#endif + dpy->in_ifevent++; prev = NULL; for (n = 3; --n >= 0;) { for (qelt = prev ? prev->next : dpy->head; @@ -60,6 +64,7 @@ Bool XCheckIfEvent ( *event = qelt->event; _XDeq(dpy, prev, qelt); _XStoreEventCookie(dpy, event); + dpy->in_ifevent--; UnlockDisplay(dpy); return True; } @@ -78,6 +83,7 @@ Bool XCheckIfEvent ( /* another thread has snatched this event */ prev = NULL; } + dpy->in_ifevent--; UnlockDisplay(dpy); return False; } diff --git a/lib/libX11/src/CrGlCur.c b/lib/libX11/src/CrGlCur.c index 460660f8..88133b7f 100644 --- a/lib/libX11/src/CrGlCur.c +++ b/lib/libX11/src/CrGlCur.c @@ -31,28 +31,16 @@ in this Software without prior written authorization from The Open Group. #ifdef USE_DYNAMIC_XCURSOR -#ifdef __UNIXOS2__ -#define RTLD_LAZY 1 -#define LIBXCURSOR "Xcursor.dll" -#endif #include #include -#if defined(hpux) -#include -#else #include -#endif #include "Cr.h" #ifdef __CYGWIN__ #define LIBXCURSOR "cygXcursor-1.dll" #endif -#if defined(hpux) -typedef shl_t XModuleType; -#else typedef void *XModuleType; -#endif #ifndef LIBXCURSOR #define LIBXCURSOR "libXcursor.so.1" @@ -68,11 +56,7 @@ open_library (void) XModuleType module; for (;;) { -#if defined(hpux) - module = shl_load(library, BIND_DEFERRED, 0L); -#else module = dlopen(library, RTLD_LAZY); -#endif if (module) return module; dot = strrchr (library, '.'); @@ -88,28 +72,9 @@ fetch_symbol (XModuleType module, const char *under_symbol) { void *result = NULL; const char *symbol = under_symbol + 1; -#if defined(hpux) - int getsyms_cnt, i; - struct shl_symbol *symbols; - - getsyms_cnt = shl_getsymbols(module, TYPE_PROCEDURE, - EXPORT_SYMBOLS, malloc, &symbols); - - for(i=0; i 0) { - free(symbols); - } -#else result = dlsym (module, symbol); if (!result) result = dlsym (module, under_symbol); -#endif return result; } diff --git a/lib/libX11/src/DrArcs.c b/lib/libX11/src/DrArcs.c index 14405aa3..bd010050 100644 --- a/lib/libX11/src/DrArcs.c +++ b/lib/libX11/src/DrArcs.c @@ -45,8 +45,8 @@ XDrawArcs( LockDisplay(dpy); FlushGC(dpy, gc); GetReq(PolyArc,req); - req->drawable = d; - req->gc = gc->gid; + req->drawable = (CARD32) d; + req->gc = (CARD32) gc->gid; len = ((long)n_arcs) * arc_scale; SetReqLen(req, len, 1); len <<= 2; /* watch out for macros... */ diff --git a/lib/libX11/src/DrLines.c b/lib/libX11/src/DrLines.c index 68071b6b..460aabaa 100644 --- a/lib/libX11/src/DrLines.c +++ b/lib/libX11/src/DrLines.c @@ -43,9 +43,9 @@ XDrawLines ( LockDisplay(dpy); FlushGC(dpy, gc); GetReq (PolyLine, req); - req->drawable = d; - req->gc = gc->gid; - req->coordMode = mode; + req->drawable = (CARD32) d; + req->gc = (CARD32) gc->gid; + req->coordMode = (BYTE) mode; SetReqLen(req, npoints, 65535 - req->length); /* each point is 2 16-bit integers */ length = npoints << 2; /* watch out for macros... */ diff --git a/lib/libX11/src/DrPoints.c b/lib/libX11/src/DrPoints.c index 287fa057..e7f946b0 100644 --- a/lib/libX11/src/DrPoints.c +++ b/lib/libX11/src/DrPoints.c @@ -49,12 +49,12 @@ XDrawPoints( FlushGC(dpy, gc); while (n_points) { GetReq(PolyPoint, req); - req->drawable = d; - req->gc = gc->gid; - req->coordMode = mode; + req->drawable = (CARD32) d; + req->gc = (CARD32) gc->gid; + req->coordMode = (BYTE) mode; n = n_points; if (!dpy->bigreq_size && n > (dpy->max_request_size - req->length)) - n = dpy->max_request_size - req->length; + n = (int) (dpy->max_request_size - req->length); SetReqLen(req, n, n); nbytes = ((long)n) << 2; /* watch out for macros... */ if (xoff || yoff) { diff --git a/lib/libX11/src/DrRects.c b/lib/libX11/src/DrRects.c index 7827bf18..13757562 100644 --- a/lib/libX11/src/DrRects.c +++ b/lib/libX11/src/DrRects.c @@ -45,12 +45,12 @@ XDrawRectangles( FlushGC(dpy, gc); while (n_rects) { GetReq(PolyRectangle, req); - req->drawable = d; - req->gc = gc->gid; + req->drawable = (CARD32) d; + req->gc = (CARD32) gc->gid; n = n_rects; len = ((long)n) << 1; if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length)) { - n = (dpy->max_request_size - req->length) >> 1; + n = (int) ((dpy->max_request_size - req->length) >> 1); len = ((long)n) << 1; } SetReqLen(req, len, len); diff --git a/lib/libX11/src/DrSegs.c b/lib/libX11/src/DrSegs.c index 93eab4d0..59bf463d 100644 --- a/lib/libX11/src/DrSegs.c +++ b/lib/libX11/src/DrSegs.c @@ -45,12 +45,12 @@ XDrawSegments ( FlushGC(dpy, gc); while (nsegments) { GetReq (PolySegment, req); - req->drawable = d; - req->gc = gc->gid; + req->drawable = (CARD32) d; + req->gc = (CARD32) gc->gid; n = nsegments; len = ((long)n) << 1; if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length)) { - n = (dpy->max_request_size - req->length) >> 1; + n = (int) ((dpy->max_request_size - req->length) >> 1); len = ((long)n) << 1; } SetReqLen(req, len, len); diff --git a/lib/libX11/src/FillArcs.c b/lib/libX11/src/FillArcs.c index 62cfabf8..3d0b62f0 100644 --- a/lib/libX11/src/FillArcs.c +++ b/lib/libX11/src/FillArcs.c @@ -47,12 +47,12 @@ XFillArcs( FlushGC(dpy, gc); while (n_arcs) { GetReq(PolyFillArc, req); - req->drawable = d; - req->gc = gc->gid; + req->drawable = (CARD32) d; + req->gc = (CARD32) gc->gid; n = n_arcs; len = ((long)n) * arc_scale; if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length)) { - n = (dpy->max_request_size - req->length) / arc_scale; + n = (int) ((dpy->max_request_size - req->length) / arc_scale); len = ((long)n) * arc_scale; } SetReqLen(req, len, len); diff --git a/lib/libX11/src/FillPoly.c b/lib/libX11/src/FillPoly.c index ea162a41..8c3bfabf 100644 --- a/lib/libX11/src/FillPoly.c +++ b/lib/libX11/src/FillPoly.c @@ -46,10 +46,10 @@ XFillPolygon( FlushGC(dpy, gc); GetReq(FillPoly, req); - req->drawable = d; - req->gc = gc->gid; - req->shape = shape; - req->coordMode = mode; + req->drawable = (CARD32) d; + req->gc = (CARD32) gc->gid; + req->shape = (BYTE) shape; + req->coordMode = (BYTE) mode; SetReqLen(req, n_points, 65535 - req->length); diff --git a/lib/libX11/src/FillRcts.c b/lib/libX11/src/FillRcts.c index ad334244..a14afcf1 100644 --- a/lib/libX11/src/FillRcts.c +++ b/lib/libX11/src/FillRcts.c @@ -45,12 +45,12 @@ XFillRectangles( FlushGC(dpy, gc); while (n_rects) { GetReq(PolyFillRectangle, req); - req->drawable = d; - req->gc = gc->gid; + req->drawable = (CARD32) d; + req->gc = (CARD32) gc->gid; n = n_rects; len = ((long)n) << 1; if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length)) { - n = (dpy->max_request_size - req->length) >> 1; + n = (int) ((dpy->max_request_size - req->length) >> 1); len = ((long)n) << 1; } SetReqLen(req, len, len); diff --git a/lib/libX11/src/GetDflt.c b/lib/libX11/src/GetDflt.c index c9222a2a..f50238fe 100644 --- a/lib/libX11/src/GetDflt.c +++ b/lib/libX11/src/GetDflt.c @@ -184,10 +184,6 @@ XGetDefault( #ifdef WIN32 char *progname2; #endif -#ifdef __UNIXOS2__ - char *progname2; - char *dotpos; -#endif /* * strip path off of program name (XXX - this is OS specific) @@ -198,13 +194,6 @@ XGetDefault( if (progname2 && (!progname || progname < progname2)) progname = progname2; #endif -#ifdef __UNIXOS2__ /* Very similar to WIN32 */ - progname2 = strrchr (prog, '\\'); - if (progname2 && (!progname || progname < progname2)) - progname = progname2; - dotpos = strrchr (prog, '.'); - if (dotpos && (dotpos>progname2)) *dotpos='\0'; -#endif /* We take out the .exe suffix */ if (progname) progname++; diff --git a/lib/libX11/src/Host.c b/lib/libX11/src/Host.c index e2b7d57d..49fab393 100644 --- a/lib/libX11/src/Host.c +++ b/lib/libX11/src/Host.c @@ -34,7 +34,7 @@ X Window System is a trademark of The Open Group. */ /* - * Copyright 2004 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/src/IfEvent.c b/lib/libX11/src/IfEvent.c index ead93dca..35c592e3 100644 --- a/lib/libX11/src/IfEvent.c +++ b/lib/libX11/src/IfEvent.c @@ -48,7 +48,11 @@ XIfEvent ( register _XQEvent *qelt, *prev; unsigned long qe_serial = 0; - LockDisplay(dpy); + LockDisplay(dpy); +#ifdef XTHREADS + dpy->ifevent_thread = xthread_self(); +#endif + dpy->in_ifevent++; prev = NULL; while (1) { for (qelt = prev ? prev->next : dpy->head; @@ -59,6 +63,7 @@ XIfEvent ( *event = qelt->event; _XDeq(dpy, prev, qelt); _XStoreEventCookie(dpy, event); + dpy->in_ifevent--; UnlockDisplay(dpy); return 0; } diff --git a/lib/libX11/src/ImUtil.c b/lib/libX11/src/ImUtil.c index fbfad33e..bedcd095 100644 --- a/lib/libX11/src/ImUtil.c +++ b/lib/libX11/src/ImUtil.c @@ -239,10 +239,6 @@ static void _putbits( * */ -#if defined(Lynx) && defined(ROUNDUP) -#undef ROUNDUP -#endif - #define ROUNDUP(nbytes, pad) ((((nbytes) + ((pad)-1)) / (pad)) * ((pad)>>3)) #define XYNORMALIZE(bp, img) \ diff --git a/lib/libX11/src/LiHosts.c b/lib/libX11/src/LiHosts.c index 315e4dbb..5ba60be8 100644 --- a/lib/libX11/src/LiHosts.c +++ b/lib/libX11/src/LiHosts.c @@ -34,7 +34,7 @@ X Window System is a trademark of The Open Group. */ /* - * Copyright 2004 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/src/Makefile.am b/lib/libX11/src/Makefile.am index 634b75f9..fcfa29de 100644 --- a/lib/libX11/src/Makefile.am +++ b/lib/libX11/src/Makefile.am @@ -333,17 +333,12 @@ if OS2 libX11_la_SOURCES+=os2Stubs.c endif OS2 -if THRSTUBS -libX11_la_SOURCES+=UIThrStubs.c -endif - x11datadir = @X11_DATADIR@ x11data_DATA = XErrorDB EXTRA_DIST = \ $(x11data_DATA) \ - os2Stubs.c \ - UIThrStubs.c + os2Stubs.c libX11_xcb_la_SOURCES = x11_xcb.c Xxcbint.h libX11_xcb_la_LDFLAGS = -version-number 1:0:0 -no-undefined @@ -371,6 +366,7 @@ libX11_la_LIBADD = \ $(USE_I18N_LIBS) \ $(USE_XCMS_LIBS) \ $(USE_XKB_LIBS) \ + $(USE_THREAD_LIBS) \ $(X11_LIBS) preprocess: $(patsubst %.c,%.ii,$(libX11_la_SOURCES)) diff --git a/lib/libX11/src/Makefile.in b/lib/libX11/src/Makefile.in index c40629e2..6a33f364 100644 --- a/lib/libX11/src/Makefile.in +++ b/lib/libX11/src/Makefile.in @@ -56,8 +56,7 @@ host_triplet = @host@ # ========================= Extra stuff ============================ # @OS2_TRUE@am__append_1 = os2Stubs.c -@THRSTUBS_TRUE@am__append_2 = UIThrStubs.c -@MAKE_LINT_LIB_TRUE@am__append_3 = $(lintlib_DATA) +@MAKE_LINT_LIB_TRUE@am__append_2 = $(lintlib_DATA) subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/config.h.in $(top_srcdir)/depcomp reallocarray.c @@ -115,7 +114,8 @@ libX11_xcb_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(libX11_xcb_la_LDFLAGS) $(LDFLAGS) -o $@ am__DEPENDENCIES_1 = libX11_la_DEPENDENCIES = $(LTLIBOBJS) $(USE_I18N_LIBS) \ - $(USE_XCMS_LIBS) $(USE_XKB_LIBS) $(am__DEPENDENCIES_1) + $(USE_XCMS_LIBS) $(USE_XKB_LIBS) $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) am__libX11_la_SOURCES_DIST = AllCells.c AllowEv.c AllPlanes.c \ AutoRep.c Backgnd.c BdrWidth.c Bell.c Border.c ChAccCon.c \ ChActPGb.c ChClMode.c ChCmap.c ChGC.c ChKeyCon.c ChkIfEv.c \ @@ -166,9 +166,8 @@ am__libX11_la_SOURCES_DIST = AllCells.c AllowEv.c AllPlanes.c \ Window.c WinEvent.c Withdraw.c WMGeom.c WMProps.c WrBitF.c \ Xatomtype.h xcb_disp.c xcb_io.c Xintatom.h Xintconn.h \ XlibAsync.c XlibInt.c Xprivate.h XomGeneric.h Xresinternal.h \ - Xrm.c Xxcbint.h os2Stubs.c UIThrStubs.c + Xrm.c Xxcbint.h os2Stubs.c @OS2_TRUE@am__objects_1 = os2Stubs.lo -@THRSTUBS_TRUE@am__objects_2 = UIThrStubs.lo am_libX11_la_OBJECTS = AllCells.lo AllowEv.lo AllPlanes.lo AutoRep.lo \ Backgnd.lo BdrWidth.lo Bell.lo Border.lo ChAccCon.lo \ ChActPGb.lo ChClMode.lo ChCmap.lo ChGC.lo ChKeyCon.lo \ @@ -222,7 +221,7 @@ am_libX11_la_OBJECTS = AllCells.lo AllowEv.lo AllPlanes.lo AutoRep.lo \ UnldFont.lo UnmapSubs.lo UnmapWin.lo VisUtil.lo WarpPtr.lo \ Window.lo WinEvent.lo Withdraw.lo WMGeom.lo WMProps.lo \ WrBitF.lo xcb_disp.lo xcb_io.lo XlibAsync.lo XlibInt.lo Xrm.lo \ - $(am__objects_1) $(am__objects_2) + $(am__objects_1) libX11_la_OBJECTS = $(am_libX11_la_OBJECTS) libX11_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ @@ -417,6 +416,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ @@ -500,7 +500,7 @@ top_srcdir = @top_srcdir@ SUBDIRS = util xcms xlibi18n $(XKB_SUBDIRS) lib_LTLIBRARIES = libX11.la libX11-xcb.la BUILT_SOURCES = ks_tables.h -CLEANFILES = ks_tables.h ks_tables_h $(am__append_3) +CLEANFILES = ks_tables.h ks_tables_h $(am__append_2) AM_CPPFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/include/X11 \ @@ -592,13 +592,12 @@ libX11_la_SOURCES = AllCells.c AllowEv.c AllPlanes.c AutoRep.c \ Window.c WinEvent.c Withdraw.c WMGeom.c WMProps.c WrBitF.c \ Xatomtype.h xcb_disp.c xcb_io.c Xintatom.h Xintconn.h \ XlibAsync.c XlibInt.c Xprivate.h XomGeneric.h Xresinternal.h \ - Xrm.c Xxcbint.h $(am__append_1) $(am__append_2) + Xrm.c Xxcbint.h $(am__append_1) x11datadir = @X11_DATADIR@ x11data_DATA = XErrorDB EXTRA_DIST = \ $(x11data_DATA) \ - os2Stubs.c \ - UIThrStubs.c + os2Stubs.c libX11_xcb_la_SOURCES = x11_xcb.c Xxcbint.h libX11_xcb_la_LDFLAGS = -version-number 1:0:0 -no-undefined @@ -615,6 +614,7 @@ libX11_la_LIBADD = \ $(USE_I18N_LIBS) \ $(USE_XCMS_LIBS) \ $(USE_XKB_LIBS) \ + $(USE_THREAD_LIBS) \ $(X11_LIBS) @@ -953,7 +953,6 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextExt16.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TextToStr.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TrCoords.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UIThrStubs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UndefCurs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UngrabBut.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UngrabKbd.Plo@am__quote@ diff --git a/lib/libX11/src/OpenDis.c b/lib/libX11/src/OpenDis.c index 5017b040..89a0ebdf 100644 --- a/lib/libX11/src/OpenDis.c +++ b/lib/libX11/src/OpenDis.c @@ -189,6 +189,7 @@ XOpenDisplay ( dpy->xcmisc_opcode = 0; dpy->xkb_info = NULL; dpy->exit_handler_data = NULL; + dpy->in_ifevent = 0; /* * Setup other information in this display structure. @@ -472,6 +473,10 @@ XOpenDisplay ( } } sp->root_visual = _XVIDtoVisual(dpy, root_visualID); + if (sp->root_visual == NULL) { + OutOfMemory(dpy); + return(NULL); + } } if(usedbytes != setuplength){ diff --git a/lib/libX11/src/PeekIfEv.c b/lib/libX11/src/PeekIfEv.c index 207cd119..754749a7 100644 --- a/lib/libX11/src/PeekIfEv.c +++ b/lib/libX11/src/PeekIfEv.c @@ -50,6 +50,10 @@ XPeekIfEvent ( unsigned long qe_serial = 0; LockDisplay(dpy); +#ifdef XTHREADS + dpy->ifevent_thread = xthread_self(); +#endif + dpy->in_ifevent++; prev = NULL; while (1) { for (qelt = prev ? prev->next : dpy->head; @@ -63,6 +67,7 @@ XPeekIfEvent ( _XStoreEventCookie(dpy, ©); *event = copy; } + dpy->in_ifevent--; UnlockDisplay(dpy); return 0; } diff --git a/lib/libX11/src/PutImage.c b/lib/libX11/src/PutImage.c index ba411e36..40a10a50 100644 --- a/lib/libX11/src/PutImage.c +++ b/lib/libX11/src/PutImage.c @@ -41,10 +41,6 @@ in this Software without prior written authorization from The Open Group. #define RConst const #endif -#if defined(Lynx) && defined(ROUNDUP) -#undef ROUNDUP -#endif - /* assumes pad is a power of 2 */ #define ROUNDUP(nbytes, pad) (((nbytes) + ((pad) - 1)) & ~(long)((pad) - 1)) diff --git a/lib/libX11/src/QuColors.c b/lib/libX11/src/QuColors.c index 10cf1825..099f1a4e 100644 --- a/lib/libX11/src/QuColors.c +++ b/lib/libX11/src/QuColors.c @@ -43,7 +43,7 @@ _XQueryColors( GetReq(QueryColors, req); - req->cmap = cmap; + req->cmap = (CARD32) cmap; SetReqLen(req, ncolors, ncolors); /* each pixel is a CARD32 */ for (i = 0; i < ncolors; i++) @@ -51,11 +51,11 @@ _XQueryColors( /* XXX this isn't very efficient */ if (_XReply(dpy, (xReply *) &rep, 0, xFalse) != 0) { - xrgb *color = Xmallocarray(ncolors, sizeof(xrgb)); + xrgb *color = Xmallocarray((size_t) ncolors, sizeof(xrgb)); if (color != NULL) { - unsigned long nbytes = (long) ncolors * SIZEOF(xrgb); + unsigned long nbytes = (size_t) ncolors * SIZEOF(xrgb); - _XRead(dpy, (char *) color, nbytes); + _XRead(dpy, (char *) color, (long) nbytes); for (i = 0; i < ncolors; i++) { register XColor *def = &defs[i]; @@ -82,9 +82,9 @@ XQueryColors( int n; if (dpy->bigreq_size > 0) - n = dpy->bigreq_size - (sizeof (xQueryColorsReq) >> 2) - 1; + n = (int) (dpy->bigreq_size - (sizeof (xQueryColorsReq) >> 2) - 1); else - n = dpy->max_request_size - (sizeof (xQueryColorsReq) >> 2); + n = (int) (dpy->max_request_size - (sizeof (xQueryColorsReq) >> 2)); LockDisplay(dpy); while (ncolors >= n) { diff --git a/lib/libX11/src/RdBitF.c b/lib/libX11/src/RdBitF.c index 62130408..e5a8592e 100644 --- a/lib/libX11/src/RdBitF.c +++ b/lib/libX11/src/RdBitF.c @@ -129,9 +129,6 @@ XReadBitmapFileData ( int hx = -1; /* x hotspot */ int hy = -1; /* y hotspot */ -#ifdef __UNIXOS2__ - filename = __XOS2RedirRoot(filename); -#endif if (!(fstream = fopen(filename, "r"))) return BitmapOpenFailed; diff --git a/lib/libX11/src/SetCRects.c b/lib/libX11/src/SetCRects.c index b18c449a..1de2e3f1 100644 --- a/lib/libX11/src/SetCRects.c +++ b/lib/libX11/src/SetCRects.c @@ -44,16 +44,16 @@ void _XSetClipRectangles ( register _XExtension *ext; GetReq (SetClipRectangles, req); - req->gc = gc->gid; - req->xOrigin = gc->values.clip_x_origin = clip_x_origin; - req->yOrigin = gc->values.clip_y_origin = clip_y_origin; - req->ordering = ordering; + req->gc = (CARD32) gc->gid; + req->xOrigin = (INT16) (gc->values.clip_x_origin = clip_x_origin); + req->yOrigin = (INT16) (gc->values.clip_y_origin = clip_y_origin); + req->ordering = (BYTE) ordering; len = ((long)n) << 1; SetReqLen(req, len, 1); len <<= 2; Data16 (dpy, (short *) rectangles, len); gc->rects = 1; - dirty = gc->dirty & ~(GCClipMask | GCClipXOrigin | GCClipYOrigin); + dirty = (gc->dirty & (unsigned long) ~(GCClipMask | GCClipXOrigin | GCClipYOrigin)); gc->dirty = GCClipMask | GCClipXOrigin | GCClipYOrigin; /* call out to any extensions interested */ for (ext = dpy->ext_procs; ext; ext = ext->next) diff --git a/lib/libX11/src/SetLocale.c b/lib/libX11/src/SetLocale.c index 81f4a7c3..409019b9 100644 --- a/lib/libX11/src/SetLocale.c +++ b/lib/libX11/src/SetLocale.c @@ -99,43 +99,20 @@ _XlcMapOSLocaleName( char *osname, char *siname) { -#if defined(hpux) || defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(sgi) || defined(__osf__) || defined(AIXV3) || defined(ultrix) || defined(WIN32) || defined(__UNIXOS2__) || defined(linux) -# ifdef hpux -# ifndef _LastCategory - /* HPUX 9 and earlier */ -# define SKIPCOUNT 2 -# define STARTCHAR ':' +#if defined(CSRG_BASED) || defined(sun) || defined(SVR4) || defined(WIN32) || defined(linux) +# if defined(WIN32) +# define SKIPCOUNT 1 +# define STARTCHAR '=' +# define ENDCHAR ';' +# define WHITEFILL +# else +# if defined(linux) +# define STARTSTR "LC_CTYPE=" # define ENDCHAR ';' # else - /* HPUX 10 */ -# define ENDCHAR ' ' -# endif -# else -# ifdef ultrix -# define SKIPCOUNT 2 -# define STARTCHAR '\001' -# define ENDCHAR '\001' -# else -# if defined(WIN32) || defined(__UNIXOS2__) -# define SKIPCOUNT 1 -# define STARTCHAR '=' -# define ENDCHAR ';' -# define WHITEFILL -# else -# if defined(__osf__) || (defined(AIXV3) && !defined(AIXV4)) -# define STARTCHAR ' ' -# define ENDCHAR ' ' -# else -# if defined(linux) -# define STARTSTR "LC_CTYPE=" -# define ENDCHAR ';' -# else -# if !defined(sun) || defined(SVR4) -# define STARTCHAR '/' -# define ENDCHAR '/' -# endif -# endif -# endif +# if !defined(sun) || defined(SVR4) +# define STARTCHAR '/' +# define ENDCHAR '/' # endif # endif # endif diff --git a/lib/libX11/src/UIThrStubs.c b/lib/libX11/src/UIThrStubs.c deleted file mode 100644 index 95873e88..00000000 --- a/lib/libX11/src/UIThrStubs.c +++ /dev/null @@ -1,157 +0,0 @@ -/* - * - * Copyright (c) 1995 David E. Wexelblat. All rights reserved - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL DAVID E. WEXELBLAT BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name of David E. Wexelblat shall - * not be used in advertising or otherwise to promote the sale, use or - * other dealings in this Software without prior written authorization - * from David E. Wexelblat. - * - */ - -/* - * Stubs for thread functions needed by the X library. Supports - * UnixWare 2.x threads; may support Solaris 2 threads as well, but not - * tested. Defining things this way removes the dependency of the X - * library on the threads library, but still supports threads if the user - * specificies the thread library on the link line. - */ - -/* - * Modifications by Carlos A M dos Santos, XFree86 Project, November 1999. - * - * Explanation from : - * The structure below is complicated, mostly because P1003.1c (the - * IEEE POSIX Threads spec) went through lots of drafts, and some - * vendors shipped systems based on draft API that were changed later. - * Unfortunately POSIX did not provide a feature-test macro for - * distinguishing each of the drafts. - */ - -#ifdef CTHREADS -#ifdef HAVE_CONFIG_H -#include -#endif -#include -typedef cthread_t xthread_t; -#define xthread_self cthread_self -#pragma weak cthread_self = _Xthr_self_stub_ -#define xmutex_init mutex_init -#pragma weak mutex_init = _Xthr_zero_stub_ -#pragma weak mutex_clear = _Xthr_zero_stub_ -#pragma weak mutex_lock = _Xthr_zero_stub_ -#pragma weak mutex_unlock = _Xthr_zero_stub_ -#pragma weak condition_init = _Xthr_zero_stub_ -#pragma weak condition_clear = _Xthr_zero_stub_ -#pragma weak condition_wait = _Xthr_zero_stub_ -#pragma weak condition_signal = _Xthr_zero_stub_ -#pragma weak condition_broadcast = _Xthr_zero_stub_ -#else /* !CTHREADS */ -#if defined(SVR4) && !defined(__sgi) -#include -typedef thread_t xthread_t; -#pragma weak thr_self = _Xthr_self_stub_ -#pragma weak mutex_init = _Xthr_zero_stub_ -#pragma weak mutex_destroy = _Xthr_zero_stub_ -#pragma weak mutex_lock = _Xthr_zero_stub_ -#pragma weak mutex_unlock = _Xthr_zero_stub_ -#pragma weak cond_init = _Xthr_zero_stub_ -#pragma weak cond_destroy = _Xthr_zero_stub_ -#pragma weak cond_wait = _Xthr_zero_stub_ -#pragma weak cond_signal = _Xthr_zero_stub_ -#pragma weak cond_broadcast = _Xthr_zero_stub_ -#else /* !SVR4 */ -#ifdef WIN32 -#include -#else /* !WIN32 */ -#ifdef USE_TIS_SUPPORT -#include -typedef pthread_t xthread_t; -#pragma weak tis_self = _Xthr_self_stub_ -#pragma weak tis_mutex_init = _Xthr_zero_stub_ -#pragma weak tis_mutex_destroy = _Xthr_zero_stub_ -#pragma weak tis_mutex_lock = _Xthr_zero_stub_ -#pragma weak tis_mutex_unlock = _Xthr_zero_stub_ -#pragma weak tis_cond_init = _Xthr_zero_stub_ -#pragma weak tis_cond_destroy = _Xthr_zero_stub_ -#pragma weak tis_cond_wait = _Xthr_zero_stub_ -#pragma weak tis_cond_signal = _Xthr_zero_stub_ -#pragma weak tis_cond_broadcast = _Xthr_zero_stub_ -#else -#include -typedef pthread_t xthread_t; -#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) -xthread_t pthread_self() __attribute__ ((weak, alias ("_Xthr_self_stub_"))); -int pthread_mutex_init() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); -int pthread_mutex_destroy() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); -int pthread_mutex_lock() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); -int pthread_mutex_unlock() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); -int pthread_cond_init() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); -int pthread_cond_destroy() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); -int pthread_cond_wait() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); -int pthread_cond_signal() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); -int pthread_cond_broadcast() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); -int pthread_key_create() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); -void *pthread_getspecific() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); -int pthread_setspecific() __attribute__ ((weak, alias ("_Xthr_zero_stub_"))); -#else /* __GNUC__ */ -#pragma weak pthread_self = _Xthr_self_stub_ -#pragma weak pthread_mutex_init = _Xthr_zero_stub_ -#pragma weak pthread_mutex_destroy = _Xthr_zero_stub_ -#pragma weak pthread_mutex_lock = _Xthr_zero_stub_ -#pragma weak pthread_mutex_unlock = _Xthr_zero_stub_ -#pragma weak pthread_cond_init = _Xthr_zero_stub_ -#pragma weak pthread_cond_destroy = _Xthr_zero_stub_ -#pragma weak pthread_cond_wait = _Xthr_zero_stub_ -#pragma weak pthread_cond_signal = _Xthr_zero_stub_ -#pragma weak pthread_cond_broadcast = _Xthr_zero_stub_ -/* These are added for libGL */ -#pragma weak pthread_key_create = _Xthr_zero_stub_ -#pragma weak pthread_getspecific = _Xthr_zero_stub_ -#pragma weak pthread_setspecific = _Xthr_zero_stub_ -#endif /* __GNUC__ */ -#if defined(_DECTHREADS_) || defined(linux) -#pragma weak pthread_equal = _Xthr_equal_stub_ /* See Xthreads.h! */ -int -_Xthr_equal_stub_() -{ - return(1); -} -#endif /* _DECTHREADS_ || linux */ -#endif /* USE_TIS_SUPPORT */ -#endif /* WIN32 */ -#endif /* SVR4 */ -#endif /* CTHREADS */ - -static xthread_t -_Xthr_self_stub_() -{ - static xthread_t _X_no_thread_id; - - return(_X_no_thread_id); /* defined by */ -} - -static int -_Xthr_zero_stub_() -{ - return(0); -} diff --git a/lib/libX11/src/WMProps.c b/lib/libX11/src/WMProps.c index b99d35f2..a408e4a9 100644 --- a/lib/libX11/src/WMProps.c +++ b/lib/libX11/src/WMProps.c @@ -122,14 +122,6 @@ void XSetWMProperties ( * systems will have to change this. */ char *cp = strrchr (argv[0], '/'); -#ifdef __UNIXOS2__ - char *os2_cp = strrchr (argv[0],'\\'); - char *dot_cp = strrchr (argv[0],'.'); - if (os2_cp && (os2_cp > cp)) { - if(dot_cp && (dot_cp > os2_cp)) *dot_cp = '\0'; - cp=os2_cp; - } -#endif tmp.res_name = (cp ? cp + 1 : argv[0]); } tmp.res_class = classHints->res_class; diff --git a/lib/libX11/src/WrBitF.c b/lib/libX11/src/WrBitF.c index 0d4fb654..fe5d2661 100644 --- a/lib/libX11/src/WrBitF.c +++ b/lib/libX11/src/WrBitF.c @@ -106,9 +106,6 @@ XWriteBitmapFile( else name++; -#ifdef __UNIXOS2__ - filename = (char*)__XOS2RedirRoot(filename); -#endif if (!(stream = fopen(filename, "w"))) return(BitmapOpenFailed); diff --git a/lib/libX11/src/XlibInt.c b/lib/libX11/src/XlibInt.c index 297b7711..a4a69b4e 100644 --- a/lib/libX11/src/XlibInt.c +++ b/lib/libX11/src/XlibInt.c @@ -98,19 +98,10 @@ xthread_t (*_Xthread_self_fn)(void) = NULL; #define ECHECK(err) (WSAGetLastError() == err) #define ESET(val) WSASetLastError(val) #else -#ifdef __UNIXOS2__ -#define ECHECK(err) (errno == err) -#define ESET(val) -#else #define ECHECK(err) (errno == err) #define ESET(val) errno = val #endif -#endif -#ifdef __UNIXOS2__ -#include -#define MAX_PATH _POSIX_PATH_MAX -#endif /* * The following routines are internal routines used by Xlib for protocol @@ -1706,7 +1697,7 @@ _XData32( * and so, you may be better off using gethostname (if it exists). */ -#if (defined(_POSIX_SOURCE) && !defined(AIXV3) && !defined(__QNX__)) || defined(hpux) || defined(SVR4) +#if defined(_POSIX_SOURCE) || defined(SVR4) #define NEED_UTSNAME #include #else @@ -1857,10 +1848,6 @@ static int AccessFile (path, pathbuf, len_pathbuf, pathret) /* try the places set in the environment */ drive = getenv ("_XBASEDRIVE"); -#ifdef __UNIXOS2__ - if (!drive) - drive = getenv ("X11ROOT"); -#endif if (!drive) drive = "C:"; len = strlen (drive) + strlen (path); @@ -1873,7 +1860,6 @@ static int AccessFile (path, pathbuf, len_pathbuf, pathret) return 1; } -#ifndef __UNIXOS2__ /* one last place to look */ drive = getenv ("HOMEDRIVE"); if (drive) { @@ -1908,7 +1894,6 @@ static int AccessFile (path, pathbuf, len_pathbuf, pathret) } } } -#endif return 0; } diff --git a/lib/libX11/src/Xrm.c b/lib/libX11/src/Xrm.c index a8ebf883..ae098009 100644 --- a/lib/libX11/src/Xrm.c +++ b/lib/libX11/src/Xrm.c @@ -305,7 +305,7 @@ typedef unsigned char XrmBits; static XrmBits const xrmtypes[256] = { EOS,0,0,0,0,0,0,0, 0,SPACE,EOL,0,0, -#if defined(WIN32) || defined(__UNIXOS2__) +#ifdef WIN32 EOL, /* treat CR the same as LF, just in case */ #else 0, @@ -1575,9 +1575,6 @@ ReadInFile(_Xconst char *filename) register int fd, size; char * filebuf; -#ifdef __UNIXOS2__ - filename = __XOS2RedirRoot(filename); -#endif /* * MS-Windows and OS/2 note: Default open mode includes O_TEXT @@ -1609,18 +1606,6 @@ ReadInFile(_Xconst char *filename) return (char *)NULL; } size = read (fd, filebuf, size); - -#ifdef __UNIXOS2__ - { /* kill CRLF */ - int i,k; - for (i=k=0; i header file. */ -#undef HAVE_DL_H - /* Define to 1 if you have the `getpagesize' function. */ #undef HAVE_GETPAGESIZE @@ -36,8 +33,8 @@ /* Define to 1 if you have the `ws2_32' library (-lws2_32). */ #undef HAVE_LIBWS2_32 -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H +/* Define to 1 if you have the header file. */ +#undef HAVE_MINIX_CONFIG_H /* Define to 1 if you have a working `mmap' system call. */ #undef HAVE_MMAP @@ -48,15 +45,15 @@ /* Define to 1 if you have the `seteuid' function. */ #undef HAVE_SETEUID -/* Use shl_load to load shared libraries */ -#undef HAVE_SHL_LOAD - /* Define to 1 if the system has the type `socklen_t'. */ #undef HAVE_SOCKLEN_T /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H @@ -99,6 +96,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H +/* Define to 1 if you have the header file. */ +#undef HAVE_WCHAR_H + /* Define to 1 if the system has the `__builtin_popcountl' built-in function */ #undef HAVE___BUILTIN_POPCOUNTL @@ -146,7 +146,9 @@ /* Patch version of this package */ #undef PACKAGE_VERSION_PATCHLEVEL -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS /* Support TCP socket connections */ @@ -171,21 +173,87 @@ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif +/* Enable general extensions on macOS. */ +#ifndef _DARWIN_C_SOURCE +# undef _DARWIN_C_SOURCE +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif /* Enable GNU extensions on systems that have them. */ #ifndef _GNU_SOURCE # undef _GNU_SOURCE #endif -/* Enable threading extensions on Solaris. */ +/* Enable X/Open compliant socket functions that do not require linking + with -lxnet on HP-UX 11.11. */ +#ifndef _HPUX_ALT_XOPEN_SOCKET_API +# undef _HPUX_ALT_XOPEN_SOCKET_API +#endif +/* Identify the host operating system as Minix. + This macro does not affect the system headers' behavior. + A future release of Autoconf may stop defining this macro. */ +#ifndef _MINIX +# undef _MINIX +#endif +/* Enable general extensions on NetBSD. + Enable NetBSD compatibility extensions on Minix. */ +#ifndef _NETBSD_SOURCE +# undef _NETBSD_SOURCE +#endif +/* Enable OpenBSD compatibility extensions on NetBSD. + Oddly enough, this does nothing on OpenBSD. */ +#ifndef _OPENBSD_SOURCE +# undef _OPENBSD_SOURCE +#endif +/* Define to 1 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_SOURCE +# undef _POSIX_SOURCE +#endif +/* Define to 2 if needed for POSIX-compatible behavior. */ +#ifndef _POSIX_1_SOURCE +# undef _POSIX_1_SOURCE +#endif +/* Enable POSIX-compatible threading on Solaris. */ #ifndef _POSIX_PTHREAD_SEMANTICS # undef _POSIX_PTHREAD_SEMANTICS #endif +/* Enable extensions specified by ISO/IEC TS 18661-5:2014. */ +#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-1:2014. */ +#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ +# undef __STDC_WANT_IEC_60559_BFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-2:2015. */ +#ifndef __STDC_WANT_IEC_60559_DFP_EXT__ +# undef __STDC_WANT_IEC_60559_DFP_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-4:2015. */ +#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__ +# undef __STDC_WANT_IEC_60559_FUNCS_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TS 18661-3:2015. */ +#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__ +# undef __STDC_WANT_IEC_60559_TYPES_EXT__ +#endif +/* Enable extensions specified by ISO/IEC TR 24731-2:2010. */ +#ifndef __STDC_WANT_LIB_EXT2__ +# undef __STDC_WANT_LIB_EXT2__ +#endif +/* Enable extensions specified by ISO/IEC 24747:2009. */ +#ifndef __STDC_WANT_MATH_SPEC_FUNCS__ +# undef __STDC_WANT_MATH_SPEC_FUNCS__ +#endif /* Enable extensions on HP NonStop. */ #ifndef _TANDEM_SOURCE # undef _TANDEM_SOURCE #endif -/* Enable general extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ +/* Enable X/Open extensions. Define to 500 only if necessary + to make mbstate_t available. */ +#ifndef _XOPEN_SOURCE +# undef _XOPEN_SOURCE #endif @@ -234,26 +302,11 @@ /* Whether libX11 needs to use MT safe API's */ #undef XUSE_MTSAFE_API -/* Enable large inode numbers on Mac OS X 10.5. */ -#ifndef _DARWIN_USE_64_BIT_INODE -# define _DARWIN_USE_64_BIT_INODE 1 -#endif - /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES -/* Define to 1 if on MINIX. */ -#undef _MINIX - -/* Define to 2 if the system does not provide POSIX.1 features except with - this defined. */ -#undef _POSIX_1_SOURCE - -/* Define to 1 if you need to in order for `stat' and other things to work. */ -#undef _POSIX_SOURCE - /* Defined if needed to expose struct msghdr.msg_control */ #undef _XOPEN_SOURCE diff --git a/lib/libX11/src/globals.c b/lib/libX11/src/globals.c index ea3fe6e1..089a6536 100644 --- a/lib/libX11/src/globals.c +++ b/lib/libX11/src/globals.c @@ -37,48 +37,21 @@ from The Open Group. #endif #include - -/* - * If possible, it is useful to have the global data default to a null value. - * Some shared library implementations are *much* happier if there isn't any - * global initialized data. - */ -#ifdef NULL_NOT_ZERO /* then need to initialize */ -#define SetZero(t,var,z) t var = z -#else -#define SetZero(t,var,z) t var -#endif - -#ifdef USL_SHAREDLIB /* then need extra variables */ -/* - * If we need to define extra variables for each global - */ -#define ZEROINIT(t,var,val) SetZero(t,var,val); \ - SetZero (long, _libX_##var##Flag, 0); \ - SetZero (void *, _libX_##var##Ptr, NULL) - -#else /* else not USL_SHAREDLIB */ -/* - * no extra crud - */ -#define ZEROINIT(t,var,val) SetZero (t, var, val) - -#endif /* USL_SHAREDLIB */ - - /* * Error handlers; used to be in XlibInt.c */ -ZEROINIT (XErrorHandler, _XErrorFunction, NULL); -ZEROINIT (XIOErrorHandler, _XIOErrorFunction, NULL); -ZEROINIT (_XQEvent *, _qfree, NULL); +XErrorHandler _XErrorFunction; +XIOErrorHandler _XIOErrorFunction; +_XQEvent * _qfree; /* * Debugging information and display list; used to be in XOpenDis.c */ -ZEROINIT (int, _Xdebug, 0); -ZEROINIT (Display *, _XHeadOfDisplayList, NULL); +#ifndef WIN32 +int _Xdebug; +#endif +Display *_XHeadOfDisplayList; #ifdef XTEST1 @@ -103,4 +76,10 @@ xlib_ctor(void) { XInitThreads(); } + +__attribute__((destructor)) static void +xlib_dtor(void) +{ + XFreeThreads(); +} #endif diff --git a/lib/libX11/src/locking.c b/lib/libX11/src/locking.c index ea5000e1..3625bd27 100644 --- a/lib/libX11/src/locking.c +++ b/lib/libX11/src/locking.c @@ -240,7 +240,9 @@ static void _XUnlockDisplay( if (lock_hist_loc >= LOCK_HIST_SIZE) lock_hist_loc = 0; #endif /* XTHREADS_WARN */ - xmutex_unlock(dpy->lock->mutex); + + if (dpy->in_ifevent == 0 || !xthread_equal(dpy->ifevent_thread, xthread_self())) + xmutex_unlock(dpy->lock->mutex); } @@ -457,17 +459,20 @@ static void _XLockDisplay( XTHREADS_FILE_LINE_ARGS ) { -#ifdef XTHREADS struct _XErrorThreadInfo *ti; -#endif + + if (dpy->in_ifevent && xthread_equal(dpy->ifevent_thread, xthread_self())) + return; + #ifdef XTHREADS_WARN _XLockDisplayWarn(dpy, file, line); #else xmutex_lock(dpy->lock->mutex); #endif + if (dpy->lock->locking_level > 0) - _XDisplayLockWait(dpy); -#ifdef XTHREADS + _XDisplayLockWait(dpy); + /* * Skip the two function calls below which may generate requests * when LockDisplay is called from within _XError. @@ -475,7 +480,7 @@ static void _XLockDisplay( for (ti = dpy->error_threads; ti; ti = ti->next) if (ti->error_thread == xthread_self()) return; -#endif + _XIDHandler(dpy); _XSeqSyncFunction(dpy); } @@ -490,6 +495,9 @@ static void _XInternalLockDisplay( XTHREADS_FILE_LINE_ARGS ) { + if (dpy->in_ifevent && xthread_equal(dpy->ifevent_thread, xthread_self())) + return; + #ifdef XTHREADS_WARN _XLockDisplayWarn(dpy, file, line); #else @@ -643,9 +651,32 @@ Status XInitThreads(void) return 1; } +Status XFreeThreads(void) +{ + if (global_lock.lock != NULL) { + xmutex_free(global_lock.lock); + global_lock.lock = NULL; + } + if (i18n_lock.lock != NULL) { + xmutex_free(i18n_lock.lock); + i18n_lock.lock = NULL; + } + if (conv_lock.lock != NULL) { + xmutex_free(conv_lock.lock); + conv_lock.lock = NULL; + } + + return 1; +} + #else /* XTHREADS */ Status XInitThreads(void) { return 0; } + +Status XFreeThreads(void) +{ + return 0; +} #endif /* XTHREADS */ diff --git a/lib/libX11/src/reallocarray.h b/lib/libX11/src/reallocarray.h index ee38ebf8..fc720d08 100644 --- a/lib/libX11/src/reallocarray.h +++ b/lib/libX11/src/reallocarray.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/src/util/Makefile.in b/lib/libX11/src/util/Makefile.in index 9452ffe7..a0c40312 100644 --- a/lib/libX11/src/util/Makefile.in +++ b/lib/libX11/src/util/Makefile.in @@ -219,6 +219,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/src/xcms/Makefile.in b/lib/libX11/src/xcms/Makefile.in index 8e29cb2f..79b36287 100644 --- a/lib/libX11/src/xcms/Makefile.in +++ b/lib/libX11/src/xcms/Makefile.in @@ -261,6 +261,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/src/xcms/cmsColNm.c b/lib/libX11/src/xcms/cmsColNm.c index eb26b9b0..80582181 100644 --- a/lib/libX11/src/xcms/cmsColNm.c +++ b/lib/libX11/src/xcms/cmsColNm.c @@ -734,9 +734,6 @@ LoadColornameDB(void) if ((pathname = getenv("XCMSDB")) == NULL) { pathname = XCMSDB; } -#ifdef __UNIXOS2__ - pathname = __XOS2RedirRoot(pathname); -#endif length = (int)strlen(pathname); if ((length == 0) || (length >= (BUFSIZ - 5))){ diff --git a/lib/libX11/src/xcms/cmsTrig.c b/lib/libX11/src/xcms/cmsTrig.c index ebb92be5..b23033aa 100644 --- a/lib/libX11/src/xcms/cmsTrig.c +++ b/lib/libX11/src/xcms/cmsTrig.c @@ -71,11 +71,7 @@ _XcmsModuloF( #define XCMS_SIXTHPI 0.523598775598298820 #define XCMS_RADIANS(d) ((d) * XCMS_PI / 180.0) #define XCMS_DEGREES(r) ((r) * 180.0 / XCMS_PI) -#ifdef __vax__ -#define XCMS_X6_UNDERFLOWS (3.784659e-07) /* X**6 almost underflows*/ -#else #define XCMS_X6_UNDERFLOWS (4.209340e-52) /* X**6 almost underflows */ -#endif #define XCMS_X16_UNDERFLOWS (5.421010e-20) /* X**16 almost underflows*/ #define XCMS_CHAR_BIT 8 #define XCMS_LONG_MAX 0x7FFFFFFF diff --git a/lib/libX11/src/xkb/Makefile.in b/lib/libX11/src/xkb/Makefile.in index 136f95e7..d7a4245a 100644 --- a/lib/libX11/src/xkb/Makefile.in +++ b/lib/libX11/src/xkb/Makefile.in @@ -225,6 +225,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/src/xkb/XKB.c b/lib/libX11/src/xkb/XKB.c index 4df82b24..0f5c7a31 100644 --- a/lib/libX11/src/xkb/XKB.c +++ b/lib/libX11/src/xkb/XKB.c @@ -373,11 +373,7 @@ XkbGetXlibControls(Display *dpy) unsigned int XkbXlibControlsImplemented(void) { -#ifdef __sgi - return XkbLC_AllControls; -#else return XkbLC_AllControls & ~XkbLC_AllComposeControls; -#endif } Bool diff --git a/lib/libX11/src/xkb/XKBBind.c b/lib/libX11/src/xkb/XKBBind.c index 8da18a7f..467e4198 100644 --- a/lib/libX11/src/xkb/XKBBind.c +++ b/lib/libX11/src/xkb/XKBBind.c @@ -113,36 +113,24 @@ XKeycodeToKeysym(Display *dpy, return NoSymbol; if (col > 3) { - int lastSym, tmp, nGrp; + int firstSym, nGrp, grp; - lastSym = 3; + firstSym = 4; nGrp = XkbKeyNumGroups(xkb, kc); - if ((nGrp > 0) && - ((tmp = XkbKeyGroupWidth(xkb, kc, XkbGroup1Index)) > 2)) { - if (col <= (lastSym + tmp - 2)) - return XkbKeycodeToKeysym(dpy, kc, XkbGroup1Index, - col - lastSym + 2); - lastSym += tmp - 2; - } - if ((nGrp > 1) && - ((tmp = XkbKeyGroupWidth(xkb, kc, XkbGroup2Index)) > 2)) { - if (col <= (lastSym + tmp - 2)) - return XkbKeycodeToKeysym(dpy, kc, XkbGroup2Index, - col - lastSym + 2); - lastSym += tmp - 2; - } - if (nGrp > 2) { - tmp = XkbKeyGroupWidth(xkb, kc, XkbGroup3Index); - if (col <= lastSym + tmp) - return XkbKeycodeToKeysym(dpy, kc, XkbGroup3Index, - col - lastSym); - lastSym += tmp; - } - if (nGrp > 3) { - tmp = XkbKeyGroupWidth(xkb, kc, XkbGroup4Index); - if (col <= lastSym + tmp) - return XkbKeycodeToKeysym(dpy, kc, XkbGroup4Index, - col - lastSym); + for (grp = 0; grp < nGrp; grp++) { + int width = XkbKeyGroupWidth(xkb, kc, grp); + int skip = 0; + if (grp < 2) { + /* Skip the first two symbols in the first two groups, since we + * return them below for indexes 0-3. */ + skip = 2; + width -= skip; + if (width < 0) + width = 0; + } + if (col < firstSym + width) + return XkbKeycodeToKeysym(dpy, kc, grp, col - firstSym + skip); + firstSym += width; } return NoSymbol; } @@ -214,6 +202,14 @@ XkbKeysymToModifiers(Display *dpy, KeySym ks) return mods; } +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wdeprecated-declarations" +#elif defined(__GNUC__) +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif + KeySym XLookupKeysym(register XKeyEvent * event, int col) { @@ -223,22 +219,15 @@ XLookupKeysym(register XKeyEvent * event, int col) return _XLookupKeysym(event, col); _XkbCheckPendingRefresh(dpy, dpy->xkb_info); -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif defined(__GNUC__) -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif return XKeycodeToKeysym(dpy, event->keycode, col); +} + #ifdef __clang__ #pragma clang diagnostic pop #elif defined(__GNUC__) #pragma GCC diagnostic pop #endif -} - /* * Not a public entry point -- XkbTranslateKey is an obsolete name * that is preserved here so that functions linked against the old diff --git a/lib/libX11/src/xkb/XKBCvt.c b/lib/libX11/src/xkb/XKBCvt.c index 8cef2f72..457368f2 100644 --- a/lib/libX11/src/xkb/XKBCvt.c +++ b/lib/libX11/src/xkb/XKBCvt.c @@ -50,10 +50,6 @@ from The Open Group. #include #include -#ifdef __sgi_not_xconsortium -#define XKB_EXTEND_LOOKUP_STRING -#endif - static int _XkbHandleSpecialSym(KeySym keysym, char *buffer, int nbytes, int *extra_rtrn) { @@ -276,11 +272,7 @@ _XkbGetCharset(void) else { struct stat sbuf; FILE *file; -#ifndef __UNIXOS2__ char *cf = CHARSET_FILE; -#else - char *cf = __XOS2RedirRoot(CHARSET_FILE); -#endif #ifndef S_ISREG # define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG) diff --git a/lib/libX11/src/xkb/XKBExtDev.c b/lib/libX11/src/xkb/XKBExtDev.c index a3e671df..162cc356 100644 --- a/lib/libX11/src/xkb/XKBExtDev.c +++ b/lib/libX11/src/xkb/XKBExtDev.c @@ -188,8 +188,7 @@ _XkbReadGetDeviceInfoReply(Display *dpy, return tmp; } if (rep->nBtnsWanted > 0) { - if (((unsigned short) rep->firstBtnWanted + rep->nBtnsWanted) - >= devi->num_btns) + if (((unsigned short) rep->firstBtnWanted + rep->nBtnsWanted) > devi->num_btns) goto BAILOUT; act = &devi->btn_acts[rep->firstBtnWanted]; bzero((char *) act, (rep->nBtnsWanted * sizeof(XkbAction))); @@ -201,8 +200,7 @@ _XkbReadGetDeviceInfoReply(Display *dpy, if (rep->nBtnsRtrn > 0) { int size; - if (((unsigned short) rep->firstBtnRtrn + rep->nBtnsRtrn) - >= devi->num_btns) + if (((unsigned short) rep->firstBtnRtrn + rep->nBtnsRtrn) > devi->num_btns) goto BAILOUT; act = &devi->btn_acts[rep->firstBtnRtrn]; size = rep->nBtnsRtrn * SIZEOF(xkbActionWireDesc); diff --git a/lib/libX11/src/xkb/XKBNames.c b/lib/libX11/src/xkb/XKBNames.c index 1f6115b5..0ea1c827 100644 --- a/lib/libX11/src/xkb/XKBNames.c +++ b/lib/libX11/src/xkb/XKBNames.c @@ -189,6 +189,7 @@ _XkbReadGetNamesReply(Display *dpy, (char *) &names->keys[rep->firstKey], rep->nKeys * XkbKeyNameLength)) goto BAILOUT; + names->num_keys = rep->nKeys; } else _XkbSkipReadBufferData(&buf, rep->nKeys * XkbKeyNameLength); diff --git a/lib/libX11/src/xlibi18n/Makefile.in b/lib/libX11/src/xlibi18n/Makefile.in index 81fe00db..e3aaa6f0 100644 --- a/lib/libX11/src/xlibi18n/Makefile.in +++ b/lib/libX11/src/xlibi18n/Makefile.in @@ -253,6 +253,7 @@ STRICT_CFLAGS = @STRICT_CFLAGS@ STRIP = @STRIP@ STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@ TRADITIONALCPPFLAGS = @TRADITIONALCPPFLAGS@ +USE_THREAD_LIBS = @USE_THREAD_LIBS@ VERSION = @VERSION@ WCHAR32 = @WCHAR32@ X11_CFLAGS = @X11_CFLAGS@ diff --git a/lib/libX11/src/xlibi18n/XDefaultIMIF.c b/lib/libX11/src/xlibi18n/XDefaultIMIF.c index 74e79759..f985eb59 100644 --- a/lib/libX11/src/xlibi18n/XDefaultIMIF.c +++ b/lib/libX11/src/xlibi18n/XDefaultIMIF.c @@ -37,7 +37,7 @@ Sun Microsystems, Inc. or its licensors is granted. */ /* - * Copyright 2000 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/src/xlibi18n/XDefaultOMIF.c b/lib/libX11/src/xlibi18n/XDefaultOMIF.c index 2946f48d..e8666628 100644 --- a/lib/libX11/src/xlibi18n/XDefaultOMIF.c +++ b/lib/libX11/src/xlibi18n/XDefaultOMIF.c @@ -37,7 +37,7 @@ Sun Microsystems, Inc. or its licensors is granted. */ /* - * Copyright 2000 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/src/xlibi18n/XimTrInt.h b/lib/libX11/src/xlibi18n/XimTrInt.h index bceab988..375cde25 100644 --- a/lib/libX11/src/xlibi18n/XimTrInt.h +++ b/lib/libX11/src/xlibi18n/XimTrInt.h @@ -1,5 +1,5 @@ /* - * Copyright 1992 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1992, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/src/xlibi18n/XimTrX.h b/lib/libX11/src/xlibi18n/XimTrX.h index 198d5fa5..52fea04a 100644 --- a/lib/libX11/src/xlibi18n/XimTrX.h +++ b/lib/libX11/src/xlibi18n/XimTrX.h @@ -1,5 +1,5 @@ /* - * Copyright 1992 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1992, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/src/xlibi18n/XimTrans.h b/lib/libX11/src/xlibi18n/XimTrans.h index 8c3aa829..975495cd 100644 --- a/lib/libX11/src/xlibi18n/XimTrans.h +++ b/lib/libX11/src/xlibi18n/XimTrans.h @@ -1,5 +1,5 @@ /* - * Copyright 1992 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1992, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/src/xlibi18n/XimintP.h b/lib/libX11/src/xlibi18n/XimintP.h index 14a7e6d5..674da029 100644 --- a/lib/libX11/src/xlibi18n/XimintP.h +++ b/lib/libX11/src/xlibi18n/XimintP.h @@ -1,5 +1,5 @@ /* - * Copyright 1991, 1992 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1991, 1992, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/src/xlibi18n/XlcDL.c b/lib/libX11/src/xlibi18n/XlcDL.c index c1abe79f..351f2ee7 100644 --- a/lib/libX11/src/xlibi18n/XlcDL.c +++ b/lib/libX11/src/xlibi18n/XlcDL.c @@ -37,7 +37,7 @@ Sun Microsystems, Inc. or its licensors is granted. */ /* - * Copyright 2000 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -63,19 +63,11 @@ Sun Microsystems, Inc. or its licensors is granted. #ifdef HAVE_CONFIG_H # include #else -# if defined(hpux) -# define HAVE_DL_H -# else -# define HAVE_DLFCN_H -# endif +# define HAVE_DLFCN_H #endif #include -#ifdef HAVE_DL_H -#include -#endif - #ifdef HAVE_DLFCN_H #include #endif @@ -107,11 +99,7 @@ typedef struct { char *im_unregister; int dl_release; unsigned int refcount; -#if defined(hpux) - shl_t dl_module; -#else void *dl_module; -#endif } XI18NObjectsListRec, *XI18NObjectsList; #define OBJECT_INIT_LEN 8 @@ -157,7 +145,6 @@ strdup_with_underscore(const char *symbol) return result; } -#ifndef hpux static void * try_both_dlsym (void *handle, char *name) { @@ -175,7 +162,6 @@ try_both_dlsym (void *handle, char *name) } return ret; } -#endif static void resolve_object(char *path, const char *lc_name) @@ -303,11 +289,7 @@ open_object( path = __lc_path(object->dl_name, lc_dir); if (!path) return False; -#if defined(hpux) - object->dl_module = shl_load(path, BIND_DEFERRED, 0L); -#else object->dl_module = dlopen(path, RTLD_LAZY); -#endif Xfree(path); if (!object->dl_module) @@ -324,31 +306,11 @@ fetch_symbol( char *symbol) { void *result = NULL; -#if defined(hpux) - int getsyms_cnt, i; - struct shl_symbol *symbols; -#endif if (symbol == NULL) return NULL; -#if defined(hpux) - getsyms_cnt = shl_getsymbols(object->dl_module, TYPE_PROCEDURE, - EXPORT_SYMBOLS, malloc, &symbols); - - for(i=0; i 0) { - free(symbols); - } -#else result = try_both_dlsym(object->dl_module, symbol); -#endif return result; } @@ -359,11 +321,7 @@ close_object(XI18NObjectsList object) object->refcount--; if (object->refcount == 0) { -#if defined(hpux) - shl_unload(object->dl_module); -#else dlclose(object->dl_module); -#endif object->dl_module = NULL; } } @@ -468,10 +426,6 @@ _XDynamicRegisterIMInstantiateCallback( Bool ret_flag = False; int count; XI18NObjectsList objects_list = xi18n_objects_list; -#if defined(hpux) - int getsyms_cnt, i; - struct shl_symbol *symbols; -#endif lc_name = lcd->core->name; @@ -516,10 +470,6 @@ _XDynamicUnRegisterIMInstantiateCallback( Bool ret_flag = False; int count; XI18NObjectsList objects_list = xi18n_objects_list; -#if defined(hpux) - int getsyms_cnt, i; - struct shl_symbol *symbols; -#endif lc_name = lcd->core->name; if (_XlcLocaleDirName(lc_dir, BUFSIZE, lc_name) == NULL) return False; @@ -572,10 +522,6 @@ _XDynamicOpenOM(XLCd lcd, Display *display, XrmDatabase rdb, char *lc_name; dynamicIOpenProcp om_openOM = (dynamicIOpenProcp)NULL; XI18NObjectsList objects_list = xi18n_objects_list; -#if defined(hpux) - int getsyms_cnt, i; - struct shl_symbol *symbols; -#endif lc_name = lcd->core->name; diff --git a/lib/libX11/src/xlibi18n/XlcSL.c b/lib/libX11/src/xlibi18n/XlcSL.c index b8b3967d..362cf4f4 100644 --- a/lib/libX11/src/xlibi18n/XlcSL.c +++ b/lib/libX11/src/xlibi18n/XlcSL.c @@ -37,7 +37,7 @@ Sun Microsystems, Inc. or its licensors is granted. */ /* - * Copyright 2000 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/lib/libX11/src/xlibi18n/lcDB.c b/lib/libX11/src/xlibi18n/lcDB.c index 8b02b67e..848a9738 100644 --- a/lib/libX11/src/xlibi18n/lcDB.c +++ b/lib/libX11/src/xlibi18n/lcDB.c @@ -345,15 +345,6 @@ read_line( cur += len; str[cur] = '\0'; -#ifdef __UNIXOS2__ /* Take out carriage returns under OS/2 */ - if (cur>1) { - if (str[cur-2] == '\r' && str[cur-1] == '\n') { - str[cur-2] = '\n'; - str[cur-1] = '\0'; - cur--; - } - } -#endif if (!quoted && cur > 1 && str[cur - 2] == SYM_BACKSLASH && (str[cur - 1] == SYM_NEWLINE || str[cur-1] == SYM_CR)) { /* the line is ended backslash followed by newline. @@ -1289,11 +1280,7 @@ _XlcCreateLocaleDataBase( if (name == NULL) return (XPointer)NULL; -#ifndef __UNIXOS2__ name_q = XrmStringToQuark(name); -#else - name_q = XrmStringToQuark((char*)__XOS2RedirRoot(name)); -#endif for (list = _db_list; list; list = list->next) { if (name_q == list->name_q) { list->ref_count++; diff --git a/lib/libX11/src/xlibi18n/lcFile.c b/lib/libX11/src/xlibi18n/lcFile.c index 2af750f7..b6cf93f2 100644 --- a/lib/libX11/src/xlibi18n/lcFile.c +++ b/lib/libX11/src/xlibi18n/lcFile.c @@ -46,11 +46,7 @@ #define isreadable(f) ((access((f), R_OK) != -1) ? 1 : 0) #endif -#ifndef __UNIXOS2__ #define LC_PATHDELIM ':' -#else -#define LC_PATHDELIM ';' -#endif #define XLC_BUFSIZE 256 @@ -92,41 +88,7 @@ parse_line( return argc; } -#ifdef __UNIXOS2__ - -/* fg021216: entries in locale files are separated by colons while under - OS/2, path entries are separated by semicolon, so we need two functions */ - -static int -parse_line1( - char *line, - char **argv, - int argsize) -{ - int argc = 0; - char *p = line; - - while (argc < argsize) { - while (isspace(*p)) { - ++p; - } - if (*p == '\0') { - break; - } - argv[argc++] = p; - while (*p != ';' && *p != '\n' && *p != '\0') { - ++p; - } - if (*p == '\0') { - break; - } - *p++ = '\0'; - } - - return argc; -} -#elif defined(WIN32) - +#ifdef WIN32 /* this is parse_line but skips drive letters at the beginning of the entry */ static int parse_line1( @@ -159,8 +121,7 @@ parse_line1( return argc; } - -#endif /* __UNIXOS2__ */ +#endif /* WIN32 */ /* Splits a colon separated list of directories, and returns the constituent paths (without trailing slash). At most argsize constituents are stored @@ -174,7 +135,7 @@ _XlcParsePath( char *p = path; int n, i; -#if !defined(__UNIXOS2__) && !defined(WIN32) +#ifndef WIN32 n = parse_line(path, argv, argsize); #else n = parse_line1(path, argv, argsize); @@ -234,7 +195,7 @@ xlocaledir( * * Note: this only protects setuid-root clients. It doesn't * protect other setuid or any setgid clients. If this tradeoff - * isn't acceptable, set DisableXLocaleDirEnv to YES in host.def. + * isn't acceptable, run configure with --disable-xlocaledir . */ unsigned int oldeuid; oldeuid = geteuid(); @@ -265,11 +226,7 @@ xlocaledir( #endif /* NO_XLOCALEDIR */ if (len < buf_len) -#ifndef __UNIXOS2__ strncpy(p, XLOCALEDIR, (size_t) (buf_len - len)); -#else - strncpy(p,__XOS2RedirRoot(XLOCALEDIR), buf_len - len); -#endif buf[buf_len-1] = '\0'; } @@ -312,7 +269,7 @@ xlocalelibdir( * * Note: this only protects setuid-root clients. It doesn't * protect other setuid or any setgid clients. If this tradeoff - * isn't acceptable, set DisableXLocaleDirEnv to YES in host.def. + * isn't acceptable, run configure with --disable-xlocaledir . */ unsigned int oldeuid; oldeuid = geteuid(); @@ -343,11 +300,7 @@ xlocalelibdir( #endif /* NO_XLOCALEDIR */ if (len < buf_len) -#ifndef __UNIXOS2__ strncpy(p, XLOCALELIBDIR, (size_t) (buf_len - len)); -#else - strncpy(p,__XOS2RedirRoot(XLOCALELIBDIR), (size_t) (buf_len - len)); -#endif buf[buf_len-1] = '\0'; } @@ -374,17 +327,6 @@ resolve_name( char *p = buf; int n; char *args[2], *from, *to; -#ifdef __UNIXOS2__ /* Take out CR under OS/2 */ - int len; - - len = strlen(p); - if (len > 1) { - if (*(p+len-2) == '\r' && *(p+len-1) == '\n') { - *(p+len-2) = '\n'; - *(p+len-1) = '\0'; - } - } -#endif while (isspace(*p)) { ++p; } diff --git a/lib/libX11/src/xlibi18n/lcInit.c b/lib/libX11/src/xlibi18n/lcInit.c index e3092f77..552b8210 100644 --- a/lib/libX11/src/xlibi18n/lcInit.c +++ b/lib/libX11/src/xlibi18n/lcInit.c @@ -37,7 +37,7 @@ Sun Microsystems, Inc. or its licensors is granted. */ /* - * Copyright 2000 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, Oracle and/or its affiliates. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/lib/libxcb/libxcb-dpms/shlib_version b/lib/libxcb/libxcb-dpms/shlib_version index 1edea46d..893819d1 100644 --- a/lib/libxcb/libxcb-dpms/shlib_version +++ b/lib/libxcb/libxcb-dpms/shlib_version @@ -1,2 +1,2 @@ major=1 -minor=0 +minor=1 diff --git a/lib/libxcb/libxcb-dri3/shlib_version b/lib/libxcb/libxcb-dri3/shlib_version index dea2b62c..97247aba 100644 --- a/lib/libxcb/libxcb-dri3/shlib_version +++ b/lib/libxcb/libxcb-dri3/shlib_version @@ -1,2 +1,2 @@ major=0 -minor=2 +minor=3 diff --git a/lib/libxcb/libxcb-present/shlib_version b/lib/libxcb/libxcb-present/shlib_version index 3d7c908e..dea2b62c 100644 --- a/lib/libxcb/libxcb-present/shlib_version +++ b/lib/libxcb/libxcb-present/shlib_version @@ -1,2 +1,2 @@ major=0 -minor=1 +minor=2 diff --git a/lib/libxcb/src/Makefile b/lib/libxcb/src/Makefile index 99063e2f..a1c4e33e 100644 --- a/lib/libxcb/src/Makefile +++ b/lib/libxcb/src/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2022/07/17 08:31:10 matthieu Exp $ +# $OpenBSD: Makefile,v 1.14 2024/07/11 08:05:32 matthieu Exp $ # This Makefile is used to generate the sources files with xcbgen # The x11/py-xcbgen package needs to be installed @@ -6,7 +6,7 @@ DATADIR= ${X11BASE}/share PYTHON= python${PYTHON_VERSION} -MANOPTIONS= -c 'libxcb 1.15' -l 'X Version 11' -s 3 +MANOPTIONS= -c 'libxcb 1.17.0' -l 'X Version 11' -s 3 SRCS= \ bigreq.c \ diff --git a/lib/libxcb/src/bigreq.h b/lib/libxcb/src/bigreq.h index bfb9527b..becd16de 100644 --- a/lib/libxcb/src/bigreq.h +++ b/lib/libxcb/src/bigreq.h @@ -54,22 +54,30 @@ typedef struct xcb_big_requests_enable_reply_t { } xcb_big_requests_enable_reply_t; /** + * @brief Enable the BIG-REQUESTS extension * * @param c The connection * @return A cookie * - * Delivers a request to the X server. + * This enables the BIG-REQUESTS extension, which allows for requests larger than + * 262140 bytes in length. When enabled, if the 16-bit length field is zero, it + * is immediately followed by a 32-bit length field specifying the length of the + * request in 4-byte units. * */ xcb_big_requests_enable_cookie_t xcb_big_requests_enable (xcb_connection_t *c); /** + * @brief Enable the BIG-REQUESTS extension * * @param c The connection * @return A cookie * - * Delivers a request to the X server. + * This enables the BIG-REQUESTS extension, which allows for requests larger than + * 262140 bytes in length. When enabled, if the 16-bit length field is zero, it + * is immediately followed by a 32-bit length field specifying the length of the + * request in 4-byte units. * * This form can be used only if the request will cause * a reply to be generated. Any returned error will be diff --git a/lib/libxcb/src/composite.h b/lib/libxcb/src/composite.h index 6daddeab..d05d0729 100644 --- a/lib/libxcb/src/composite.h +++ b/lib/libxcb/src/composite.h @@ -198,11 +198,15 @@ typedef struct xcb_composite_release_overlay_window_request_t { } xcb_composite_release_overlay_window_request_t; /** + * @brief Negotiate the version of Composite * * @param c The connection + * @param client_major_version The major version supported by the client. + * @param client_minor_version The minor version supported by the client. * @return A cookie * - * Delivers a request to the X server. + * This negotiates the version of the Composite extension. It must be precede all + * other requests using Composite. Failure to do so will cause a BadRequest error. * */ xcb_composite_query_version_cookie_t @@ -211,11 +215,15 @@ xcb_composite_query_version (xcb_connection_t *c, uint32_t client_minor_version); /** + * @brief Negotiate the version of Composite * * @param c The connection + * @param client_major_version The major version supported by the client. + * @param client_minor_version The minor version supported by the client. * @return A cookie * - * Delivers a request to the X server. + * This negotiates the version of the Composite extension. It must be precede all + * other requests using Composite. Failure to do so will cause a BadRequest error. * * This form can be used only if the request will cause * a reply to be generated. Any returned error will be @@ -246,11 +254,22 @@ xcb_composite_query_version_reply (xcb_connection_t *c, xcb_generic_error_t **e); /** + * @brief Redirect the hierarchy starting at "window" to off-screen storage. * * @param c The connection + * @param window The root of the hierarchy to redirect to off-screen storage. + * @param update A bitmask of #xcb_composite_redirect_t values. + * @param update Whether contents are automatically mirrored to the parent window. If one client + * already specifies an update type of Manual, any attempt by another to specify a + * mode of Manual so will result in an Access error. * @return A cookie * - * Delivers a request to the X server. + * The hierarchy starting at 'window' is directed to off-screen + * storage. When all clients enabling redirection terminate, + * the redirection will automatically be disabled. + * + * The root window may not be redirected. Doing so results in a Match + * error. * * This form can be used only if the request will not cause * a reply to be generated. Any returned error will be @@ -262,11 +281,22 @@ xcb_composite_redirect_window_checked (xcb_connection_t *c, uint8_t update); /** + * @brief Redirect the hierarchy starting at "window" to off-screen storage. * * @param c The connection + * @param window The root of the hierarchy to redirect to off-screen storage. + * @param update A bitmask of #xcb_composite_redirect_t values. + * @param update Whether contents are automatically mirrored to the parent window. If one client + * already specifies an update type of Manual, any attempt by another to specify a + * mode of Manual so will result in an Access error. * @return A cookie * - * Delivers a request to the X server. + * The hierarchy starting at 'window' is directed to off-screen + * storage. When all clients enabling redirection terminate, + * the redirection will automatically be disabled. + * + * The root window may not be redirected. Doing so results in a Match + * error. * */ xcb_void_cookie_t @@ -275,11 +305,20 @@ xcb_composite_redirect_window (xcb_connection_t *c, uint8_t update); /** + * @brief Redirect all current and future children of ‘window’ * * @param c The connection + * @param window The root of the hierarchy to redirect to off-screen storage. + * @param update A bitmask of #xcb_composite_redirect_t values. + * @param update Whether contents are automatically mirrored to the parent window. If one client + * already specifies an update type of Manual, any attempt by another to specify a + * mode of Manual so will result in an Access error. * @return A cookie * - * Delivers a request to the X server. + * Hierarchies starting at all current and future children of window + * will be redirected as in RedirectWindow. If update is Manual, + * then painting of the window background during window manipulation + * and ClearArea requests is inhibited. * * This form can be used only if the request will not cause * a reply to be generated. Any returned error will be @@ -291,11 +330,20 @@ xcb_composite_redirect_subwindows_checked (xcb_connection_t *c, uint8_t update); /** + * @brief Redirect all current and future children of ‘window’ * * @param c The connection + * @param window The root of the hierarchy to redirect to off-screen storage. + * @param update A bitmask of #xcb_composite_redirect_t values. + * @param update Whether contents are automatically mirrored to the parent window. If one client + * already specifies an update type of Manual, any attempt by another to specify a + * mode of Manual so will result in an Access error. * @return A cookie * - * Delivers a request to the X server. + * Hierarchies starting at all current and future children of window + * will be redirected as in RedirectWindow. If update is Manual, + * then painting of the window background during window manipulation + * and ClearArea requests is inhibited. * */ xcb_void_cookie_t @@ -304,11 +352,18 @@ xcb_composite_redirect_subwindows (xcb_connection_t *c, uint8_t update); /** + * @brief Terminate redirection of the specified window. * * @param c The connection + * @param window The window to terminate redirection of. Must be redirected by the + * current client, or a Value error results. + * @param update A bitmask of #xcb_composite_redirect_t values. + * @param update The update type passed to RedirectWindows. If this does not match the + * previously requested update type, a Value error results. * @return A cookie * - * Delivers a request to the X server. + * Redirection of the specified window will be terminated. This cannot be + * used if the window was redirected with RedirectSubwindows. * * This form can be used only if the request will not cause * a reply to be generated. Any returned error will be @@ -320,11 +375,18 @@ xcb_composite_unredirect_window_checked (xcb_connection_t *c, uint8_t update); /** + * @brief Terminate redirection of the specified window. * * @param c The connection + * @param window The window to terminate redirection of. Must be redirected by the + * current client, or a Value error results. + * @param update A bitmask of #xcb_composite_redirect_t values. + * @param update The update type passed to RedirectWindows. If this does not match the + * previously requested update type, a Value error results. * @return A cookie * - * Delivers a request to the X server. + * Redirection of the specified window will be terminated. This cannot be + * used if the window was redirected with RedirectSubwindows. * */ xcb_void_cookie_t @@ -333,11 +395,18 @@ xcb_composite_unredirect_window (xcb_connection_t *c, uint8_t update); /** + * @brief Terminate redirection of the specified window’s children * * @param c The connection + * @param window The window to terminate redirection of. Must have previously been + * selected for sub-redirection by the current client, or a Value error + * results. + * @param update A bitmask of #xcb_composite_redirect_t values. + * @param update The update type passed to RedirectSubWindows. If this does not match + * the previously requested update type, a Value error results. * @return A cookie * - * Delivers a request to the X server. + * Redirection of all children of window will be terminated. * * This form can be used only if the request will not cause * a reply to be generated. Any returned error will be @@ -349,11 +418,18 @@ xcb_composite_unredirect_subwindows_checked (xcb_connection_t *c, uint8_t update); /** + * @brief Terminate redirection of the specified window’s children * * @param c The connection + * @param window The window to terminate redirection of. Must have previously been + * selected for sub-redirection by the current client, or a Value error + * results. + * @param update A bitmask of #xcb_composite_redirect_t values. + * @param update The update type passed to RedirectSubWindows. If this does not match + * the previously requested update type, a Value error results. * @return A cookie * - * Delivers a request to the X server. + * Redirection of all children of window will be terminated. * */ xcb_void_cookie_t diff --git a/lib/libxcb/src/damage.h b/lib/libxcb/src/damage.h index ff99ccbc..0f432b9a 100644 --- a/lib/libxcb/src/damage.h +++ b/lib/libxcb/src/damage.h @@ -191,11 +191,16 @@ xcb_generic_iterator_t xcb_damage_damage_end (xcb_damage_damage_iterator_t i); /** + * @brief Negotiate the version of the DAMAGE extension * * @param c The connection + * @param client_major_version The major version supported by the client. + * @param client_minor_version The minor version supported by the client. * @return A cookie * - * Delivers a request to the X server. + * This negotiates the version of the DAMAGE extension. It must precede any other + * request using the DAMAGE extension. Failure to do so will cause a BadRequest + * error for those requests. * */ xcb_damage_query_version_cookie_t @@ -204,11 +209,16 @@ xcb_damage_query_version (xcb_connection_t *c, uint32_t client_minor_version); /** + * @brief Negotiate the version of the DAMAGE extension * * @param c The connection + * @param client_major_version The major version supported by the client. + * @param client_minor_version The minor version supported by the client. * @return A cookie * - * Delivers a request to the X server. + * This negotiates the version of the DAMAGE extension. It must precede any other + * request using the DAMAGE extension. Failure to do so will cause a BadRequest + * error for those requests. * * This form can be used only if the request will cause * a reply to be generated. Any returned error will be @@ -239,11 +249,40 @@ xcb_damage_query_version_reply (xcb_connection_t *c, xcb_generic_error_t **e); /** + * @brief Creates a Damage object to monitor changes to a drawable. * * @param c The connection + * @param damage The ID with which you will refer to the new Damage object, created by + * `xcb_generate_id`. + * @param drawable The ID of the drawable to be monitored. + * @param level A bitmask of #xcb_damage_report_level_t values. + * @param level The level of detail to be provided in Damage events. * @return A cookie * - * Delivers a request to the X server. + * This creates a Damage object to monitor changes to a drawable, and specifies + * the level of detail to be reported for changes. + * + * We call changes made to pixel contents of windows and pixmaps 'damage' + * throughout this extension. + * + * Damage accumulates as drawing occurs in the drawable. Each drawing operation + * 'damages' one or more rectangular areas within the drawable. The rectangles + * are guaranteed to include the set of pixels modified by each operation, but + * may include significantly more than just those pixels. The desire is for + * the damage to strike a balance between the number of rectangles reported and + * the extraneous area included. A reasonable goal is for each primitive + * object drawn (line, string, rectangle) to be represented as a single + * rectangle and for the damage area of the operation to be the union of these + * rectangles. + * + * The DAMAGE extension allows applications to either receive the raw + * rectangles as a stream of events, or to have them partially processed within + * the X server to reduce the amount of data transmitted as well as reduce the + * processing latency once the repaint operation has started. + * + * The Damage object holds any accumulated damage region and reflects the + * relationship between the drawable selected for damage notification and the + * drawable for which damage is tracked. * * This form can be used only if the request will not cause * a reply to be generated. Any returned error will be @@ -256,11 +295,40 @@ xcb_damage_create_checked (xcb_connection_t *c, uint8_t level); /** + * @brief Creates a Damage object to monitor changes to a drawable. * * @param c The connection + * @param damage The ID with which you will refer to the new Damage object, created by + * `xcb_generate_id`. + * @param drawable The ID of the drawable to be monitored. + * @param level A bitmask of #xcb_damage_report_level_t values. + * @param level The level of detail to be provided in Damage events. * @return A cookie * - * Delivers a request to the X server. + * This creates a Damage object to monitor changes to a drawable, and specifies + * the level of detail to be reported for changes. + * + * We call changes made to pixel contents of windows and pixmaps 'damage' + * throughout this extension. + * + * Damage accumulates as drawing occurs in the drawable. Each drawing operation + * 'damages' one or more rectangular areas within the drawable. The rectangles + * are guaranteed to include the set of pixels modified by each operation, but + * may include significantly more than just those pixels. The desire is for + * the damage to strike a balance between the number of rectangles reported and + * the extraneous area included. A reasonable goal is for each primitive + * object drawn (line, string, rectangle) to be represented as a single + * rectangle and for the damage area of the operation to be the union of these + * rectangles. + * + * The DAMAGE extension allows applications to either receive the raw + * rectangles as a stream of events, or to have them partially processed within + * the X server to reduce the amount of data transmitted as well as reduce the + * processing latency once the repaint operation has started. + * + * The Damage object holds any accumulated damage region and reflects the + * relationship between the drawable selected for damage notification and the + * drawable for which damage is tracked. * */ xcb_void_cookie_t @@ -270,11 +338,14 @@ xcb_damage_create (xcb_connection_t *c, uint8_t level); /** + * @brief Destroys a previously created Damage object. * * @param c The connection + * @param damage The ID you provided to `xcb_create_damage`. * @return A cookie * - * Delivers a request to the X server. + * This destroys a Damage object and requests the X server stop reporting + * the changes it was tracking. * * This form can be used only if the request will not cause * a reply to be generated. Any returned error will be @@ -285,11 +356,14 @@ xcb_damage_destroy_checked (xcb_connection_t *c, xcb_damage_damage_t damage); /** + * @brief Destroys a previously created Damage object. * * @param c The connection + * @param damage The ID you provided to `xcb_create_damage`. * @return A cookie * - * Delivers a request to the X server. + * This destroys a Damage object and requests the X server stop reporting + * the changes it was tracking. * */ xcb_void_cookie_t @@ -297,11 +371,15 @@ xcb_damage_destroy (xcb_connection_t *c, xcb_damage_damage_t damage); /** + * @brief Remove regions from a previously created Damage object. * * @param c The connection + * @param damage The ID you provided to `xcb_create_damage`. * @return A cookie * - * Delivers a request to the X server. + * This updates the regions of damage recorded in a a Damage object. + * See https://www.x.org/releases/current/doc/damageproto/damageproto.txt + * for details. * * This form can be used only if the request will not cause * a reply to be generated. Any returned error will be @@ -314,11 +392,15 @@ xcb_damage_subtract_checked (xcb_connection_t *c, xcb_xfixes_region_t parts); /** + * @brief Remove regions from a previously created Damage object. * * @param c The connection + * @param damage The ID you provided to `xcb_create_damage`. * @return A cookie * - * Delivers a request to the X server. + * This updates the regions of damage recorded in a a Damage object. + * See https://www.x.org/releases/current/doc/damageproto/damageproto.txt + * for details. * */ xcb_void_cookie_t @@ -328,11 +410,14 @@ xcb_damage_subtract (xcb_connection_t *c, xcb_xfixes_region_t parts); /** + * @brief Add a region to a previously created Damage object. * * @param c The connection * @return A cookie * - * Delivers a request to the X server. + * This updates the regions of damage recorded in a a Damage object. + * See https://www.x.org/releases/current/doc/damageproto/damageproto.txt + * for details. * * This form can be used only if the request will not cause * a reply to be generated. Any returned error will be @@ -344,11 +429,14 @@ xcb_damage_add_checked (xcb_connection_t *c, xcb_xfixes_region_t region); /** + * @brief Add a region to a previously created Damage object. * * @param c The connection * @return A cookie * - * Delivers a request to the X server. + * This updates the regions of damage recorded in a a Damage object. + * See https://www.x.org/releases/current/doc/damageproto/damageproto.txt + * for details. * */ xcb_void_cookie_t diff --git a/lib/libxcb/src/dpms.c b/lib/libxcb/src/dpms.c index e1020d4d..7155a69a 100644 --- a/lib/libxcb/src/dpms.c +++ b/lib/libxcb/src/dpms.c @@ -14,6 +14,7 @@ #include "dpms.h" #define ALIGNOF(type) offsetof(struct { char dummy; type member; }, member) +#include "xproto.h" xcb_extension_t xcb_dpms_id = { "DPMS", 0 }; @@ -457,3 +458,55 @@ xcb_dpms_info_reply (xcb_connection_t *c, return (xcb_dpms_info_reply_t *) xcb_wait_for_reply(c, cookie.sequence, e); } +xcb_void_cookie_t +xcb_dpms_select_input_checked (xcb_connection_t *c, + uint32_t event_mask) +{ + static const xcb_protocol_request_t xcb_req = { + .count = 2, + .ext = &xcb_dpms_id, + .opcode = XCB_DPMS_SELECT_INPUT, + .isvoid = 1 + }; + + struct iovec xcb_parts[4]; + xcb_void_cookie_t xcb_ret; + xcb_dpms_select_input_request_t xcb_out; + + xcb_out.event_mask = event_mask; + + xcb_parts[2].iov_base = (char *) &xcb_out; + xcb_parts[2].iov_len = sizeof(xcb_out); + xcb_parts[3].iov_base = 0; + xcb_parts[3].iov_len = -xcb_parts[2].iov_len & 3; + + xcb_ret.sequence = xcb_send_request(c, XCB_REQUEST_CHECKED, xcb_parts + 2, &xcb_req); + return xcb_ret; +} + +xcb_void_cookie_t +xcb_dpms_select_input (xcb_connection_t *c, + uint32_t event_mask) +{ + static const xcb_protocol_request_t xcb_req = { + .count = 2, + .ext = &xcb_dpms_id, + .opcode = XCB_DPMS_SELECT_INPUT, + .isvoid = 1 + }; + + struct iovec xcb_parts[4]; + xcb_void_cookie_t xcb_ret; + xcb_dpms_select_input_request_t xcb_out; + + xcb_out.event_mask = event_mask; + + xcb_parts[2].iov_base = (char *) &xcb_out; + xcb_parts[2].iov_len = sizeof(xcb_out); + xcb_parts[3].iov_base = 0; + xcb_parts[3].iov_len = -xcb_parts[2].iov_len & 3; + + xcb_ret.sequence = xcb_send_request(c, 0, xcb_parts + 2, &xcb_req); + return xcb_ret; +} + diff --git a/lib/libxcb/src/dpms.h b/lib/libxcb/src/dpms.h index 95aa91d7..42c56e98 100644 --- a/lib/libxcb/src/dpms.h +++ b/lib/libxcb/src/dpms.h @@ -13,13 +13,14 @@ #define __DPMS_H #include "xcb.h" +#include "xproto.h" #ifdef __cplusplus extern "C" { #endif -#define XCB_DPMS_MAJOR_VERSION 0 -#define XCB_DPMS_MINOR_VERSION 0 +#define XCB_DPMS_MAJOR_VERSION 1 +#define XCB_DPMS_MINOR_VERSION 2 extern xcb_extension_t xcb_dpms_id; @@ -211,6 +212,42 @@ typedef struct xcb_dpms_info_reply_t { uint8_t pad1[21]; } xcb_dpms_info_reply_t; +typedef enum xcb_dpms_event_mask_t { + XCB_DPMS_EVENT_MASK_INFO_NOTIFY = 1 +} xcb_dpms_event_mask_t; + +/** Opcode for xcb_dpms_select_input. */ +#define XCB_DPMS_SELECT_INPUT 8 + +/** + * @brief xcb_dpms_select_input_request_t + **/ +typedef struct xcb_dpms_select_input_request_t { + uint8_t major_opcode; + uint8_t minor_opcode; + uint16_t length; + uint32_t event_mask; +} xcb_dpms_select_input_request_t; + +/** Opcode for xcb_dpms_info_notify. */ +#define XCB_DPMS_INFO_NOTIFY 0 + +/** + * @brief xcb_dpms_info_notify_event_t + **/ +typedef struct xcb_dpms_info_notify_event_t { + uint8_t response_type; + uint8_t extension; + uint16_t sequence; + uint32_t length; + uint16_t event_type; + uint8_t pad0[2]; + xcb_timestamp_t timestamp; + uint16_t power_level; + uint8_t state; + uint8_t pad1[21]; +} xcb_dpms_info_notify_event_t; + /** * * @param c The connection @@ -499,6 +536,33 @@ xcb_dpms_info_reply (xcb_connection_t *c, xcb_dpms_info_cookie_t cookie /**< */, xcb_generic_error_t **e); +/** + * + * @param c The connection + * @return A cookie + * + * Delivers a request to the X server. + * + * This form can be used only if the request will not cause + * a reply to be generated. Any returned error will be + * saved for handling by xcb_request_check(). + */ +xcb_void_cookie_t +xcb_dpms_select_input_checked (xcb_connection_t *c, + uint32_t event_mask); + +/** + * + * @param c The connection + * @return A cookie + * + * Delivers a request to the X server. + * + */ +xcb_void_cookie_t +xcb_dpms_select_input (xcb_connection_t *c, + uint32_t event_mask); + #ifdef __cplusplus } diff --git a/lib/libxcb/src/dri3.c b/lib/libxcb/src/dri3.c index d4239350..ad33aa60 100644 --- a/lib/libxcb/src/dri3.c +++ b/lib/libxcb/src/dri3.c @@ -18,6 +18,24 @@ xcb_extension_t xcb_dri3_id = { "DRI3", 0 }; +void +xcb_dri3_syncobj_next (xcb_dri3_syncobj_iterator_t *i) +{ + --i->rem; + ++i->data; + i->index += sizeof(xcb_dri3_syncobj_t); +} + +xcb_generic_iterator_t +xcb_dri3_syncobj_end (xcb_dri3_syncobj_iterator_t i) +{ + xcb_generic_iterator_t ret; + ret.data = i.data + i.rem; + ret.index = i.index + ((char *) ret.data - (char *) i.data); + ret.rem = 0; + return ret; +} + xcb_dri3_query_version_cookie_t xcb_dri3_query_version (xcb_connection_t *c, uint32_t major_version, @@ -977,3 +995,119 @@ xcb_dri3_set_drm_device_in_use (xcb_connection_t *c, return xcb_ret; } +xcb_void_cookie_t +xcb_dri3_import_syncobj_checked (xcb_connection_t *c, + xcb_dri3_syncobj_t syncobj, + xcb_drawable_t drawable, + int32_t syncobj_fd) +{ + static const xcb_protocol_request_t xcb_req = { + .count = 2, + .ext = &xcb_dri3_id, + .opcode = XCB_DRI3_IMPORT_SYNCOBJ, + .isvoid = 1 + }; + + struct iovec xcb_parts[4]; + xcb_void_cookie_t xcb_ret; + xcb_dri3_import_syncobj_request_t xcb_out; + int fds[1]; + int fd_index = 0; + + xcb_out.syncobj = syncobj; + xcb_out.drawable = drawable; + + xcb_parts[2].iov_base = (char *) &xcb_out; + xcb_parts[2].iov_len = sizeof(xcb_out); + xcb_parts[3].iov_base = 0; + xcb_parts[3].iov_len = -xcb_parts[2].iov_len & 3; + + fds[fd_index++] = syncobj_fd; + xcb_ret.sequence = xcb_send_request_with_fds(c, XCB_REQUEST_CHECKED, xcb_parts + 2, &xcb_req, 1, fds); + return xcb_ret; +} + +xcb_void_cookie_t +xcb_dri3_import_syncobj (xcb_connection_t *c, + xcb_dri3_syncobj_t syncobj, + xcb_drawable_t drawable, + int32_t syncobj_fd) +{ + static const xcb_protocol_request_t xcb_req = { + .count = 2, + .ext = &xcb_dri3_id, + .opcode = XCB_DRI3_IMPORT_SYNCOBJ, + .isvoid = 1 + }; + + struct iovec xcb_parts[4]; + xcb_void_cookie_t xcb_ret; + xcb_dri3_import_syncobj_request_t xcb_out; + int fds[1]; + int fd_index = 0; + + xcb_out.syncobj = syncobj; + xcb_out.drawable = drawable; + + xcb_parts[2].iov_base = (char *) &xcb_out; + xcb_parts[2].iov_len = sizeof(xcb_out); + xcb_parts[3].iov_base = 0; + xcb_parts[3].iov_len = -xcb_parts[2].iov_len & 3; + + fds[fd_index++] = syncobj_fd; + xcb_ret.sequence = xcb_send_request_with_fds(c, 0, xcb_parts + 2, &xcb_req, 1, fds); + return xcb_ret; +} + +xcb_void_cookie_t +xcb_dri3_free_syncobj_checked (xcb_connection_t *c, + xcb_dri3_syncobj_t syncobj) +{ + static const xcb_protocol_request_t xcb_req = { + .count = 2, + .ext = &xcb_dri3_id, + .opcode = XCB_DRI3_FREE_SYNCOBJ, + .isvoid = 1 + }; + + struct iovec xcb_parts[4]; + xcb_void_cookie_t xcb_ret; + xcb_dri3_free_syncobj_request_t xcb_out; + + xcb_out.syncobj = syncobj; + + xcb_parts[2].iov_base = (char *) &xcb_out; + xcb_parts[2].iov_len = sizeof(xcb_out); + xcb_parts[3].iov_base = 0; + xcb_parts[3].iov_len = -xcb_parts[2].iov_len & 3; + + xcb_ret.sequence = xcb_send_request(c, XCB_REQUEST_CHECKED, xcb_parts + 2, &xcb_req); + return xcb_ret; +} + +xcb_void_cookie_t +xcb_dri3_free_syncobj (xcb_connection_t *c, + xcb_dri3_syncobj_t syncobj) +{ + static const xcb_protocol_request_t xcb_req = { + .count = 2, + .ext = &xcb_dri3_id, + .opcode = XCB_DRI3_FREE_SYNCOBJ, + .isvoid = 1 + }; + + struct iovec xcb_parts[4]; + xcb_void_cookie_t xcb_ret; + xcb_dri3_free_syncobj_request_t xcb_out; + + xcb_out.syncobj = syncobj; + + xcb_parts[2].iov_base = (char *) &xcb_out; + xcb_parts[2].iov_len = sizeof(xcb_out); + xcb_parts[3].iov_base = 0; + xcb_parts[3].iov_len = -xcb_parts[2].iov_len & 3; + + xcb_ret.sequence = xcb_send_request(c, 0, xcb_parts + 2, &xcb_req); + return xcb_ret; +} + diff --git a/lib/libxcb/src/dri3.h b/lib/libxcb/src/dri3.h index a4038f6d..0968a1e1 100644 --- a/lib/libxcb/src/dri3.h +++ b/lib/libxcb/src/dri3.h @@ -20,10 +20,21 @@ extern "C" { #endif #define XCB_DRI3_MAJOR_VERSION 1 -#define XCB_DRI3_MINOR_VERSION 3 +#define XCB_DRI3_MINOR_VERSION 4 extern xcb_extension_t xcb_dri3_id; +typedef uint32_t xcb_dri3_syncobj_t; + +/** + * @brief xcb_dri3_syncobj_iterator_t + **/ +typedef struct xcb_dri3_syncobj_iterator_t { + xcb_dri3_syncobj_t *data; + int rem; + int index; +} xcb_dri3_syncobj_iterator_t; + /** * @brief xcb_dri3_query_version_cookie_t **/ @@ -312,6 +323,56 @@ typedef struct xcb_dri3_set_drm_device_in_use_request_t { uint32_t drmMinor; } xcb_dri3_set_drm_device_in_use_request_t; +/** Opcode for xcb_dri3_import_syncobj. */ +#define XCB_DRI3_IMPORT_SYNCOBJ 10 + +/** + * @brief xcb_dri3_import_syncobj_request_t + **/ +typedef struct xcb_dri3_import_syncobj_request_t { + uint8_t major_opcode; + uint8_t minor_opcode; + uint16_t length; + xcb_dri3_syncobj_t syncobj; + xcb_drawable_t drawable; +} xcb_dri3_import_syncobj_request_t; + +/** Opcode for xcb_dri3_free_syncobj. */ +#define XCB_DRI3_FREE_SYNCOBJ 11 + +/** + * @brief xcb_dri3_free_syncobj_request_t + **/ +typedef struct xcb_dri3_free_syncobj_request_t { + uint8_t major_opcode; + uint8_t minor_opcode; + uint16_t length; + xcb_dri3_syncobj_t syncobj; +} xcb_dri3_free_syncobj_request_t; + +/** + * Get the next element of the iterator + * @param i Pointer to a xcb_dri3_syncobj_iterator_t + * + * Get the next element in the iterator. The member rem is + * decreased by one. The member data points to the next + * element. The member index is increased by sizeof(xcb_dri3_syncobj_t) + */ +void +xcb_dri3_syncobj_next (xcb_dri3_syncobj_iterator_t *i); + +/** + * Return the iterator pointing to the last element + * @param i An xcb_dri3_syncobj_iterator_t + * @return The iterator pointing to the last element + * + * Set the current element in the iterator to the last element. + * The member rem is set to 0. The member data points to the + * last element. + */ +xcb_generic_iterator_t +xcb_dri3_syncobj_end (xcb_dri3_syncobj_iterator_t i); + /** * * @param c The connection @@ -872,6 +933,64 @@ xcb_dri3_set_drm_device_in_use (xcb_connection_t *c, uint32_t drmMajor, uint32_t drmMinor); +/** + * + * @param c The connection + * @return A cookie + * + * Delivers a request to the X server. + * + * This form can be used only if the request will not cause + * a reply to be generated. Any returned error will be + * saved for handling by xcb_request_check(). + */ +xcb_void_cookie_t +xcb_dri3_import_syncobj_checked (xcb_connection_t *c, + xcb_dri3_syncobj_t syncobj, + xcb_drawable_t drawable, + int32_t syncobj_fd); + +/** + * + * @param c The connection + * @return A cookie + * + * Delivers a request to the X server. + * + */ +xcb_void_cookie_t +xcb_dri3_import_syncobj (xcb_connection_t *c, + xcb_dri3_syncobj_t syncobj, + xcb_drawable_t drawable, + int32_t syncobj_fd); + +/** + * + * @param c The connection + * @return A cookie + * + * Delivers a request to the X server. + * + * This form can be used only if the request will not cause + * a reply to be generated. Any returned error will be + * saved for handling by xcb_request_check(). + */ +xcb_void_cookie_t +xcb_dri3_free_syncobj_checked (xcb_connection_t *c, + xcb_dri3_syncobj_t syncobj); + +/** + * + * @param c The connection + * @return A cookie + * + * Delivers a request to the X server. + * + */ +xcb_void_cookie_t +xcb_dri3_free_syncobj (xcb_connection_t *c, + xcb_dri3_syncobj_t syncobj); + #ifdef __cplusplus } diff --git a/lib/libxcb/src/present.c b/lib/libxcb/src/present.c index 27aeecc4..4228d762 100644 --- a/lib/libxcb/src/present.c +++ b/lib/libxcb/src/present.c @@ -18,6 +18,7 @@ #include "randr.h" #include "xfixes.h" #include "sync.h" +#include "dri3.h" xcb_extension_t xcb_present_id = { "Present", 0 }; @@ -484,6 +485,187 @@ xcb_present_query_capabilities_reply (xcb_connection_t * return (xcb_present_query_capabilities_reply_t *) xcb_wait_for_reply(c, cookie.sequence, e); } +int +xcb_present_pixmap_synced_sizeof (const void *_buffer, + uint32_t notifies_len) +{ + char *xcb_tmp = (char *)_buffer; + unsigned int xcb_buffer_len = 0; + unsigned int xcb_block_len = 0; + unsigned int xcb_pad = 0; + unsigned int xcb_align_to = 0; + + + xcb_block_len += sizeof(xcb_present_pixmap_synced_request_t); + xcb_tmp += xcb_block_len; + xcb_buffer_len += xcb_block_len; + xcb_block_len = 0; + /* notifies */ + xcb_block_len += notifies_len * sizeof(xcb_present_notify_t); + xcb_tmp += xcb_block_len; + xcb_align_to = ALIGNOF(xcb_present_notify_t); + /* insert padding */ + xcb_pad = -xcb_block_len & (xcb_align_to - 1); + xcb_buffer_len += xcb_block_len + xcb_pad; + if (0 != xcb_pad) { + xcb_tmp += xcb_pad; + xcb_pad = 0; + } + xcb_block_len = 0; + + return xcb_buffer_len; +} + +xcb_void_cookie_t +xcb_present_pixmap_synced_checked (xcb_connection_t *c, + xcb_window_t window, + xcb_pixmap_t pixmap, + uint32_t serial, + xcb_xfixes_region_t valid, + xcb_xfixes_region_t update, + int16_t x_off, + int16_t y_off, + xcb_randr_crtc_t target_crtc, + xcb_dri3_syncobj_t acquire_syncobj, + xcb_dri3_syncobj_t release_syncobj, + uint64_t acquire_point, + uint64_t release_point, + uint32_t options, + uint64_t target_msc, + uint64_t divisor, + uint64_t remainder, + uint32_t notifies_len, + const xcb_present_notify_t *notifies) +{ + static const xcb_protocol_request_t xcb_req = { + .count = 4, + .ext = &xcb_present_id, + .opcode = XCB_PRESENT_PIXMAP_SYNCED, + .isvoid = 1 + }; + + struct iovec xcb_parts[6]; + xcb_void_cookie_t xcb_ret; + xcb_present_pixmap_synced_request_t xcb_out; + + xcb_out.window = window; + xcb_out.pixmap = pixmap; + xcb_out.serial = serial; + xcb_out.valid = valid; + xcb_out.update = update; + xcb_out.x_off = x_off; + xcb_out.y_off = y_off; + xcb_out.target_crtc = target_crtc; + xcb_out.acquire_syncobj = acquire_syncobj; + xcb_out.release_syncobj = release_syncobj; + xcb_out.acquire_point = acquire_point; + xcb_out.release_point = release_point; + xcb_out.options = options; + memset(xcb_out.pad0, 0, 4); + xcb_out.target_msc = target_msc; + xcb_out.divisor = divisor; + xcb_out.remainder = remainder; + + xcb_parts[2].iov_base = (char *) &xcb_out; + xcb_parts[2].iov_len = sizeof(xcb_out); + xcb_parts[3].iov_base = 0; + xcb_parts[3].iov_len = -xcb_parts[2].iov_len & 3; + /* xcb_present_notify_t notifies */ + xcb_parts[4].iov_base = (char *) notifies; + xcb_parts[4].iov_len = notifies_len * sizeof(xcb_present_notify_t); + xcb_parts[5].iov_base = 0; + xcb_parts[5].iov_len = -xcb_parts[4].iov_len & 3; + + xcb_ret.sequence = xcb_send_request(c, XCB_REQUEST_CHECKED, xcb_parts + 2, &xcb_req); + return xcb_ret; +} + +xcb_void_cookie_t +xcb_present_pixmap_synced (xcb_connection_t *c, + xcb_window_t window, + xcb_pixmap_t pixmap, + uint32_t serial, + xcb_xfixes_region_t valid, + xcb_xfixes_region_t update, + int16_t x_off, + int16_t y_off, + xcb_randr_crtc_t target_crtc, + xcb_dri3_syncobj_t acquire_syncobj, + xcb_dri3_syncobj_t release_syncobj, + uint64_t acquire_point, + uint64_t release_point, + uint32_t options, + uint64_t target_msc, + uint64_t divisor, + uint64_t remainder, + uint32_t notifies_len, + const xcb_present_notify_t *notifies) +{ + static const xcb_protocol_request_t xcb_req = { + .count = 4, + .ext = &xcb_present_id, + .opcode = XCB_PRESENT_PIXMAP_SYNCED, + .isvoid = 1 + }; + + struct iovec xcb_parts[6]; + xcb_void_cookie_t xcb_ret; + xcb_present_pixmap_synced_request_t xcb_out; + + xcb_out.window = window; + xcb_out.pixmap = pixmap; + xcb_out.serial = serial; + xcb_out.valid = valid; + xcb_out.update = update; + xcb_out.x_off = x_off; + xcb_out.y_off = y_off; + xcb_out.target_crtc = target_crtc; + xcb_out.acquire_syncobj = acquire_syncobj; + xcb_out.release_syncobj = release_syncobj; + xcb_out.acquire_point = acquire_point; + xcb_out.release_point = release_point; + xcb_out.options = options; + memset(xcb_out.pad0, 0, 4); + xcb_out.target_msc = target_msc; + xcb_out.divisor = divisor; + xcb_out.remainder = remainder; + + xcb_parts[2].iov_base = (char *) &xcb_out; + xcb_parts[2].iov_len = sizeof(xcb_out); + xcb_parts[3].iov_base = 0; + xcb_parts[3].iov_len = -xcb_parts[2].iov_len & 3; + /* xcb_present_notify_t notifies */ + xcb_parts[4].iov_base = (char *) notifies; + xcb_parts[4].iov_len = notifies_len * sizeof(xcb_present_notify_t); + xcb_parts[5].iov_base = 0; + xcb_parts[5].iov_len = -xcb_parts[4].iov_len & 3; + + xcb_ret.sequence = xcb_send_request(c, 0, xcb_parts + 2, &xcb_req); + return xcb_ret; +} + +xcb_present_notify_t * +xcb_present_pixmap_synced_notifies (const xcb_present_pixmap_synced_request_t *R) +{ + return (xcb_present_notify_t *) (R + 1); +} + +int +xcb_present_pixmap_synced_notifies_length (const xcb_present_pixmap_synced_request_t *R) +{ + return (((R->length * 4) - sizeof(xcb_present_pixmap_synced_request_t))/sizeof(xcb_present_notify_t)); +} + +xcb_present_notify_iterator_t +xcb_present_pixmap_synced_notifies_iterator (const xcb_present_pixmap_synced_request_t *R) +{ + xcb_present_notify_iterator_t i; + i.data = (xcb_present_notify_t *) (R + 1); + i.rem = (((R->length * 4) - sizeof(xcb_present_pixmap_synced_request_t))/sizeof(xcb_present_notify_t)); + i.index = (char *) i.data - (char *) R; + return i; +} + int xcb_present_redirect_notify_sizeof (const void *_buffer, uint32_t notifies_len) diff --git a/lib/libxcb/src/present.h b/lib/libxcb/src/present.h index e366330a..963f0359 100644 --- a/lib/libxcb/src/present.h +++ b/lib/libxcb/src/present.h @@ -17,13 +17,14 @@ #include "randr.h" #include "xfixes.h" #include "sync.h" +#include "dri3.h" #ifdef __cplusplus extern "C" { #endif #define XCB_PRESENT_MAJOR_VERSION 1 -#define XCB_PRESENT_MINOR_VERSION 2 +#define XCB_PRESENT_MINOR_VERSION 4 extern xcb_extension_t xcb_present_id; @@ -47,14 +48,17 @@ typedef enum xcb_present_option_t { XCB_PRESENT_OPTION_ASYNC = 1, XCB_PRESENT_OPTION_COPY = 2, XCB_PRESENT_OPTION_UST = 4, - XCB_PRESENT_OPTION_SUBOPTIMAL = 8 + XCB_PRESENT_OPTION_SUBOPTIMAL = 8, + XCB_PRESENT_OPTION_ASYNC_MAY_TEAR = 16 } xcb_present_option_t; typedef enum xcb_present_capability_t { XCB_PRESENT_CAPABILITY_NONE = 0, XCB_PRESENT_CAPABILITY_ASYNC = 1, XCB_PRESENT_CAPABILITY_FENCE = 2, - XCB_PRESENT_CAPABILITY_UST = 4 + XCB_PRESENT_CAPABILITY_UST = 4, + XCB_PRESENT_CAPABILITY_ASYNC_MAY_TEAR = 8, + XCB_PRESENT_CAPABILITY_SYNCOBJ = 16 } xcb_present_capability_t; typedef enum xcb_present_complete_kind_t { @@ -221,6 +225,35 @@ typedef struct xcb_present_query_capabilities_reply_t { uint32_t capabilities; } xcb_present_query_capabilities_reply_t; +/** Opcode for xcb_present_pixmap_synced. */ +#define XCB_PRESENT_PIXMAP_SYNCED 5 + +/** + * @brief xcb_present_pixmap_synced_request_t + **/ +typedef struct xcb_present_pixmap_synced_request_t { + uint8_t major_opcode; + uint8_t minor_opcode; + uint16_t length; + xcb_window_t window; + xcb_pixmap_t pixmap; + uint32_t serial; + xcb_xfixes_region_t valid; + xcb_xfixes_region_t update; + int16_t x_off; + int16_t y_off; + xcb_randr_crtc_t target_crtc; + xcb_dri3_syncobj_t acquire_syncobj; + xcb_dri3_syncobj_t release_syncobj; + uint64_t acquire_point; + uint64_t release_point; + uint32_t options; + uint8_t pad0[4]; + uint64_t target_msc; + uint64_t divisor; + uint64_t remainder; +} xcb_present_pixmap_synced_request_t; + /** Opcode for xcb_present_generic. */ #define XCB_PRESENT_GENERIC 0 @@ -619,6 +652,80 @@ xcb_present_query_capabilities_reply (xcb_connection_t * xcb_present_query_capabilities_cookie_t cookie /**< */, xcb_generic_error_t **e); +int +xcb_present_pixmap_synced_sizeof (const void *_buffer, + uint32_t notifies_len); + +/** + * + * @param c The connection + * @return A cookie + * + * Delivers a request to the X server. + * + * This form can be used only if the request will not cause + * a reply to be generated. Any returned error will be + * saved for handling by xcb_request_check(). + */ +xcb_void_cookie_t +xcb_present_pixmap_synced_checked (xcb_connection_t *c, + xcb_window_t window, + xcb_pixmap_t pixmap, + uint32_t serial, + xcb_xfixes_region_t valid, + xcb_xfixes_region_t update, + int16_t x_off, + int16_t y_off, + xcb_randr_crtc_t target_crtc, + xcb_dri3_syncobj_t acquire_syncobj, + xcb_dri3_syncobj_t release_syncobj, + uint64_t acquire_point, + uint64_t release_point, + uint32_t options, + uint64_t target_msc, + uint64_t divisor, + uint64_t remainder, + uint32_t notifies_len, + const xcb_present_notify_t *notifies); + +/** + * + * @param c The connection + * @return A cookie + * + * Delivers a request to the X server. + * + */ +xcb_void_cookie_t +xcb_present_pixmap_synced (xcb_connection_t *c, + xcb_window_t window, + xcb_pixmap_t pixmap, + uint32_t serial, + xcb_xfixes_region_t valid, + xcb_xfixes_region_t update, + int16_t x_off, + int16_t y_off, + xcb_randr_crtc_t target_crtc, + xcb_dri3_syncobj_t acquire_syncobj, + xcb_dri3_syncobj_t release_syncobj, + uint64_t acquire_point, + uint64_t release_point, + uint32_t options, + uint64_t target_msc, + uint64_t divisor, + uint64_t remainder, + uint32_t notifies_len, + const xcb_present_notify_t *notifies); + +xcb_present_notify_t * +xcb_present_pixmap_synced_notifies (const xcb_present_pixmap_synced_request_t *R); + +int +xcb_present_pixmap_synced_notifies_length (const xcb_present_pixmap_synced_request_t *R); + +xcb_present_notify_iterator_t +xcb_present_pixmap_synced_notifies_iterator (const xcb_present_pixmap_synced_request_t *R); + int xcb_present_redirect_notify_sizeof (const void *_buffer, uint32_t notifies_len); diff --git a/lib/libxcb/src/randr.c b/lib/libxcb/src/randr.c index efff1aa6..24679746 100644 --- a/lib/libxcb/src/randr.c +++ b/lib/libxcb/src/randr.c @@ -5326,13 +5326,13 @@ xcb_randr_set_monitor_checked (xcb_connection_t *c, xcb_randr_monitor_info_t *monitorinfo) { static const xcb_protocol_request_t xcb_req = { - .count = 4, + .count = 3, .ext = &xcb_randr_id, .opcode = XCB_RANDR_SET_MONITOR, .isvoid = 1 }; - struct iovec xcb_parts[6]; + struct iovec xcb_parts[5]; xcb_void_cookie_t xcb_ret; xcb_randr_set_monitor_request_t xcb_out; @@ -5357,13 +5357,13 @@ xcb_randr_set_monitor (xcb_connection_t *c, xcb_randr_monitor_info_t *monitorinfo) { static const xcb_protocol_request_t xcb_req = { - .count = 4, + .count = 3, .ext = &xcb_randr_id, .opcode = XCB_RANDR_SET_MONITOR, .isvoid = 1 }; - struct iovec xcb_parts[6]; + struct iovec xcb_parts[5]; xcb_void_cookie_t xcb_ret; xcb_randr_set_monitor_request_t xcb_out; diff --git a/lib/libxcb/src/shm.h b/lib/libxcb/src/shm.h index 248e0f44..1d22d3bd 100644 --- a/lib/libxcb/src/shm.h +++ b/lib/libxcb/src/shm.h @@ -284,22 +284,28 @@ xcb_generic_iterator_t xcb_shm_seg_end (xcb_shm_seg_iterator_t i); /** + * @brief Query the version of the MIT-SHM extension. * * @param c The connection * @return A cookie * - * Delivers a request to the X server. + * This is used to determine the version of the MIT-SHM extension supported by the + * X server. Clients MUST NOT make other requests in this extension until a reply + * to this requests indicates the X server supports them. * */ xcb_shm_query_version_cookie_t xcb_shm_query_version (xcb_connection_t *c); /** + * @brief Query the version of the MIT-SHM extension. * * @param c The connection * @return A cookie * - * Delivers a request to the X server. + * This is used to determine the version of the MIT-SHM extension supported by the + * X server. Clients MUST NOT make other requests in this extension until a reply + * to this requests indicates the X server supports them. * * This form can be used only if the request will cause * a reply to be generated. Any returned error will be @@ -328,11 +334,18 @@ xcb_shm_query_version_reply (xcb_connection_t *c, xcb_generic_error_t **e); /** + * @brief Attach a System V shared memory segment. * * @param c The connection + * @param shmseg A shared memory segment ID created with xcb_generate_id(). + * @param shmid The System V shared memory segment the server should map. + * @param read_only True if the segment shall be mapped read only by the X11 server, otherwise false. * @return A cookie * - * Delivers a request to the X server. + * Attach a System V shared memory segment to the server. This will fail unless + * the server has permission to map the segment. The client may destroy the segment + * as soon as it receives a XCB_SHM_COMPLETION event with the shmseg value in this + * request and with the appropriate serial number. * * This form can be used only if the request will not cause * a reply to be generated. Any returned error will be @@ -345,11 +358,18 @@ xcb_shm_attach_checked (xcb_connection_t *c, uint8_t read_only); /** + * @brief Attach a System V shared memory segment. * * @param c The connection + * @param shmseg A shared memory segment ID created with xcb_generate_id(). + * @param shmid The System V shared memory segment the server should map. + * @param read_only True if the segment shall be mapped read only by the X11 server, otherwise false. * @return A cookie * - * Delivers a request to the X server. + * Attach a System V shared memory segment to the server. This will fail unless + * the server has permission to map the segment. The client may destroy the segment + * as soon as it receives a XCB_SHM_COMPLETION event with the shmseg value in this + * request and with the appropriate serial number. * */ xcb_void_cookie_t @@ -359,11 +379,14 @@ xcb_shm_attach (xcb_connection_t *c, uint8_t read_only); /** + * @brief Destroys the specified shared memory segment. * * @param c The connection + * @param shmseg The segment to be destroyed. * @return A cookie * - * Delivers a request to the X server. + * Destroys the specified shared memory segment. This will never fail unless the + * segment number is incorrect. * * This form can be used only if the request will not cause * a reply to be generated. Any returned error will be @@ -374,11 +397,14 @@ xcb_shm_detach_checked (xcb_connection_t *c, xcb_shm_seg_t shmseg); /** + * @brief Destroys the specified shared memory segment. * * @param c The connection + * @param shmseg The segment to be destroyed. * @return A cookie * - * Delivers a request to the X server. + * Destroys the specified shared memory segment. This will never fail unless the + * segment number is incorrect. * */ xcb_void_cookie_t @@ -386,11 +412,37 @@ xcb_shm_detach (xcb_connection_t *c, xcb_shm_seg_t shmseg); /** + * @brief Copy data from the shared memory to the specified drawable. * * @param c The connection + * @param drawable The drawable to draw to. + * @param gc The graphics context to use. + * @param total_width The total width of the source image. + * @param total_height The total height of the source image. + * @param src_x The source X coordinate of the sub-image to copy. + * @param src_y The source Y coordinate of the sub-image to copy. + * @param src_width The width, in source image coordinates, of the data to copy from the source. + * The X server will use this to determine the amount of data to copy. The amount + * of the destination image that is overwritten is determined automatically. + * @param src_height The height, in source image coordinates, of the data to copy from the source. + * The X server will use this to determine the amount of data to copy. The amount + * of the destination image that is overwritten is determined automatically. + * @param dst_x The X coordinate on the destination drawable to copy to. + * @param dst_y The Y coordinate on the destination drawable to copy to. + * @param depth The depth to use. + * @param format The format of the image being drawn. If it is XYBitmap, depth must be 1, or a + * "BadMatch" error results. The foreground pixel in the GC determines the source + * for the one bits in the image, and the background pixel determines the source + * for the zero bits. For XYPixmap and ZPixmap, the depth must match the depth of + * the drawable, or a "BadMatch" error results. + * @param send_event True if the server should send an XCB_SHM_COMPLETION event when the blit + * completes. + * @param offset The offset that the source image starts at. * @return A cookie * - * Delivers a request to the X server. + * Copy data from the shared memory to the specified drawable. The amount of bytes + * written to the destination image is always equal to the number of bytes read + * from the shared memory segment. * * This form can be used only if the request will not cause * a reply to be generated. Any returned error will be @@ -415,11 +467,37 @@ xcb_shm_put_image_checked (xcb_connection_t *c, uint32_t offset); /** + * @brief Copy data from the shared memory to the specified drawable. * * @param c The connection + * @param drawable The drawable to draw to. + * @param gc The graphics context to use. + * @param total_width The total width of the source image. + * @param total_height The total height of the source image. + * @param src_x The source X coordinate of the sub-image to copy. + * @param src_y The source Y coordinate of the sub-image to copy. + * @param src_width The width, in source image coordinates, of the data to copy from the source. + * The X server will use this to determine the amount of data to copy. The amount + * of the destination image that is overwritten is determined automatically. + * @param src_height The height, in source image coordinates, of the data to copy from the source. + * The X server will use this to determine the amount of data to copy. The amount + * of the destination image that is overwritten is determined automatically. + * @param dst_x The X coordinate on the destination drawable to copy to. + * @param dst_y The Y coordinate on the destination drawable to copy to. + * @param depth The depth to use. + * @param format The format of the image being drawn. If it is XYBitmap, depth must be 1, or a + * "BadMatch" error results. The foreground pixel in the GC determines the source + * for the one bits in the image, and the background pixel determines the source + * for the zero bits. For XYPixmap and ZPixmap, the depth must match the depth of + * the drawable, or a "BadMatch" error results. + * @param send_event True if the server should send an XCB_SHM_COMPLETION event when the blit + * completes. + * @param offset The offset that the source image starts at. * @return A cookie * - * Delivers a request to the X server. + * Copy data from the shared memory to the specified drawable. The amount of bytes + * written to the destination image is always equal to the number of bytes read + * from the shared memory segment. * */ xcb_void_cookie_t @@ -441,11 +519,23 @@ xcb_shm_put_image (xcb_connection_t *c, uint32_t offset); /** + * @brief Copies data from the specified drawable to the shared memory segment. * * @param c The connection + * @param drawable The drawable to copy the image out of. + * @param x The X coordinate in the drawable to begin copying at. + * @param y The Y coordinate in the drawable to begin copying at. + * @param width The width of the image to copy. + * @param height The height of the image to copy. + * @param plane_mask A mask that determines which planes are used. + * @param format The format to use for the copy (???). + * @param shmseg The destination shared memory segment. + * @param offset The offset in the shared memory segment to copy data to. * @return A cookie * - * Delivers a request to the X server. + * Copy data from the specified drawable to the shared memory segment. The amount + * of bytes written to the destination image is always equal to the number of bytes + * read from the shared memory segment. * */ xcb_shm_get_image_cookie_t @@ -461,11 +551,23 @@ xcb_shm_get_image (xcb_connection_t *c, uint32_t offset); /** + * @brief Copies data from the specified drawable to the shared memory segment. * * @param c The connection + * @param drawable The drawable to copy the image out of. + * @param x The X coordinate in the drawable to begin copying at. + * @param y The Y coordinate in the drawable to begin copying at. + * @param width The width of the image to copy. + * @param height The height of the image to copy. + * @param plane_mask A mask that determines which planes are used. + * @param format The format to use for the copy (???). + * @param shmseg The destination shared memory segment. + * @param offset The offset in the shared memory segment to copy data to. * @return A cookie * - * Delivers a request to the X server. + * Copy data from the specified drawable to the shared memory segment. The amount + * of bytes written to the destination image is always equal to the number of bytes + * read from the shared memory segment. * * This form can be used only if the request will cause * a reply to be generated. Any returned error will be @@ -503,11 +605,21 @@ xcb_shm_get_image_reply (xcb_connection_t *c, xcb_generic_error_t **e); /** + * @brief Create a pixmap backed by shared memory. * * @param c The connection + * @param pid A pixmap ID created with xcb_generate_id(). + * @param drawable The drawable to create the pixmap in. + * @param width The width of the pixmap to create. Must be nonzero, or a Value error results. + * @param height The height of the pixmap to create. Must be nonzero, or a Value error results. + * @param depth The depth of the pixmap to create. Must be nonzero, or a Value error results. + * @param shmseg The shared memory segment to use to create the pixmap. + * @param offset The offset in the segment to create the pixmap at. * @return A cookie * - * Delivers a request to the X server. + * Create a pixmap backed by shared memory. Writes to the shared memory will be + * reflected in the contents of the pixmap, and writes to the pixmap will be + * reflected in the contents of the shared memory. * * This form can be used only if the request will not cause * a reply to be generated. Any returned error will be @@ -524,11 +636,21 @@ xcb_shm_create_pixmap_checked (xcb_connection_t *c, uint32_t offset); /** + * @brief Create a pixmap backed by shared memory. * * @param c The connection + * @param pid A pixmap ID created with xcb_generate_id(). + * @param drawable The drawable to create the pixmap in. + * @param width The width of the pixmap to create. Must be nonzero, or a Value error results. + * @param height The height of the pixmap to create. Must be nonzero, or a Value error results. + * @param depth The depth of the pixmap to create. Must be nonzero, or a Value error results. + * @param shmseg The shared memory segment to use to create the pixmap. + * @param offset The offset in the segment to create the pixmap at. * @return A cookie * - * Delivers a request to the X server. + * Create a pixmap backed by shared memory. Writes to the shared memory will be + * reflected in the contents of the pixmap, and writes to the pixmap will be + * reflected in the contents of the shared memory. * */ xcb_void_cookie_t @@ -542,11 +664,17 @@ xcb_shm_create_pixmap (xcb_connection_t *c, uint32_t offset); /** + * @brief Create a shared memory segment * * @param c The connection + * @param shmseg A shared memory segment ID created with xcb_generate_id(). + * @param shm_fd The file descriptor the server should mmap(). + * @param read_only True if the segment shall be mapped read only by the X11 server, otherwise false. * @return A cookie * - * Delivers a request to the X server. + * Create a shared memory segment. The file descriptor will be mapped at offset + * zero, and the size will be obtained using fstat(). A zero size will result in a + * Value error. * * This form can be used only if the request will not cause * a reply to be generated. Any returned error will be @@ -559,11 +687,17 @@ xcb_shm_attach_fd_checked (xcb_connection_t *c, uint8_t read_only); /** + * @brief Create a shared memory segment * * @param c The connection + * @param shmseg A shared memory segment ID created with xcb_generate_id(). + * @param shm_fd The file descriptor the server should mmap(). + * @param read_only True if the segment shall be mapped read only by the X11 server, otherwise false. * @return A cookie * - * Delivers a request to the X server. + * Create a shared memory segment. The file descriptor will be mapped at offset + * zero, and the size will be obtained using fstat(). A zero size will result in a + * Value error. * */ xcb_void_cookie_t @@ -573,11 +707,16 @@ xcb_shm_attach_fd (xcb_connection_t *c, uint8_t read_only); /** + * @brief Asks the server to allocate a shared memory segment. * * @param c The connection + * @param shmseg A shared memory segment ID created with xcb_generate_id(). + * @param size The size of the segment to create. + * @param read_only True if the server should map the segment read-only; otherwise false. * @return A cookie * - * Delivers a request to the X server. + * Asks the server to allocate a shared memory segment. The server’s reply will + * include a file descriptor for the client to pass to mmap(). * */ xcb_shm_create_segment_cookie_t @@ -587,11 +726,16 @@ xcb_shm_create_segment (xcb_connection_t *c, uint8_t read_only); /** + * @brief Asks the server to allocate a shared memory segment. * * @param c The connection + * @param shmseg A shared memory segment ID created with xcb_generate_id(). + * @param size The size of the segment to create. + * @param read_only True if the server should map the segment read-only; otherwise false. * @return A cookie * - * Delivers a request to the X server. + * Asks the server to allocate a shared memory segment. The server’s reply will + * include a file descriptor for the client to pass to mmap(). * * This form can be used only if the request will cause * a reply to be generated. Any returned error will be diff --git a/lib/libxcb/src/xfixes.h b/lib/libxcb/src/xfixes.h index cf95f63c..574b15de 100644 --- a/lib/libxcb/src/xfixes.h +++ b/lib/libxcb/src/xfixes.h @@ -739,7 +739,15 @@ typedef struct xcb_xfixes_delete_pointer_barrier_request_t { typedef enum xcb_xfixes_client_disconnect_flags_t { XCB_XFIXES_CLIENT_DISCONNECT_FLAGS_DEFAULT = 0, +/**< The default behavior for regular clients: the X11 server won't terminate as long +as such clients are still connected, and should this client disconnect, the +server will continue running so long as other clients (that have not set +XFixesClientDisconnectFlagTerminate) are connected. */ + XCB_XFIXES_CLIENT_DISCONNECT_FLAGS_TERMINATE = 1 +/**< Indicates to the X11 server that it can ignore the client and terminate itself +even though the client is still connected to the X11 server. */ + } xcb_xfixes_client_disconnect_flags_t; /** Opcode for xcb_xfixes_set_client_disconnect_mode. */ @@ -2046,11 +2054,13 @@ xcb_xfixes_delete_pointer_barrier (xcb_connection_t *c, xcb_xfixes_barrier_t barrier); /** + * @brief Sets the disconnect mode for the client. * * @param c The connection + * @param disconnect_mode The new disconnect mode. * @return A cookie * - * Delivers a request to the X server. + * No description yet * * This form can be used only if the request will not cause * a reply to be generated. Any returned error will be @@ -2061,11 +2071,13 @@ xcb_xfixes_set_client_disconnect_mode_checked (xcb_connection_t *c, uint32_t disconnect_mode); /** + * @brief Sets the disconnect mode for the client. * * @param c The connection + * @param disconnect_mode The new disconnect mode. * @return A cookie * - * Delivers a request to the X server. + * No description yet * */ xcb_void_cookie_t diff --git a/lib/libxcb/src/xinput.c b/lib/libxcb/src/xinput.c index 38fc6c48..159521a7 100644 --- a/lib/libxcb/src/xinput.c +++ b/lib/libxcb/src/xinput.c @@ -4325,13 +4325,13 @@ xcb_input_change_feedback_control_checked (xcb_connection_t *c, xcb_input_feedback_ctl_t *feedback) { static const xcb_protocol_request_t xcb_req = { - .count = 4, + .count = 3, .ext = &xcb_input_id, .opcode = XCB_INPUT_CHANGE_FEEDBACK_CONTROL, .isvoid = 1 }; - struct iovec xcb_parts[6]; + struct iovec xcb_parts[5]; xcb_void_cookie_t xcb_ret; xcb_input_change_feedback_control_request_t xcb_out; @@ -4361,13 +4361,13 @@ xcb_input_change_feedback_control (xcb_connection_t *c, xcb_input_feedback_ctl_t *feedback) { static const xcb_protocol_request_t xcb_req = { - .count = 4, + .count = 3, .ext = &xcb_input_id, .opcode = XCB_INPUT_CHANGE_FEEDBACK_CONTROL, .isvoid = 1 }; - struct iovec xcb_parts[6]; + struct iovec xcb_parts[5]; xcb_void_cookie_t xcb_ret; xcb_input_change_feedback_control_request_t xcb_out; @@ -7311,13 +7311,13 @@ xcb_input_change_device_control (xcb_connection_t *c, xcb_input_device_ctl_t *control) { static const xcb_protocol_request_t xcb_req = { - .count = 4, + .count = 3, .ext = &xcb_input_id, .opcode = XCB_INPUT_CHANGE_DEVICE_CONTROL, .isvoid = 0 }; - struct iovec xcb_parts[6]; + struct iovec xcb_parts[5]; xcb_input_change_device_control_cookie_t xcb_ret; xcb_input_change_device_control_request_t xcb_out; @@ -7345,13 +7345,13 @@ xcb_input_change_device_control_unchecked (xcb_connection_t *c, xcb_input_device_ctl_t *control) { static const xcb_protocol_request_t xcb_req = { - .count = 4, + .count = 3, .ext = &xcb_input_id, .opcode = XCB_INPUT_CHANGE_DEVICE_CONTROL, .isvoid = 0 }; - struct iovec xcb_parts[6]; + struct iovec xcb_parts[5]; xcb_input_change_device_control_cookie_t xcb_ret; xcb_input_change_device_control_request_t xcb_out; diff --git a/proto/xcb-proto/autogen.sh b/proto/xcb-proto/autogen.sh index fc34bd55..72cba586 100644 --- a/proto/xcb-proto/autogen.sh +++ b/proto/xcb-proto/autogen.sh @@ -1,14 +1,17 @@ #! /bin/sh -srcdir=`dirname $0` +srcdir=`dirname "$0"` test -z "$srcdir" && srcdir=. ORIGDIR=`pwd` -cd $srcdir +cd "$srcdir" autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? +cd "$ORIGDIR" || exit $? + +git config --local --get format.subjectPrefix >/dev/null 2>&1 || + git config --local format.subjectPrefix "PATCH xcbproto" if test -z "$NOCONFIGURE"; then - $srcdir/configure "$@" + exec "$srcdir"/configure "$@" fi diff --git a/proto/xcb-proto/configure.ac b/proto/xcb-proto/configure.ac index 27a85da3..60a1b783 100644 --- a/proto/xcb-proto/configure.ac +++ b/proto/xcb-proto/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ(2.57) AC_INIT([XCB Proto], - 1.15.2, + 1.17.0, [xcb@lists.freedesktop.org]) AC_CONFIG_SRCDIR([xcb-proto.pc.in]) AM_INIT_AUTOMAKE([foreign dist-xz]) diff --git a/proto/xcb-proto/src/bigreq.xml b/proto/xcb-proto/src/bigreq.xml index 3cca2f77..ddd1e210 100644 --- a/proto/xcb-proto/src/bigreq.xml +++ b/proto/xcb-proto/src/bigreq.xml @@ -33,6 +33,20 @@ authorization from the authors. + + +The maximum length of requests supported by the server, in 4-byte units. + + + + Enable the BIG-REQUESTS extension + +This enables the BIG-REQUESTS extension, which allows for requests larger than +262140 bytes in length. When enabled, if the 16-bit length field is zero, it +is immediately followed by a 32-bit length field specifying the length of the +request in 4-byte units. + + diff --git a/proto/xcb-proto/src/composite.xml b/proto/xcb-proto/src/composite.xml index 86de1462..dcbf9a6d 100644 --- a/proto/xcb-proto/src/composite.xml +++ b/proto/xcb-proto/src/composite.xml @@ -23,6 +23,48 @@ Except as contained in this notice, the names of the authors or their institutions shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from the authors. + +Copyright (c) 2006, Oracle and/or its affiliates. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. + +Copyright © 2003 Keith Packard + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, 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 Keith Packard not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Keith Packard makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL KEITH PACKARD 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. + --> + + The negotiated version of Composite + +This indicates the version of Composite chosen by the server. It will always be +less than or equal to the version offered by the client. + + The major version chosen by the server. + The minor version chosen by the server. + + + Negotiate the version of Composite + +This negotiates the version of the Composite extension. It must be precede all +other requests using Composite. Failure to do so will cause a BadRequest error. + + The major version supported by the client. + The minor version supported by the client. + + + Redirect the hierarchy starting at "window" to off-screen storage. + + The hierarchy starting at 'window' is directed to off-screen + storage. When all clients enabling redirection terminate, + the redirection will automatically be disabled. + + The root window may not be redirected. Doing so results in a Match + error. + + The root of the hierarchy to redirect to off-screen storage. + + Whether contents are automatically mirrored to the parent window. If one client + already specifies an update type of Manual, any attempt by another to specify a + mode of Manual so will result in an Access error. + + + + Redirect all current and future children of ‘window’ + + Hierarchies starting at all current and future children of window + will be redirected as in RedirectWindow. If update is Manual, + then painting of the window background during window manipulation + and ClearArea requests is inhibited. + + The root of the hierarchy to redirect to off-screen storage. + + Whether contents are automatically mirrored to the parent window. If one client + already specifies an update type of Manual, any attempt by another to specify a + mode of Manual so will result in an Access error. + + + + Terminate redirection of the specified window. + + Redirection of the specified window will be terminated. This cannot be + used if the window was redirected with RedirectSubwindows. + + + The window to terminate redirection of. Must be redirected by the + current client, or a Value error results. + + + The update type passed to RedirectWindows. If this does not match the + previously requested update type, a Value error results. + + + + Terminate redirection of the specified window’s children + + Redirection of all children of window will be terminated. + + + The window to terminate redirection of. Must have previously been + selected for sub-redirection by the current client, or a Value error + results. + + + The update type passed to RedirectSubWindows. If this does not match + the previously requested update type, a Value error results. + + diff --git a/proto/xcb-proto/src/damage.xml b/proto/xcb-proto/src/damage.xml index c04721d1..930090a3 100644 --- a/proto/xcb-proto/src/damage.xml +++ b/proto/xcb-proto/src/damage.xml @@ -51,7 +51,26 @@ authorization from the authors. + + The negotiated version of the DAMAGE extension + +This indicates the version of the DAMAGE extension chosen by the server. +It will always be less than or equal to the version offered by the client. + + The major version chosen by the server. + The minor version chosen by the server. + + + Negotiate the version of the DAMAGE extension + +This negotiates the version of the DAMAGE extension. It must precede any other +request using the DAMAGE extension. Failure to do so will cause a BadRequest +error for those requests. + + The major version supported by the client. + The minor version supported by the client. + @@ -59,21 +78,84 @@ authorization from the authors. + + Creates a Damage object to monitor changes to a drawable. + + + The ID of the drawable to be monitored. + The level of detail to be provided in Damage events. + + + Destroys a previously created Damage object. + +This destroys a Damage object and requests the X server stop reporting +the changes it was tracking. + + + + + Remove regions from a previously created Damage object. + +This updates the regions of damage recorded in a a Damage object. +See https://www.x.org/releases/current/doc/damageproto/damageproto.txt +for details. + + The ID you provided to `xcb_create_damage`. + + + Add a region to a previously created Damage object. + +This updates the regions of damage recorded in a a Damage object. +See https://www.x.org/releases/current/doc/damageproto/damageproto.txt +for details. + + The ID you provided to `xcb_create_damage`. + @@ -83,5 +165,29 @@ authorization from the authors. + + the contents of the monitored drawable have changed + + + + + + + + diff --git a/proto/xcb-proto/src/dpms.xml b/proto/xcb-proto/src/dpms.xml index 55812845..814a14ec 100644 --- a/proto/xcb-proto/src/dpms.xml +++ b/proto/xcb-proto/src/dpms.xml @@ -26,7 +26,8 @@ sale, use or other dealings in this Software without prior written authorization from the authors. --> + major-version="1" minor-version="2"> + xproto @@ -84,4 +85,20 @@ authorization from the authors. + + + 0 + + + + + + + + + + + + + diff --git a/proto/xcb-proto/src/dri3.xml b/proto/xcb-proto/src/dri3.xml index 9549fd4b..d681aae8 100644 --- a/proto/xcb-proto/src/dri3.xml +++ b/proto/xcb-proto/src/dri3.xml @@ -23,10 +23,11 @@ OF THIS SOFTWARE. --> + major-version="1" minor-version="4"> xproto + @@ -170,4 +171,15 @@ OF THIS SOFTWARE. + + + + + + + + + + + diff --git a/proto/xcb-proto/src/present.xml b/proto/xcb-proto/src/present.xml index fb06e73f..bae445f5 100644 --- a/proto/xcb-proto/src/present.xml +++ b/proto/xcb-proto/src/present.xml @@ -23,11 +23,12 @@ OF THIS SOFTWARE. --> + major-version="1" minor-version="4"> xproto randr xfixes sync + dri3 @@ -52,6 +53,7 @@ OF THIS SOFTWARE. 1 2 3 + 4 @@ -59,6 +61,9 @@ OF THIS SOFTWARE. 0 1 2 + 3 + + 4 @@ -135,6 +140,29 @@ OF THIS SOFTWARE. + + + + + + + + + + + + + + + + + + + + + + + diff --git a/proto/xcb-proto/src/screensaver.xml b/proto/xcb-proto/src/screensaver.xml index c546f944..2c43b4db 100644 --- a/proto/xcb-proto/src/screensaver.xml +++ b/proto/xcb-proto/src/screensaver.xml @@ -99,63 +99,63 @@ Draft Standard Version 1.1 value_mask - BackPixmap + BackPixmap - BackPixel + BackPixel - BorderPixmap + BorderPixmap - BorderPixel + BorderPixel - BitGravity + BitGravity - WinGravity + WinGravity - BackingStore + BackingStore - BackingPlanes + BackingPlanes - BackingPixel + BackingPixel - OverrideRedirect + OverrideRedirect - SaveUnder + SaveUnder - EventMask + EventMask - DontPropagate + DontPropagate - Colormap + Colormap - Cursor + Cursor diff --git a/proto/xcb-proto/src/shm.xml b/proto/xcb-proto/src/shm.xml index c2605da0..0f93a2cd 100644 --- a/proto/xcb-proto/src/shm.xml +++ b/proto/xcb-proto/src/shm.xml @@ -39,6 +39,29 @@ authorization from the authors. + + Report that an XCB_SHM_PUT_IMAGE request has completed + + + + + + + @@ -52,7 +75,39 @@ authorization from the authors. + + The version of the MIT-SHM extension supported by the server + + + + + The UID of the server. + The GID of the server. + + + Query the version of the MIT-SHM extension. + + @@ -60,10 +115,36 @@ authorization from the authors. + + Attach a System V shared memory segment. + + + + + + + Destroys the specified shared memory segment. + + The segment to be destroyed. + @@ -83,6 +164,49 @@ authorization from the authors. + + Copy data from the shared memory to the specified drawable. + + The drawable to draw to. + The graphics context to use. + The total width of the source image. + The total height of the source image. + The source X coordinate of the sub-image to copy. + The source Y coordinate of the sub-image to copy. + + + + + The depth to use. + + + The offset that the source image starts at. + @@ -100,7 +224,33 @@ authorization from the authors. + + Indicates the result of the copy. + + The depth of the source drawable. + The visual ID of the source drawable. + The number of bytes copied. + + + Copies data from the specified drawable to the shared memory segment. + + The drawable to copy the image out of. + The X coordinate in the drawable to begin copying at. + The Y coordinate in the drawable to begin copying at. + The width of the image to copy. + The height of the image to copy. + A mask that determines which planes are used. + The format to use for the copy (???). + The destination shared memory segment. + The offset in the shared memory segment to copy data to. + @@ -112,6 +262,31 @@ authorization from the authors. + + Create a pixmap backed by shared memory. + +Create a pixmap backed by shared memory. Writes to the shared memory will be +reflected in the contents of the pixmap, and writes to the pixmap will be +reflected in the contents of the shared memory. + + A pixmap ID created with xcb_generate_id(). + The drawable to create the pixmap in. + + + + + + @@ -119,6 +294,21 @@ authorization from the authors. + + Create a shared memory segment + + + The file descriptor the server should mmap(). + + @@ -130,6 +320,30 @@ authorization from the authors. + + The returned file descriptor. + + + + + Asks the server to allocate a shared memory segment. + + + The size of the segment to create. + + diff --git a/proto/xcb-proto/src/xfixes.xml b/proto/xcb-proto/src/xfixes.xml index a01cd7b0..442bc02e 100644 --- a/proto/xcb-proto/src/xfixes.xml +++ b/proto/xcb-proto/src/xfixes.xml @@ -365,10 +365,28 @@ authorization from the authors. 0 0 + + + + + + Sets the disconnect mode for the client. + + @@ -376,7 +394,12 @@ authorization from the authors. + + Gets the disconnect mode for the client. + + - diff --git a/share/mk/bsd.xorg.mk b/share/mk/bsd.xorg.mk index 768d6521..dc2bd802 100644 --- a/share/mk/bsd.xorg.mk +++ b/share/mk/bsd.xorg.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.xorg.mk,v 1.66 2024/07/09 09:27:00 matthieu Exp $ -*- makefile -*- +# $OpenBSD: bsd.xorg.mk,v 1.67 2024/07/10 09:51:33 matthieu Exp $ -*- makefile -*- # # Copyright 2006,2012 Matthieu Herrb # @@ -21,7 +21,7 @@ AUTOMAKE_VERSION= 1.12 AUTOCONF_VERSION= 2.71 -PYTHON_VERSION= 3.10 +PYTHON_VERSION= 3.11 # Where source lives XSRCDIR?= /usr/xenocara

: "₽" U20bd # ROUBLE SIGN + : "₽" U20bd # ROUBLE SIGN + : "₽" U20bd # ROUBLE SIGN + : "₽" U20bd # ROUBLE SIGN + : "₽" U20bd # ROUBLE SIGN XCOMM Dashes : "–" U2013 # EN DASH @@ -260,12 +248,8 @@ XCOMM Other symbols : "¤" currency # CURRENCY SIGN : "¤" currency # CURRENCY SIGN - : "¤" currency # CURRENCY SIGN - : "¤" currency # CURRENCY SIGN : "¤" currency # CURRENCY SIGN : "¤" currency # CURRENCY SIGN - : "¤" currency # CURRENCY SIGN - : "¤" currency # CURRENCY SIGN : "№" numerosign # NUMERO SIGN : "№" numerosign # NUMERO SIGN @@ -294,6 +278,11 @@ XCOMM Latin-1 Supplement : "ª" ordfeminine # FEMININE ORDINAL INDICATOR : "º" masculine # MASCULINE ORDINAL INDICATOR : "º" masculine # MASCULINE ORDINAL INDICATOR + <1> : "¹" onesuperior # SUPERSCRIPT ONE + <1> : "¹" onesuperior # SUPERSCRIPT ONE + <1> : "¹" onesuperior # SUPERSCRIPT ONE + : "¹" onesuperior # SUPERSCRIPT ONE + : "¹" onesuperior # SUPERSCRIPT ONE <2> : "²" twosuperior # SUPERSCRIPT TWO <2> : "²" twosuperior # SUPERSCRIPT TWO <2> : "²" twosuperior # SUPERSCRIPT TWO @@ -307,11 +296,6 @@ XCOMM Latin-1 Supplement : "µ" mu # MICRO SIGN : "µ" mu # MICRO SIGN : "µ" mu # MICRO SIGN - <1> : "¹" onesuperior # SUPERSCRIPT ONE - <1> : "¹" onesuperior # SUPERSCRIPT ONE - <1> : "¹" onesuperior # SUPERSCRIPT ONE - : "¹" onesuperior # SUPERSCRIPT ONE - : "¹" onesuperior # SUPERSCRIPT ONE <1> <4> : "¼" onequarter # VULGAR FRACTION ONE QUARTER <1> <2> : "½" onehalf # VULGAR FRACTION ONE HALF <3> <4> : "¾" threequarters # VULGAR FRACTION THREE QUARTERS @@ -381,11 +365,11 @@ XCOMM Latin-1 Supplement : "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS : "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS : "Ï" Idiaeresis # LATIN CAPITAL LETTER I WITH DIAERESIS - : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301 - : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301 - : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301 - : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301 - : "J́" # LATIN CAPITAL LETTER J U004A with COMBINING ACUTE ACCENT U0301 + : "J́" # LATIN CAPITAL LETTER J plus COMBINING ACUTE + : "J́" # LATIN CAPITAL LETTER J plus COMBINING ACUTE + : "J́" # LATIN CAPITAL LETTER J plus COMBINING ACUTE + : "J́" # LATIN CAPITAL LETTER J plus COMBINING ACUTE + : "J́" # LATIN CAPITAL LETTER J plus COMBINING ACUTE : "Ð" ETH # LATIN CAPITAL LETTER ETH : "Ñ" Ntilde # LATIN CAPITAL LETTER N WITH TILDE : "Ñ" Ntilde # LATIN CAPITAL LETTER N WITH TILDE @@ -506,11 +490,11 @@ XCOMM Latin-1 Supplement : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS : "ï" idiaeresis # LATIN SMALL LETTER I WITH DIAERESIS - : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 - : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 - : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 - : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 - : "j́" # LATIN SMALL LETTER J U006A with COMBINING ACUTE ACCENT U0301 + : "j́" # LATIN SMALL LETTER J plus COMBINING ACUTE + : "j́" # LATIN SMALL LETTER J plus COMBINING ACUTE + : "j́" # LATIN SMALL LETTER J plus COMBINING ACUTE + : "j́" # LATIN SMALL LETTER J plus COMBINING ACUTE + : "j́" # LATIN SMALL LETTER J plus COMBINING ACUTE : "ð" eth # LATIN SMALL LETTER ETH : "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE : "ñ" ntilde # LATIN SMALL LETTER N WITH TILDE @@ -706,20 +690,18 @@ XCOMM Latin Extended-A : "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE : "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE : "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE - : "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE - : "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE : "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE : "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE : "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE + : "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE : "Ğ" U011E # LATIN CAPITAL LETTER G WITH BREVE : "ğ" U011F # LATIN SMALL LETTER G WITH BREVE : "ğ" U011F # LATIN SMALL LETTER G WITH BREVE : "ğ" U011F # LATIN SMALL LETTER G WITH BREVE - : "ğ" U011F # LATIN SMALL LETTER G WITH BREVE - : "ğ" U011F # LATIN SMALL LETTER G WITH BREVE : "ğ" U011F # LATIN SMALL LETTER G WITH BREVE : "ğ" U011F # LATIN SMALL LETTER G WITH BREVE : "ğ" U011F # LATIN SMALL LETTER G WITH BREVE + : "ğ" U011F # LATIN SMALL LETTER G WITH BREVE : "ğ" U011F # LATIN SMALL LETTER G WITH BREVE : "Ġ" U0120 # LATIN CAPITAL LETTER G WITH DOT ABOVE : "Ġ" U0120 # LATIN CAPITAL LETTER G WITH DOT ABOVE @@ -1058,11 +1040,14 @@ XCOMM Latin Extended-A : "ž" U017E # LATIN SMALL LETTER Z WITH CARON : "ž" U017E # LATIN SMALL LETTER Z WITH CARON : "ž" U017E # LATIN SMALL LETTER Z WITH CARON + : "ſ" U017F # LATIN SMALL LETTER LONG S + : "ſ" U017F # LATIN SMALL LETTER LONG S XCOMM Latin Extended-B : "ƀ" U0180 # LATIN SMALL LETTER B WITH STROKE : "ƀ" U0180 # LATIN SMALL LETTER B WITH STROKE : "ƀ" U0180 # LATIN SMALL LETTER B WITH STROKE + : "Ə" U018F # LATIN CAPITAL LETTER SCHWA : "Ɨ" U0197 # LATIN CAPITAL LETTER I WITH STROKE : "Ɨ" U0197 # LATIN CAPITAL LETTER I WITH STROKE : "Ɨ" U0197 # LATIN CAPITAL LETTER I WITH STROKE @@ -1234,18 +1219,12 @@ XCOMM Latin Extended-B : "ǫ" U01EB # LATIN SMALL LETTER O WITH OGONEK : "ǫ" U01EB # LATIN SMALL LETTER O WITH OGONEK : "ǫ" U01EB # LATIN SMALL LETTER O WITH OGONEK - : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON - : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON - : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON : "Ǭ" U01EC # LATIN CAPITAL LETTER O WITH OGONEK AND MACRON - : "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON - : "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON - : "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON : "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON : "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON : "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON @@ -1339,6 +1318,18 @@ XCOMM Latin Extended-B : "ȕ" U0215 # LATIN SMALL LETTER U WITH DOUBLE GRAVE : "Ȗ" U0216 # LATIN CAPITAL LETTER U WITH INVERTED BREVE : "ȗ" U0217 # LATIN SMALL LETTER U WITH INVERTED BREVE + : "Ș" U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW + : "Ș" U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW + : "Ș" U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW + : "ș" U0219 # LATIN SMALL LETTER S WITH COMMA BELOW + : "ș" U0219 # LATIN SMALL LETTER S WITH COMMA BELOW + : "ș" U0219 # LATIN SMALL LETTER S WITH COMMA BELOW + : "Ț" U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW + : "Ț" U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW + : "Ț" U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW + : "ț" U021B # LATIN SMALL LETTER T WITH COMMA BELOW + : "ț" U021B # LATIN SMALL LETTER T WITH COMMA BELOW + : "ț" U021B # LATIN SMALL LETTER T WITH COMMA BELOW : "Ȟ" U021E # LATIN CAPITAL LETTER H WITH CARON : "Ȟ" U021E # LATIN CAPITAL LETTER H WITH CARON : "Ȟ" U021E # LATIN CAPITAL LETTER H WITH CARON @@ -1393,18 +1384,12 @@ XCOMM Latin Extended-B : "Ȯ" U022E # LATIN CAPITAL LETTER O WITH DOT ABOVE : "ȯ" U022F # LATIN SMALL LETTER O WITH DOT ABOVE : "ȯ" U022F # LATIN SMALL LETTER O WITH DOT ABOVE - : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON - : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON - : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON - : "ȱ" U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON - : "ȱ" U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON - : "ȱ" U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON : "ȱ" U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON : "ȱ" U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON : "ȱ" U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON @@ -1417,8 +1402,17 @@ XCOMM Latin Extended-B : "ȳ" U0233 # LATIN SMALL LETTER Y WITH MACRON : "ȳ" U0233 # LATIN SMALL LETTER Y WITH MACRON : "ȳ" U0233 # LATIN SMALL LETTER Y WITH MACRON - : "ə" U0259 # LATIN SMALL LETTER SCHWA + : "Ƀ" U0243 # LATIN CAPITAL LETTER B WITH STROKE + : "Ƀ" U0243 # LATIN CAPITAL LETTER B WITH STROKE + : "Ƀ" U0243 # LATIN CAPITAL LETTER B WITH STROKE +/* Four sequences for Samogitian. */ + : "Ė̄" # LATIN CAPITAL LETTER E WITH DOT ABOVE plus combining macron + : "Ė̄" # LATIN CAPITAL LETTER E WITH DOT ABOVE plus combining macron + : "ė̄" # LATIN SMALL LETTER E WITH DOT ABOVE plus combining macron + : "ė̄" # LATIN SMALL LETTER E WITH DOT ABOVE plus combining macron +XCOMM IPA Extensions + : "ə" U0259 # LATIN SMALL LETTER SCHWA : "ɨ" U0268 # LATIN SMALL LETTER I WITH STROKE : "ɨ" U0268 # LATIN SMALL LETTER I WITH STROKE : "ɨ" U0268 # LATIN SMALL LETTER I WITH STROKE @@ -1495,9 +1489,6 @@ XCOMM Greek : "Ώ" U038F # GREEK CAPITAL LETTER OMEGA WITH TONOS : "Ώ" U038F # GREEK CAPITAL LETTER OMEGA WITH TONOS : "Ώ" U038F # GREEK CAPITAL LETTER OMEGA WITH TONOS - : "ΐ" U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS - : "ΐ" U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS - : "ΐ" U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS : "ΐ" U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS : "ΐ" U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS : "ΐ" U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS @@ -1505,7 +1496,6 @@ XCOMM Greek : "ΐ" U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS : "ΐ" U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS : "ΐ" U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS - : "ΐ" U0390 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS : "Ϊ" U03AA # GREEK CAPITAL LETTER IOTA WITH DIALYTIKA : "Ϊ" U03AA # GREEK CAPITAL LETTER IOTA WITH DIALYTIKA : "Ϊ" U03AA # GREEK CAPITAL LETTER IOTA WITH DIALYTIKA @@ -1527,9 +1517,6 @@ XCOMM Greek : "ί" U03AF # GREEK SMALL LETTER IOTA WITH TONOS : "ί" U03AF # GREEK SMALL LETTER IOTA WITH TONOS : "ί" U03AF # GREEK SMALL LETTER IOTA WITH TONOS - : "ΰ" U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS - : "ΰ" U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS - : "ΰ" U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS : "ΰ" U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS : "ΰ" U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS : "ΰ" U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS @@ -1537,7 +1524,6 @@ XCOMM Greek : "ΰ" U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS : "ΰ" U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS : "ΰ" U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS - : "ΰ" U03B0 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS : "ϊ" U03CA # GREEK SMALL LETTER IOTA WITH DIALYTIKA : "ϊ" U03CA # GREEK SMALL LETTER IOTA WITH DIALYTIKA : "ϊ" U03CA # GREEK SMALL LETTER IOTA WITH DIALYTIKA @@ -2079,9 +2065,6 @@ XCOMM Latin Extended Additional : "ḙ" U1E19 # LATIN SMALL LETTER E WITH CIRCUMFLEX BELOW : "Ḛ" U1E1A # LATIN CAPITAL LETTER E WITH TILDE BELOW : "ḛ" U1E1B # LATIN SMALL LETTER E WITH TILDE BELOW - : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE - : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE - : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE @@ -2091,9 +2074,6 @@ XCOMM Latin Extended Additional : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE - : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE - : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE - : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE @@ -2496,6 +2476,8 @@ XCOMM Latin Extended Additional : "ẙ" U1E99 # LATIN SMALL LETTER Y WITH RING ABOVE : "ẛ" U1E9B # LATIN SMALL LETTER LONG S WITH DOT ABOVE : "ẛ" U1E9B # LATIN SMALL LETTER LONG S WITH DOT ABOVE + : "ẛ" U1E9B # LATIN SMALL LETTER LONG S WITH DOT ABOVE + : "ẛ" U1E9B # LATIN SMALL LETTER LONG S WITH DOT ABOVE : "Ạ" U1EA0 # LATIN CAPITAL LETTER A WITH DOT BELOW : "Ạ" U1EA0 # LATIN CAPITAL LETTER A WITH DOT BELOW : "ạ" U1EA1 # LATIN SMALL LETTER A WITH DOT BELOW @@ -2558,15 +2540,11 @@ XCOMM Latin Extended Additional : "ẫ" U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE : "ẫ" U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE : "ẫ" U1EAB # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE - : "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW - : "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW : "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW : "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW : "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW : "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW : "Ậ" U1EAC # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW - : "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW - : "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW : "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW : "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW : "ậ" U1EAD # LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW @@ -2634,9 +2612,6 @@ XCOMM Latin Extended Additional : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE - : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW - : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW - : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW @@ -2644,9 +2619,6 @@ XCOMM Latin Extended Additional : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW - : "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW - : "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW - : "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW : "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW : "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW : "ặ" U1EB7 # LATIN SMALL LETTER A WITH BREVE AND DOT BELOW @@ -2980,44 +2952,30 @@ XCOMM Greek Extended : "ἀ" U1F00 # GREEK SMALL LETTER ALPHA WITH PSILI : "ἁ" U1F01 # GREEK SMALL LETTER ALPHA WITH DASIA : "ἁ" U1F01 # GREEK SMALL LETTER ALPHA WITH DASIA - : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA - : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA : "ἂ" U1F02 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA - : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA - : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA : "ἃ" U1F03 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA - : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA - : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA - : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA : "ἄ" U1F04 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA - : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA - : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA - : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA : "ἅ" U1F05 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA - : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI - : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI : "ἆ" U1F06 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI - : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI - : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI : "ἇ" U1F07 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI @@ -3026,44 +2984,30 @@ XCOMM Greek Extended : "Ἀ" U1F08 # GREEK CAPITAL LETTER ALPHA WITH PSILI : "Ἁ" U1F09 # GREEK CAPITAL LETTER ALPHA WITH DASIA : "Ἁ" U1F09 # GREEK CAPITAL LETTER ALPHA WITH DASIA - : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA - : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA : "Ἂ" U1F0A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA - : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA - : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA : "Ἃ" U1F0B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA - : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA - : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA - : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA : "Ἄ" U1F0C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA - : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA - : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA - : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA : "Ἅ" U1F0D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA - : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI - : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI : "Ἆ" U1F0E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI - : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI - : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI : "Ἇ" U1F0F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI @@ -3072,30 +3016,20 @@ XCOMM Greek Extended : "ἐ" U1F10 # GREEK SMALL LETTER EPSILON WITH PSILI : "ἑ" U1F11 # GREEK SMALL LETTER EPSILON WITH DASIA : "ἑ" U1F11 # GREEK SMALL LETTER EPSILON WITH DASIA - : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA - : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA : "ἒ" U1F12 # GREEK SMALL LETTER EPSILON WITH PSILI AND VARIA - : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA - : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA : "ἓ" U1F13 # GREEK SMALL LETTER EPSILON WITH DASIA AND VARIA - : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA - : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA - : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA : "ἔ" U1F14 # GREEK SMALL LETTER EPSILON WITH PSILI AND OXIA - : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA - : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA - : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA : "ἕ" U1F15 # GREEK SMALL LETTER EPSILON WITH DASIA AND OXIA @@ -3106,30 +3040,20 @@ XCOMM Greek Extended : "Ἐ" U1F18 # GREEK CAPITAL LETTER EPSILON WITH PSILI : "Ἑ" U1F19 # GREEK CAPITAL LETTER EPSILON WITH DASIA : "Ἑ" U1F19 # GREEK CAPITAL LETTER EPSILON WITH DASIA - : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA - : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA : "Ἒ" U1F1A # GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA - : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA - : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA : "Ἓ" U1F1B # GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA - : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA - : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA - : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA : "Ἔ" U1F1C # GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA - : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA - : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA - : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA : "Ἕ" U1F1D # GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA @@ -3140,44 +3064,30 @@ XCOMM Greek Extended : "ἠ" U1F20 # GREEK SMALL LETTER ETA WITH PSILI : "ἡ" U1F21 # GREEK SMALL LETTER ETA WITH DASIA : "ἡ" U1F21 # GREEK SMALL LETTER ETA WITH DASIA - : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA - : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA : "ἢ" U1F22 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA - : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA - : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA : "ἣ" U1F23 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA - : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA - : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA - : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA : "ἤ" U1F24 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA - : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA - : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA - : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA : "ἥ" U1F25 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA - : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI - : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI : "ἦ" U1F26 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI - : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI - : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI : "ἧ" U1F27 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI @@ -3186,44 +3096,30 @@ XCOMM Greek Extended : "Ἠ" U1F28 # GREEK CAPITAL LETTER ETA WITH PSILI : "Ἡ" U1F29 # GREEK CAPITAL LETTER ETA WITH DASIA : "Ἡ" U1F29 # GREEK CAPITAL LETTER ETA WITH DASIA - : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA - : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA : "Ἢ" U1F2A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA - : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA - : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA : "Ἣ" U1F2B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA - : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA - : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA - : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA : "Ἤ" U1F2C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA - : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA - : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA - : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA : "Ἥ" U1F2D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA - : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI - : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI : "Ἦ" U1F2E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI - : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI - : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI : "Ἧ" U1F2F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI @@ -3232,44 +3128,30 @@ XCOMM Greek Extended : "ἰ" U1F30 # GREEK SMALL LETTER IOTA WITH PSILI : "ἱ" U1F31 # GREEK SMALL LETTER IOTA WITH DASIA : "ἱ" U1F31 # GREEK SMALL LETTER IOTA WITH DASIA - : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA - : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA : "ἲ" U1F32 # GREEK SMALL LETTER IOTA WITH PSILI AND VARIA - : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA - : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA : "ἳ" U1F33 # GREEK SMALL LETTER IOTA WITH DASIA AND VARIA - : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA - : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA - : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA : "ἴ" U1F34 # GREEK SMALL LETTER IOTA WITH PSILI AND OXIA - : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA - : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA - : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA : "ἵ" U1F35 # GREEK SMALL LETTER IOTA WITH DASIA AND OXIA - : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI - : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI : "ἶ" U1F36 # GREEK SMALL LETTER IOTA WITH PSILI AND PERISPOMENI - : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI - : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI : "ἷ" U1F37 # GREEK SMALL LETTER IOTA WITH DASIA AND PERISPOMENI @@ -3278,44 +3160,30 @@ XCOMM Greek Extended : "Ἰ" U1F38 # GREEK CAPITAL LETTER IOTA WITH PSILI : "Ἱ" U1F39 # GREEK CAPITAL LETTER IOTA WITH DASIA : "Ἱ" U1F39 # GREEK CAPITAL LETTER IOTA WITH DASIA - : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA - : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA : "Ἲ" U1F3A # GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA - : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA - : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA : "Ἳ" U1F3B # GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA - : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA - : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA - : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA : "Ἴ" U1F3C # GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA - : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA - : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA - : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA : "Ἵ" U1F3D # GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA - : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI - : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI : "Ἶ" U1F3E # GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI - : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI - : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI : "Ἷ" U1F3F # GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI @@ -3324,30 +3192,20 @@ XCOMM Greek Extended : "ὀ" U1F40 # GREEK SMALL LETTER OMICRON WITH PSILI : "ὁ" U1F41 # GREEK SMALL LETTER OMICRON WITH DASIA : "ὁ" U1F41 # GREEK SMALL LETTER OMICRON WITH DASIA - : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA - : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA : "ὂ" U1F42 # GREEK SMALL LETTER OMICRON WITH PSILI AND VARIA - : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA - : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA : "ὃ" U1F43 # GREEK SMALL LETTER OMICRON WITH DASIA AND VARIA - : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA - : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA - : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA : "ὄ" U1F44 # GREEK SMALL LETTER OMICRON WITH PSILI AND OXIA - : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA - : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA - : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA : "ὅ" U1F45 # GREEK SMALL LETTER OMICRON WITH DASIA AND OXIA @@ -3358,30 +3216,20 @@ XCOMM Greek Extended : "Ὀ" U1F48 # GREEK CAPITAL LETTER OMICRON WITH PSILI : "Ὁ" U1F49 # GREEK CAPITAL LETTER OMICRON WITH DASIA : "Ὁ" U1F49 # GREEK CAPITAL LETTER OMICRON WITH DASIA - : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA - : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA : "Ὂ" U1F4A # GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA - : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA - : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA : "Ὃ" U1F4B # GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA - : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA - : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA - : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA : "Ὄ" U1F4C # GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA - : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA - : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA - : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA : "Ὅ" U1F4D # GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA @@ -3392,67 +3240,46 @@ XCOMM Greek Extended : "ὐ" U1F50 # GREEK SMALL LETTER UPSILON WITH PSILI : "ὑ" U1F51 # GREEK SMALL LETTER UPSILON WITH DASIA : "ὑ" U1F51 # GREEK SMALL LETTER UPSILON WITH DASIA - : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA - : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA : "ὒ" U1F52 # GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA - : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA - : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA : "ὓ" U1F53 # GREEK SMALL LETTER UPSILON WITH DASIA AND VARIA - : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA - : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA - : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA : "ὔ" U1F54 # GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA - : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA - : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA - : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA : "ὕ" U1F55 # GREEK SMALL LETTER UPSILON WITH DASIA AND OXIA - : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI - : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI : "ὖ" U1F56 # GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI - : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI - : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI : "ὗ" U1F57 # GREEK SMALL LETTER UPSILON WITH DASIA AND PERISPOMENI : "Ὑ" U1F59 # GREEK CAPITAL LETTER UPSILON WITH DASIA : "Ὑ" U1F59 # GREEK CAPITAL LETTER UPSILON WITH DASIA - : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA - : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA : "Ὓ" U1F5B # GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA - : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA - : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA - : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA : "Ὕ" U1F5D # GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA - : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI - : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI : "Ὗ" U1F5F # GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI @@ -3461,44 +3288,30 @@ XCOMM Greek Extended : "ὠ" U1F60 # GREEK SMALL LETTER OMEGA WITH PSILI : "ὡ" U1F61 # GREEK SMALL LETTER OMEGA WITH DASIA : "ὡ" U1F61 # GREEK SMALL LETTER OMEGA WITH DASIA - : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA - : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA : "ὢ" U1F62 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA - : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA - : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA : "ὣ" U1F63 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA - : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA - : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA - : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA : "ὤ" U1F64 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA - : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA - : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA - : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA : "ὥ" U1F65 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA - : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI - : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI : "ὦ" U1F66 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI - : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI - : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI : "ὧ" U1F67 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI @@ -3507,44 +3320,30 @@ XCOMM Greek Extended : "Ὠ" U1F68 # GREEK CAPITAL LETTER OMEGA WITH PSILI : "Ὡ" U1F69 # GREEK CAPITAL LETTER OMEGA WITH DASIA : "Ὡ" U1F69 # GREEK CAPITAL LETTER OMEGA WITH DASIA - : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA - : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA : "Ὢ" U1F6A # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA - : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA - : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA : "Ὣ" U1F6B # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA - : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA - : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA - : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA : "Ὤ" U1F6C # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA - : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA - : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA - : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA : "Ὥ" U1F6D # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA - : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI - : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI : "Ὦ" U1F6E # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI - : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI - : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI : "Ὧ" U1F6F # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI @@ -3563,24 +3362,14 @@ XCOMM Greek Extended : "ὺ" U1F7A # GREEK SMALL LETTER UPSILON WITH VARIA : "ὼ" U1F7C # GREEK SMALL LETTER OMEGA WITH VARIA : "ὼ" U1F7C # GREEK SMALL LETTER OMEGA WITH VARIA - : "ᾀ" U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI - : "ᾀ" U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI : "ᾀ" U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI : "ᾀ" U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI : "ᾀ" U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI : "ᾀ" U1F80 # GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI - : "ᾁ" U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI - : "ᾁ" U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI : "ᾁ" U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI : "ᾁ" U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI : "ᾁ" U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI : "ᾁ" U1F81 # GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI - : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI - : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI - : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI - : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI - : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI - : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI @@ -3589,12 +3378,6 @@ XCOMM Greek Extended : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI : "ᾂ" U1F82 # GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI - : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI - : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI - : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI - : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI - : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI - : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI @@ -3603,18 +3386,8 @@ XCOMM Greek Extended : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI : "ᾃ" U1F83 # GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI - : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI @@ -3623,18 +3396,8 @@ XCOMM Greek Extended : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI : "ᾄ" U1F84 # GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI @@ -3643,12 +3406,6 @@ XCOMM Greek Extended : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI : "ᾅ" U1F85 # GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI @@ -3657,12 +3414,6 @@ XCOMM Greek Extended : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI : "ᾆ" U1F86 # GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI @@ -3671,24 +3422,14 @@ XCOMM Greek Extended : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI : "ᾇ" U1F87 # GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾈ" U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI - : "ᾈ" U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI : "ᾈ" U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI : "ᾈ" U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI : "ᾈ" U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI : "ᾈ" U1F88 # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI - : "ᾉ" U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI - : "ᾉ" U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI : "ᾉ" U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI : "ᾉ" U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI : "ᾉ" U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI : "ᾉ" U1F89 # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI - : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI - : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI - : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI - : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI - : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI - : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI @@ -3697,12 +3438,6 @@ XCOMM Greek Extended : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI : "ᾊ" U1F8A # GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI - : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI - : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI - : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI - : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI - : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI - : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI @@ -3711,18 +3446,8 @@ XCOMM Greek Extended : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI : "ᾋ" U1F8B # GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI - : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI @@ -3731,18 +3456,8 @@ XCOMM Greek Extended : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI : "ᾌ" U1F8C # GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI @@ -3751,12 +3466,6 @@ XCOMM Greek Extended : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI : "ᾍ" U1F8D # GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI @@ -3765,12 +3474,6 @@ XCOMM Greek Extended : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI : "ᾎ" U1F8E # GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI @@ -3779,24 +3482,14 @@ XCOMM Greek Extended : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI : "ᾏ" U1F8F # GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾐ" U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI - : "ᾐ" U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI : "ᾐ" U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI : "ᾐ" U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI : "ᾐ" U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI : "ᾐ" U1F90 # GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI - : "ᾑ" U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI - : "ᾑ" U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI : "ᾑ" U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI : "ᾑ" U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI : "ᾑ" U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI : "ᾑ" U1F91 # GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI - : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI - : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI - : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI - : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI - : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI - : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI @@ -3805,12 +3498,6 @@ XCOMM Greek Extended : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI : "ᾒ" U1F92 # GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI - : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI - : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI - : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI - : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI - : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI - : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI @@ -3819,18 +3506,8 @@ XCOMM Greek Extended : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI : "ᾓ" U1F93 # GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI - : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI @@ -3839,18 +3516,8 @@ XCOMM Greek Extended : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI : "ᾔ" U1F94 # GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI @@ -3859,12 +3526,6 @@ XCOMM Greek Extended : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI : "ᾕ" U1F95 # GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI @@ -3873,12 +3534,6 @@ XCOMM Greek Extended : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI : "ᾖ" U1F96 # GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI @@ -3887,24 +3542,14 @@ XCOMM Greek Extended : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI : "ᾗ" U1F97 # GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾘ" U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI - : "ᾘ" U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI : "ᾘ" U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI : "ᾘ" U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI : "ᾘ" U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI : "ᾘ" U1F98 # GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI - : "ᾙ" U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI - : "ᾙ" U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI : "ᾙ" U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI : "ᾙ" U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI : "ᾙ" U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI : "ᾙ" U1F99 # GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI - : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI - : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI - : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI - : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI - : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI - : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI @@ -3913,12 +3558,6 @@ XCOMM Greek Extended : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI : "ᾚ" U1F9A # GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI - : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI - : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI - : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI - : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI - : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI - : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI @@ -3927,18 +3566,8 @@ XCOMM Greek Extended : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI : "ᾛ" U1F9B # GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI - : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI @@ -3947,18 +3576,8 @@ XCOMM Greek Extended : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI : "ᾜ" U1F9C # GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI @@ -3967,12 +3586,6 @@ XCOMM Greek Extended : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI : "ᾝ" U1F9D # GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI @@ -3981,12 +3594,6 @@ XCOMM Greek Extended : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI : "ᾞ" U1F9E # GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI @@ -3995,24 +3602,14 @@ XCOMM Greek Extended : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI : "ᾟ" U1F9F # GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾠ" U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI - : "ᾠ" U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI : "ᾠ" U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI : "ᾠ" U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI : "ᾠ" U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI : "ᾠ" U1FA0 # GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI - : "ᾡ" U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI - : "ᾡ" U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI : "ᾡ" U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI : "ᾡ" U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI : "ᾡ" U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI : "ᾡ" U1FA1 # GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI - : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI - : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI - : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI - : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI - : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI - : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI @@ -4021,12 +3618,6 @@ XCOMM Greek Extended : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI : "ᾢ" U1FA2 # GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI - : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI - : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI - : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI - : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI - : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI - : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI @@ -4035,18 +3626,8 @@ XCOMM Greek Extended : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI : "ᾣ" U1FA3 # GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI - : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI @@ -4055,18 +3636,8 @@ XCOMM Greek Extended : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI : "ᾤ" U1FA4 # GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI - : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI @@ -4075,12 +3646,6 @@ XCOMM Greek Extended : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI : "ᾥ" U1FA5 # GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI - : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI @@ -4089,12 +3654,6 @@ XCOMM Greek Extended : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI : "ᾦ" U1FA6 # GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI @@ -4103,24 +3662,14 @@ XCOMM Greek Extended : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI : "ᾧ" U1FA7 # GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI - : "ᾨ" U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI - : "ᾨ" U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI : "ᾨ" U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI : "ᾨ" U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI : "ᾨ" U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI : "ᾨ" U1FA8 # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI - : "ᾩ" U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI - : "ᾩ" U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI : "ᾩ" U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI : "ᾩ" U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI : "ᾩ" U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI : "ᾩ" U1FA9 # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI - : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI - : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI - : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI - : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI - : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI - : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI @@ -4129,12 +3678,6 @@ XCOMM Greek Extended : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI : "ᾪ" U1FAA # GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI - : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI - : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI - : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI - : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI - : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI - : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI @@ -4143,18 +3686,8 @@ XCOMM Greek Extended : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI : "ᾫ" U1FAB # GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI - : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI @@ -4163,18 +3696,8 @@ XCOMM Greek Extended : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI : "ᾬ" U1FAC # GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI - : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI @@ -4183,12 +3706,6 @@ XCOMM Greek Extended : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI : "ᾭ" U1FAD # GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI - : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI @@ -4197,12 +3714,6 @@ XCOMM Greek Extended : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI : "ᾮ" U1FAE # GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI - : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI : "ᾯ" U1FAF # GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI @@ -4217,26 +3728,19 @@ XCOMM Greek Extended : "ᾱ" U1FB1 # GREEK SMALL LETTER ALPHA WITH MACRON : "ᾱ" U1FB1 # GREEK SMALL LETTER ALPHA WITH MACRON : "ᾱ" U1FB1 # GREEK SMALL LETTER ALPHA WITH MACRON - : "ᾲ" U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI - : "ᾲ" U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI : "ᾲ" U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI : "ᾲ" U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI : "ᾲ" U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI : "ᾲ" U1FB2 # GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI : "ᾳ" U1FB3 # GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI : "ᾳ" U1FB3 # GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI - : "ᾴ" U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI - : "ᾴ" U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI : "ᾴ" U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI - : "ᾴ" U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI : "ᾴ" U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI : "ᾴ" U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI : "ᾴ" U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI : "ᾴ" U1FB4 # GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI : "ᾶ" U1FB6 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI : "ᾶ" U1FB6 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI - : "ᾷ" U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI - : "ᾷ" U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI : "ᾷ" U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI : "ᾷ" U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI : "ᾷ" U1FB7 # GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI @@ -4253,26 +3757,19 @@ XCOMM Greek Extended : "ᾼ" U1FBC # GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI : "῁" U1FC1 # GREEK DIALYTIKA AND PERISPOMENI : "῁" U1FC1 # GREEK DIALYTIKA AND PERISPOMENI - : "ῂ" U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI - : "ῂ" U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI : "ῂ" U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI : "ῂ" U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI : "ῂ" U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI : "ῂ" U1FC2 # GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI : "ῃ" U1FC3 # GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI : "ῃ" U1FC3 # GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI - : "ῄ" U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI - : "ῄ" U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI : "ῄ" U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI - : "ῄ" U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI : "ῄ" U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI : "ῄ" U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI : "ῄ" U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI : "ῄ" U1FC4 # GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI : "ῆ" U1FC6 # GREEK SMALL LETTER ETA WITH PERISPOMENI : "ῆ" U1FC6 # GREEK SMALL LETTER ETA WITH PERISPOMENI - : "ῇ" U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI - : "ῇ" U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI : "ῇ" U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI : "ῇ" U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI : "ῇ" U1FC7 # GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI @@ -4283,29 +3780,18 @@ XCOMM Greek Extended : "Ὴ" U1FCA # GREEK CAPITAL LETTER ETA WITH VARIA : "ῌ" U1FCC # GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI : "ῌ" U1FCC # GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI - : "῍" U1FCD # GREEK PSILI AND VARIA - : "῍" U1FCD # GREEK PSILI AND VARIA - : "῎" U1FCE # GREEK PSILI AND OXIA - : "῎" U1FCE # GREEK PSILI AND OXIA - : "῎" U1FCE # GREEK PSILI AND OXIA - : "῏" U1FCF # GREEK PSILI AND PERISPOMENI - : "῏" U1FCF # GREEK PSILI AND PERISPOMENI : "ῐ" U1FD0 # GREEK SMALL LETTER IOTA WITH VRACHY : "ῐ" U1FD0 # GREEK SMALL LETTER IOTA WITH VRACHY : "ῐ" U1FD0 # GREEK SMALL LETTER IOTA WITH VRACHY : "ῑ" U1FD1 # GREEK SMALL LETTER IOTA WITH MACRON : "ῑ" U1FD1 # GREEK SMALL LETTER IOTA WITH MACRON : "ῑ" U1FD1 # GREEK SMALL LETTER IOTA WITH MACRON - : "ῒ" U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA - : "ῒ" U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA : "ῒ" U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA : "ῒ" U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA : "ῒ" U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA : "ῒ" U1FD2 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA : "ῖ" U1FD6 # GREEK SMALL LETTER IOTA WITH PERISPOMENI : "ῖ" U1FD6 # GREEK SMALL LETTER IOTA WITH PERISPOMENI - : "ῗ" U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI - : "ῗ" U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI : "ῗ" U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI : "ῗ" U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI : "ῗ" U1FD7 # GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI @@ -4318,21 +3804,12 @@ XCOMM Greek Extended : "Ῑ" U1FD9 # GREEK CAPITAL LETTER IOTA WITH MACRON : "Ὶ" U1FDA # GREEK CAPITAL LETTER IOTA WITH VARIA : "Ὶ" U1FDA # GREEK CAPITAL LETTER IOTA WITH VARIA - : "῝" U1FDD # GREEK DASIA AND VARIA - : "῝" U1FDD # GREEK DASIA AND VARIA - : "῞" U1FDE # GREEK DASIA AND OXIA - : "῞" U1FDE # GREEK DASIA AND OXIA - : "῞" U1FDE # GREEK DASIA AND OXIA - : "῟" U1FDF # GREEK DASIA AND PERISPOMENI - : "῟" U1FDF # GREEK DASIA AND PERISPOMENI : "ῠ" U1FE0 # GREEK SMALL LETTER UPSILON WITH VRACHY : "ῠ" U1FE0 # GREEK SMALL LETTER UPSILON WITH VRACHY : "ῠ" U1FE0 # GREEK SMALL LETTER UPSILON WITH VRACHY : "ῡ" U1FE1 # GREEK SMALL LETTER UPSILON WITH MACRON : "ῡ" U1FE1 # GREEK SMALL LETTER UPSILON WITH MACRON : "ῡ" U1FE1 # GREEK SMALL LETTER UPSILON WITH MACRON - : "ῢ" U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA - : "ῢ" U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA : "ῢ" U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA : "ῢ" U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA : "ῢ" U1FE2 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA @@ -4343,8 +3820,6 @@ XCOMM Greek Extended : "ῥ" U1FE5 # GREEK SMALL LETTER RHO WITH DASIA : "ῦ" U1FE6 # GREEK SMALL LETTER UPSILON WITH PERISPOMENI : "ῦ" U1FE6 # GREEK SMALL LETTER UPSILON WITH PERISPOMENI - : "ῧ" U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI - : "ῧ" U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI : "ῧ" U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI : "ῧ" U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI : "ῧ" U1FE7 # GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI @@ -4361,26 +3836,19 @@ XCOMM Greek Extended : "Ῥ" U1FEC # GREEK CAPITAL LETTER RHO WITH DASIA : "῭" U1FED # GREEK DIALYTIKA AND VARIA : "῭" U1FED # GREEK DIALYTIKA AND VARIA - : "ῲ" U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI - : "ῲ" U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI : "ῲ" U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI : "ῲ" U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI : "ῲ" U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI : "ῲ" U1FF2 # GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI : "ῳ" U1FF3 # GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI : "ῳ" U1FF3 # GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI - : "ῴ" U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI - : "ῴ" U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI : "ῴ" U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI - : "ῴ" U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI : "ῴ" U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI : "ῴ" U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI : "ῴ" U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI : "ῴ" U1FF4 # GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI : "ῶ" U1FF6 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI : "ῶ" U1FF6 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI - : "ῷ" U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI - : "ῷ" U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI : "ῷ" U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI : "ῷ" U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI : "ῷ" U1FF7 # GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI @@ -4428,6 +3896,7 @@ XCOMM Superscripts and Subscripts : "⁺" U207A # SUPERSCRIPT PLUS SIGN : "⁺" U207A # SUPERSCRIPT PLUS SIGN : "⁻" U207B # SUPERSCRIPT MINUS + : "⁻" U207B # SUPERSCRIPT MINUS : "⁻" U207B # SUPERSCRIPT MINUS : "⁻" U207B # SUPERSCRIPT MINUS : "⁼" U207C # SUPERSCRIPT EQUALS SIGN @@ -4440,49 +3909,62 @@ XCOMM Superscripts and Subscripts : "⁾" U207E # SUPERSCRIPT RIGHT PARENTHESIS : "ⁿ" U207F # SUPERSCRIPT LATIN SMALL LETTER N : "ⁿ" U207F # SUPERSCRIPT LATIN SMALL LETTER N + <0> : "₀" U2080 # SUBSCRIPT ZERO <0> : "₀" U2080 # SUBSCRIPT ZERO : "₀" U2080 # SUBSCRIPT ZERO + <1> : "₁" U2081 # SUBSCRIPT ONE <1> : "₁" U2081 # SUBSCRIPT ONE : "₁" U2081 # SUBSCRIPT ONE + <2> : "₂" U2082 # SUBSCRIPT TWO <2> : "₂" U2082 # SUBSCRIPT TWO : "₂" U2082 # SUBSCRIPT TWO + <3> : "₃" U2083 # SUBSCRIPT THREE <3> : "₃" U2083 # SUBSCRIPT THREE : "₃" U2083 # SUBSCRIPT THREE + <4> : "₄" U2084 # SUBSCRIPT FOUR <4> : "₄" U2084 # SUBSCRIPT FOUR : "₄" U2084 # SUBSCRIPT FOUR + <5> : "₅" U2085 # SUBSCRIPT FIVE <5> : "₅" U2085 # SUBSCRIPT FIVE : "₅" U2085 # SUBSCRIPT FIVE + <6> : "₆" U2086 # SUBSCRIPT SIX <6> : "₆" U2086 # SUBSCRIPT SIX : "₆" U2086 # SUBSCRIPT SIX + <7> : "₇" U2087 # SUBSCRIPT SEVEN <7> : "₇" U2087 # SUBSCRIPT SEVEN : "₇" U2087 # SUBSCRIPT SEVEN + <8> : "₈" U2088 # SUBSCRIPT EIGHT <8> : "₈" U2088 # SUBSCRIPT EIGHT : "₈" U2088 # SUBSCRIPT EIGHT + <9> : "₉" U2089 # SUBSCRIPT NINE <9> : "₉" U2089 # SUBSCRIPT NINE : "₉" U2089 # SUBSCRIPT NINE + : "₊" U208A # SUBSCRIPT PLUS SIGN : "₊" U208A # SUBSCRIPT PLUS SIGN : "₊" U208A # SUBSCRIPT PLUS SIGN + : "₋" U208B # SUBSCRIPT MINUS + : "₋" U208B # SUBSCRIPT MINUS : "₋" U208B # SUBSCRIPT MINUS + : "₌" U208C # SUBSCRIPT EQUALS SIGN : "₌" U208C # SUBSCRIPT EQUALS SIGN : "₌" U208C # SUBSCRIPT EQUALS SIGN + : "₍" U208D # SUBSCRIPT LEFT PARENTHESIS : "₍" U208D # SUBSCRIPT LEFT PARENTHESIS + : "₎" U208E # SUBSCRIPT RIGHT PARENTHESIS : "₎" U208E # SUBSCRIPT RIGHT PARENTHESIS XCOMM Letterlike Symbols + : "ℂ" U2102 # DOUBLE-STRUCK CAPITAL C + : "ℕ" U2115 # DOUBLE-STRUCK CAPITAL N + : "ℚ" U211A # DOUBLE-STRUCK CAPITAL Q + : "ℝ" U211D # DOUBLE-STRUCK CAPITAL R + : "ℤ" U2124 # DOUBLE-STRUCK CAPITAL Z : "℠" U2120 # SERVICE MARK : "℠" U2120 # SERVICE MARK - : "℠" U2120 # SERVICE MARK - : "℠" U2120 # SERVICE MARK - : "℠" U2120 # SERVICE MARK - : "℠" U2120 # SERVICE MARK : "℠" U2120 # SERVICE MARK : "℠" U2120 # SERVICE MARK : "™" U2122 # TRADE MARK SIGN : "™" U2122 # TRADE MARK SIGN - : "™" U2122 # TRADE MARK SIGN - : "™" U2122 # TRADE MARK SIGN - : "™" U2122 # TRADE MARK SIGN - : "™" U2122 # TRADE MARK SIGN : "™" U2122 # TRADE MARK SIGN : "™" U2122 # TRADE MARK SIGN @@ -4525,54 +4007,50 @@ XCOMM Arrows : "⇓" U21D3 # DOWNWARDS DOUBLE ARROW XCOMM Mathematical Operators - : "∄" U2204 # THERE DOES NOT EXIST + : "∄" U2204 # THERE DOES NOT EXIST : "∅" U2205 # EMPTY SET - : "∉" U2209 # NOT AN ELEMENT OF - : "∌" U220C # DOES NOT CONTAIN AS MEMBER - : "∤" U2224 # DOES NOT DIVIDE - : "∦" U2226 # NOT PARALLEL TO - : "≁" U2241 # NOT TILDE - : "≄" U2244 # NOT ASYMPTOTICALLY EQUAL TO - : "≇" U2247 # NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO - : "≉" U2249 # NOT ALMOST EQUAL TO + : "∉" U2209 # NOT AN ELEMENT OF + : "∌" U220C # DOES NOT CONTAIN AS MEMBER + : "−" U2212 # MINUS SIGN + : "∤" U2224 # DOES NOT DIVIDE + : "∦" U2226 # NOT PARALLEL TO + : "≁" U2241 # NOT TILDE + : "≄" U2244 # NOT ASYMPTOTICALLY EQUAL TO + : "≇" U2247 # NEITHER APPROXIMATELY NOR ACTUALLY EQUAL TO + : "≉" U2249 # NOT ALMOST EQUAL TO : "≠" U2260 # NOT EQUAL TO : "≠" U2260 # NOT EQUAL TO - : "≠" U2260 # NOT EQUAL TO - : "≠" U2260 # NOT EQUAL TO - : "≢" U2262 # NOT IDENTICAL TO + : "≠" U2260 # NOT EQUAL TO + : "≢" U2262 # NOT IDENTICAL TO : "≤" U2264 # LESS-THAN OR EQUAL TO : "≥" U2265 # GREATER-THAN OR EQUAL TO - : "≭" U226D # NOT EQUIVALENT TO - : "≮" U226E # NOT LESS-THAN - : "≮" U226E # NOT LESS-THAN - : "≯" U226F # NOT GREATER-THAN - : "≯" U226F # NOT GREATER-THAN - : "≰" U2270 # NEITHER LESS-THAN NOR EQUAL TO - : "≱" U2271 # NEITHER GREATER-THAN NOR EQUAL TO - : "≴" U2274 # NEITHER LESS-THAN NOR EQUIVALENT TO - : "≵" U2275 # NEITHER GREATER-THAN NOR EQUIVALENT TO - : "≸" U2278 # NEITHER LESS-THAN NOR GREATER-THAN - : "≹" U2279 # NEITHER GREATER-THAN NOR LESS-THAN - : "⊀" U2280 # DOES NOT PRECEDE - : "⊁" U2281 # DOES NOT SUCCEED - : "⊄" U2284 # NOT A SUBSET OF - : "⊄" U2284 # NOT A SUBSET OF - : "⊅" U2285 # NOT A SUPERSET OF - : "⊅" U2285 # NOT A SUPERSET OF - : "⊈" U2288 # NEITHER A SUBSET OF NOR EQUAL TO - : "⊉" U2289 # NEITHER A SUPERSET OF NOR EQUAL TO - : "⊬" U22AC # DOES NOT PROVE - : "⊭" U22AD # NOT TRUE - : "⊮" U22AE # DOES NOT FORCE - : "⊯" U22AF # NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE - : "⋠" U22E0 # DOES NOT PRECEDE OR EQUAL - : "⋡" U22E1 # DOES NOT SUCCEED OR EQUAL - : "⋢" U22E2 # NOT SQUARE IMAGE OF OR EQUAL TO - : "⋣" U22E3 # NOT SQUARE ORIGINAL OF OR EQUAL TO - : "⋪" U22EA # NOT NORMAL SUBGROUP OF - : "⋫" U22EB # DOES NOT CONTAIN AS NORMAL SUBGROUP - : "⋬" U22EC # NOT NORMAL SUBGROUP OF OR EQUAL TO - : "⋭" U22ED # DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL + : "≭" U226D # NOT EQUIVALENT TO + : "≮" U226E # NOT LESS-THAN + : "≯" U226F # NOT GREATER-THAN + : "≰" U2270 # NEITHER LESS-THAN NOR EQUAL TO + : "≱" U2271 # NEITHER GREATER-THAN NOR EQUAL TO + : "≴" U2274 # NEITHER LESS-THAN NOR EQUIVALENT TO + : "≵" U2275 # NEITHER GREATER-THAN NOR EQUIVALENT TO + : "≸" U2278 # NEITHER LESS-THAN NOR GREATER-THAN + : "≹" U2279 # NEITHER GREATER-THAN NOR LESS-THAN + : "⊀" U2280 # DOES NOT PRECEDE + : "⊁" U2281 # DOES NOT SUCCEED + : "⊄" U2284 # NOT A SUBSET OF + : "⊅" U2285 # NOT A SUPERSET OF + : "⊈" U2288 # NEITHER A SUBSET OF NOR EQUAL TO + : "⊉" U2289 # NEITHER A SUPERSET OF NOR EQUAL TO + : "⊬" U22AC # DOES NOT PROVE + : "⊭" U22AD # NOT TRUE + : "⊮" U22AE # DOES NOT FORCE + : "⊯" U22AF # NEGATED DOUBLE VERTICAL BAR DOUBLE RIGHT TURNSTILE + : "⋠" U22E0 # DOES NOT PRECEDE OR EQUAL + : "⋡" U22E1 # DOES NOT SUCCEED OR EQUAL + : "⋢" U22E2 # NOT SQUARE IMAGE OF OR EQUAL TO + : "⋣" U22E3 # NOT SQUARE ORIGINAL OF OR EQUAL TO + : "⋪" U22EA # NOT NORMAL SUBGROUP OF + : "⋫" U22EB # DOES NOT CONTAIN AS NORMAL SUBGROUP + : "⋬" U22EC # NOT NORMAL SUBGROUP OF OR EQUAL TO + : "⋭" U22ED # DOES NOT CONTAIN AS NORMAL SUBGROUP OR EQUAL : "⌀" U2300 # DIAMETER SIGN @@ -4596,48 +4074,26 @@ XCOMM Enclosed Alphanumerics <9> : "⑨" U2468 # CIRCLED DIGIT NINE : "⑨" U2468 # CIRCLED DIGIT NINE <1> <0> : "⑩" U2469 # CIRCLED NUMBER TEN - <1> : "⑩" U2469 # CIRCLED NUMBER TEN - <0> : "⑩" U2469 # CIRCLED NUMBER TEN : "⑩" U2469 # CIRCLED NUMBER TEN <1> <1> : "⑪" U246A # CIRCLED NUMBER ELEVEN - <1> : "⑪" U246A # CIRCLED NUMBER ELEVEN - <1> : "⑪" U246A # CIRCLED NUMBER ELEVEN : "⑪" U246A # CIRCLED NUMBER ELEVEN <1> <2> : "⑫" U246B # CIRCLED NUMBER TWELVE - <1> : "⑫" U246B # CIRCLED NUMBER TWELVE - <2> : "⑫" U246B # CIRCLED NUMBER TWELVE : "⑫" U246B # CIRCLED NUMBER TWELVE <1> <3> : "⑬" U246C # CIRCLED NUMBER THIRTEEN - <1> : "⑬" U246C # CIRCLED NUMBER THIRTEEN - <3> : "⑬" U246C # CIRCLED NUMBER THIRTEEN : "⑬" U246C # CIRCLED NUMBER THIRTEEN <1> <4> : "⑭" U246D # CIRCLED NUMBER FOURTEEN - <1> : "⑭" U246D # CIRCLED NUMBER FOURTEEN - <4> : "⑭" U246D # CIRCLED NUMBER FOURTEEN : "⑭" U246D # CIRCLED NUMBER FOURTEEN <1> <5> : "⑮" U246E # CIRCLED NUMBER FIFTEEN - <1> : "⑮" U246E # CIRCLED NUMBER FIFTEEN - <5> : "⑮" U246E # CIRCLED NUMBER FIFTEEN : "⑮" U246E # CIRCLED NUMBER FIFTEEN <1> <6> : "⑯" U246F # CIRCLED NUMBER SIXTEEN - <1> : "⑯" U246F # CIRCLED NUMBER SIXTEEN - <6> : "⑯" U246F # CIRCLED NUMBER SIXTEEN : "⑯" U246F # CIRCLED NUMBER SIXTEEN <1> <7> : "⑰" U2470 # CIRCLED NUMBER SEVENTEEN - <1> : "⑰" U2470 # CIRCLED NUMBER SEVENTEEN - <7> : "⑰" U2470 # CIRCLED NUMBER SEVENTEEN : "⑰" U2470 # CIRCLED NUMBER SEVENTEEN <1> <8> : "⑱" U2471 # CIRCLED NUMBER EIGHTEEN - <1> : "⑱" U2471 # CIRCLED NUMBER EIGHTEEN - <8> : "⑱" U2471 # CIRCLED NUMBER EIGHTEEN : "⑱" U2471 # CIRCLED NUMBER EIGHTEEN <1> <9> : "⑲" U2472 # CIRCLED NUMBER NINETEEN - <1> : "⑲" U2472 # CIRCLED NUMBER NINETEEN - <9> : "⑲" U2472 # CIRCLED NUMBER NINETEEN : "⑲" U2472 # CIRCLED NUMBER NINETEEN <2> <0> : "⑳" U2473 # CIRCLED NUMBER TWENTY - <2> : "⑳" U2473 # CIRCLED NUMBER TWENTY - <0> : "⑳" U2473 # CIRCLED NUMBER TWENTY : "⑳" U2473 # CIRCLED NUMBER TWENTY : "Ⓐ" U24B6 # CIRCLED LATIN CAPITAL LETTER A : "Ⓑ" U24B7 # CIRCLED LATIN CAPITAL LETTER B @@ -4701,7 +4157,7 @@ XCOMM Supplemental Mathematical Operators : "⩦" U2A66 # EQUALS SIGN WITH DOT BELOW : "⩷" U2A77 # EQUALS SIGN WITH TWO DOTS ABOVE AND TWO DOTS BELOW : "⩷" U2A77 # EQUALS SIGN WITH TWO DOTS ABOVE AND TWO DOTS BELOW - : "⫝̸" U2ADC # FORKING + : "⫝̸" U2ADC # FORKING : "⫰" U2AF0 # VERTICAL LINE WITH CIRCLE BELOW XCOMM Hiragana @@ -4798,64 +4254,34 @@ XCOMM Kanbun XCOMM Enclosed CJK Letters and Months <2> <1> : "㉑" U3251 # CIRCLED NUMBER TWENTY ONE - <2> : "㉑" U3251 # CIRCLED NUMBER TWENTY ONE - <1> : "㉑" U3251 # CIRCLED NUMBER TWENTY ONE : "㉑" U3251 # CIRCLED NUMBER TWENTY ONE <2> <2> : "㉒" U3252 # CIRCLED NUMBER TWENTY TWO - <2> : "㉒" U3252 # CIRCLED NUMBER TWENTY TWO - <2> : "㉒" U3252 # CIRCLED NUMBER TWENTY TWO : "㉒" U3252 # CIRCLED NUMBER TWENTY TWO <2> <3> : "㉓" U3253 # CIRCLED NUMBER TWENTY THREE - <2> : "㉓" U3253 # CIRCLED NUMBER TWENTY THREE - <3> : "㉓" U3253 # CIRCLED NUMBER TWENTY THREE : "㉓" U3253 # CIRCLED NUMBER TWENTY THREE <2> <4> : "㉔" U3254 # CIRCLED NUMBER TWENTY FOUR - <2> : "㉔" U3254 # CIRCLED NUMBER TWENTY FOUR - <4> : "㉔" U3254 # CIRCLED NUMBER TWENTY FOUR : "㉔" U3254 # CIRCLED NUMBER TWENTY FOUR <2> <5> : "㉕" U3255 # CIRCLED NUMBER TWENTY FIVE - <2> : "㉕" U3255 # CIRCLED NUMBER TWENTY FIVE - <5> : "㉕" U3255 # CIRCLED NUMBER TWENTY FIVE : "㉕" U3255 # CIRCLED NUMBER TWENTY FIVE <2> <6> : "㉖" U3256 # CIRCLED NUMBER TWENTY SIX - <2> : "㉖" U3256 # CIRCLED NUMBER TWENTY SIX - <6> : "㉖" U3256 # CIRCLED NUMBER TWENTY SIX : "㉖" U3256 # CIRCLED NUMBER TWENTY SIX <2> <7> : "㉗" U3257 # CIRCLED NUMBER TWENTY SEVEN - <2> : "㉗" U3257 # CIRCLED NUMBER TWENTY SEVEN - <7> : "㉗" U3257 # CIRCLED NUMBER TWENTY SEVEN : "㉗" U3257 # CIRCLED NUMBER TWENTY SEVEN <2> <8> : "㉘" U3258 # CIRCLED NUMBER TWENTY EIGHT - <2> : "㉘" U3258 # CIRCLED NUMBER TWENTY EIGHT - <8> : "㉘" U3258 # CIRCLED NUMBER TWENTY EIGHT : "㉘" U3258 # CIRCLED NUMBER TWENTY EIGHT <2> <9> : "㉙" U3259 # CIRCLED NUMBER TWENTY NINE - <2> : "㉙" U3259 # CIRCLED NUMBER TWENTY NINE - <9> : "㉙" U3259 # CIRCLED NUMBER TWENTY NINE : "㉙" U3259 # CIRCLED NUMBER TWENTY NINE <3> <0> : "㉚" U325A # CIRCLED NUMBER THIRTY - <3> : "㉚" U325A # CIRCLED NUMBER THIRTY - <0> : "㉚" U325A # CIRCLED NUMBER THIRTY : "㉚" U325A # CIRCLED NUMBER THIRTY <3> <1> : "㉛" U325B # CIRCLED NUMBER THIRTY ONE - <3> : "㉛" U325B # CIRCLED NUMBER THIRTY ONE - <1> : "㉛" U325B # CIRCLED NUMBER THIRTY ONE : "㉛" U325B # CIRCLED NUMBER THIRTY ONE <3> <2> : "㉜" U325C # CIRCLED NUMBER THIRTY TWO - <3> : "㉜" U325C # CIRCLED NUMBER THIRTY TWO - <2> : "㉜" U325C # CIRCLED NUMBER THIRTY TWO : "㉜" U325C # CIRCLED NUMBER THIRTY TWO <3> <3> : "㉝" U325D # CIRCLED NUMBER THIRTY THREE - <3> : "㉝" U325D # CIRCLED NUMBER THIRTY THREE - <3> : "㉝" U325D # CIRCLED NUMBER THIRTY THREE : "㉝" U325D # CIRCLED NUMBER THIRTY THREE <3> <4> : "㉞" U325E # CIRCLED NUMBER THIRTY FOUR - <3> : "㉞" U325E # CIRCLED NUMBER THIRTY FOUR - <4> : "㉞" U325E # CIRCLED NUMBER THIRTY FOUR : "㉞" U325E # CIRCLED NUMBER THIRTY FOUR <3> <5> : "㉟" U325F # CIRCLED NUMBER THIRTY FIVE - <3> : "㉟" U325F # CIRCLED NUMBER THIRTY FIVE - <5> : "㉟" U325F # CIRCLED NUMBER THIRTY FIVE : "㉟" U325F # CIRCLED NUMBER THIRTY FIVE : "㉠" U3260 # CIRCLED HANGUL KIYEOK : "㉡" U3261 # CIRCLED HANGUL NIEUN @@ -4935,64 +4361,34 @@ XCOMM Enclosed CJK Letters and Months : "㊯" U32AF # CIRCLED IDEOGRAPH ALLIANCE : "㊰" U32B0 # CIRCLED IDEOGRAPH NIGHT <3> <6> : "㊱" U32B1 # CIRCLED NUMBER THIRTY SIX - <3> : "㊱" U32B1 # CIRCLED NUMBER THIRTY SIX - <6> : "㊱" U32B1 # CIRCLED NUMBER THIRTY SIX : "㊱" U32B1 # CIRCLED NUMBER THIRTY SIX <3> <7> : "㊲" U32B2 # CIRCLED NUMBER THIRTY SEVEN - <3> : "㊲" U32B2 # CIRCLED NUMBER THIRTY SEVEN - <7> : "㊲" U32B2 # CIRCLED NUMBER THIRTY SEVEN : "㊲" U32B2 # CIRCLED NUMBER THIRTY SEVEN <3> <8> : "㊳" U32B3 # CIRCLED NUMBER THIRTY EIGHT - <3> : "㊳" U32B3 # CIRCLED NUMBER THIRTY EIGHT - <8> : "㊳" U32B3 # CIRCLED NUMBER THIRTY EIGHT : "㊳" U32B3 # CIRCLED NUMBER THIRTY EIGHT <3> <9> : "㊴" U32B4 # CIRCLED NUMBER THIRTY NINE - <3> : "㊴" U32B4 # CIRCLED NUMBER THIRTY NINE - <9> : "㊴" U32B4 # CIRCLED NUMBER THIRTY NINE : "㊴" U32B4 # CIRCLED NUMBER THIRTY NINE <4> <0> : "㊵" U32B5 # CIRCLED NUMBER FORTY - <4> : "㊵" U32B5 # CIRCLED NUMBER FORTY - <0> : "㊵" U32B5 # CIRCLED NUMBER FORTY : "㊵" U32B5 # CIRCLED NUMBER FORTY <4> <1> : "㊶" U32B6 # CIRCLED NUMBER FORTY ONE - <4> : "㊶" U32B6 # CIRCLED NUMBER FORTY ONE - <1> : "㊶" U32B6 # CIRCLED NUMBER FORTY ONE : "㊶" U32B6 # CIRCLED NUMBER FORTY ONE <4> <2> : "㊷" U32B7 # CIRCLED NUMBER FORTY TWO - <4> : "㊷" U32B7 # CIRCLED NUMBER FORTY TWO - <2> : "㊷" U32B7 # CIRCLED NUMBER FORTY TWO : "㊷" U32B7 # CIRCLED NUMBER FORTY TWO <4> <3> : "㊸" U32B8 # CIRCLED NUMBER FORTY THREE - <4> : "㊸" U32B8 # CIRCLED NUMBER FORTY THREE - <3> : "㊸" U32B8 # CIRCLED NUMBER FORTY THREE : "㊸" U32B8 # CIRCLED NUMBER FORTY THREE <4> <4> : "㊹" U32B9 # CIRCLED NUMBER FORTY FOUR - <4> : "㊹" U32B9 # CIRCLED NUMBER FORTY FOUR - <4> : "㊹" U32B9 # CIRCLED NUMBER FORTY FOUR : "㊹" U32B9 # CIRCLED NUMBER FORTY FOUR <4> <5> : "㊺" U32BA # CIRCLED NUMBER FORTY FIVE - <4> : "㊺" U32BA # CIRCLED NUMBER FORTY FIVE - <5> : "㊺" U32BA # CIRCLED NUMBER FORTY FIVE : "㊺" U32BA # CIRCLED NUMBER FORTY FIVE <4> <6> : "㊻" U32BB # CIRCLED NUMBER FORTY SIX - <4> : "㊻" U32BB # CIRCLED NUMBER FORTY SIX - <6> : "㊻" U32BB # CIRCLED NUMBER FORTY SIX : "㊻" U32BB # CIRCLED NUMBER FORTY SIX <4> <7> : "㊼" U32BC # CIRCLED NUMBER FORTY SEVEN - <4> : "㊼" U32BC # CIRCLED NUMBER FORTY SEVEN - <7> : "㊼" U32BC # CIRCLED NUMBER FORTY SEVEN : "㊼" U32BC # CIRCLED NUMBER FORTY SEVEN <4> <8> : "㊽" U32BD # CIRCLED NUMBER FORTY EIGHT - <4> : "㊽" U32BD # CIRCLED NUMBER FORTY EIGHT - <8> : "㊽" U32BD # CIRCLED NUMBER FORTY EIGHT : "㊽" U32BD # CIRCLED NUMBER FORTY EIGHT <4> <9> : "㊾" U32BE # CIRCLED NUMBER FORTY NINE - <4> : "㊾" U32BE # CIRCLED NUMBER FORTY NINE - <9> : "㊾" U32BE # CIRCLED NUMBER FORTY NINE : "㊾" U32BE # CIRCLED NUMBER FORTY NINE <5> <0> : "㊿" U32BF # CIRCLED NUMBER FIFTY - <5> : "㊿" U32BF # CIRCLED NUMBER FIFTY - <0> : "㊿" U32BF # CIRCLED NUMBER FIFTY : "㊿" U32BF # CIRCLED NUMBER FIFTY : "㋐" U32D0 # CIRCLED KATAKANA A : "㋑" U32D1 # CIRCLED KATAKANA I @@ -5096,111 +4492,75 @@ XCOMM Musical notes : "𝆺𝅥𝅯" U1D1C0 # MUSICAL SYMBOL FUSA BLACK XCOMM Khmer digraphs - : "ាំ" - : "ោះ" - : "េះ" - : "ុំ" - : "ុះ" + : "ាំ" # KHMER VOWEL SIGN AA plus KHMER SIGN NIKAHIT + : "ោះ" # KHMER VOWEL SIGN OO plus KHMER SIGN REAHMUK + : "េះ" # KHMER VOWEL SIGN E plus KHMER SIGN REAHMUK + : "ុំ" # KHMER VOWEL SIGN U plus KHMER SIGN NIKAHIT + : "ុះ" # KHMER VOWEL SIGN U plus KHMER SIGN REAHMUK -XCOMM Arabic Lam-Alef ligatures - : "لا" # ARABIC LIGATURE LAM WITH ALEF - : "لأ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE - : "لإ" # ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW - : "لآ" # ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE +XCOMM Decomposition of four Arabic Lam-Alef ligatures + : "لا" # ARABIC LETTER LAM plus ARABIC LETTER ALEF + : "لأ" # ARABIC LETTER LAM plus ARABIC LETTER ALEF WITH HAMZA ABOVE + : "لإ" # ARABIC LETTER LAM plus ARABIC LETTER ALEF WITH HAMZA BELOW + : "لآ" # ARABIC LETTER LAM plus ARABIC LETTER ALEF WITH MADDA ABOVE + +XCOMM Breton N-graphs + : "ch" # LATIN SMALL LETTER C plus LATIN SMALL LETTER H + : "Ch" # LATIN CAPITAL LETTER C plus LATIN SMALL LETTER H + : "CH" # LATIN CAPITAL LETTER C plus LATIN CAPITAL LETTER H + : "c’h" # LATIN SMALL LETTER C plus RIGHT SINGLE QUOTATION MARK plus LATIN SMALL LETTER H + : "C’h" # LATIN CAPITAL LETTER C plus RIGHT SINGLE QUOTATION MARK plus LATIN SMALL LETTER H + : "C’H" # LATIN CAPITAL LETTER C plus RIGHT SINGLE QUOTATION MARK plus LATIN CAPITAL LETTER H XCOMM French-Dvorak Bépo compositions - : "Ǡ" U01E0 # LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON - : "ǡ" U01E1 # LATIN SMALL LETTER A WITH DOT ABOVE AND MACRON : "ȷ" U0237 # LATIN SMALL LETTER DOTLESS J : "Ŀ" U013F # LATIN CAPITAL LETTER L WITH MIDDLE DOT : "ŀ" U0140 # LATIN SMALL LETTER L WITH MIDDLE DOT - : "Ȱ" U0230 # LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON - : "ȱ" U0231 # LATIN SMALL LETTER O WITH DOT ABOVE AND MACRON : "̇" U0307 # COMBINING DOT ABOVE - : "Ṥ" U1E64 # LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE - : "ṥ" U1E65 # LATIN SMALL LETTER S WITH ACUTE AND DOT ABOVE + : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE + : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE + : "̊" U030A # COMBINING RING ABOVE : "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE : "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE : "́" U0301 # COMBINING ACUTE ACCENT - : "Ṩ" U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE - : "ṩ" U1E69 # LATIN SMALL LETTER S WITH DOT BELOW AND DOT ABOVE : "̣" U0323 # COMBINING DOT BELOW : "̣" U0323 # COMBINING DOT BELOW : "̣" U0323 # COMBINING DOT BELOW : "Ắ" Abreveacute # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE - : "Ằ" Abrevegrave # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE - : "Ẳ" Abrevehook # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE - : "Ẵ" Abrevetilde # LATIN CAPITAL LETTER A WITH BREVE AND TILDE : "ắ" abreveacute # LATIN SMALL LETTER A WITH BREVE AND ACUTE + : "Ằ" Abrevegrave # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE : "ằ" abrevegrave # LATIN SMALL LETTER A WITH BREVE AND GRAVE - : "ẳ" abrevehook # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE + : "Ẵ" Abrevetilde # LATIN CAPITAL LETTER A WITH BREVE AND TILDE : "ẵ" abrevetilde # LATIN SMALL LETTER A WITH BREVE AND TILDE : "̆" U0306 # COMBINING BREVE - : "₍" U208D # SUBSCRIPT LEFT PARENTHESIS - : "₎" U208E # SUBSCRIPT RIGHT PARENTHESIS - : "₊" U208A # SUBSCRIPT PLUS SIGN - : "₋" U208B # SUBSCRIPT MINUS - <0> : "₀" zerosubscript # SUBSCRIPT ZERO - <1> : "₁" onesubscript # SUBSCRIPT ONE - <2> : "₂" twosubscript # SUBSCRIPT TWO - <3> : "₃" threesubscript # SUBSCRIPT THREE - <4> : "₄" foursubscript # SUBSCRIPT FOUR - <5> : "₅" fivesubscript # SUBSCRIPT FIVE - <6> : "₆" sixsubscript # SUBSCRIPT SIX - <7> : "₇" sevensubscript # SUBSCRIPT SEVEN - <8> : "₈" eightsubscript # SUBSCRIPT EIGHT - <9> : "₉" ninesubscript # SUBSCRIPT NINE - : "₌" U208C # SUBSCRIPT EQUALS SIGN : "Dž" U01C5 # LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON - : "Ṧ" U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE - : "ṧ" U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE : "Ǚ" U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON : "ǚ" U01DA # LATIN SMALL LETTER U WITH DIAERESIS AND CARON : "̌" U030C # COMBINING CARON : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE - : "₵" U20B5 # CEDI SIGN : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE - : "₵" U20B5 # CEDI SIGN : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE : "̧" U0327 # COMBINING CEDILLA : "Ấ" Acircumflexacute # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE - : "Ầ" Acircumflexgrave # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE - : "Ẩ" Acircumflexhook # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE - : "Ẫ" Acircumflextilde # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE : "ấ" acircumflexacute # LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE + : "Ầ" Acircumflexgrave # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE : "ầ" acircumflexgrave # LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE - : "ẩ" acircumflexhook # LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE + : "Ẫ" Acircumflextilde # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE : "ẫ" acircumflextilde # LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE : "Ế" Ecircumflexacute # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE - : "Ề" Ecircumflexgrave # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE - : "Ể" Ecircumflexhook # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE - : "Ễ" Ecircumflextilde # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE : "ế" ecircumflexacute # LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE + : "Ề" Ecircumflexgrave # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE : "ề" ecircumflexgrave # LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE - : "ể" ecircumflexhook # LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE + : "Ễ" Ecircumflextilde # LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE : "ễ" ecircumflextilde # LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE : "Ố" Ocircumflexacute # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE - : "Ồ" Ocircumflexgrave # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE - : "Ổ" Ocircumflexhook # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE - : "Ỗ" Ocircumflextilde # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE : "ố" ocircumflexacute # LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE + : "Ồ" Ocircumflexgrave # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE : "ồ" ocircumflexgrave # LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE - : "ổ" ocircumflexhook # LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE + : "Ỗ" Ocircumflextilde # LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE : "ỗ" ocircumflextilde # LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE : "̂" U0302 # COMBINING CIRCUMFLEX ACCENT - : "Ș" U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW - : "Ș" U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW - : "Ș" U0218 # LATIN CAPITAL LETTER S WITH COMMA BELOW - : "ș" U0219 # LATIN SMALL LETTER S WITH COMMA BELOW - : "ș" U0219 # LATIN SMALL LETTER S WITH COMMA BELOW - : "ș" U0219 # LATIN SMALL LETTER S WITH COMMA BELOW - : "Ț" U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW - : "Ț" U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW - : "Ț" U021A # LATIN CAPITAL LETTER T WITH COMMA BELOW - : "ț" U021B # LATIN SMALL LETTER T WITH COMMA BELOW - : "ț" U021B # LATIN SMALL LETTER T WITH COMMA BELOW - : "ț" U021B # LATIN SMALL LETTER T WITH COMMA BELOW : "," comma # COMMA : "̦" U0326 # COMBINING COMMA BELOW : "," comma # COMMA @@ -5208,10 +4568,12 @@ XCOMM French-Dvorak Bépo compositions : "؋" U060B # AFGHANI SIGN : "₱" U20B1 # PESO SIGN : "฿" Thai_baht # THAI CURRENCY SYMBOL BAHT - : "₵" U20B5 # CEDI SIGN : "₡" ColonSign # COLON SIGN - : "₵" U20B5 # CEDI SIGN : "¢" cent # CENT SIGN + : "₵" U20B5 # CEDI SIGN + : "₵" U20B5 # CEDI SIGN + : "₵" U20B5 # CEDI SIGN + : "₵" U20B5 # CEDI SIGN : "₯" U20AF # DRACHMA SIGN : "₫" DongSign # DONG SIGN : "₠" EcuSign # EURO-CURRENCY SIGN @@ -5253,17 +4615,11 @@ XCOMM French-Dvorak Bépo compositions : "¤" currency # CURRENCY SIGN : "¤" currency # CURRENCY SIGN : "¤" currency # CURRENCY SIGN - : "Ǟ" U01DE # LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON - : "ǟ" U01DF # LATIN SMALL LETTER A WITH DIAERESIS AND MACRON : "Ḯ" U1E2E # LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE : "ḯ" U1E2F # LATIN SMALL LETTER I WITH DIAERESIS AND ACUTE - : "Ȫ" U022A # LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON - : "ȫ" U022B # LATIN SMALL LETTER O WITH DIAERESIS AND MACRON : "Ǘ" U01D7 # LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE - : "Ǚ" U01D9 # LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON - : "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE : "ǘ" U01D8 # LATIN SMALL LETTER U WITH DIAERESIS AND ACUTE - : "ǚ" U01DA # LATIN SMALL LETTER U WITH DIAERESIS AND CARON + : "Ǜ" U01DB # LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE : "ǜ" U01DC # LATIN SMALL LETTER U WITH DIAERESIS AND GRAVE : "̈" U0308 # COMBINING DIAERESIS : "̋" U030B # COMBINING DOUBLE ACUTE ACCENT @@ -5327,13 +4683,11 @@ XCOMM French-Dvorak Bépo compositions : "ƈ" U0188 # LATIN SMALL LETTER C WITH HOOK : "Ɗ" U018A # LATIN CAPITAL LETTER D WITH HOOK : "ɗ" U0257 # LATIN SMALL LETTER D WITH HOOK - : "ᶑ" U1D91 # LATIN SMALL LETTER D WITH HOOK AND TAIL : "Ƒ" U0191 # LATIN CAPITAL LETTER F WITH HOOK : "ƒ" function # LATIN SMALL LETTER F WITH HOOK : "Ɠ" U0193 # LATIN CAPITAL LETTER G WITH HOOK : "ɠ" U0260 # LATIN SMALL LETTER G WITH HOOK : "ɦ" U0266 # LATIN SMALL LETTER H WITH HOOK - : "ʄ" U0284 # LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK : "Ƙ" U0198 # LATIN CAPITAL LETTER K WITH HOOK : "ƙ" U0199 # LATIN SMALL LETTER K WITH HOOK : "Ɱ" U2C6E # LATIN CAPITAL LETTER M WITH HOOK @@ -5343,13 +4697,11 @@ XCOMM French-Dvorak Bépo compositions