diff --git a/app/editres/COPYING b/app/editres/COPYING index 7f33cbfd2..a1821364e 100644 --- a/app/editres/COPYING +++ b/app/editres/COPYING @@ -1,12 +1,21 @@ -This is a stub file. This package has not yet had its complete licensing -information compiled. Please see the individual source files for details on -your rights to use and modify this software. +Copyright 1989, 1990, 1998 The Open Group -Please submit updated COPYING files to the Xorg bugzilla: +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. -https://bugs.freedesktop.org/enter_bug.cgi?product=xorg +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. -All licensing questions regarding this software should be directed at the -Xorg mailing list: +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 +OPEN GROUP 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. -http://lists.freedesktop.org/mailman/listinfo/xorg +Except as contained in this notice, the name of The Open Group 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 Open Group. diff --git a/app/editres/ChangeLog b/app/editres/ChangeLog index f782e9121..18904618d 100644 --- a/app/editres/ChangeLog +++ b/app/editres/ChangeLog @@ -1,31 +1,243 @@ -2005-12-20 Kevin E. Martin +commit 960a84a735daedd7b4df009c46d2f8a751335676 +Author: Alan Coopersmith +Date: Tue Jan 23 17:00:54 2007 -0800 - * configure.ac: - Update package version for X11R7 release. + Version bump: 1.0.3 -2005-12-14 Kevin E. Martin +commit 6894715b043dbbbf0b622561f2de57cd89bf408d +Author: Alan Coopersmith +Date: Tue Jan 23 17:00:22 2007 -0800 - * configure.ac: - Update package version number for final X11R7 release candidate. + Fill in COPYING file with copyright/license from *.c files -2005-12-07 Kevin E. Martin +commit d134cf4e83beccea282c49d1768e4ecf6b1ea52e +Author: Alan Coopersmith +Date: Tue Jan 23 16:57:59 2007 -0800 - * Makefile.am: - * configure.ac: - Change to use the app-defaults default dir configured in libXt. + Replace static ChangeLog with dist-hook to generate from git log -2005-12-06 Kevin E. Martin +commit f8e170f16e591f349482ebfe166a639f60b78a19 +Author: Alan Coopersmith +Date: Tue Jan 2 18:44:34 2007 -0800 - * Makefile.am: - Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + renamed: .cvsignore -> .gitignore -2005-12-03 Kevin E. Martin +commit f29f6eb20486b84ab0f73dbbc4295a2193fdf451 +Author: Eric S. Raymond +Date: Tue Jan 2 18:43:21 2007 -0800 - * configure.ac: - Update package version number for X11R7 RC3 release. + Bug 9513: Unknown macro & other formatting fixes in editres.1x + + -2005-10-18 Kevin E. Martin +commit 0a067639699a5639516200e780a68a779a82bde0 +Author: Daniel Stone +Date: Sat Dec 16 00:33:35 2006 +0200 - * configure.ac: - Update package version number for RC1 release. + bump to 1.0.2 +commit 54a41faa66c411e9f82fb00333cd407cb94f4c3e +Author: Daniel Stone +Date: Fri Dec 15 23:51:21 2006 +0200 + + remove config.h from _SOURCES + Remove config.h from _SOURCES, so it doesn't get distributed. + +commit 67b0dc56b4d0ce6d5ffe36a8b638c79b7f89cf30 +Author: Kevin E Martin +Date: Wed Dec 21 02:29:42 2005 +0000 + + Update package version for X11R7 release. + +commit 80b0ef68994d37db8a43fb8862969111c2ef3170 +Author: Adam Jackson +Date: Mon Dec 19 16:22:40 2005 +0000 + + Stub COPYING files + +commit 084dc660379fe0d2cd8833d3a8967c45d793f48e +Author: Kevin E Martin +Date: Thu Dec 15 00:24:01 2005 +0000 + + Update package version number for final X11R7 release candidate. + +commit 8113fde1cc66413534f82820c363f7a142ca7b08 +Author: Kevin E Martin +Date: Wed Dec 7 16:17:58 2005 +0000 + + Change to use the app-defaults default dir configured in libXt. + +commit 81d4322158703bcccc10040984a48db852e489c4 +Author: Kevin E Martin +Date: Tue Dec 6 22:48:16 2005 +0000 + + Change *man_SOURCES ==> *man_PRE to fix autotools warnings. + +commit 9a5d8daff97901931aa983afe060be6c4583d36f +Author: Kevin E Martin +Date: Sat Dec 3 05:49:15 2005 +0000 + + Update package version number for X11R7 RC3 release. + +commit 500b5abb8c280b2f9450157822f2080d94d1f754 +Author: Alan Coopersmith +Date: Mon Nov 28 22:01:36 2005 +0000 + + Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 + update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) + +commit 5700b32bf8a970ccbcc4c6204dfa74f6c1b795cc +Author: Eric Anholt +Date: Mon Nov 21 10:34:55 2005 +0000 + + Another pass at .cvsignores for apps. + +commit dc8c4e03c64c0aaad4101cbf737d333049e0ade3 +Author: Eric Anholt +Date: Sun Nov 20 22:08:48 2005 +0000 + + Add/improve .cvsignore files for apps. + +commit ab7ebeb62f2d9cf3934bcc6c91d7f2ca29603bec +Author: Kevin E Martin +Date: Wed Oct 19 02:47:48 2005 +0000 + + Update package version number for RC1 release. + +commit 6b6f7ea565d3d034ff3406be3c8538a058100203 +Author: Alan Coopersmith +Date: Tue Oct 18 00:32:53 2005 +0000 + + Change default install dir for app-default files from + $(sysconfdir)/X11/app-defaults to $(libdir)/X11/app-defaults to match + the monolith & allow localization + +commit ee6d1e9b005eaf30cff6ac3dd9cc40919e90d884 +Author: Alan Coopersmith +Date: Mon Oct 17 23:56:19 2005 +0000 + + Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to + work better with BSD make + +commit 860f17c45f423b7d19ad78061ec1d785fa9fedf5 +Author: Alan Coopersmith +Date: Fri Oct 14 00:25:41 2005 +0000 + + Use sed to fill in variables in man page + +commit 3d586c48b217f6f783cd8b39bedd6b34f047444c +Author: Alan Coopersmith +Date: Thu Oct 13 20:10:59 2005 +0000 + + Fix app-default files to install under the same names as in the monolith + instead of their short names used only for 14-character filename length + limited ancient filesystems + +commit 18a1a2898c1124d8ec359b5320e00e58d0758c56 +Author: Alan Coopersmith +Date: Mon Aug 1 20:25:27 2005 +0000 + + Install man pages to section 1 instead of section m (Patch from Donnie + Berkholz) + +commit 46c342a910eed04ed23ea5b3ccf3280818c098a9 +Author: Kevin E Martin +Date: Fri Jul 29 21:22:28 2005 +0000 + + Various changes preparing packages for RC0: + - Verify and update package version numbers as needed + - Implement versioning scheme + - Change bug address to point to bugzilla bug entry form + - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to + reenable it) + - Fix makedepend to use pkgconfig and pass distcheck + - Update build script to build macros first + - Update modular Xorg version + +commit 3f55c0717f22df8c36bc2d64fc2ace1b5e9b34a6 +Author: Alan Coopersmith +Date: Tue Jul 26 15:44:01 2005 +0000 + + Replace more GNU make-ism's with more portable macros + +commit 193cf93becd97779c8d6ee790efa78387c71b258 +Author: Adam Jackson +Date: Wed Jul 20 19:31:48 2005 +0000 + + Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global + configure cache, you cache it, and the cached value is probably wrong. + +commit 3fbfc8390e09c5d63a8ab37342f09784acc13485 +Author: Matthieu Herrb +Date: Sun Jul 17 20:11:01 2005 +0000 + + fix rules to work with non-GNU make and outside of $srcdir + +commit d15169a6a4c05a63b17ae630c9ade3b14a3d7181 +Author: Søren Sandmann Pedersen +Date: Mon Jun 27 22:30:58 2005 +0000 + + Use $(foreach ) instead of listing the appdefaults files twice + +commit 349b2847900798cacdfe358eb8eb4773106657e8 +Author: Søren Sandmann Pedersen +Date: Mon Jun 27 21:35:04 2005 +0000 + + - Fix string test in lib/Xaw/xaw.m4 + - Xaw/Xaw7/Makefile.am: add -DXAW7 + - add build system for editres + +commit 9391b5d706fe66ac05cb3af1fd0263eed13776c8 +Author: Egbert Eich +Date: Mon Apr 4 10:17:07 2005 +0000 + + Fixed sentinels in Xt, editres and xedit to reduce number of warnings with + gcc4 (Andreas Schwab). + +commit 3528e71f7e176f696c360bee56dd78b7b9f95fc3 +Author: Egbert Eich +Date: Fri Apr 23 19:54:32 2004 +0000 + + Merging XORG-CURRENT into trunk + +commit 9ba152d28e1a57bd0e0c841ba35e6374070ba2dc +Author: Egbert Eich +Date: Sun Mar 14 08:34:50 2004 +0000 + + Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 + +commit 9ad041dcc1fa1e142b9f688463f93fb1ecc31fd5 +Author: Egbert Eich +Date: Wed Mar 3 12:12:50 2004 +0000 + + Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 + +commit 18876207a03f0a8c2210ba1decc726db1cf53702 +Author: Egbert Eich +Date: Thu Feb 26 13:36:15 2004 +0000 + + readding XFree86's cvs IDs + +commit 82de5e8b51be2df116d3d9c8cdea65f8468f7298 +Author: Egbert Eich +Date: Thu Feb 26 09:23:53 2004 +0000 + + Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 + +commit f35a8fcb820cbe4cfb1ded89677d5828a34ddec0 +Author: Kaleb Keithley +Date: Tue Nov 25 19:29:02 2003 +0000 + + XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks + +commit 6e4057717156adf6dba781d30db3f60a475ea7e4 +Author: Kaleb Keithley +Date: Fri Nov 14 16:48:57 2003 +0000 + + XFree86 4.3.0.1 + +commit efce7cb078dd34e9e9f7d6f5f5cdd0c8ef267691 +Author: Kaleb Keithley +Date: Fri Nov 14 15:54:52 2003 +0000 + + R6.6 is the Xorg base-line diff --git a/app/editres/autogen.sh b/app/editres/autogen.sh new file mode 100644 index 000000000..e81f98910 --- /dev/null +++ b/app/editres/autogen.sh @@ -0,0 +1,13 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" + diff --git a/app/editres/configure.ac b/app/editres/configure.ac index f159916c1..e34e9fe18 100644 --- a/app/editres/configure.ac +++ b/app/editres/configure.ac @@ -22,7 +22,7 @@ dnl dnl Process this file with autoconf to create configure. AC_PREREQ([2.57]) -AC_INIT(editres,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],editres) +AC_INIT(editres,[1.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],editres) AM_INIT_AUTOMAKE([dist-bzip2]) AM_MAINTAINER_MODE diff --git a/app/editres/editres.man b/app/editres/editres.man index e42b41166..27b9248b5 100644 --- a/app/editres/editres.man +++ b/app/editres/editres.man @@ -1,3 +1,4 @@ +'\" t .\" $Xorg: editres.man,v 1.4 2001/02/09 02:05:29 xorgcvs Exp $ .\" Copyright 1993, 1994, 1998 The Open Group .\" @@ -121,34 +122,21 @@ their children, it is not possible to get to every widget this way, but this mechanism does give very useful feedback between the elements in the widget tree and those in the actual application. .IP "Select All" -.br -.ns .IP "Unselect All" -.br -.ns .IP "Invert All" These functions allow the user to select, unselect, or invert all widgets in the widget tree. .IP "Select Children" -.br -.ns .IP "Select Parents" These functions select the immediate parent or children of each of the currently selected widgets. .IP "Select Descendants" -.br -.ns .IP "Select Ancestors" These functions select all parents or children of each of the currently selected widgets. This is a recursive search. .IP "Show Widget Names" -.br -.ns .IP "Show Class Names" -.br -.ns .IP "Show Widget IDs" -.br -.ns +.IP "Show Widget IDs" .IP "Show Widget Windows" When the tree widget is initially displayed the labels of each widget in the tree correspond to the widget names. These functions will @@ -174,25 +162,25 @@ the widget tree, by flashing the corresponding widget in the application \fInumFlashes\fP (three by default) times in the \fIflashColor\fP. .sp -.nf -.TA .5i 1.5i 4.0i -.ta .5i 1.5i 4.0i - \fBKey Option Translation Entry\fP - - space Unselect Select(nothing) - w Select Select(widget) - s Select Select(all) - i Invert Select(invert) - c Select Children Select(children) - d Select Descendants Select(descendants) - p Select Parent Select(parent) - a Select Ancestors Select(ancestors) - N Show Widget Names Relabel(name) - C Show Class Names Relabel(class) - I Show Widget IDs Relabel(id) - W Show Widget Windows Relabel(window) - T Toggle Widget/Class Name Relabel(toggle) -.fi +.TS +lb lb lb +l l l. +Key Option Translation Entry +- +space Unselect Select(nothing) +w Select Select(widget) +s Select Select(all) +i Invert Select(invert) +c Select Children Select(children) +d Select Descendants Select(descendants) +p Select Parent Select(parent) +a Select Ancestors Select(ancestors) +N Show Widget Names Relabel(name) +C Show Class Names Relabel(class) +I Show Widget IDs Relabel(id) +W Show Widget Windows Relabel(window) +T Toggle Widget/Class Name Relabel(toggle) +.TE .sp Clicking button 1 on a widget adds it to the set of selected widgets. Clicking button 2 on a widget deselects all other widgets and then @@ -219,7 +207,7 @@ which will generalize this level to match any widget. The last line contains a set of special buttons called \fBAny Widget Chain\fP which will turn the single level into something that matches zero or more levels. -.IP "" +.sp The initial state of this area is the most restrictive, using the resource names and the dot separator. By selecting the other buttons in this area you can ease the restrictions to allow more and more widgets @@ -237,18 +225,15 @@ This next area allows you to enter the resource value. This value should be entered exactly as you would type a line into your resource file. Thus it should contain no unescaped new-lines. There are a few special character sequences for this file: -.IP "" +.sp \\n - This will be replaced with a newline. -.br .sp \\### - Where # is any octal digit. This will be replaced with a single byte that contains this sequence interpreted as an octal number. For example, a value containing a NULL byte can be stored by specifying \\000. -.br .sp \\ - This will compress to nothing. -.br .sp \\\\ - This will compress to a single backslash. .IP "Command Area" @@ -273,7 +258,7 @@ users to put an application in states it may not be willing to handle, a hook has been provided to allow specific applications to block these SetValues requests (see \fBBlocking Editres Requests\fP below). -.IP "" +.sp Unfortunately due to design constraints imposed on the widgets by the X Toolkit and the Resource Manager, trying to coerce an inherently static system into dynamic behavior can cause strange results. There