update to xlogo 1.0.2
This commit is contained in:
parent
7993eacc9e
commit
c68089aef1
@ -1,41 +1,550 @@
|
||||
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit f826c5af5514da12ee146c61698d4545af391434
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Dec 10 22:33:05 2009 -0800
|
||||
|
||||
* configure.ac:
|
||||
Update package version for X11R7 release.
|
||||
xlogo 1.0.2
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 3166b7e2e3013ca0d0c5b1679cdcb88f21384398
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Dec 10 22:32:35 2009 -0800
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for final X11R7 release candidate.
|
||||
Add direct dependency on libXt, since xlogo calls Xt functions
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
2005-12-07 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 02220d224d457aa070daf7603461b5d359780de4
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Dec 10 22:25:24 2009 -0800
|
||||
|
||||
* Makefile.am:
|
||||
* configure.ac:
|
||||
Change to use the app-defaults default dir configured in libXt.
|
||||
Remove more leftover Xprint bits
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit fed17089fc586b6e762d121a34f2dbf95dd6433b
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Dec 10 22:23:18 2009 -0800
|
||||
|
||||
* Makefile.am:
|
||||
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
|
||||
Strip old CVS id tags and trailing whitespaces
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit a3223e295cf840b7854a91c7e5577812edb11e62
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Dec 10 22:10:27 2009 -0800
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for X11R7 RC3 release.
|
||||
Use AM_V_GEN to silence man page generation output
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
2005-11-19 Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
commit 39313841d56ebe935d55190cc239ac66d072bb32
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Thu Nov 26 09:19:54 2009 -0500
|
||||
|
||||
* configure.ac:
|
||||
Add dependency on xp module when building with Xprint support.
|
||||
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
|
||||
|
||||
Now that the INSTALL file is generated.
|
||||
Allows running make maintainer-clean.
|
||||
|
||||
2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit 0f388329378b5e5fb4cbce3e76e0f7661ac326eb
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Wed Oct 28 14:09:08 2009 -0400
|
||||
|
||||
* configure.ac:
|
||||
Update dependencies to work with separate build roots.
|
||||
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
|
||||
|
||||
Add missing INSTALL file. Use standard GNU file on building tarball
|
||||
README may have been updated
|
||||
Remove AUTHORS file as it is empty and no content available yet.
|
||||
Remove NEWS file as it is empty and no content available yet.
|
||||
|
||||
2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
commit cc1220ace1ce5ff89e089603d912d9dd456066bf
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Tue Oct 27 15:07:25 2009 -0400
|
||||
|
||||
* configure.ac:
|
||||
Update package version number for RC1 release.
|
||||
Deploy the new XORG_DEFAULT_OPTIONS #24242
|
||||
|
||||
This macro aggregate a number of existing macros that sets commmon
|
||||
X.Org components configuration options. It shields the configuration file from
|
||||
future changes.
|
||||
|
||||
commit 7e3e8c7f74d9ca2286001d53510668b02e75e25f
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Mon Oct 26 22:08:39 2009 -0400
|
||||
|
||||
Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
|
||||
|
||||
ChangeLog filename is known to Automake and requires no further
|
||||
coding in the makefile.
|
||||
|
||||
commit e5230ea7372b2d9672579f65752a1d2c7e65dab5
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Thu Oct 22 12:34:15 2009 -0400
|
||||
|
||||
.gitignore: use common defaults with custom section # 24239
|
||||
|
||||
Using common defaults will reduce errors and maintenance.
|
||||
Only the very small or inexistent custom section need periodic maintenance
|
||||
when the structure of the component changes. Do not edit defaults.
|
||||
|
||||
commit 8e40f73c2a36680aec587b4be5971cea5141e13a
|
||||
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
|
||||
Date: Wed Oct 21 12:47:21 2009 -0700
|
||||
|
||||
This is not a GNU project, so declare it foreign.
|
||||
|
||||
On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
|
||||
> On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
|
||||
> > I noticed an INSTALL file in xlsclients and libXvMC today, and it
|
||||
> > was quite annoying to work around since 'autoreconf -fvi' replaces
|
||||
> > it and git wants to commit it. Should these files even be in git?
|
||||
> > Can I nuke them for the betterment of humanity and since they get
|
||||
> > created by autoreconf anyways?
|
||||
>
|
||||
> See https://bugs.freedesktop.org/show_bug.cgi?id=24206
|
||||
|
||||
As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
|
||||
of the INSTALL file. It is also part of the 24206 solution.
|
||||
|
||||
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
|
||||
|
||||
commit 8510be4defc2a6d291ac87439abfffcdd4214f7b
|
||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
Date: Thu Oct 1 14:54:26 2009 -0700
|
||||
|
||||
Add README with pointers to mailing lists, bugzilla, & git
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||
|
||||
commit 982d3b53606238b4602bbdbc4f0f1f9c1bd0563b
|
||||
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
|
||||
Date: Thu Oct 1 14:10:15 2009 -0700
|
||||
|
||||
Require macros 1.3 for XORG_DEFAULT_OPTIONS
|
||||
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>>
|
||||
|
||||
commit 12f6dde9f5cd64773ccd907deb8600533e7b958f
|
||||
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
|
||||
Date: Thu Oct 1 14:06:44 2009 -0700
|
||||
|
||||
Fixed compiler warning
|
||||
|
||||
xlogo.c:153: warning: format not a string literal and no format arguments
|
||||
|
||||
commit 9bb8ad30520e9e9d688e844e18590b371a2ac1a9
|
||||
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
|
||||
Date: Thu Jan 22 15:40:27 2009 -0200
|
||||
|
||||
Correct make distcheck and sparse warnings.
|
||||
|
||||
commit 15a8c8d5c3db1945a3ba6876241d04f0027e9dcd
|
||||
Author: Julien Cristau <jcristau@debian.org>
|
||||
Date: Thu Aug 21 00:30:29 2008 +0200
|
||||
|
||||
Build fix, XAW_USE_XPRINT is no more
|
||||
|
||||
commit 44ca3b95b355af966044132fab8b5e1616aa7303
|
||||
Author: James Cloos <cloos@jhcloos.com>
|
||||
Date: Wed Aug 20 10:32:52 2008 -0400
|
||||
|
||||
xaw8 is gone, use xaw7
|
||||
|
||||
commit f426787beaad60cee9c116613ddde540c310038a
|
||||
Author: Julien Cristau <jcristau@debian.org>
|
||||
Date: Fri May 16 14:25:24 2008 +0200
|
||||
|
||||
$(builddir) is the current directory
|
||||
|
||||
Apparently automake doesn't always export the builddir variable.
|
||||
This fixes my previous commit.
|
||||
|
||||
commit 7c427dcbce96d6cb445ed73e08805524b593e1ea
|
||||
Author: Julien Cristau <jcristau@debian.org>
|
||||
Date: Sun Apr 20 19:51:43 2008 +0200
|
||||
|
||||
Use AM_CFLAGS instead of xlogo_CFLAGS and remove AM_PROG_CC_C_O
|
||||
|
||||
commit 79c7a3d87978c253105603b8ac6b5d48a0b2b476
|
||||
Author: Julien Cristau <jcristau@debian.org>
|
||||
Date: Sun Apr 20 19:49:24 2008 +0200
|
||||
|
||||
Fix build with builddir != srcdir
|
||||
|
||||
commit 1b7e7cf9ec4723afa3e9bed0825fbc8adca6408f
|
||||
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
|
||||
Date: Thu Mar 27 20:30:08 2008 -0700
|
||||
|
||||
Added missing AM_PROG_CC_C_O
|
||||
|
||||
commit 2ddbb1bf87af90f0fcf1d78992b3783374831614
|
||||
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
|
||||
Date: Thu Mar 27 20:07:50 2008 -0700
|
||||
|
||||
Build fix for file systems that are not case sensitive
|
||||
|
||||
commit 7c07c38b263902fef9e2962c1946ad493718c2e6
|
||||
Author: James Cloos <cloos@jhcloos.com>
|
||||
Date: Thu Dec 6 16:37:21 2007 -0500
|
||||
|
||||
Replace static ChangeLog with dist-hook to generate from git log
|
||||
|
||||
commit 2875b41b3e619315821b603ef56b1d29657469c2
|
||||
Author: James Cloos <cloos@jhcloos.com>
|
||||
Date: Mon Sep 3 05:51:31 2007 -0400
|
||||
|
||||
Add *~ to .gitignore to skip patch/emacs droppings
|
||||
|
||||
commit dc7d96bec5665c64da74da75e0710a7b57b9173a
|
||||
Author: James Cloos <cloos@jhcloos.com>
|
||||
Date: Thu Aug 23 19:24:58 2007 -0400
|
||||
|
||||
Rename .cvsignore to .gitignore
|
||||
|
||||
commit a88e031e6c81857edc404f7b5d52c0c39cdd3146
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Dec 21 02:29:51 2005 +0000
|
||||
|
||||
Update package version for X11R7 release.
|
||||
|
||||
commit d8f94db09d68dc59dfe8d183cd0c1f3b9eff3004
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Mon Dec 19 16:22:45 2005 +0000
|
||||
|
||||
Stub COPYING files
|
||||
|
||||
commit ae1b1194d57cb1a1089cffe61137e67c9e8b6b20
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Thu Dec 15 00:24:08 2005 +0000
|
||||
|
||||
Update package version number for final X11R7 release candidate.
|
||||
|
||||
commit be590c64bc8df224154347ab5f6c32fe60bf0e67
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Dec 7 16:18:00 2005 +0000
|
||||
|
||||
Change to use the app-defaults default dir configured in libXt.
|
||||
|
||||
commit 2ad19d20118c07d369ef67dd9ff8bd094d8e5864
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Tue Dec 6 22:48:23 2005 +0000
|
||||
|
||||
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
|
||||
|
||||
commit 6ea22dc485341e30ac906e3559b104326ab90178
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Sat Dec 3 05:49:25 2005 +0000
|
||||
|
||||
Update package version number for X11R7 RC3 release.
|
||||
|
||||
commit 7f3821c5e6815bbb59a9298d2671b150cf89615f
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Mon Nov 28 22:01:44 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 601ec0670c548caed335352295bbcb058968aa50
|
||||
Author: Eric Anholt <anholt@freebsd.org>
|
||||
Date: Mon Nov 21 10:35:02 2005 +0000
|
||||
|
||||
Another pass at .cvsignores for apps.
|
||||
|
||||
commit 09d3bc9867032ee89503914bc7e731c48a470dfb
|
||||
Author: Eric Anholt <anholt@freebsd.org>
|
||||
Date: Sun Nov 20 22:08:53 2005 +0000
|
||||
|
||||
Add/improve .cvsignore files for apps.
|
||||
|
||||
commit a5ed76fbde1c8195951b41a0372a0b5caeeaebfa
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Sun Nov 20 04:13:45 2005 +0000
|
||||
|
||||
Add dependency on xp module when building with Xprint support.
|
||||
|
||||
commit ddcaa857470b13840b8a3c3e1748c0154f76b9c2
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Sat Nov 19 07:15:37 2005 +0000
|
||||
|
||||
Update pkgconfig files to separate library build-time dependencies from
|
||||
application build-time dependencies, and update package deps to work
|
||||
with separate build roots.
|
||||
|
||||
commit f3e7ab0f031b9ff8968596667616e79ec05f9b62
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Wed Oct 19 02:47:55 2005 +0000
|
||||
|
||||
Update package version number for RC1 release.
|
||||
|
||||
commit 1b4c1658fc24b851a7f83e9190ecc6aacbc9f23b
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Tue Oct 18 00:32:54 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 0b90073689ab1745bb2277485687521f564a1939
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Mon Oct 17 23:56:23 2005 +0000
|
||||
|
||||
Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
|
||||
work better with BSD make
|
||||
|
||||
commit 0813f5229d48b9a0ed3dec5438db338dae71dfd9
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Sat Oct 15 01:04:15 2005 +0000
|
||||
|
||||
Add #include <config.h> for modularization.
|
||||
|
||||
commit fd78790af2a87e999b0f01d1c8f8ecce849a2384
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Fri Oct 14 00:25:46 2005 +0000
|
||||
|
||||
Use sed to fill in variables in man page
|
||||
|
||||
commit 70298627f76aaf18ab4e63e297a0f42a8809d9bb
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Thu Oct 13 20:11:00 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 42f1737418b0c1d7e2ceaaaf3ddbcb2db7ab614b
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Tue Aug 16 15:52:25 2005 +0000
|
||||
|
||||
Fix render checks to check for both Xrender & Xft2, and to define XRENDER
|
||||
|
||||
commit 2eae29c6f837bd6f8ab383f0d4e61742c063291a
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Mon Aug 1 20:25:30 2005 +0000
|
||||
|
||||
Install man pages to section 1 instead of section m (Patch from Donnie
|
||||
Berkholz)
|
||||
|
||||
commit 345a950cebdb8717e08fb878de0307a2611ba846
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Fri Jul 29 21:22:35 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 28cbacfd0b809ce1614d177b10dd11ff1ab4b9d0
|
||||
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||
Date: Tue Jul 26 15:44:02 2005 +0000
|
||||
|
||||
Replace more GNU make-ism's with more portable macros
|
||||
|
||||
commit e3721beb3d51bd53527639afb4185f8fda24101e
|
||||
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
Date: Sat Jul 23 16:41:40 2005 +0000
|
||||
|
||||
Fix remaining DEP_{CFLAGS,LIB} references
|
||||
|
||||
commit 19cf02998290cc99fcbc94feb03647386ef595f9
|
||||
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||
Date: Sat Jul 23 16:40:58 2005 +0000
|
||||
|
||||
fix GNU-make only app-default rule
|
||||
|
||||
commit b7533f8eb9cea84603a80e5207b4a589d3dfd444
|
||||
Author: Adam Jackson <ajax@nwnk.net>
|
||||
Date: Wed Jul 20 19:31:58 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 6fc943cfccd96e6ad0fec6a2e1b836fa0d0d7d3a
|
||||
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||
Date: Tue Jul 5 22:51:09 2005 +0000
|
||||
|
||||
Add build systems for xlogo, xlsatoms, xlsclients, xmag, xman, xmessage,
|
||||
xmh, xmore. lib/Xaw/xaw.m4: Add an AM_CONDITIONAL and a shell variable
|
||||
xaw_use_xprint symlink.sh: add some extra files for xgc, xinit,
|
||||
xkbcomp, xlogo, xmb, and xmodmap xc/programs/xmore/xmore.c:
|
||||
Conditionalize use of xprint
|
||||
|
||||
commit 4d8b36adf2024e6c28ecd266fb3585fdbc2c66f2
|
||||
Author: Roland Mainz <roland.mainz@nrubsig.org>
|
||||
Date: Mon Apr 11 01:06:15 2005 +0000
|
||||
|
||||
xc/programs/Xserver/Xprint/attributes.c
|
||||
xc/programs/glxgears/glxgears.c
|
||||
xc/programs/xdbedizzy/xdbedizzy.c
|
||||
xc/programs/xedit/Imakefile
|
||||
xc/programs/xedit/Xedit-xprint.ad
|
||||
xc/programs/xedit/util.c
|
||||
xc/programs/xedit/xedit.h
|
||||
xc/programs/xlogo/print.c
|
||||
xc/programs/xlogo/xlogo.c
|
||||
xc/programs/xlogo/xlogo.h
|
||||
xc/programs/xman/Imakefile
|
||||
xc/programs/xman/print.h
|
||||
xc/programs/xmore/Imakefile
|
||||
xc/programs/xmore/print.c
|
||||
xc/programs/xmore/print.h
|
||||
xc/programs/xmore/printdialog.c
|
||||
xc/programs/xphelloworld/xpawhelloworld/xpawhelloworld.c
|
||||
xc/programs/xphelloworld/xphelloworld/xphelloworld.c
|
||||
xc/programs/xphelloworld/xpsimplehelloworld/xpsimplehelloworld.c
|
||||
xc/programs/xphelloworld/xpxmhelloworld/xpxmhelloworld.c
|
||||
//bugs.freedesktop.org/show_bug.cgi?id=790) attachment #2379
|
||||
(https://bugs.freedesktop.org/attachment.cgi?id=2379) Implement support
|
||||
client+Xserver support for passing output (stdout+stderr) of the
|
||||
spooler command started by the Xprint server back to the application
|
||||
using the "xp-spooler-command-results" XPJobAttr attribute
|
||||
(applications can fetch the attribute value after the XPEndJobNotify
|
||||
event was received; more details can be found in
|
||||
http://xprint.mozdev.org/docs/dtprint_fspec.ps).
|
||||
|
||||
commit c4d739517989871ad786fd0f5e0ae6a683f7e92f
|
||||
Author: Roland Mainz <roland.mainz@nrubsig.org>
|
||||
Date: Mon Jan 3 01:06:35 2005 +0000
|
||||
|
||||
xc/lib/XprintAppUtil/xpapputil.c
|
||||
xc/lib/XprintAppUtil/xpapputil.h
|
||||
xc/lib/XprintUtil/xprintutil.c
|
||||
xc/lib/XprintUtil/xprintutil.h
|
||||
xc/programs/glxgears/glxgears.c
|
||||
xc/programs/xdbedizzy/xdbedizzy.c
|
||||
xc/programs/xedit/Xedit-xprint.ad
|
||||
xc/programs/xedit/commands.c
|
||||
xc/programs/xlogo/print.c
|
||||
xc/programs/xlsfonts/xlsfonts.c
|
||||
xc/programs/xlsfonts/xlsfonts.man
|
||||
xc/programs/xlsfonts/xlsfonts.sgml
|
||||
xc/programs/xman/Xman-xprint.ad
|
||||
xc/programs/xman/handler.c
|
||||
xc/programs/xman/print.c
|
||||
xc/programs/xman/print.h
|
||||
xc/programs/xmore/XMore.ad
|
||||
xc/programs/xmore/print.c
|
||||
xc/programs/xmore/print.h
|
||||
xc/programs/xmore/printdialog.c
|
||||
xc/programs/xmore/printdialog.h
|
||||
xc/programs/xmore/printdialogprivates.h
|
||||
xc/programs/xmore/xmore.c
|
||||
xc/programs/xphelloworld/xpawhelloworld/xpawhelloworld.c
|
||||
xc/programs/xphelloworld/xphelloworld/xphelloworld.c
|
||||
xc/programs/xphelloworld/xpsimplehelloworld/xpsimplehelloworld.c
|
||||
xc/programs/xphelloworld/xpxmhelloworld/xpxmhelloworld.c
|
||||
xc/programs/xphelloworld/xpxthelloworld/xpxthelloworld.c
|
||||
xc/programs/xplsprinters/xplsprinters.c
|
||||
//bugs.freedesktop.org/show_bug.cgi?id=1706) attachment #1615
|
||||
(https://bugs.freedesktop.org/attachment.cgi?id=1615): XprintUtils
|
||||
2004/Q3 update. This adds various new features to the XprintUtils
|
||||
library including support for page resolutions where
|
||||
X_resolution!=Y_resolution, listfonts-mode control and initial
|
||||
framework for the COLORSPACE extension. Patch by Roland Mainz
|
||||
<roland.mainz@nrubsig.org> and Julien Lafon <julien.lafon@gmail.com>.
|
||||
|
||||
commit f4149e9970ced64f8eb2e92a115ea87174de2747
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Thu Sep 2 05:50:38 2004 +0000
|
||||
|
||||
Clean up defines for Xprint support and fix BuildServersOnly build for
|
||||
libXaw.
|
||||
|
||||
commit ac167b94611ccb2b990ff70db5957fae0bde0969
|
||||
Author: Kevin E Martin <kem@kem.org>
|
||||
Date: Thu Sep 2 01:10:30 2004 +0000
|
||||
|
||||
Bump major version number of libXaw (Bug #1273).
|
||||
|
||||
commit 18ae14262f9859a2e1f2dd769a0c4dcf4e1bb344
|
||||
Author: Kristian Høgsberg <krh@redhat.com>
|
||||
Date: Mon Aug 16 16:36:16 2004 +0000
|
||||
|
||||
As discussed and agreed on on the release-wranglers meeting of August 16,
|
||||
I'm committing the patch from bug #1060 to back out unconditional
|
||||
Xprint functionality.
|
||||
Back out Xprint changes.
|
||||
Revert xman to CVS of June 5, revert xlogo to CVS of May 8, revert xedit to
|
||||
CVS of April 25, to back out unconditional Xprint support.
|
||||
Fix up Xprint config logic to be like the rest of the extensions:
|
||||
BuildXprint is a one-stop option for disabling everything Xprint
|
||||
related. XprtServer controls building Xprt, BuildXprintLib controls
|
||||
building Xprint libs and BuildXprintClients controls building clients
|
||||
related to Xprint. BuiltXprint defaults to YES and the other options
|
||||
respects relevant settings, i.e. BuildServer and BuildServersOnly.
|
||||
Build Xaw regardless of BuildXprintLib setting.
|
||||
Only build xphelloworld, xplsprinters and xprehashprinterlist when
|
||||
BuildXprintClients it YES. Disable building xmore, it has always
|
||||
supported XawPrintShell.
|
||||
Make Xprint support depend on BuildXprintLib.
|
||||
|
||||
commit 28ffd14fbae70a5e01cdcbe2cb9342d3c8816b76
|
||||
Author: Roland Mainz <roland.mainz@nrubsig.org>
|
||||
Date: Sun May 9 00:36:41 2004 +0000
|
||||
|
||||
Fix for http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=581 -
|
||||
Print support for XLogo.
|
||||
|
||||
commit 8eb746981d01e0db330e8e6139300ede823037f3
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Fri Apr 23 19:54:57 2004 +0000
|
||||
|
||||
Merging XORG-CURRENT into trunk
|
||||
|
||||
commit 2a3e8d4963b3a8ed53e226965ec80f749ad8d5a4
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Sun Mar 14 08:35:37 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
|
||||
|
||||
commit effebf964672168e99b59fdf89be48dab2f88ecd
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Wed Mar 3 12:13:14 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
|
||||
|
||||
commit 8cc0b397fa0c771a60f58e362a69bc04e8f1510f
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Thu Feb 26 13:36:26 2004 +0000
|
||||
|
||||
readding XFree86's cvs IDs
|
||||
|
||||
commit 142da2b715826c9fe7dad89ee344ead2f798cf82
|
||||
Author: Egbert Eich <eich@suse.de>
|
||||
Date: Thu Feb 26 09:24:14 2004 +0000
|
||||
|
||||
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
|
||||
|
||||
commit 59a2fa66d61369dd415f1cb7c8c5d6e7640e4870
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Dec 19 20:56:01 2003 +0000
|
||||
|
||||
XFree86 4.3.99.902 (RC 2)
|
||||
|
||||
commit 54d675d206d1dbb9901e33ccc14988daf98f97b8
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Tue Nov 25 19:29:15 2003 +0000
|
||||
|
||||
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
|
||||
|
||||
commit 05b7c570b155f167e5a7f1b804e10b870bbc762c
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 16:49:23 2003 +0000
|
||||
|
||||
XFree86 4.3.0.1
|
||||
|
||||
commit cc25207f02f9b4d630f5d6646a1815431e532ea0
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 16:49:23 2003 +0000
|
||||
|
||||
Initial revision
|
||||
|
||||
commit 6fc51a3195bf01d2f69b33524d27ec3bb5e17181
|
||||
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||
Date: Fri Nov 14 15:54:54 2003 +0000
|
||||
|
||||
R6.6 is the Xorg base-line
|
||||
|
@ -1,6 +1,297 @@
|
||||
Installation Instructions
|
||||
*************************
|
||||
|
||||
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
|
||||
2006, 2007, 2008 Free Software Foundation, Inc.
|
||||
|
||||
This file is free documentation; the Free Software Foundation gives
|
||||
unlimited permission to copy, distribute and modify it.
|
||||
|
||||
Basic Installation
|
||||
==================
|
||||
|
||||
Briefly, the shell commands `./configure; make; make install' should
|
||||
configure, build, and install this package. The following
|
||||
more-detailed instructions are generic; see the `README' file for
|
||||
instructions specific to this package.
|
||||
|
||||
The `configure' shell script attempts to guess correct values for
|
||||
various system-dependent variables used during compilation. It uses
|
||||
those values to create a `Makefile' in each directory of the package.
|
||||
It may also create one or more `.h' files containing system-dependent
|
||||
definitions. Finally, it creates a shell script `config.status' that
|
||||
you can run in the future to recreate the current configuration, and a
|
||||
file `config.log' containing compiler output (useful mainly for
|
||||
debugging `configure').
|
||||
|
||||
It can also use an optional file (typically called `config.cache'
|
||||
and enabled with `--cache-file=config.cache' or simply `-C') that saves
|
||||
the results of its tests to speed up reconfiguring. Caching is
|
||||
disabled by default to prevent problems with accidental use of stale
|
||||
cache files.
|
||||
|
||||
If you need to do unusual things to compile the package, please try
|
||||
to figure out how `configure' could check whether to do them, and mail
|
||||
diffs or instructions to the address given in the `README' so they can
|
||||
be considered for the next release. If you are using the cache, and at
|
||||
some point `config.cache' contains results you don't want to keep, you
|
||||
may remove or edit it.
|
||||
|
||||
The file `configure.ac' (or `configure.in') is used to create
|
||||
`configure' by a program called `autoconf'. You need `configure.ac' if
|
||||
you want to change it or regenerate `configure' using a newer version
|
||||
of `autoconf'.
|
||||
|
||||
The simplest way to compile this package is:
|
||||
|
||||
1. `cd' to the directory containing the package's source code and type
|
||||
`./configure' to configure the package for your system.
|
||||
|
||||
Running `configure' might take a while. While running, it prints
|
||||
some messages telling which features it is checking for.
|
||||
|
||||
2. Type `make' to compile the package.
|
||||
|
||||
3. Optionally, type `make check' to run any self-tests that come with
|
||||
the package.
|
||||
|
||||
4. Type `make install' to install the programs and any data files and
|
||||
documentation.
|
||||
|
||||
5. You can remove the program binaries and object files from the
|
||||
source code directory by typing `make clean'. To also remove the
|
||||
files that `configure' created (so you can compile the package for
|
||||
a different kind of computer), type `make distclean'. There is
|
||||
also a `make maintainer-clean' target, but that is intended mainly
|
||||
for the package's developers. If you use it, you may have to get
|
||||
all sorts of other programs in order to regenerate files that came
|
||||
with the distribution.
|
||||
|
||||
6. Often, you can also type `make uninstall' to remove the installed
|
||||
files again.
|
||||
|
||||
Compilers and Options
|
||||
=====================
|
||||
|
||||
Some systems require unusual options for compilation or linking that
|
||||
the `configure' script does not know about. Run `./configure --help'
|
||||
for details on some of the pertinent environment variables.
|
||||
|
||||
You can give `configure' initial values for configuration parameters
|
||||
by setting variables in the command line or in the environment. Here
|
||||
is an example:
|
||||
|
||||
./configure CC=c99 CFLAGS=-g LIBS=-lposix
|
||||
|
||||
*Note Defining Variables::, for more details.
|
||||
|
||||
Compiling For Multiple Architectures
|
||||
====================================
|
||||
|
||||
You can compile the package for more than one kind of computer at the
|
||||
same time, by placing the object files for each architecture in their
|
||||
own directory. To do this, you can use GNU `make'. `cd' to the
|
||||
directory where you want the object files and executables to go and run
|
||||
the `configure' script. `configure' automatically checks for the
|
||||
source code in the directory that `configure' is in and in `..'.
|
||||
|
||||
With a non-GNU `make', it is safer to compile the package for one
|
||||
architecture at a time in the source code directory. After you have
|
||||
installed the package for one architecture, use `make distclean' before
|
||||
reconfiguring for another architecture.
|
||||
|
||||
On MacOS X 10.5 and later systems, you can create libraries and
|
||||
executables that work on multiple system types--known as "fat" or
|
||||
"universal" binaries--by specifying multiple `-arch' options to the
|
||||
compiler but only a single `-arch' option to the preprocessor. Like
|
||||
this:
|
||||
|
||||
./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
||||
CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
||||
CPP="gcc -E" CXXCPP="g++ -E"
|
||||
|
||||
This is not guaranteed to produce working output in all cases, you
|
||||
may have to build one architecture at a time and combine the results
|
||||
using the `lipo' tool if you have problems.
|
||||
|
||||
Installation Names
|
||||
==================
|
||||
|
||||
By default, `make install' installs the package's commands under
|
||||
`/usr/local/bin', include files under `/usr/local/include', etc. You
|
||||
can specify an installation prefix other than `/usr/local' by giving
|
||||
`configure' the option `--prefix=PREFIX'.
|
||||
|
||||
You can specify separate installation prefixes for
|
||||
architecture-specific files and architecture-independent files. If you
|
||||
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
|
||||
PREFIX as the prefix for installing programs and libraries.
|
||||
Documentation and other data files still use the regular prefix.
|
||||
|
||||
In addition, if you use an unusual directory layout you can give
|
||||
options like `--bindir=DIR' to specify different values for particular
|
||||
kinds of files. Run `configure --help' for a list of the directories
|
||||
you can set and what kinds of files go in them.
|
||||
|
||||
If the package supports it, you can cause programs to be installed
|
||||
with an extra prefix or suffix on their names by giving `configure' the
|
||||
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
|
||||
|
||||
Optional Features
|
||||
=================
|
||||
|
||||
Some packages pay attention to `--enable-FEATURE' options to
|
||||
`configure', where FEATURE indicates an optional part of the package.
|
||||
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
|
||||
is something like `gnu-as' or `x' (for the X Window System). The
|
||||
`README' should mention any `--enable-' and `--with-' options that the
|
||||
package recognizes.
|
||||
|
||||
For packages that use the X Window System, `configure' can usually
|
||||
find the X include and library files automatically, but if it doesn't,
|
||||
you can use the `configure' options `--x-includes=DIR' and
|
||||
`--x-libraries=DIR' to specify their locations.
|
||||
|
||||
Particular systems
|
||||
==================
|
||||
|
||||
On HP-UX, the default C compiler is not ANSI C compatible. If GNU
|
||||
CC is not installed, it is recommended to use the following options in
|
||||
order to use an ANSI C compiler:
|
||||
|
||||
./configure CC="cc -Ae"
|
||||
|
||||
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
|
||||
|
||||
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
|
||||
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
|
||||
a workaround. If GNU CC is not installed, it is therefore recommended
|
||||
to try
|
||||
|
||||
./configure CC="cc"
|
||||
|
||||
and if that doesn't work, try
|
||||
|
||||
./configure CC="cc -nodtk"
|
||||
|
||||
Specifying the System Type
|
||||
==========================
|
||||
|
||||
There may be some features `configure' cannot figure out
|
||||
automatically, but needs to determine by the type of machine the package
|
||||
will run on. Usually, assuming the package is built to be run on the
|
||||
_same_ architectures, `configure' can figure that out, but if it prints
|
||||
a message saying it cannot guess the machine type, give it the
|
||||
`--build=TYPE' option. TYPE can either be a short name for the system
|
||||
type, such as `sun4', or a canonical name which has the form:
|
||||
|
||||
CPU-COMPANY-SYSTEM
|
||||
|
||||
where SYSTEM can have one of these forms:
|
||||
|
||||
OS KERNEL-OS
|
||||
|
||||
See the file `config.sub' for the possible values of each field. If
|
||||
`config.sub' isn't included in this package, then this package doesn't
|
||||
need to know the machine type.
|
||||
|
||||
If you are _building_ compiler tools for cross-compiling, you should
|
||||
use the option `--target=TYPE' to select the type of system they will
|
||||
produce code for.
|
||||
|
||||
If you want to _use_ a cross compiler, that generates code for a
|
||||
platform different from the build platform, you should specify the
|
||||
"host" platform (i.e., that on which the generated programs will
|
||||
eventually be run) with `--host=TYPE'.
|
||||
|
||||
Sharing Defaults
|
||||
================
|
||||
|
||||
If you want to set default values for `configure' scripts to share,
|
||||
you can create a site shell script called `config.site' that gives
|
||||
default values for variables like `CC', `cache_file', and `prefix'.
|
||||
`configure' looks for `PREFIX/share/config.site' if it exists, then
|
||||
`PREFIX/etc/config.site' if it exists. Or, you can set the
|
||||
`CONFIG_SITE' environment variable to the location of the site script.
|
||||
A warning: not all `configure' scripts look for a site script.
|
||||
|
||||
Defining Variables
|
||||
==================
|
||||
|
||||
Variables not defined in a site shell script can be set in the
|
||||
environment passed to `configure'. However, some packages may run
|
||||
configure again during the build, and the customized values of these
|
||||
variables may be lost. In order to avoid this problem, you should set
|
||||
them in the `configure' command line, using `VAR=value'. For example:
|
||||
|
||||
./configure CC=/usr/local2/bin/gcc
|
||||
|
||||
causes the specified `gcc' to be used as the C compiler (unless it is
|
||||
overridden in the site shell script).
|
||||
|
||||
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
|
||||
an Autoconf bug. Until the bug is fixed you can use this workaround:
|
||||
|
||||
CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
|
||||
|
||||
`configure' Invocation
|
||||
======================
|
||||
|
||||
`configure' recognizes the following options to control how it
|
||||
operates.
|
||||
|
||||
`--help'
|
||||
`-h'
|
||||
Print a summary of all of the options to `configure', and exit.
|
||||
|
||||
`--help=short'
|
||||
`--help=recursive'
|
||||
Print a summary of the options unique to this package's
|
||||
`configure', and exit. The `short' variant lists options used
|
||||
only in the top level, while the `recursive' variant lists options
|
||||
also present in any nested packages.
|
||||
|
||||
`--version'
|
||||
`-V'
|
||||
Print the version of Autoconf used to generate the `configure'
|
||||
script, and exit.
|
||||
|
||||
`--cache-file=FILE'
|
||||
Enable the cache: use and save the results of the tests in FILE,
|
||||
traditionally `config.cache'. FILE defaults to `/dev/null' to
|
||||
disable caching.
|
||||
|
||||
`--config-cache'
|
||||
`-C'
|
||||
Alias for `--cache-file=config.cache'.
|
||||
|
||||
`--quiet'
|
||||
`--silent'
|
||||
`-q'
|
||||
Do not print messages saying which checks are being made. To
|
||||
suppress all normal output, redirect it to `/dev/null' (any error
|
||||
messages will still be shown).
|
||||
|
||||
`--srcdir=DIR'
|
||||
Look for the package's source code in directory DIR. Usually
|
||||
`configure' can determine that directory automatically.
|
||||
|
||||
`--prefix=DIR'
|
||||
Use DIR as the installation prefix. *Note Installation Names::
|
||||
for more details, including other options available for fine-tuning
|
||||
the installation locations.
|
||||
|
||||
`--no-create'
|
||||
`-n'
|
||||
Run the configure checks, but stop before creating any output
|
||||
files.
|
||||
|
||||
`configure' also accepts some other, not widely useful, options. Run
|
||||
`configure --help' for more details.
|
||||
|
||||
Installation Instructions
|
||||
*************************
|
||||
|
||||
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
|
||||
Software Foundation, Inc.
|
||||
|
||||
|
@ -1,5 +1,3 @@
|
||||
/* $XdotOrg: xc/programs/xlogo/Logo.c,v 1.2 2004/04/23 19:54:57 eich Exp $ */
|
||||
/* $Xorg: Logo.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */
|
||||
/*
|
||||
|
||||
Copyright 1988, 1994, 1998 The Open Group
|
||||
@ -27,7 +25,6 @@ other dealings in this Software without prior written authorization
|
||||
from The Open Group.
|
||||
|
||||
*/
|
||||
/* $XFree86: xc/programs/xlogo/Logo.c,v 1.6 2002/05/23 23:53:59 keithp Exp $ */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
@ -45,7 +42,7 @@ from The Open Group.
|
||||
|
||||
static XtResource resources[] = {
|
||||
{XtNshapeWindow, XtCShapeWindow, XtRBoolean, sizeof (Boolean),
|
||||
XtOffsetOf(LogoRec,logo.shape_window), XtRImmediate,
|
||||
XtOffsetOf(LogoRec,logo.shape_window), XtRImmediate,
|
||||
(XtPointer) FALSE},
|
||||
#ifdef XRENDER
|
||||
{XtNrender, XtCBoolean, XtRBoolean, sizeof(Boolean),
|
||||
@ -68,14 +65,14 @@ static XtResource resources[] = {
|
||||
};
|
||||
|
||||
static void ClassInitialize ( void );
|
||||
static void Initialize ( Widget request, Widget new, ArgList args,
|
||||
static void Initialize ( Widget request, Widget new, ArgList args,
|
||||
Cardinal *num_args );
|
||||
static void Destroy ( Widget gw );
|
||||
static void Realize ( Widget gw, XtValueMask *valuemaskp,
|
||||
static void Realize ( Widget gw, XtValueMask *valuemaskp,
|
||||
XSetWindowAttributes *attr );
|
||||
static void Resize ( Widget gw );
|
||||
static void Redisplay ( Widget gw, XEvent *event, Region region );
|
||||
static Boolean SetValues ( Widget gcurrent, Widget grequest, Widget gnew,
|
||||
static Boolean SetValues ( Widget gcurrent, Widget grequest, Widget gnew,
|
||||
ArgList args, Cardinal *num_args );
|
||||
|
||||
LogoClassRec logoClassRec = {
|
||||
@ -130,7 +127,7 @@ WidgetClass logoWidgetClass = (WidgetClass) &logoClassRec;
|
||||
* *
|
||||
*****************************************************************************/
|
||||
|
||||
static void
|
||||
static void
|
||||
create_gcs(LogoWidget w)
|
||||
{
|
||||
XGCValues v;
|
||||
@ -145,7 +142,7 @@ create_gcs(LogoWidget w)
|
||||
w->logo.backGC = XtGetGC ((Widget) w, GCForeground, &v);
|
||||
}
|
||||
|
||||
static void
|
||||
static void
|
||||
check_shape(LogoWidget w)
|
||||
{
|
||||
if (w->logo.shape_window) {
|
||||
@ -157,7 +154,7 @@ check_shape(LogoWidget w)
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static void
|
||||
static void
|
||||
unset_shape(LogoWidget w)
|
||||
{
|
||||
XSetWindowAttributes attr;
|
||||
@ -165,7 +162,7 @@ unset_shape(LogoWidget w)
|
||||
Display *dpy = XtDisplay ((Widget) w);
|
||||
Window win = XtWindow ((Widget) w);
|
||||
|
||||
if (w->core.background_pixmap != None &&
|
||||
if (w->core.background_pixmap != None &&
|
||||
w->core.background_pixmap != XtUnspecifiedPixmap) {
|
||||
attr.background_pixmap = w->core.background_pixmap;
|
||||
mask = CWBackPixmap;
|
||||
@ -179,7 +176,7 @@ unset_shape(LogoWidget w)
|
||||
w->logo.need_shaping = w->logo.shape_window;
|
||||
}
|
||||
|
||||
static void
|
||||
static void
|
||||
set_shape(LogoWidget w)
|
||||
{
|
||||
GC ones, zeros;
|
||||
@ -239,7 +236,7 @@ RenderPrepare (LogoWidget w)
|
||||
}
|
||||
}
|
||||
|
||||
XtConvertArgRec xftColorConvertArgs[] = {
|
||||
static XtConvertArgRec xftColorConvertArgs[] = {
|
||||
{XtWidgetBaseOffset, (XtPointer)XtOffsetOf(WidgetRec, core.screen),
|
||||
sizeof(Screen *)},
|
||||
{XtWidgetBaseOffset, (XtPointer)XtOffsetOf(WidgetRec, core.colormap),
|
||||
@ -273,7 +270,7 @@ XmuFreeXftColor (XtAppContext app, XrmValuePtr toVal, XtPointer closure,
|
||||
Screen *screen;
|
||||
Colormap colormap;
|
||||
XftColor *color;
|
||||
|
||||
|
||||
if (*num_args != 2)
|
||||
{
|
||||
XtAppErrorMsg (app,
|
||||
@ -292,7 +289,7 @@ XmuFreeXftColor (XtAppContext app, XrmValuePtr toVal, XtPointer closure,
|
||||
XScreenNumberOfScreen (screen)),
|
||||
colormap, color);
|
||||
}
|
||||
|
||||
|
||||
static Boolean
|
||||
XmuCvtStringToXftColor(Display *dpy,
|
||||
XrmValue *args, Cardinal *num_args,
|
||||
@ -304,7 +301,7 @@ XmuCvtStringToXftColor(Display *dpy,
|
||||
XftColor xftColor;
|
||||
Screen *screen;
|
||||
Colormap colormap;
|
||||
|
||||
|
||||
if (*num_args != 2)
|
||||
{
|
||||
XtAppErrorMsg (XtDisplayToApplicationContext (dpy),
|
||||
@ -335,39 +332,39 @@ XmuCvtStringToXftColor(Display *dpy,
|
||||
}
|
||||
else if (!XRenderParseColor (dpy, spec, &renderColor))
|
||||
return False;
|
||||
if (!XftColorAllocValue (dpy,
|
||||
if (!XftColorAllocValue (dpy,
|
||||
DefaultVisual (dpy,
|
||||
XScreenNumberOfScreen (screen)),
|
||||
colormap,
|
||||
&renderColor,
|
||||
&xftColor))
|
||||
return False;
|
||||
|
||||
|
||||
donestr (XftColor, xftColor, XtRXftColor);
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
static void
|
||||
static void
|
||||
ClassInitialize(void)
|
||||
{
|
||||
#ifdef XRENDER
|
||||
XtSetTypeConverter (XtRString, XtRXftColor,
|
||||
XmuCvtStringToXftColor,
|
||||
XtSetTypeConverter (XtRString, XtRXftColor,
|
||||
XmuCvtStringToXftColor,
|
||||
xftColorConvertArgs, XtNumber(xftColorConvertArgs),
|
||||
XtCacheByDisplay, XmuFreeXftColor);
|
||||
#endif
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static void
|
||||
static void
|
||||
Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args)
|
||||
{
|
||||
LogoWidget w = (LogoWidget)new;
|
||||
|
||||
#ifdef XRENDER
|
||||
w->logo.draw = 0;
|
||||
w->logo.draw = NULL;
|
||||
w->logo.fgpixel = w->logo.fg.pixel;
|
||||
#endif
|
||||
if (w->core.width < 1) w->core.width = 100;
|
||||
@ -379,7 +376,7 @@ Initialize(Widget request, Widget new, ArgList args, Cardinal *num_args)
|
||||
w->logo.need_shaping = w->logo.shape_window;
|
||||
}
|
||||
|
||||
static void
|
||||
static void
|
||||
Destroy(Widget gw)
|
||||
{
|
||||
LogoWidget w = (LogoWidget) gw;
|
||||
@ -393,7 +390,7 @@ Destroy(Widget gw)
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
static void
|
||||
Realize(Widget gw, XtValueMask *valuemaskp, XSetWindowAttributes *attr)
|
||||
{
|
||||
LogoWidget w = (LogoWidget) gw;
|
||||
@ -407,7 +404,7 @@ Realize(Widget gw, XtValueMask *valuemaskp, XSetWindowAttributes *attr)
|
||||
(gw, valuemaskp, attr);
|
||||
}
|
||||
|
||||
static void
|
||||
static void
|
||||
Resize(Widget gw)
|
||||
{
|
||||
LogoWidget w = (LogoWidget) gw;
|
||||
@ -416,7 +413,7 @@ Resize(Widget gw)
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static void
|
||||
static void
|
||||
Redisplay(Widget gw, XEvent *event, Region region)
|
||||
{
|
||||
LogoWidget w = (LogoWidget) gw;
|
||||
@ -452,8 +449,8 @@ Redisplay(Widget gw, XEvent *event, Region region)
|
||||
}
|
||||
|
||||
/* ARGSUSED */
|
||||
static Boolean
|
||||
SetValues (Widget gcurrent, Widget grequest, Widget gnew,
|
||||
static Boolean
|
||||
SetValues (Widget gcurrent, Widget grequest, Widget gnew,
|
||||
ArgList args, Cardinal *num_args)
|
||||
{
|
||||
LogoWidget current = (LogoWidget) gcurrent;
|
||||
@ -470,7 +467,7 @@ SetValues (Widget gcurrent, Widget grequest, Widget gnew,
|
||||
if (!new->logo.shape_window) create_gcs (new);
|
||||
redisplay = TRUE;
|
||||
}
|
||||
|
||||
|
||||
if (new->logo.shape_window != current->logo.shape_window) {
|
||||
if (new->logo.shape_window) {
|
||||
Destroy (gnew);
|
||||
|
@ -1,4 +1,3 @@
|
||||
/* $Xorg: Logo.h,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */
|
||||
/*
|
||||
|
||||
Copyright 1988, 1990, 1998 The Open Group
|
||||
@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
|
||||
from The Open Group.
|
||||
|
||||
*/
|
||||
/* $XFree86$ */
|
||||
|
||||
#ifndef _XawLogo_h
|
||||
#define _XawLogo_h
|
||||
|
@ -1,4 +1,3 @@
|
||||
/* $Xorg: LogoP.h,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */
|
||||
/*
|
||||
|
||||
Copyright 1988, 1993, 1998 The Open Group
|
||||
@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
|
||||
from The Open Group.
|
||||
|
||||
*/
|
||||
/* $XFree86$ */
|
||||
|
||||
#ifndef _XawLogoP_h
|
||||
#define _XawLogoP_h
|
||||
|
@ -10,7 +10,7 @@
|
||||
# specific, written prior permission. Red Hat makes no
|
||||
# representations about the suitability of this software for any purpose. It
|
||||
# is provided "as is" without express or implied warranty.
|
||||
#
|
||||
#
|
||||
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
bin_PROGRAMS = xlogo
|
||||
|
||||
xlogo_CFLAGS = $(XLOGO_CFLAGS)
|
||||
AM_CFLAGS = $(XLOGO_CFLAGS)
|
||||
xlogo_LDADD = $(XLOGO_LIBS)
|
||||
|
||||
xlogo_SOURCES = \
|
||||
@ -33,43 +33,26 @@ xlogo_SOURCES = \
|
||||
xlogo.c \
|
||||
xlogo.h
|
||||
|
||||
if XAW_USE_XPRINT
|
||||
xlogo_SOURCES += \
|
||||
print.c \
|
||||
print.h
|
||||
endif
|
||||
|
||||
appman_PRE = \
|
||||
xlogo.man
|
||||
|
||||
# App default files (*.ad)
|
||||
# App default files
|
||||
DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
|
||||
|
||||
appdefaultdir = @appdefaultdir@
|
||||
|
||||
|
||||
APPDEFAULTFILES = \
|
||||
XLogo \
|
||||
XLogo-color
|
||||
|
||||
|
||||
SUFFIXES = .ad
|
||||
|
||||
.ad:
|
||||
cp $< $@
|
||||
|
||||
appdefault_DATA = $(APPDEFAULTFILES)
|
||||
|
||||
EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad)
|
||||
|
||||
CLEANFILES = $(APPDEFAULTFILES)
|
||||
dist_appdefault_DATA = \
|
||||
app-defaults/XLogo \
|
||||
app-defaults/XLogo-color
|
||||
|
||||
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
|
||||
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
|
||||
|
||||
EXTRA_DIST += $(appman_PRE)
|
||||
CLEANFILES += $(appman_DATA)
|
||||
EXTRA_DIST = $(appman_PRE)
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
CLEANFILES = $(appman_DATA)
|
||||
|
||||
SED = sed
|
||||
|
||||
@ -90,7 +73,18 @@ MAN_SUBSTS = \
|
||||
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
|
||||
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
|
||||
|
||||
SUFFIXES += .$(APP_MAN_SUFFIX) .man
|
||||
SUFFIXES = .$(APP_MAN_SUFFIX) .man
|
||||
|
||||
.man.$(APP_MAN_SUFFIX):
|
||||
sed $(MAN_SUBSTS) < $< > $@
|
||||
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|
||||
|
||||
|
||||
.PHONY: ChangeLog INSTALL
|
||||
|
||||
INSTALL:
|
||||
$(INSTALL_CMD)
|
||||
|
||||
ChangeLog:
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog INSTALL
|
||||
|
@ -26,7 +26,7 @@
|
||||
# specific, written prior permission. Red Hat makes no
|
||||
# representations about the suitability of this software for any purpose. It
|
||||
# is provided "as is" without express or implied warranty.
|
||||
#
|
||||
#
|
||||
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
||||
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
||||
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
||||
@ -59,15 +59,11 @@ POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
bin_PROGRAMS = xlogo$(EXEEXT)
|
||||
@XAW_USE_XPRINT_TRUE@am__append_1 = \
|
||||
@XAW_USE_XPRINT_TRUE@ print.c \
|
||||
@XAW_USE_XPRINT_TRUE@ print.h
|
||||
|
||||
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
||||
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
|
||||
compile config.guess config.sub depcomp install-sh missing \
|
||||
mkinstalldirs
|
||||
DIST_COMMON = README $(am__configure_deps) $(dist_appdefault_DATA) \
|
||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
||||
$(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \
|
||||
ChangeLog INSTALL NEWS compile config.guess config.sub depcomp \
|
||||
install-sh missing mkinstalldirs
|
||||
subdir = .
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
@ -78,15 +74,11 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
|
||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||
CONFIG_HEADER = config.h
|
||||
CONFIG_CLEAN_FILES =
|
||||
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)" \
|
||||
"$(DESTDIR)$(appmandir)"
|
||||
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" \
|
||||
"$(DESTDIR)$(appdefaultdir)"
|
||||
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
||||
PROGRAMS = $(bin_PROGRAMS)
|
||||
am__xlogo_SOURCES_DIST = Logo.c Logo.h LogoP.h RenderLogo.c \
|
||||
RenderLogo.h xlogo.c xlogo.h print.c print.h
|
||||
@XAW_USE_XPRINT_TRUE@am__objects_1 = xlogo-print.$(OBJEXT)
|
||||
am_xlogo_OBJECTS = xlogo-Logo.$(OBJEXT) xlogo-RenderLogo.$(OBJEXT) \
|
||||
xlogo-xlogo.$(OBJEXT) $(am__objects_1)
|
||||
am_xlogo_OBJECTS = Logo.$(OBJEXT) RenderLogo.$(OBJEXT) xlogo.$(OBJEXT)
|
||||
xlogo_OBJECTS = $(am_xlogo_OBJECTS)
|
||||
am__DEPENDENCIES_1 =
|
||||
xlogo_DEPENDENCIES = $(am__DEPENDENCIES_1)
|
||||
@ -98,16 +90,16 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
|
||||
CCLD = $(CC)
|
||||
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
|
||||
SOURCES = $(xlogo_SOURCES)
|
||||
DIST_SOURCES = $(am__xlogo_SOURCES_DIST)
|
||||
DIST_SOURCES = $(xlogo_SOURCES)
|
||||
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
|
||||
am__vpath_adj = case $$p in \
|
||||
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
|
||||
*) f=$$p;; \
|
||||
esac;
|
||||
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
|
||||
appdefaultDATA_INSTALL = $(INSTALL_DATA)
|
||||
appmanDATA_INSTALL = $(INSTALL_DATA)
|
||||
DATA = $(appdefault_DATA) $(appman_DATA)
|
||||
dist_appdefaultDATA_INSTALL = $(INSTALL_DATA)
|
||||
DATA = $(appman_DATA) $(dist_appdefault_DATA)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
@ -120,7 +112,6 @@ am__remove_distdir = \
|
||||
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
|
||||
GZIP_ENV = --best
|
||||
distuninstallcheck_listfiles = find . -type f -print
|
||||
distcleancheck_listfiles = find . -type f -print
|
||||
ACLOCAL = @ACLOCAL@
|
||||
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
|
||||
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||
@ -138,7 +129,10 @@ AWK = @AWK@
|
||||
CC = @CC@
|
||||
CCDEPMODE = @CCDEPMODE@
|
||||
CFLAGS = @CFLAGS@
|
||||
CHANGELOG_CMD = @CHANGELOG_CMD@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CWARNFLAGS = @CWARNFLAGS@
|
||||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
@ -147,9 +141,11 @@ 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_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
@ -178,24 +174,16 @@ PKG_CONFIG = @PKG_CONFIG@
|
||||
SET_MAKE = @SET_MAKE@
|
||||
SHELL = @SHELL@
|
||||
STRIP = @STRIP@
|
||||
TMP_XAW_CFLAGS = @TMP_XAW_CFLAGS@
|
||||
TMP_XAW_LIBS = @TMP_XAW_LIBS@
|
||||
VERSION = @VERSION@
|
||||
XAW_USE_XPRINT_FALSE = @XAW_USE_XPRINT_FALSE@
|
||||
XAW_USE_XPRINT_TRUE = @XAW_USE_XPRINT_TRUE@
|
||||
XEXT_CFLAGS = @XEXT_CFLAGS@
|
||||
XEXT_LIBS = @XEXT_LIBS@
|
||||
XFT_CFLAGS = @XFT_CFLAGS@
|
||||
XFT_LIBS = @XFT_LIBS@
|
||||
XLOGO_CFLAGS = @XLOGO_CFLAGS@
|
||||
XLOGO_LIBS = @XLOGO_LIBS@
|
||||
XPRINT_UTIL_CFLAGS = @XPRINT_UTIL_CFLAGS@
|
||||
XPRINT_UTIL_LIBS = @XPRINT_UTIL_LIBS@
|
||||
XRENDER_CFLAGS = @XRENDER_CFLAGS@
|
||||
XRENDER_LIBS = @XRENDER_LIBS@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_STRIP = @ac_ct_STRIP@
|
||||
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__include = @am__include@
|
||||
@ -203,8 +191,6 @@ am__leading_dot = @am__leading_dot@
|
||||
am__quote = @am__quote@
|
||||
am__tar = @am__tar@
|
||||
am__untar = @am__untar@
|
||||
|
||||
# App default files (*.ad)
|
||||
appdefaultdir = @appdefaultdir@
|
||||
bindir = @bindir@
|
||||
build = @build@
|
||||
@ -213,44 +199,61 @@ build_cpu = @build_cpu@
|
||||
build_os = @build_os@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
distcleancheck_listfiles = @distcleancheck_listfiles@
|
||||
docdir = @docdir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
host = @host@
|
||||
host_alias = @host_alias@
|
||||
host_cpu = @host_cpu@
|
||||
host_os = @host_os@
|
||||
host_vendor = @host_vendor@
|
||||
htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
libdir = @libdir@
|
||||
libexecdir = @libexecdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
oldincludedir = @oldincludedir@
|
||||
pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
xlogo_CFLAGS = $(XLOGO_CFLAGS)
|
||||
AM_CFLAGS = $(XLOGO_CFLAGS)
|
||||
xlogo_LDADD = $(XLOGO_LIBS)
|
||||
xlogo_SOURCES = Logo.c Logo.h LogoP.h RenderLogo.c RenderLogo.h \
|
||||
xlogo.c xlogo.h $(am__append_1)
|
||||
xlogo_SOURCES = \
|
||||
Logo.c \
|
||||
Logo.h \
|
||||
LogoP.h \
|
||||
RenderLogo.c \
|
||||
RenderLogo.h \
|
||||
xlogo.c \
|
||||
xlogo.h
|
||||
|
||||
appman_PRE = \
|
||||
xlogo.man
|
||||
|
||||
APPDEFAULTFILES = \
|
||||
XLogo \
|
||||
XLogo-color
|
||||
|
||||
SUFFIXES = .ad .$(APP_MAN_SUFFIX) .man
|
||||
appdefault_DATA = $(APPDEFAULTFILES)
|
||||
EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) $(appman_PRE)
|
||||
CLEANFILES = $(APPDEFAULTFILES) $(appman_DATA)
|
||||
# App default files
|
||||
DISTCHECK_CONFIGURE_FLAGS = --with-appdefaultdir=\$${datadir}/X11/app-defaults
|
||||
dist_appdefault_DATA = \
|
||||
app-defaults/XLogo \
|
||||
app-defaults/XLogo-color
|
||||
|
||||
appmandir = $(APP_MAN_DIR)
|
||||
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
|
||||
EXTRA_DIST = $(appman_PRE)
|
||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||
CLEANFILES = $(appman_DATA)
|
||||
SED = sed
|
||||
|
||||
# Strings to replace in man pages
|
||||
@ -269,26 +272,27 @@ MAN_SUBSTS = \
|
||||
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
|
||||
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
|
||||
|
||||
SUFFIXES = .$(APP_MAN_SUFFIX) .man
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-am
|
||||
|
||||
.SUFFIXES:
|
||||
.SUFFIXES: .ad .$(APP_MAN_SUFFIX) .man .c .o .obj
|
||||
.SUFFIXES: .$(APP_MAN_SUFFIX) .man .c .o .obj
|
||||
am--refresh:
|
||||
@:
|
||||
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
|
||||
@for dep in $?; do \
|
||||
case '$(am__configure_deps)' in \
|
||||
*$$dep*) \
|
||||
echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
|
||||
cd $(srcdir) && $(AUTOMAKE) --gnu \
|
||||
echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
|
||||
cd $(srcdir) && $(AUTOMAKE) --foreign \
|
||||
&& exit 0; \
|
||||
exit 1;; \
|
||||
esac; \
|
||||
done; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
|
||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
|
||||
cd $(top_srcdir) && \
|
||||
$(AUTOMAKE) --gnu Makefile
|
||||
$(AUTOMAKE) --foreign Makefile
|
||||
.PRECIOUS: Makefile
|
||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||
@case '$?' in \
|
||||
@ -357,10 +361,9 @@ mostlyclean-compile:
|
||||
distclean-compile:
|
||||
-rm -f *.tab.c
|
||||
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xlogo-Logo.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xlogo-RenderLogo.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xlogo-print.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xlogo-xlogo.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Logo.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RenderLogo.Po@am__quote@
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xlogo.Po@am__quote@
|
||||
|
||||
.c.o:
|
||||
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
||||
@ -375,80 +378,7 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
||||
|
||||
xlogo-Logo.o: Logo.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlogo_CFLAGS) $(CFLAGS) -MT xlogo-Logo.o -MD -MP -MF "$(DEPDIR)/xlogo-Logo.Tpo" -c -o xlogo-Logo.o `test -f 'Logo.c' || echo '$(srcdir)/'`Logo.c; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xlogo-Logo.Tpo" "$(DEPDIR)/xlogo-Logo.Po"; else rm -f "$(DEPDIR)/xlogo-Logo.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Logo.c' object='xlogo-Logo.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlogo_CFLAGS) $(CFLAGS) -c -o xlogo-Logo.o `test -f 'Logo.c' || echo '$(srcdir)/'`Logo.c
|
||||
|
||||
xlogo-Logo.obj: Logo.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlogo_CFLAGS) $(CFLAGS) -MT xlogo-Logo.obj -MD -MP -MF "$(DEPDIR)/xlogo-Logo.Tpo" -c -o xlogo-Logo.obj `if test -f 'Logo.c'; then $(CYGPATH_W) 'Logo.c'; else $(CYGPATH_W) '$(srcdir)/Logo.c'; fi`; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xlogo-Logo.Tpo" "$(DEPDIR)/xlogo-Logo.Po"; else rm -f "$(DEPDIR)/xlogo-Logo.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='Logo.c' object='xlogo-Logo.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlogo_CFLAGS) $(CFLAGS) -c -o xlogo-Logo.obj `if test -f 'Logo.c'; then $(CYGPATH_W) 'Logo.c'; else $(CYGPATH_W) '$(srcdir)/Logo.c'; fi`
|
||||
|
||||
xlogo-RenderLogo.o: RenderLogo.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlogo_CFLAGS) $(CFLAGS) -MT xlogo-RenderLogo.o -MD -MP -MF "$(DEPDIR)/xlogo-RenderLogo.Tpo" -c -o xlogo-RenderLogo.o `test -f 'RenderLogo.c' || echo '$(srcdir)/'`RenderLogo.c; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xlogo-RenderLogo.Tpo" "$(DEPDIR)/xlogo-RenderLogo.Po"; else rm -f "$(DEPDIR)/xlogo-RenderLogo.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='RenderLogo.c' object='xlogo-RenderLogo.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlogo_CFLAGS) $(CFLAGS) -c -o xlogo-RenderLogo.o `test -f 'RenderLogo.c' || echo '$(srcdir)/'`RenderLogo.c
|
||||
|
||||
xlogo-RenderLogo.obj: RenderLogo.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlogo_CFLAGS) $(CFLAGS) -MT xlogo-RenderLogo.obj -MD -MP -MF "$(DEPDIR)/xlogo-RenderLogo.Tpo" -c -o xlogo-RenderLogo.obj `if test -f 'RenderLogo.c'; then $(CYGPATH_W) 'RenderLogo.c'; else $(CYGPATH_W) '$(srcdir)/RenderLogo.c'; fi`; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xlogo-RenderLogo.Tpo" "$(DEPDIR)/xlogo-RenderLogo.Po"; else rm -f "$(DEPDIR)/xlogo-RenderLogo.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='RenderLogo.c' object='xlogo-RenderLogo.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlogo_CFLAGS) $(CFLAGS) -c -o xlogo-RenderLogo.obj `if test -f 'RenderLogo.c'; then $(CYGPATH_W) 'RenderLogo.c'; else $(CYGPATH_W) '$(srcdir)/RenderLogo.c'; fi`
|
||||
|
||||
xlogo-xlogo.o: xlogo.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlogo_CFLAGS) $(CFLAGS) -MT xlogo-xlogo.o -MD -MP -MF "$(DEPDIR)/xlogo-xlogo.Tpo" -c -o xlogo-xlogo.o `test -f 'xlogo.c' || echo '$(srcdir)/'`xlogo.c; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xlogo-xlogo.Tpo" "$(DEPDIR)/xlogo-xlogo.Po"; else rm -f "$(DEPDIR)/xlogo-xlogo.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xlogo.c' object='xlogo-xlogo.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlogo_CFLAGS) $(CFLAGS) -c -o xlogo-xlogo.o `test -f 'xlogo.c' || echo '$(srcdir)/'`xlogo.c
|
||||
|
||||
xlogo-xlogo.obj: xlogo.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlogo_CFLAGS) $(CFLAGS) -MT xlogo-xlogo.obj -MD -MP -MF "$(DEPDIR)/xlogo-xlogo.Tpo" -c -o xlogo-xlogo.obj `if test -f 'xlogo.c'; then $(CYGPATH_W) 'xlogo.c'; else $(CYGPATH_W) '$(srcdir)/xlogo.c'; fi`; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xlogo-xlogo.Tpo" "$(DEPDIR)/xlogo-xlogo.Po"; else rm -f "$(DEPDIR)/xlogo-xlogo.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xlogo.c' object='xlogo-xlogo.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlogo_CFLAGS) $(CFLAGS) -c -o xlogo-xlogo.obj `if test -f 'xlogo.c'; then $(CYGPATH_W) 'xlogo.c'; else $(CYGPATH_W) '$(srcdir)/xlogo.c'; fi`
|
||||
|
||||
xlogo-print.o: print.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlogo_CFLAGS) $(CFLAGS) -MT xlogo-print.o -MD -MP -MF "$(DEPDIR)/xlogo-print.Tpo" -c -o xlogo-print.o `test -f 'print.c' || echo '$(srcdir)/'`print.c; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xlogo-print.Tpo" "$(DEPDIR)/xlogo-print.Po"; else rm -f "$(DEPDIR)/xlogo-print.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='print.c' object='xlogo-print.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlogo_CFLAGS) $(CFLAGS) -c -o xlogo-print.o `test -f 'print.c' || echo '$(srcdir)/'`print.c
|
||||
|
||||
xlogo-print.obj: print.c
|
||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlogo_CFLAGS) $(CFLAGS) -MT xlogo-print.obj -MD -MP -MF "$(DEPDIR)/xlogo-print.Tpo" -c -o xlogo-print.obj `if test -f 'print.c'; then $(CYGPATH_W) 'print.c'; else $(CYGPATH_W) '$(srcdir)/print.c'; fi`; \
|
||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xlogo-print.Tpo" "$(DEPDIR)/xlogo-print.Po"; else rm -f "$(DEPDIR)/xlogo-print.Tpo"; exit 1; fi
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='print.c' object='xlogo-print.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xlogo_CFLAGS) $(CFLAGS) -c -o xlogo-print.obj `if test -f 'print.c'; then $(CYGPATH_W) 'print.c'; else $(CYGPATH_W) '$(srcdir)/print.c'; fi`
|
||||
uninstall-info-am:
|
||||
install-appdefaultDATA: $(appdefault_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(appdefaultdir)" || $(mkdir_p) "$(DESTDIR)$(appdefaultdir)"
|
||||
@list='$(appdefault_DATA)'; for p in $$list; do \
|
||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
f=$(am__strip_dir) \
|
||||
echo " $(appdefaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appdefaultdir)/$$f'"; \
|
||||
$(appdefaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appdefaultdir)/$$f"; \
|
||||
done
|
||||
|
||||
uninstall-appdefaultDATA:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@list='$(appdefault_DATA)'; for p in $$list; do \
|
||||
f=$(am__strip_dir) \
|
||||
echo " rm -f '$(DESTDIR)$(appdefaultdir)/$$f'"; \
|
||||
rm -f "$(DESTDIR)$(appdefaultdir)/$$f"; \
|
||||
done
|
||||
install-appmanDATA: $(appman_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(appmandir)" || $(mkdir_p) "$(DESTDIR)$(appmandir)"
|
||||
@ -466,6 +396,23 @@ uninstall-appmanDATA:
|
||||
echo " rm -f '$(DESTDIR)$(appmandir)/$$f'"; \
|
||||
rm -f "$(DESTDIR)$(appmandir)/$$f"; \
|
||||
done
|
||||
install-dist_appdefaultDATA: $(dist_appdefault_DATA)
|
||||
@$(NORMAL_INSTALL)
|
||||
test -z "$(appdefaultdir)" || $(mkdir_p) "$(DESTDIR)$(appdefaultdir)"
|
||||
@list='$(dist_appdefault_DATA)'; for p in $$list; do \
|
||||
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
f=$(am__strip_dir) \
|
||||
echo " $(dist_appdefaultDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(appdefaultdir)/$$f'"; \
|
||||
$(dist_appdefaultDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(appdefaultdir)/$$f"; \
|
||||
done
|
||||
|
||||
uninstall-dist_appdefaultDATA:
|
||||
@$(NORMAL_UNINSTALL)
|
||||
@list='$(dist_appdefault_DATA)'; for p in $$list; do \
|
||||
f=$(am__strip_dir) \
|
||||
echo " rm -f '$(DESTDIR)$(appdefaultdir)/$$f'"; \
|
||||
rm -f "$(DESTDIR)$(appdefaultdir)/$$f"; \
|
||||
done
|
||||
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
@ -518,6 +465,7 @@ distclean-tags:
|
||||
distdir: $(DISTFILES)
|
||||
$(am__remove_distdir)
|
||||
mkdir $(distdir)
|
||||
$(mkdir_p) $(distdir)/app-defaults
|
||||
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
|
||||
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
|
||||
list='$(DISTFILES)'; for file in $$list; do \
|
||||
@ -544,6 +492,9 @@ distdir: $(DISTFILES)
|
||||
|| exit 1; \
|
||||
fi; \
|
||||
done
|
||||
$(MAKE) $(AM_MAKEFLAGS) \
|
||||
top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
||||
dist-hook
|
||||
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
||||
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
||||
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
||||
@ -645,7 +596,7 @@ check-am: all-am
|
||||
check: check-am
|
||||
all-am: Makefile $(PROGRAMS) $(DATA) config.h
|
||||
installdirs:
|
||||
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appdefaultdir)" "$(DESTDIR)$(appmandir)"; do \
|
||||
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)" "$(DESTDIR)$(appdefaultdir)"; do \
|
||||
test -z "$$dir" || $(mkdir_p) "$$dir"; \
|
||||
done
|
||||
install: install-am
|
||||
@ -673,6 +624,7 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
|
||||
@ -694,7 +646,7 @@ info: info-am
|
||||
|
||||
info-am:
|
||||
|
||||
install-data-am: install-appdefaultDATA install-appmanDATA
|
||||
install-data-am: install-appmanDATA install-dist_appdefaultDATA
|
||||
|
||||
install-exec-am: install-binPROGRAMS
|
||||
|
||||
@ -723,30 +675,38 @@ ps: ps-am
|
||||
|
||||
ps-am:
|
||||
|
||||
uninstall-am: uninstall-appdefaultDATA uninstall-appmanDATA \
|
||||
uninstall-binPROGRAMS uninstall-info-am
|
||||
uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
|
||||
uninstall-dist_appdefaultDATA uninstall-info-am
|
||||
|
||||
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
|
||||
clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
|
||||
dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
|
||||
distclean-compile distclean-generic distclean-hdr \
|
||||
dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
|
||||
distclean distclean-compile distclean-generic distclean-hdr \
|
||||
distclean-tags distcleancheck distdir distuninstallcheck dvi \
|
||||
dvi-am html html-am info info-am install install-am \
|
||||
install-appdefaultDATA install-appmanDATA install-binPROGRAMS \
|
||||
install-data install-data-am install-exec install-exec-am \
|
||||
install-info install-info-am install-man install-strip \
|
||||
installcheck installcheck-am installdirs maintainer-clean \
|
||||
maintainer-clean-generic mostlyclean mostlyclean-compile \
|
||||
mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
|
||||
uninstall-am uninstall-appdefaultDATA uninstall-appmanDATA \
|
||||
uninstall-binPROGRAMS uninstall-info-am
|
||||
install-appmanDATA install-binPROGRAMS install-data \
|
||||
install-data-am install-dist_appdefaultDATA install-exec \
|
||||
install-exec-am install-info install-info-am install-man \
|
||||
install-strip installcheck installcheck-am installdirs \
|
||||
maintainer-clean maintainer-clean-generic mostlyclean \
|
||||
mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
|
||||
tags uninstall uninstall-am uninstall-appmanDATA \
|
||||
uninstall-binPROGRAMS uninstall-dist_appdefaultDATA \
|
||||
uninstall-info-am
|
||||
|
||||
|
||||
.ad:
|
||||
cp $< $@
|
||||
|
||||
.man.$(APP_MAN_SUFFIX):
|
||||
sed $(MAN_SUBSTS) < $< > $@
|
||||
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|
||||
|
||||
.PHONY: ChangeLog INSTALL
|
||||
|
||||
INSTALL:
|
||||
$(INSTALL_CMD)
|
||||
|
||||
ChangeLog:
|
||||
$(CHANGELOG_CMD)
|
||||
|
||||
dist-hook: ChangeLog INSTALL
|
||||
# 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:
|
||||
|
@ -0,0 +1,25 @@
|
||||
The xlogo program simply displays the X Window System logo.
|
||||
|
||||
All questions regarding this software should be directed at the
|
||||
Xorg mailing list:
|
||||
|
||||
http://lists.freedesktop.org/mailman/listinfo/xorg
|
||||
|
||||
Please submit bug reports to the Xorg bugzilla:
|
||||
|
||||
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
|
||||
|
||||
The master development code repository can be found at:
|
||||
|
||||
git://anongit.freedesktop.org/git/xorg/app/xlogo
|
||||
|
||||
http://cgit.freedesktop.org/xorg/app/xlogo
|
||||
|
||||
For patch submission instructions, see:
|
||||
|
||||
http://www.x.org/wiki/Development/Documentation/SubmittingPatches
|
||||
|
||||
For more information on the git code manager, see:
|
||||
|
||||
http://wiki.x.org/wiki/GitPage
|
||||
|
@ -1,5 +1,3 @@
|
||||
/* $Xorg: DrawLogo.c,v 1.4 2001/02/09 02:03:52 xorgcvs Exp $ */
|
||||
|
||||
/*
|
||||
|
||||
Copyright 1988, 1998 The Open Group
|
||||
@ -25,14 +23,13 @@ used in advertising or otherwise to promote the sale, use or other dealings
|
||||
in this Software without prior written authorization from The Open Group.
|
||||
|
||||
*/
|
||||
/* $XFree86: xc/programs/xlogo/RenderLogo.c,v 1.3tsi Exp $ */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
#include <stdio.h>
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/extensions/Xrender.h>
|
||||
|
||||
#include "RenderLogo.h"
|
||||
@ -124,7 +121,7 @@ RenderLogo(Display *dpy, int op, Picture src, Picture dst, XRenderPictFormat *ma
|
||||
static double
|
||||
compute_inverse_slope (XLineDouble *l)
|
||||
{
|
||||
return ((l->p2.x - l->p1.x) /
|
||||
return ((l->p2.x - l->p1.x) /
|
||||
(l->p2.y - l->p1.y));
|
||||
}
|
||||
|
||||
|
@ -1,4 +1,3 @@
|
||||
/* $Xorg: Logo.h,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */
|
||||
/*
|
||||
|
||||
Copyright 1988, 1990, 1998 The Open Group
|
||||
@ -26,7 +25,6 @@ other dealings in this Software without prior written authorization
|
||||
from The Open Group.
|
||||
|
||||
*/
|
||||
/* $XFree86$ */
|
||||
|
||||
#ifndef _RenderLogo_h
|
||||
#define _RenderLogo_h
|
||||
|
@ -1,5 +0,0 @@
|
||||
! $Xorg: XLogo-co.ad,v 1.3 2000/08/17 19:54:52 cpqbld Exp $
|
||||
#include "XLogo"
|
||||
! MIT colors are Cardinal Red (Pantone 201c) and Silver Grey (Pantone 421c)
|
||||
XLogo*background: rgb:d2/22/32
|
||||
XLogo*foreground: rgb:d7/d7/d7
|
@ -1,4 +0,0 @@
|
||||
XLogo*iconPixmap: xlogo32
|
||||
XLogo*iconMask: xlogo32
|
||||
XLogo*baseTranslations: #override \
|
||||
<Key>q,<Key>Escape: quit()
|
265
app/xlogo/aclocal.m4
vendored
265
app/xlogo/aclocal.m4
vendored
@ -995,72 +995,7 @@ AC_SUBST([am__tar])
|
||||
AC_SUBST([am__untar])
|
||||
]) # _AM_PROG_TAR
|
||||
|
||||
dnl Copyright 2005 Red Hat, Inc
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, distribute, and sell this software and its
|
||||
dnl documentation for any purpose is hereby granted without fee, provided that
|
||||
dnl the above copyright notice appear in all copies and that both that
|
||||
dnl copyright notice and this permission notice appear in supporting
|
||||
dnl documentation.
|
||||
dnl
|
||||
dnl The above copyright notice and this permission notice shall be included
|
||||
dnl in all copies or substantial portions of the Software.
|
||||
dnl
|
||||
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||
dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||
dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||
dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||
dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
dnl OTHER DEALINGS IN THE SOFTWARE.
|
||||
dnl
|
||||
dnl Except as contained in this notice, the name of the copyright holders shall
|
||||
dnl not be used in advertising or otherwise to promote the sale, use or
|
||||
dnl other dealings in this Software without prior written authorization
|
||||
dnl from the copyright holders.
|
||||
dnl
|
||||
|
||||
# XAW_CHECK_XPRINT_SUPPORT()
|
||||
# --------------------------
|
||||
# Adds --enable/disable-xprint and selects the appropriate version of the Xaw
|
||||
# library. If neither --enable-xprint nor --disable-xprint are given,
|
||||
# the presence of an Xaw with Xprint support will be auto detected
|
||||
|
||||
AC_DEFUN([XAW_CHECK_XPRINT_SUPPORT],[
|
||||
AC_ARG_ENABLE(xprint, AC_HELP_STRING([--enable-xprint], [Enable XPrint support]),
|
||||
[use_xprint=$enableval],[use_xprint=auto])
|
||||
if test "x$use_xprint" = "xyes"; then
|
||||
TMP_CHECK1=xaw8
|
||||
TMP_CHECK2=
|
||||
xaw_use_xprint=yes
|
||||
elif test "x$use_xprint" = "xno"; then
|
||||
TMP_CHECK1=xaw7
|
||||
TMP_CHECK2=
|
||||
xaw_use_xprint=no
|
||||
else
|
||||
TMP_CHECK1=xaw8
|
||||
TMP_CHECK2=xaw7
|
||||
xaw_use_xprint=yes
|
||||
fi
|
||||
|
||||
PKG_CHECK_MODULES(TMP_XAW, $TMP_CHECK1, success=yes, success=no)
|
||||
if [[ ! -z $TMP_CHECK2 ]] ; then
|
||||
if test $success = no ; then
|
||||
PKG_CHECK_MODULES(TMP_XAW, $TMP_CHECK2, success=yes, success=no)
|
||||
xaw_use_xprint=no
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x$success" = "xyes"; then
|
||||
$1_CFLAGS=$TMP_XAW_CFLAGS
|
||||
$1_LIBS=$TMP_XAW_LIBS
|
||||
|
||||
AM_CONDITIONAL([XAW_USE_XPRINT], [test "x$xaw_use_xprint" = "xyes"])
|
||||
else
|
||||
AC_MSG_ERROR([No suitable version of Xaw found])
|
||||
fi
|
||||
])
|
||||
|
||||
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
|
||||
dnl
|
||||
dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
|
||||
dnl
|
||||
@ -1097,27 +1032,24 @@ dnl of the copyright holder.
|
||||
# your configure.ac with the minimum required version, such as:
|
||||
# XORG_MACROS_VERSION(1.1)
|
||||
#
|
||||
# To force at least a version with this macro defined, also add:
|
||||
# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
|
||||
# To ensure that this macro is defined, also add:
|
||||
# m4_ifndef([XORG_MACROS_VERSION],
|
||||
# [m4_fatal([must install xorg-macros 1.1 or later before running autoconf/autogen])])
|
||||
#
|
||||
#
|
||||
# See the "minimum version" comment for each macro you use to see what
|
||||
# version you require.
|
||||
AC_DEFUN([XORG_MACROS_VERSION],[
|
||||
[XORG_MACROS_needed_version=$1
|
||||
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
|
||||
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
|
||||
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
|
||||
[XORG_MACROS_version=1.1.5
|
||||
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
|
||||
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
|
||||
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
|
||||
AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
|
||||
fi
|
||||
if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
|
||||
AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer])
|
||||
fi
|
||||
AC_MSG_RESULT([yes, $XORG_MACROS_version])
|
||||
m4_defun([XORG_MACROS_VERSION],[
|
||||
m4_define([vers_have], [1.3.0])
|
||||
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,,
|
||||
[m4_fatal([xorg-macros major version ]maj_needed[ is required but ]vers_have[ found])])
|
||||
m4_if(m4_version_compare(vers_have, [$1]), -1,
|
||||
[m4_fatal([xorg-macros version $1 or higher is required but ]vers_have[ found])])
|
||||
m4_undefine([vers_have])
|
||||
m4_undefine([maj_have])
|
||||
m4_undefine([maj_needed])
|
||||
]) # XORG_MACROS_VERSION
|
||||
|
||||
# XORG_PROG_RAWCPP()
|
||||
@ -1142,6 +1074,10 @@ else
|
||||
if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
|
||||
RAWCPPFLAGS=-undef
|
||||
AC_MSG_RESULT([yes])
|
||||
# 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"
|
||||
AC_MSG_RESULT([yes, with -ansi])
|
||||
else
|
||||
AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.])
|
||||
fi
|
||||
@ -1254,10 +1190,16 @@ AC_SUBST([ADMIN_MAN_DIR])
|
||||
# Whether or not the necessary tools and files are found can be checked
|
||||
# with the AM_CONDITIONAL "BUILD_LINUXDOC"
|
||||
AC_DEFUN([XORG_CHECK_LINUXDOC],[
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
if test x$XORG_SGML_PATH = x ; then
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
fi
|
||||
HAVE_DEFS_ENT=
|
||||
|
||||
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
|
||||
if test x"$cross_compiling" = x"yes" ; then
|
||||
HAVE_DEFS_ENT=no
|
||||
else
|
||||
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
|
||||
fi
|
||||
|
||||
AC_PATH_PROG(LINUXDOC, linuxdoc)
|
||||
AC_PATH_PROG(PS2PDF, ps2pdf)
|
||||
@ -1306,7 +1248,9 @@ AC_SUBST(MAKE_HTML)
|
||||
# indicates whether the necessary tools and files are found and, if set,
|
||||
# $(MAKE_XXX) blah.sgml will produce blah.xxx.
|
||||
AC_DEFUN([XORG_CHECK_DOCBOOK],[
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
if test x$XORG_SGML_PATH = x ; then
|
||||
XORG_SGML_PATH=$prefix/share/sgml
|
||||
fi
|
||||
HAVE_DEFS_ENT=
|
||||
BUILDTXTDOC=no
|
||||
BUILDPDFDOC=no
|
||||
@ -1363,6 +1307,57 @@ AC_SUBST(MAKE_PDF)
|
||||
AC_SUBST(MAKE_HTML)
|
||||
]) # XORG_CHECK_DOCBOOK
|
||||
|
||||
# XORG_WITH_XMLTO
|
||||
# ----------------
|
||||
# Minimum version: 1.5.0
|
||||
#
|
||||
# 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
|
||||
# as whether or not to use the xmlto package.
|
||||
#
|
||||
# Interface to module:
|
||||
# HAVE_XMLTO: used in makefiles to conditionally generate documentation
|
||||
# XMLTO: returns the path of the xmlto program found
|
||||
# returns the path set by the user in the environment
|
||||
# --with-xmlto: 'yes' user instructs the module to use xmlto
|
||||
# 'no' user instructs the module not to use xmlto
|
||||
#
|
||||
# If the user sets the value of XMLTO, AC_PATH_PROG skips testing the path.
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_XMLTO],[
|
||||
AC_ARG_VAR([XMLTO], [Path to xmlto command])
|
||||
AC_ARG_WITH(xmlto,
|
||||
AS_HELP_STRING([--with-xmlto],
|
||||
[Use xmlto to regenerate documentation (default: yes, if installed)]),
|
||||
[use_xmlto=$withval], [use_xmlto=auto])
|
||||
|
||||
if test "x$use_xmlto" = x"auto"; then
|
||||
AC_PATH_PROG([XMLTO], [xmlto])
|
||||
if test "x$XMLTO" = "x"; then
|
||||
AC_MSG_WARN([xmlto not found - documentation targets will be skipped])
|
||||
have_xmlto=no
|
||||
else
|
||||
have_xmlto=yes
|
||||
fi
|
||||
elif test "x$use_xmlto" = x"yes" ; then
|
||||
AC_PATH_PROG([XMLTO], [xmlto])
|
||||
if test "x$XMLTO" = "x"; then
|
||||
AC_MSG_WARN([--with-xmlto=yes specified but xmlto not found in PATH])
|
||||
fi
|
||||
have_xmlto=yes
|
||||
elif test "x$use_xmlto" = x"no" ; then
|
||||
if test "x$XMLTO" != "x"; then
|
||||
AC_MSG_WARN([ignoring XMLTO environment variable since --with-xmlto=no was specified])
|
||||
fi
|
||||
have_xmlto=no
|
||||
else
|
||||
AC_MSG_ERROR([--with-xmlto expects 'yes' or 'no'])
|
||||
fi
|
||||
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
|
||||
]) # XORG_CHECK_XMLTO
|
||||
|
||||
# XORG_CHECK_MALLOC_ZERO
|
||||
# ----------------------
|
||||
# Minimum version: 1.0.0
|
||||
@ -1372,7 +1367,7 @@ AC_SUBST(MAKE_HTML)
|
||||
# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
|
||||
AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[
|
||||
AC_ARG_ENABLE(malloc0returnsnull,
|
||||
AC_HELP_STRING([--enable-malloc0returnsnull],
|
||||
AS_HELP_STRING([--enable-malloc0returnsnull],
|
||||
[malloc(0) returns NULL (default: auto)]),
|
||||
[MALLOC_ZERO_RETURNS_NULL=$enableval],
|
||||
[MALLOC_ZERO_RETURNS_NULL=auto])
|
||||
@ -1424,7 +1419,7 @@ AC_SUBST([XTMALLOC_ZERO_CFLAGS])
|
||||
AC_DEFUN([XORG_WITH_LINT],[
|
||||
|
||||
# Allow checking code with lint, sparse, etc.
|
||||
AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint],
|
||||
AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint],
|
||||
[Use a lint-style source code checker (default: disabled)])],
|
||||
[use_lint=$withval], [use_lint=no])
|
||||
if test "x$use_lint" = "xyes" ; then
|
||||
@ -1465,7 +1460,7 @@ AM_CONDITIONAL(LINT, [test x$LINT != xno])
|
||||
AC_DEFUN([XORG_LINT_LIBRARY],[
|
||||
AC_REQUIRE([XORG_WITH_LINT])
|
||||
# Build lint "library" for more indepth checks of programs calling this library
|
||||
AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library],
|
||||
AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library],
|
||||
[Create lint library (default: disabled)])],
|
||||
[make_lint_lib=$enableval], [make_lint_lib=no])
|
||||
if test "x$make_lint_lib" != "xno" ; then
|
||||
@ -1483,6 +1478,75 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
|
||||
|
||||
]) # XORG_LINT_LIBRARY
|
||||
|
||||
# XORG_CWARNFLAGS
|
||||
# ---------------
|
||||
# Minimum version: 1.2.0
|
||||
#
|
||||
# Defines CWARNFLAGS to enable C compiler warnings.
|
||||
#
|
||||
AC_DEFUN([XORG_CWARNFLAGS], [
|
||||
AC_REQUIRE([AC_PROG_CC])
|
||||
if test "x$GCC" = xyes ; then
|
||||
CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
|
||||
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
|
||||
-Wbad-function-cast"
|
||||
case `$CC -dumpversion` in
|
||||
3.4.* | 4.*)
|
||||
CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
|
||||
;;
|
||||
esac
|
||||
else
|
||||
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
|
||||
if test "x$SUNCC" = "xyes"; then
|
||||
CWARNFLAGS="-v"
|
||||
fi
|
||||
fi
|
||||
AC_SUBST(CWARNFLAGS)
|
||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||
]) # XORG_CWARNFLAGS
|
||||
|
||||
# XORG_STRICT_OPTION
|
||||
# -----------------------
|
||||
# Minimum version: 1.3.0
|
||||
#
|
||||
# Add configure option to enable strict compilation
|
||||
AC_DEFUN([XORG_STRICT_OPTION], [
|
||||
AC_REQUIRE([AC_PROG_CC])
|
||||
AC_REQUIRE([AC_PROG_CC_C99])
|
||||
AC_REQUIRE([XORG_CWARNFLAGS])
|
||||
|
||||
AC_ARG_ENABLE(strict-compilation,
|
||||
AS_HELP_STRING([--enable-strict-compilation],
|
||||
[Enable all warnings from compiler and make them errors (default: disabled)]),
|
||||
[STRICT_COMPILE=$enableval], [STRICT_COMPILE=no])
|
||||
if test "x$STRICT_COMPILE" = "xyes"; then
|
||||
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
|
||||
AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"])
|
||||
if test "x$GCC" = xyes ; then
|
||||
STRICT_CFLAGS="-pedantic -Werror"
|
||||
elif test "x$SUNCC" = "xyes"; then
|
||||
STRICT_CFLAGS="-errwarn"
|
||||
elif test "x$INTELCC" = "xyes"; then
|
||||
STRICT_CFLAGS="-Werror"
|
||||
fi
|
||||
fi
|
||||
CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
|
||||
AC_SUBST([CWARNFLAGS])
|
||||
]) # XORG_STRICT_OPTION
|
||||
|
||||
# XORG_DEFAULT_OPTIONS
|
||||
# --------------------
|
||||
# Minimum version: 1.3.0
|
||||
#
|
||||
# Defines default options for X.Org modules.
|
||||
#
|
||||
AC_DEFUN([XORG_DEFAULT_OPTIONS], [
|
||||
XORG_CWARNFLAGS
|
||||
XORG_STRICT_OPTION
|
||||
XORG_RELEASE_VERSION
|
||||
XORG_CHANGELOG
|
||||
XORG_MANPAGE_SECTIONS
|
||||
]) # XORG_DEFAULT_OPTIONS
|
||||
dnl Copyright 2005 Red Hat, Inc
|
||||
dnl
|
||||
dnl Permission to use, copy, modify, distribute, and sell this software and its
|
||||
@ -1517,7 +1581,7 @@ dnl
|
||||
|
||||
AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||
AC_ARG_WITH(release-version,
|
||||
AC_HELP_STRING([--with-release-version=STRING],
|
||||
AS_HELP_STRING([--with-release-version=STRING],
|
||||
[Use release version string in package name]),
|
||||
[RELEASE_VERSION="$withval"],
|
||||
[RELEASE_VERSION=""])
|
||||
@ -1529,14 +1593,14 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
|
||||
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
|
||||
[Major version of this package])
|
||||
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
|
||||
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2 | cut -d - -f 1`
|
||||
if test "x$PVM" = "x"; then
|
||||
PVM="0"
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
|
||||
[$PVM],
|
||||
[Minor version of this package])
|
||||
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
|
||||
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3 | cut -d - -f 1`
|
||||
if test "x$PVP" = "x"; then
|
||||
PVP="0"
|
||||
fi
|
||||
@ -1545,3 +1609,20 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||
[Patch version of this package])
|
||||
])
|
||||
|
||||
# XORG_CHANGELOG()
|
||||
# ----------------
|
||||
# Minimum version: 1.2.0
|
||||
#
|
||||
# Defines the variable CHANGELOG_CMD as the command to generate
|
||||
# ChangeLog from git.
|
||||
#
|
||||
# Arrange that distcleancheck ignores ChangeLog left over by distclean.
|
||||
#
|
||||
AC_DEFUN([XORG_CHANGELOG], [
|
||||
CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \
|
||||
mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \
|
||||
echo 'git directory not found: installing possibly empty changelog.' >&2)"
|
||||
AC_SUBST([CHANGELOG_CMD])
|
||||
AC_SUBST([distcleancheck_listfiles], ['find . -type f ! -name ChangeLog -print'])
|
||||
]) # XORG_CHANGELOG
|
||||
|
||||
|
@ -1,5 +1,32 @@
|
||||
/* config.h.in. Generated from configure.ac by autoheader. */
|
||||
|
||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||
#undef HAVE_INTTYPES_H
|
||||
|
||||
/* Define to 1 if you have the <memory.h> header file. */
|
||||
#undef HAVE_MEMORY_H
|
||||
|
||||
/* Define to 1 if you have the <stdint.h> header file. */
|
||||
#undef HAVE_STDINT_H
|
||||
|
||||
/* Define to 1 if you have the <stdlib.h> header file. */
|
||||
#undef HAVE_STDLIB_H
|
||||
|
||||
/* Define to 1 if you have the <strings.h> header file. */
|
||||
#undef HAVE_STRINGS_H
|
||||
|
||||
/* Define to 1 if you have the <string.h> header file. */
|
||||
#undef HAVE_STRING_H
|
||||
|
||||
/* Define to 1 if you have the <sys/stat.h> header file. */
|
||||
#undef HAVE_SYS_STAT_H
|
||||
|
||||
/* Define to 1 if you have the <sys/types.h> header file. */
|
||||
#undef HAVE_SYS_TYPES_H
|
||||
|
||||
/* Define to 1 if you have the <unistd.h> header file. */
|
||||
#undef HAVE_UNISTD_H
|
||||
|
||||
/* Name of package */
|
||||
#undef PACKAGE
|
||||
|
||||
@ -27,6 +54,9 @@
|
||||
/* Patch version of this package */
|
||||
#undef PACKAGE_VERSION_PATCHLEVEL
|
||||
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#undef STDC_HEADERS
|
||||
|
||||
/* Version number of package */
|
||||
#undef VERSION
|
||||
|
||||
|
8485
app/xlogo/configure
vendored
8485
app/xlogo/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -21,24 +21,24 @@ dnl
|
||||
dnl Process this file with autoconf to create configure.
|
||||
|
||||
AC_PREREQ([2.57])
|
||||
AC_INIT(xlogo,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xlogo)
|
||||
AM_INIT_AUTOMAKE([dist-bzip2])
|
||||
AC_INIT(xlogo, [1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xlogo)
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
# Require xorg-macros: XORG_DEFAULT_OPTIONS
|
||||
m4_ifndef([XORG_MACROS_VERSION],
|
||||
[m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
|
||||
XORG_MACROS_VERSION(1.3)
|
||||
XORG_DEFAULT_OPTIONS
|
||||
|
||||
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
AC_PROG_CC
|
||||
AC_PROG_INSTALL
|
||||
|
||||
# Checks for pkg-config packages
|
||||
XAW_CHECK_XPRINT_SUPPORT(XLOGO)
|
||||
|
||||
if test "x$xaw_use_xprint" = "xyes" ; then
|
||||
PKG_CHECK_MODULES(XPRINT_UTIL, xprintutil xp)
|
||||
|
||||
XLOGO_CFLAGS="$XLOGO_CFLAGS $XPRINT_UTIL_CFLAGS"
|
||||
XLOGO_LIBS="$XLOGO_LIBS $XPRINT_UTIL_LIBS"
|
||||
fi
|
||||
PKG_CHECK_MODULES(XLOGO, xaw7 xt)
|
||||
|
||||
# Use render & xft2 to draw logo?
|
||||
|
||||
@ -64,14 +64,16 @@ PKG_CHECK_MODULES(XEXT, xext)
|
||||
XLOGO_CFLAGS="$XLOGO_CFLAGS $XEXT_CFLAGS"
|
||||
XLOGO_LIBS="$XLOGO_LIBS $XEXT_LIBS"
|
||||
|
||||
XLOGO_CFLAGS="$CWARNFLAGS $XLOGO_CFLAGS"
|
||||
AC_SUBST(XLOGO_CFLAGS)
|
||||
AC_SUBST(XLOGO_LIBS)
|
||||
|
||||
PKG_CHECK_MODULES(APPDEFS, xt)
|
||||
appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
|
||||
xt_appdefaultdir=$(pkg-config --variable=appdefaultdir xt)
|
||||
AC_ARG_WITH(appdefaultdir,
|
||||
AC_HELP_STRING([--with-appdefaultdir=<pathname>],
|
||||
[specify directory for app-defaults files (default is autodetected)]),
|
||||
[appdefaultdir="$withval"], [appdefaultdir="${xt_appdefaultdir}"])
|
||||
AC_SUBST(appdefaultdir)
|
||||
|
||||
XORG_MANPAGE_SECTIONS
|
||||
XORG_RELEASE_VERSION
|
||||
|
||||
AC_OUTPUT([Makefile])
|
||||
|
@ -1,260 +0,0 @@
|
||||
/*
|
||||
* $Xorg: print.c,v 1.1 2004/04/30 02:05:54 gisburn Exp $
|
||||
*
|
||||
Copyright 2004 Roland Mainz <roland.mainz@nrubsig.org>
|
||||
|
||||
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.
|
||||
|
||||
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
|
||||
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.
|
||||
|
||||
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.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
#include "xlogo.h"
|
||||
#include "Logo.h"
|
||||
#include "print.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
static Widget
|
||||
CreatePrintShell(Widget videoshell,
|
||||
Screen *pscreen,
|
||||
String printshell_name,
|
||||
ArgList args,
|
||||
Cardinal numargs)
|
||||
{
|
||||
String videoname,
|
||||
videoclass;
|
||||
Widget pappshell,
|
||||
printshell;
|
||||
Display *pdpy = XDisplayOfScreen(pscreen);
|
||||
int dummyc = 0;
|
||||
String dummys = "";
|
||||
XtGetApplicationNameAndClass(XtDisplay(videoshell),
|
||||
&videoname, &videoclass);
|
||||
|
||||
/* XXX: Why is the |dummyc|&&|dummys| stuff needed here ? */
|
||||
XtDisplayInitialize(XtWidgetToApplicationContext(videoshell), pdpy,
|
||||
videoname, videoclass,
|
||||
NULL, 0,
|
||||
&dummyc, &dummys);
|
||||
|
||||
pappshell = XtVaAppCreateShell(videoname, videoclass,
|
||||
applicationShellWidgetClass,
|
||||
pdpy,
|
||||
XtNscreen, pscreen,
|
||||
NULL);
|
||||
printshell = XtCreatePopupShell(printshell_name,
|
||||
xawPrintShellWidgetClass,
|
||||
pappshell, args, numargs);
|
||||
|
||||
|
||||
/* we're mapping/unmapping at start/end page time */
|
||||
XtSetMappedWhenManaged(printshell, False);
|
||||
|
||||
XtRealizeWidget(printshell);
|
||||
|
||||
return printshell;
|
||||
}
|
||||
|
||||
typedef struct
|
||||
{
|
||||
Widget toplevel;
|
||||
Bool isPrinting;
|
||||
Widget printshell;
|
||||
Display *pdpy;
|
||||
Screen *pscreen;
|
||||
XPContext pcontext;
|
||||
void *printtofile_handle;
|
||||
} AppPrintData;
|
||||
|
||||
static AppPrintData apdx;
|
||||
static AppPrintData *apd = &apdx;
|
||||
|
||||
static void
|
||||
PageSetupCB(Widget widget, XtPointer client_data, XtPointer call_data)
|
||||
{
|
||||
Widget pshell = widget;
|
||||
XawPrintShellCallbackStruct *psp = (XawPrintShellCallbackStruct *)call_data;
|
||||
AppPrintData *p = (AppPrintData *)client_data;
|
||||
|
||||
Log(("--> PageSetupCB\n"));
|
||||
|
||||
if (!psp->last_page_in_job) {
|
||||
Widget plogo;
|
||||
Log(("Creating print logo\n"));
|
||||
plogo = XtCreateManagedWidget("xlogo", logoWidgetClass, pshell, NULL, ZERO);
|
||||
|
||||
/* Make sure that the Xt machinery is really using the right screen (assertion) */
|
||||
if (XpGetScreenOfContext(XtDisplay(plogo), p->pcontext) != XtScreen(plogo))
|
||||
Error(("Widget's screen != print screen. BAD.\n"));
|
||||
|
||||
/* XLogo always only prints one page */
|
||||
psp->last_page_in_job = True;
|
||||
}
|
||||
}
|
||||
|
||||
void FinishPrinting(AppPrintData *p)
|
||||
{
|
||||
char *scr;
|
||||
|
||||
if (p->printtofile_handle) {
|
||||
if (XpuWaitForPrintFileChild(p->printtofile_handle) != XPGetDocFinished) {
|
||||
fprintf(stderr, "%s: Error while printing to file.\n", ProgramName);
|
||||
}
|
||||
p->printtofile_handle = NULL;
|
||||
}
|
||||
|
||||
/* Job completed, check if there are any messages from the spooler command */
|
||||
scr = XpGetOneAttribute(p->pdpy, p->pcontext, XPJobAttr, "xp-spooler-command-results");
|
||||
if( scr )
|
||||
{
|
||||
if( strlen(scr) > 0 )
|
||||
{
|
||||
const char *msg = XpuCompoundTextToXmb(p->pdpy, scr);
|
||||
if( msg )
|
||||
{
|
||||
Msg(("Spooler command returned '%s'.\n", msg));
|
||||
XpuFreeXmbString(msg);
|
||||
}
|
||||
else
|
||||
{
|
||||
Msg(("Spooler command returned '%s' (unconverted).\n", scr));
|
||||
}
|
||||
}
|
||||
|
||||
XFree((void *)scr);
|
||||
}
|
||||
|
||||
if (p->printshell) {
|
||||
XtDestroyWidget(p->printshell);
|
||||
p->printshell = NULL;
|
||||
}
|
||||
|
||||
if (p->pdpy) {
|
||||
/* We have to use XpDestroyContext() and XtCloseDisplay() instead
|
||||
* of XpuClosePrinterDisplay() to make libXt happy... */
|
||||
if (p->pcontext != None)
|
||||
XpDestroyContext(p->pdpy, p->pcontext);
|
||||
XtCloseDisplay(p->pdpy);
|
||||
}
|
||||
|
||||
/* "Print once and exit"-mode ? */
|
||||
if (userOptions.printAndExit) {
|
||||
XtAppSetExitFlag(XtWidgetToApplicationContext(p->toplevel));
|
||||
}
|
||||
|
||||
p->toplevel = NULL;
|
||||
p->isPrinting = False;
|
||||
p->pdpy = NULL;
|
||||
p->pscreen = NULL;
|
||||
p->pcontext = None;
|
||||
}
|
||||
|
||||
static
|
||||
void PrintEndJobCB(Widget pshell, XtPointer client_data, XtPointer call_data)
|
||||
{
|
||||
AppPrintData *p = (AppPrintData *)client_data;
|
||||
|
||||
Log(("--> PrintEndJobCB\n"));
|
||||
|
||||
/* Finish printing and destroy print shell (it's legal to destroy Xt
|
||||
* widgets from within it's own callbacks) */
|
||||
FinishPrinting(p);
|
||||
}
|
||||
|
||||
void DoPrint(Widget toplevel, const char *printername, const char *toFile)
|
||||
{
|
||||
XPPrinterList plist; /* list of printers */
|
||||
int plist_count; /* number of entries in |plist|-array */
|
||||
Display *pdpy = NULL;
|
||||
XPContext pcontext = None;
|
||||
long dpi_x = 0L,
|
||||
dpi_y = 0L;
|
||||
|
||||
if (apd->isPrinting) {
|
||||
fprintf(stderr, "%s: Already busy with printing.\n", ProgramName);
|
||||
return;
|
||||
}
|
||||
|
||||
plist = XpuGetPrinterList(printername, &plist_count);
|
||||
if (!plist) {
|
||||
fprintf(stderr, "%s: no printers found for printer spec \"%s\".\n",
|
||||
ProgramName, NULLSTR(printername));
|
||||
return;
|
||||
}
|
||||
|
||||
printername = strdup(plist[0].name);
|
||||
XpuFreePrinterList(plist);
|
||||
|
||||
Log(("Using printer '%s'\n", printername));
|
||||
|
||||
/* Get printer, either by "name" (foobar) or "name@display" (foobar@gaja:5) */
|
||||
if( XpuGetPrinter(printername, &pdpy, &pcontext) != 1 ) {
|
||||
fprintf(stderr, "%s: Cannot open printer '%s'.\n", ProgramName, printername);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Configure the print context (paper size, title etc.)
|
||||
* We must do this before creating any Xt widgets - otherwise they will
|
||||
* make wrong assuptions about fonts, resultions etc. ...
|
||||
*/
|
||||
XpuSetJobTitle(pdpy, pcontext, "Xprint XLogo");
|
||||
|
||||
/* Configuration done, set the context */
|
||||
XpSetContext(pdpy, pcontext);
|
||||
|
||||
/* Get default printer resolution */
|
||||
if (XpuGetResolution(pdpy, pcontext, &dpi_x, &dpi_y) != 1) {
|
||||
fprintf(stderr, "%s: No default resolution for printer '%s'\n", ProgramName, printername);
|
||||
XpuClosePrinterDisplay(pdpy, pcontext);
|
||||
return;
|
||||
}
|
||||
|
||||
apd->toplevel = toplevel;
|
||||
apd->pdpy = pdpy;
|
||||
apd->pcontext = pcontext;
|
||||
apd->pscreen = XpGetScreenOfContext(pdpy, pcontext);
|
||||
|
||||
apd->printshell = CreatePrintShell(toplevel, apd->pscreen, "Print", NULL, 0);
|
||||
|
||||
XtAddCallback(apd->printshell, XawNpageSetupCallback, PageSetupCB, (XtPointer)apd);
|
||||
XtAddCallback(apd->printshell, XawNendJobCallback, PrintEndJobCB, (XtPointer)apd);
|
||||
|
||||
apd->isPrinting = True;
|
||||
|
||||
if (toFile) {
|
||||
printf("%s: Printing to file '%s'...\n", ProgramName, toFile);
|
||||
apd->printtofile_handle = XpuStartJobToFile(pdpy, pcontext, toFile);
|
||||
if (!apd->printtofile_handle) {
|
||||
perror("XpuStartJobToFile failure");
|
||||
apd->isPrinting = False;
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("%s: Printing to printer '%s'...\n", ProgramName, printername);
|
||||
XpuStartJobToSpooler(pdpy);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,41 +0,0 @@
|
||||
/*
|
||||
* $Xorg: print.h,v 1.1 2004/04/30 02:05:54 gisburn Exp $
|
||||
*
|
||||
Copyright 2004 Roland Mainz <roland.mainz@nrubsig.org>
|
||||
|
||||
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.
|
||||
|
||||
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
|
||||
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.
|
||||
|
||||
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.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef XLOGO_PRINT_H
|
||||
#define XLOGO_PRINT_H 1
|
||||
|
||||
#include <X11/Intrinsic.h>
|
||||
#include <X11/StringDefs.h>
|
||||
#include <X11/Shell.h>
|
||||
#include <X11/Xaw/Print.h>
|
||||
#include <X11/Xaw/Cardinals.h>
|
||||
#include <X11/XprintUtil/xprintutil.h>
|
||||
|
||||
/* Prototypes */
|
||||
void DoPrint(Widget toplevel, const char *printername, const char *toFile);
|
||||
|
||||
#endif /* !XLOGO_PRINT_H */
|
@ -1,6 +1,5 @@
|
||||
/*
|
||||
* $Xorg: xlogo.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $
|
||||
*
|
||||
|
||||
Copyright 1989, 1998 The Open Group
|
||||
|
||||
Permission to use, copy, modify, distribute, and sell this software and its
|
||||
@ -22,10 +21,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
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.
|
||||
*
|
||||
*/
|
||||
|
||||
/* $XFree86: xc/programs/xlogo/xlogo.c,v 3.7 2001/07/25 15:05:26 dawes Exp $ */
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
@ -36,9 +33,6 @@ in this Software without prior written authorization from The Open Group.
|
||||
#include "xlogo.h"
|
||||
#include "Logo.h"
|
||||
#include <X11/Xaw/Cardinals.h>
|
||||
#ifdef INCLUDE_XPRINT_SUPPORT
|
||||
#include "print.h"
|
||||
#endif /* INCLUDE_XPRINT_SUPPORT */
|
||||
#ifdef XKB
|
||||
#include <X11/extensions/XKBbells.h>
|
||||
#endif
|
||||
@ -49,9 +43,6 @@ in this Software without prior written authorization from The Open Group.
|
||||
const char *ProgramName; /* program name (from argv[0]) */
|
||||
|
||||
static void quit(Widget w, XEvent *event, String *params, Cardinal *num_params);
|
||||
#ifdef INCLUDE_XPRINT_SUPPORT
|
||||
static void print(Widget w, XEvent *event, String *params, Cardinal *num_params);
|
||||
#endif /* INCLUDE_XPRINT_SUPPORT */
|
||||
|
||||
static XrmOptionDescRec options[] = {
|
||||
{ "-shape", "*shapeWindow", XrmoptionNoArg, (XPointer) "on" },
|
||||
@ -61,18 +52,10 @@ static XrmOptionDescRec options[] = {
|
||||
#endif
|
||||
{"-v", "Verbose", XrmoptionNoArg, "TRUE"},
|
||||
{"-q", "Quiet", XrmoptionNoArg, "TRUE"},
|
||||
#ifdef INCLUDE_XPRINT_SUPPORT
|
||||
{"-print", "Print", XrmoptionNoArg, "TRUE"},
|
||||
{"-printer", "printer", XrmoptionSepArg, NULL},
|
||||
{"-printfile", "printFile", XrmoptionSepArg, NULL},
|
||||
#endif /* INCLUDE_XPRINT_SUPPORT */
|
||||
};
|
||||
|
||||
static XtActionsRec actions[] = {
|
||||
{"quit", quit },
|
||||
#ifdef INCLUDE_XPRINT_SUPPORT
|
||||
{"print", print}
|
||||
#endif /* INCLUDE_XPRINT_SUPPORT */
|
||||
};
|
||||
|
||||
static Atom wm_delete_window;
|
||||
@ -82,37 +65,27 @@ XLogoResourceData userOptions;
|
||||
|
||||
#define Offset(field) XtOffsetOf(XLogoResourceData, field)
|
||||
|
||||
XtResource resources[] = {
|
||||
static XtResource resources[] = {
|
||||
{"verbose", "Verbose", XtRBoolean, sizeof(Boolean), Offset(verbose), XtRImmediate, (XtPointer)False},
|
||||
{"quiet", "Quiet", XtRBoolean, sizeof(Boolean), Offset(quiet), XtRImmediate, (XtPointer)False},
|
||||
#ifdef INCLUDE_XPRINT_SUPPORT
|
||||
{"print", "Print", XtRBoolean, sizeof(Boolean), Offset(printAndExit), XtRImmediate, (XtPointer)False},
|
||||
{"printer", "Printer", XtRString, sizeof(String), Offset(printername), XtRImmediate, (XtPointer)NULL},
|
||||
{"printFile", "PrintFile", XtRString, sizeof(String), Offset(printfile), XtRImmediate, (XtPointer)NULL}
|
||||
#endif /* INCLUDE_XPRINT_SUPPORT */
|
||||
};
|
||||
|
||||
|
||||
String fallback_resources[] = {
|
||||
static String fallback_resources[] = {
|
||||
"*iconPixmap: xlogo32",
|
||||
"*iconMask: xlogo32",
|
||||
"*baseTranslations: #override \\"
|
||||
#ifdef INCLUDE_XPRINT_SUPPORT
|
||||
"\t<Key>q: quit()\\n\\"
|
||||
"\t<Key>p: print()",
|
||||
#else /* !INCLUDE_XPRINT_SUPPORT */
|
||||
"\t<Key>q: quit()",
|
||||
#endif /* !INCLUDE_XPRINT_SUPPORT */
|
||||
NULL,
|
||||
};
|
||||
|
||||
static void
|
||||
static void
|
||||
die(Widget w, XtPointer client_data, XtPointer call_data)
|
||||
{
|
||||
XtAppSetExitFlag(XtWidgetToApplicationContext(w));
|
||||
}
|
||||
|
||||
static void
|
||||
static void
|
||||
save(Widget w, XtPointer client_data, XtPointer call_data)
|
||||
{
|
||||
return;
|
||||
@ -122,7 +95,7 @@ save(Widget w, XtPointer client_data, XtPointer call_data)
|
||||
* Report the syntax for calling xlogo.
|
||||
*/
|
||||
|
||||
static void
|
||||
static void
|
||||
Syntax(Widget toplevel)
|
||||
{
|
||||
Arg arg;
|
||||
@ -136,9 +109,6 @@ Syntax(Widget toplevel)
|
||||
reasons[n++] = " [-v] [-q]\n";
|
||||
reasons[n++] = " [-d [<host>]:[<vs>]]\n";
|
||||
reasons[n++] = " [-g [<width>][x<height>][<+-><xoff>[<+-><yoff>]]]\n";
|
||||
#ifdef INCLUDE_XPRINT_SUPPORT
|
||||
reasons[n++] = " [-print] [-printname <name>] [-printfile <file>]\n";
|
||||
#endif /* INCLUDE_XPRINT_SUPPORT */
|
||||
#ifdef XRENDER
|
||||
reasons[n++] = " [-render] [-sharp]\n";
|
||||
#endif /* XRENDER */
|
||||
@ -146,16 +116,16 @@ Syntax(Widget toplevel)
|
||||
|
||||
XtSetArg(arg, XtNconnection, &connection);
|
||||
XtGetValues(toplevel, &arg, (Cardinal)1);
|
||||
if (connection)
|
||||
if (connection)
|
||||
SmcCloseConnection(connection, n, reasons);
|
||||
else {
|
||||
for (i=0; i < n; i++)
|
||||
printf(reasons[i]);
|
||||
printf("%s", reasons[i]);
|
||||
}
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
int
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
Widget toplevel;
|
||||
@ -164,35 +134,27 @@ main(int argc, char *argv[])
|
||||
ProgramName = argv[0];
|
||||
|
||||
toplevel = XtOpenApplication(&app_con, "XLogo",
|
||||
options, XtNumber(options),
|
||||
options, XtNumber(options),
|
||||
&argc, argv, fallback_resources,
|
||||
sessionShellWidgetClass, NULL, ZERO);
|
||||
if (argc != 1)
|
||||
Syntax(toplevel);
|
||||
|
||||
XtGetApplicationResources(toplevel, (XtPointer)&userOptions, resources,
|
||||
XtGetApplicationResources(toplevel, (XtPointer)&userOptions, resources,
|
||||
XtNumber(resources), NULL, 0);
|
||||
|
||||
XtAppAddActions(app_con, actions, XtNumber(actions));
|
||||
|
||||
#ifdef INCLUDE_XPRINT_SUPPORT
|
||||
if (userOptions.printAndExit) {
|
||||
XtCallActionProc(toplevel, "print", NULL, NULL, 0);
|
||||
}
|
||||
else
|
||||
#endif /* INCLUDE_XPRINT_SUPPORT */
|
||||
{
|
||||
XtAddCallback(toplevel, XtNsaveCallback, save, NULL);
|
||||
XtAddCallback(toplevel, XtNdieCallback, die, NULL);
|
||||
XtOverrideTranslations
|
||||
(toplevel, XtParseTranslationTable ("<Message>WM_PROTOCOLS: quit()"));
|
||||
XtCreateManagedWidget("xlogo", logoWidgetClass, toplevel, NULL, ZERO);
|
||||
XtRealizeWidget(toplevel);
|
||||
wm_delete_window = XInternAtom(XtDisplay(toplevel), "WM_DELETE_WINDOW",
|
||||
False);
|
||||
(void) XSetWMProtocols (XtDisplay(toplevel), XtWindow(toplevel),
|
||||
&wm_delete_window, 1);
|
||||
}
|
||||
XtAddCallback(toplevel, XtNsaveCallback, save, NULL);
|
||||
XtAddCallback(toplevel, XtNdieCallback, die, NULL);
|
||||
XtOverrideTranslations
|
||||
(toplevel, XtParseTranslationTable ("<Message>WM_PROTOCOLS: quit()"));
|
||||
XtCreateManagedWidget("xlogo", logoWidgetClass, toplevel, NULL, ZERO);
|
||||
XtRealizeWidget(toplevel);
|
||||
wm_delete_window = XInternAtom(XtDisplay(toplevel), "WM_DELETE_WINDOW",
|
||||
False);
|
||||
(void) XSetWMProtocols (XtDisplay(toplevel), XtWindow(toplevel),
|
||||
&wm_delete_window, 1);
|
||||
|
||||
XtAppMainLoop(app_con);
|
||||
|
||||
@ -200,12 +162,12 @@ main(int argc, char *argv[])
|
||||
}
|
||||
|
||||
/*ARGSUSED*/
|
||||
static void
|
||||
static void
|
||||
quit(Widget w, XEvent *event, String *params, Cardinal *num_params)
|
||||
{
|
||||
Arg arg;
|
||||
|
||||
if (event->type == ClientMessage &&
|
||||
|
||||
if (event->type == ClientMessage &&
|
||||
(Atom)event->xclient.data.l[0] != wm_delete_window) {
|
||||
#ifdef XKB
|
||||
XkbStdBell(XtDisplay(w), XtWindow(w), 0, XkbBI_BadValue);
|
||||
@ -220,11 +182,3 @@ quit(Widget w, XEvent *event, String *params, Cardinal *num_params)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef INCLUDE_XPRINT_SUPPORT
|
||||
/*ARGSUSED*/
|
||||
static void
|
||||
print(Widget w, XEvent *event, String *params, Cardinal *num_params)
|
||||
{
|
||||
DoPrint(w, userOptions.printername, userOptions.printfile);
|
||||
}
|
||||
#endif /* INCLUDE_XPRINT_SUPPORT */
|
||||
|
@ -1,6 +1,5 @@
|
||||
/*
|
||||
* $Xorg: xlogo.h,v 1.1 2004/04/30 02:05:54 gisburn Exp $
|
||||
*
|
||||
|
||||
Copyright 2004 Roland Mainz <roland.mainz@nrubsig.org>
|
||||
|
||||
Permission to use, copy, modify, distribute, and sell this software and its
|
||||
@ -22,7 +21,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
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.
|
||||
*
|
||||
|
||||
*/
|
||||
|
||||
#ifndef XLOGO_XLOGO_H
|
||||
|
@ -1,15 +1,14 @@
|
||||
.\" $Xorg: xlogo.man,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $
|
||||
.\" Copyright 1988, 1994, 1998 The Open Group
|
||||
.\"
|
||||
.\"
|
||||
.\" 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.
|
||||
.\"
|
||||
.\"
|
||||
.\" 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.
|
||||
@ -17,14 +16,12 @@
|
||||
.\" 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 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.
|
||||
.\"
|
||||
.\" $XFree86: xc/programs/xlogo/xlogo.man,v 1.10 2002/10/12 16:06:48 herrb Exp $
|
||||
.\"
|
||||
.TH XLOGO 1 __xorgversion__
|
||||
.SH NAME
|
||||
xlogo - X Window System logo
|
||||
@ -55,10 +52,10 @@ understands all of the Simple widget resource names and classes as well as:
|
||||
.B foreground (\fPclass\fB Foreground)
|
||||
Specifies the color for the logo. The default is depends on whether
|
||||
\fIreverseVideo\fP is specified. If \fIreverseVideo\fP is specified
|
||||
the default is \fIXtDefaultForeground\fP, otherwise the default is
|
||||
the default is \fIXtDefaultForeground\fP, otherwise the default is
|
||||
\fIXtDefaultBackground\fP.
|
||||
.TP 8
|
||||
.B shapeWindow (\fPclass\fB ShapeWindow)
|
||||
.B shapeWindow (\fPclass\fB ShapeWindow)
|
||||
Specifies that the window is shaped to the X logo. The default is False.
|
||||
.SH WIDGETS
|
||||
In order to specify resources, it is useful to know the hierarchy of
|
||||
@ -67,8 +64,8 @@ indentation indicates hierarchical structure. The widget class name
|
||||
is given first, followed by the widget instance name.
|
||||
.sp
|
||||
.nf
|
||||
.TA .5i
|
||||
.ta .5i
|
||||
.TA .5i
|
||||
.ta .5i
|
||||
XLogo xlogo
|
||||
Logo xlogo
|
||||
.fi
|
||||
|
Loading…
Reference in New Issue
Block a user