From 4d15dbb1ac524a017e9812fb7f21f032ccbc2ae1 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Wed, 21 Jan 2009 16:04:57 -0200 Subject: Ansification and compile warning fixes. This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects make distcheck and all gcc 4.3 and sparse warnings. --- app-defaults/XFontSel | 148 +++++++++++++++++++++++++++++++++++++++++++++++ app-defaults/XFontSel.ad | 148 ----------------------------------------------- 2 files changed, 148 insertions(+), 148 deletions(-) create mode 100644 app-defaults/XFontSel delete mode 100644 app-defaults/XFontSel.ad (limited to 'app-defaults') diff --git a/app-defaults/XFontSel b/app-defaults/XFontSel new file mode 100644 index 0000000..73c4854 --- /dev/null +++ b/app-defaults/XFontSel @@ -0,0 +1,148 @@ +! $XConsortium: XFontSel.ad,v 1.12 94/04/17 20:43:40 gildea Exp $ +! +! app-defaults for XFontSel +! +! Copyright (c) 1985, 1986, 1987, 1988, 1989 X Consortium +! +! 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 THE X CONSORTIUM 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 the X Consortium 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 X Consortium. +! +! Author: +! Ralph R. Swick, Digital Equipment Corporation/M.I.T. Project Athena +! one weekend in November, 1989 +! +! $XFree86: xc/programs/xfontsel/XFontSel.ad,v 1.1 2000/02/13 03:26:24 dawes Exp $ + +*appDefaultsVersion: 1 + +*pixelSizeList: 7, 30, 40, 50, 60 +*pointSizeList: 250, 300, 350, 400 + +XFontSel.cursor: left_ptr +*allowShellResize: true + +*commandBox.ShowGrip: false +*commandBox*top: chainTop +*commandBox*bottom: chainTop + +*quitButton.Label: quit +*quitButton.left: chainLeft +*quitButton.right: chainLeft + +*ownButton.Label: select +*ownButton.fromHoriz: quitButton +*ownButton.left: chainLeft +*ownButton.right: chainLeft + +*countLabel.BorderWidth: 0 +*countLabel.Justify: right +*countLabel.Label: 999999 fonts match +*countLabel.left: chainRight +*countLabel.right: chainRight + +*fieldBox.Orientation: horizontal +*fieldBox.HSpace: 0 +*fieldBox.HSpace: 0 + +*dash.label: - +*dash.borderWidth: 0 +*dash.internalHeight: 0 +*dash.internalWidth: 0 + +*fieldBox*MenuButton.BorderWidth: 0 +*fieldBox*MenuButton.internalHeight: 0 +*fieldBox*MenuButton.internalWidth: 0 +*fieldBox*MenuButton.shapeStyle: rectangle + +#ifdef LONG_NAMES +*fieldBox*field0.Label: foundry +*fieldBox*field1.Label: family +*fieldBox*field2.Label: weight +*fieldBox*field3.Label: slant +*fieldBox*field4.Label: set width +*fieldBox*field5.Label: add style +*fieldBox*field6.Label: pixel size +*fieldBox*field7.Label: point size +*fieldBox*field8.Label: resolutionX +*fieldBox*field9.Label: resolutionY +*fieldBox*field10.Label: spacing +*fieldBox*field11.Label: avg width +*fieldBox*field12.Label: registry +*fieldBox*field13.Label: encoding +#else +*fieldBox*field0.Label: fndry +*fieldBox*field1.Label: fmly +*fieldBox*field2.Label: wght +*fieldBox*field3.Label: slant +*fieldBox*field4.Label: sWdth +*fieldBox*field5.Label: adstyl +*fieldBox*field6.Label: pxlsz +*fieldBox*field7.Label: ptSz +*fieldBox*field8.Label: resx +*fieldBox*field9.Label: resy +*fieldBox*field10.Label: spc +*fieldBox*field11.Label: avgWdth +*fieldBox*field12.Label: rgstry +*fieldBox*field13.Label: encdng +#endif + +!*fieldBox*field11.Sensitive: False +*fieldBox*field11.menu.Options.ShowUnselectable: False + + +!*field1*menu*courier.Font: + +*fontName*skipAdjust: true + +*sampleText*international: false + +*sampleText*Label: \ +Processing fonts... + +*sampleText: \ +ABCDEFGHIJKLMNOPQRSTUVWXYZ\n\ +abcdefghijklmnopqrstuvwxyz\n\ +0123456789\n\ +\340\346\347\353\356\360\361\363\371\375\ +\300\306\307\313\316\320\321\323\331\335 + + +*sampleText16: \ +\044\042\044\044\044\046\044\050\044\052\044\053\044\055\044\057\ +\044\061\044\063\044\065\044\067\044\071\044\073\044\075\044\077\n\ +\044\101\044\104\044\106\044\110\044\112\044\113\044\114\044\115\ +\044\116\044\117\044\122\044\125\044\130\044\133\044\136\044\137\n\ +\061\042\061\044\061\046\061\050\061\052\061\053\061\055\061\057\ +\061\061\061\063\061\065\061\067\061\071\061\073\061\075\061\077\n\ +\061\101\061\104\061\106\061\110\061\112\061\113\061\114\061\115\ +\061\116\061\117\061\122\061\125\061\130\061\133\061\136\061\137\n\ + +*sampleTextUCS: \ +ABCDEFGHIJKLMNOPQRSTUVWXYZ /0123456789\n\ +abcdefghijklmnopqrstuvwxyz £©µÀÆÖÞßéöÿ\n\ +–—‘“”„†•…‰™œŠŸž€ ΑΒΓΔΩαβγδω АБВГДабвгд\n\ +∀∂∈ℝ∧∪≡∞ ↑↗↨↻⇣ ┐┼╔╘░►☺♀ fi�⑀₂ἠḂӥẄɐː⍎אԱა + +*sampleText*allowResize: true +*sampleText*Height: 50 diff --git a/app-defaults/XFontSel.ad b/app-defaults/XFontSel.ad deleted file mode 100644 index 73c4854..0000000 --- a/app-defaults/XFontSel.ad +++ /dev/null @@ -1,148 +0,0 @@ -! $XConsortium: XFontSel.ad,v 1.12 94/04/17 20:43:40 gildea Exp $ -! -! app-defaults for XFontSel -! -! Copyright (c) 1985, 1986, 1987, 1988, 1989 X Consortium -! -! 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 THE X CONSORTIUM 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 the X Consortium 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 X Consortium. -! -! Author: -! Ralph R. Swick, Digital Equipment Corporation/M.I.T. Project Athena -! one weekend in November, 1989 -! -! $XFree86: xc/programs/xfontsel/XFontSel.ad,v 1.1 2000/02/13 03:26:24 dawes Exp $ - -*appDefaultsVersion: 1 - -*pixelSizeList: 7, 30, 40, 50, 60 -*pointSizeList: 250, 300, 350, 400 - -XFontSel.cursor: left_ptr -*allowShellResize: true - -*commandBox.ShowGrip: false -*commandBox*top: chainTop -*commandBox*bottom: chainTop - -*quitButton.Label: quit -*quitButton.left: chainLeft -*quitButton.right: chainLeft - -*ownButton.Label: select -*ownButton.fromHoriz: quitButton -*ownButton.left: chainLeft -*ownButton.right: chainLeft - -*countLabel.BorderWidth: 0 -*countLabel.Justify: right -*countLabel.Label: 999999 fonts match -*countLabel.left: chainRight -*countLabel.right: chainRight - -*fieldBox.Orientation: horizontal -*fieldBox.HSpace: 0 -*fieldBox.HSpace: 0 - -*dash.label: - -*dash.borderWidth: 0 -*dash.internalHeight: 0 -*dash.internalWidth: 0 - -*fieldBox*MenuButton.BorderWidth: 0 -*fieldBox*MenuButton.internalHeight: 0 -*fieldBox*MenuButton.internalWidth: 0 -*fieldBox*MenuButton.shapeStyle: rectangle - -#ifdef LONG_NAMES -*fieldBox*field0.Label: foundry -*fieldBox*field1.Label: family -*fieldBox*field2.Label: weight -*fieldBox*field3.Label: slant -*fieldBox*field4.Label: set width -*fieldBox*field5.Label: add style -*fieldBox*field6.Label: pixel size -*fieldBox*field7.Label: point size -*fieldBox*field8.Label: resolutionX -*fieldBox*field9.Label: resolutionY -*fieldBox*field10.Label: spacing -*fieldBox*field11.Label: avg width -*fieldBox*field12.Label: registry -*fieldBox*field13.Label: encoding -#else -*fieldBox*field0.Label: fndry -*fieldBox*field1.Label: fmly -*fieldBox*field2.Label: wght -*fieldBox*field3.Label: slant -*fieldBox*field4.Label: sWdth -*fieldBox*field5.Label: adstyl -*fieldBox*field6.Label: pxlsz -*fieldBox*field7.Label: ptSz -*fieldBox*field8.Label: resx -*fieldBox*field9.Label: resy -*fieldBox*field10.Label: spc -*fieldBox*field11.Label: avgWdth -*fieldBox*field12.Label: rgstry -*fieldBox*field13.Label: encdng -#endif - -!*fieldBox*field11.Sensitive: False -*fieldBox*field11.menu.Options.ShowUnselectable: False - - -!*field1*menu*courier.Font: - -*fontName*skipAdjust: true - -*sampleText*international: false - -*sampleText*Label: \ -Processing fonts... - -*sampleText: \ -ABCDEFGHIJKLMNOPQRSTUVWXYZ\n\ -abcdefghijklmnopqrstuvwxyz\n\ -0123456789\n\ -\340\346\347\353\356\360\361\363\371\375\ -\300\306\307\313\316\320\321\323\331\335 - - -*sampleText16: \ -\044\042\044\044\044\046\044\050\044\052\044\053\044\055\044\057\ -\044\061\044\063\044\065\044\067\044\071\044\073\044\075\044\077\n\ -\044\101\044\104\044\106\044\110\044\112\044\113\044\114\044\115\ -\044\116\044\117\044\122\044\125\044\130\044\133\044\136\044\137\n\ -\061\042\061\044\061\046\061\050\061\052\061\053\061\055\061\057\ -\061\061\061\063\061\065\061\067\061\071\061\073\061\075\061\077\n\ -\061\101\061\104\061\106\061\110\061\112\061\113\061\114\061\115\ -\061\116\061\117\061\122\061\125\061\130\061\133\061\136\061\137\n\ - -*sampleTextUCS: \ -ABCDEFGHIJKLMNOPQRSTUVWXYZ /0123456789\n\ -abcdefghijklmnopqrstuvwxyz £©µÀÆÖÞßéöÿ\n\ -–—‘“”„†•…‰™œŠŸž€ ΑΒΓΔΩαβγδω АБВГДабвгд\n\ -∀∂∈ℝ∧∪≡∞ ↑↗↨↻⇣ ┐┼╔╘░►☺♀ fi�⑀₂ἠḂӥẄɐː⍎אԱა - -*sampleText*allowResize: true -*sampleText*Height: 50 -- cgit v1.2.3