bitmap/AUTHORS | 2
bitmap/BitEdit.c | 46
bitmap/Bitmap-color.ad | 19
bitmap/Bitmap-nocase.ad | 233
bitmap/Bitmap.ad | 229
bitmap/Bitmap.c | 4
bitmap/Bitmap.h | 2
bitmap/BitmapP.h | 4
bitmap/COPYING | 27
bitmap/ChangeLog | 94
bitmap/CutPaste.c | 3
bitmap/Dialog.c | 2
bitmap/Dialog.h | 2
bitmap/Graphics.c | 2
bitmap/Handlers.c | 3
bitmap/Makefile.am | 36
bitmap/Makefile.in | 562 -
bitmap/README | 25
bitmap/ReqMach.c | 3
bitmap/Requests.h | 2
bitmap/aclocal.m4 | 798 -
bitmap/app-defaults/Bitmap | 228
bitmap/app-defaults/Bitmap-color | 18
bitmap/app-defaults/Bitmap-nocase | 231
bitmap/atobm.c | 4
bitmap/bitmap.man | 4
bitmap/bmtoa.c | 5
bitmap/compile | 17
bitmap/config.guess | 101
bitmap/config.h.in | 35
bitmap/config.sub | 109
bitmap/configure | 5179
++++++----
bitmap/configure.ac | 24
bitmap/depcomp | 172
bitmap/install-sh | 517
bitmap/missing | 104
debian/changelog | 17
debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff | 26
debian/patches/03_xconsole_implicit_pointer_conversion.diff | 16
debian/patches/05_xmore_fix_segv_without_xprint.diff | 15
debian/patches/06_xclock_geometry.diff | 92
debian/patches/series | 2
xclipboard/ChangeLog | 325
xclipboard/INSTALL | 236
xclipboard/Makefile.am | 40
xclipboard/Makefile.in | 472
xclipboard/README | 28
xclipboard/XClipboard.ad | 126
xclipboard/aclocal.m4 | 1913 ++-
xclipboard/app-defaults/XClipboard | 126
xclipboard/compile | 142
xclipboard/config.guess | 107
xclipboard/config.h.in | 42
xclipboard/config.sub | 128
xclipboard/configure | 4337
+++++---
xclipboard/configure.ac | 22
xclipboard/depcomp | 172
xclipboard/install-sh | 517
xclipboard/missing | 104
xclipboard/mkinstalldirs | 158
xclipboard/xclipboard.c | 131
xclipboard/xcutsel.c | 2
xclock/COPYING | 82
xclock/ChangeLog | 97
xclock/Clock.c | 442
xclock/Clock.h | 14
xclock/ClockP.h | 12
xclock/INSTALL | 302
xclock/Makefile.am | 30
xclock/Makefile.in | 352
xclock/README | 27
xclock/XClock-color.ad | 10
xclock/XClock.ad | 1
xclock/aclocal.m4 | 645 -
xclock/app-defaults/XClock | 1
xclock/app-defaults/XClock-color | 10
xclock/config.guess | 107
xclock/config.h.in | 30
xclock/config.sub | 116
xclock/configure | 4738
+++++----
xclock/configure.ac | 27
xclock/depcomp | 116
xclock/install-sh | 231
xclock/missing | 49
xclock/xclock.c | 16
xclock/xclock.man | 44
xcursorgen/ChangeLog | 33
xcursorgen/INSTALL | 16
xcursorgen/Makefile.am | 10
xcursorgen/Makefile.in | 363
xcursorgen/README | 25
xcursorgen/aclocal.m4 | 1865 ++-
xcursorgen/autogen.sh | 13
xcursorgen/config.guess | 85
xcursorgen/config.h.in | 30
xcursorgen/config.sub | 104
xcursorgen/configure | 4080 +++++--
xcursorgen/configure.ac | 16
xcursorgen/depcomp | 172
xcursorgen/install-sh | 517
xcursorgen/missing | 104
xcursorgen/xcursorgen.c | 6
xeyes/ChangeLog | 298
xeyes/Eyes.c | 478
xeyes/Eyes.h | 14
xeyes/EyesP.h | 18
xeyes/INSTALL | 236
xeyes/Makefile.am | 14
xeyes/Makefile.in | 420
xeyes/README | 25
xeyes/aclocal.m4 | 677 -
xeyes/compile | 142
xeyes/config.guess | 168
xeyes/config.h.in | 42
xeyes/config.sub | 147
xeyes/configure | 4201
+++++---
xeyes/configure.ac | 19
xeyes/depcomp | 172
xeyes/install-sh | 517
xeyes/missing | 104
xeyes/mkinstalldirs | 158
xeyes/transform.c | 42
xeyes/transform.h | 5
xeyes/xeyes.c | 15
xeyes/xeyes.man | 12
xgc/COPYING | 57
xgc/ChangeLog | 346
xgc/INSTALL | 236
xgc/Makefile.am | 40
xgc/Makefile.in | 676 -
xgc/README | 26
xgc/Xgc.ad | 2
xgc/aclocal.m4 | 1931 ++-
xgc/app-defaults/Xgc | 2
xgc/app-defaults/Xgc-color | 55
xgc/compile | 142
xgc/config.guess | 81
xgc/config.h.in | 30
xgc/config.sub | 96
xgc/configure | 4785
+++++----
xgc/configure.ac | 21
xgc/depcomp | 172
xgc/gram.c | 1053 +-
xgc/gram.h | 43
xgc/install-sh | 517
xgc/lex.c | 1434 +-
xgc/lex.l | 2
xgc/main.c | 161
xgc/main.h | 148
xgc/missing | 104
xgc/mkinstalldirs | 158
xgc/testfrac.c | 5
xgc/text.c | 7
xgc/xgc.man | 140
xgc/ylwrap | 222
xman/ChangeLog | 593 +
xman/Makefile.am | 43
xman/Makefile.in | 610 -
xman/README | 25
xman/ScrollByL.c | 4
xman/Xman-noxprint.ad | 195
xman/Xman-xprint.ad | 294
xman/aclocal.m4 | 1815 +--
xman/app-defaults/Xman | 195
xman/buttons.c | 2
xman/config.guess | 107
xman/config.h.in | 32
xman/config.sub | 116
xman/configure | 4442
+++++---
xman/configure.ac | 49
xman/depcomp | 116
xman/globals.h | 9
xman/handler.c | 2
xman/help.c | 2
xman/install-sh | 231
xman/main.c | 8
xman/man.c | 26
xman/man.h | 2
xman/misc.c | 111
xman/missing | 49
xman/print.c | 396
xman/print.h | 50
xman/vendor.h | 15
xwd/COPYING | 48
xwd/ChangeLog | 119
xwd/Makefile.am | 6
xwd/Makefile.in | 344
xwd/README | 25
xwd/aclocal.m4 | 1770 +--
xwd/clientwin.c | 6
xwd/compile | 142
xwd/config.guess | 128
xwd/config.h.in | 31
xwd/config.sub | 76
xwd/configure | 2375 +++-
xwd/configure.ac | 13
xwd/depcomp | 87
xwd/dsimple.c | 3
xwd/install-sh | 5
xwd/list.c | 2
xwd/missing | 49
xwd/multiVis.c | 243
xwd/xwd.c | 52
xwud/COPYING | 27
xwud/ChangeLog | 230
xwud/INSTALL | 236
xwud/Makefile.am | 14
xwud/Makefile.in | 385
xwud/README | 26
xwud/aclocal.m4 | 1847 ++-
xwud/compile | 142
xwud/config.guess | 107
xwud/config.h.in | 39
xwud/config.sub | 128
xwud/configure | 4065 +++++--
xwud/configure.ac | 12
xwud/depcomp | 172
xwud/install-sh | 517
xwud/missing | 104
xwud/mkinstalldirs | 158
xwud/xwud.c | 18
221 files changed, 48058 insertions(+), 28928 deletions(-)
New commits:
commit 72ef061dc6e639db5522382508948cbc74518234
Author: Brice Goglin <bgog...@debian.org>
Date: Sun Dec 6 11:59:10 2009 +0100
Refresh patches
diff --git a/debian/changelog b/debian/changelog
index ee397a3..00a57bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,9 @@ x11-apps (7.5+1) UNRELEASED; urgency=low
* xwd 1.0.3.
+ Drop 01_xwd_do_not_spew_usage_on_connection_error.diff, applied upstream.
* xwud 1.0.2.
+ * Refresh patches.
- -- Brice Goglin <bgog...@debian.org> Sun, 06 Dec 2009 12:09:04 +0100
+ -- Brice Goglin <bgog...@debian.org> Sun, 06 Dec 2009 12:09:46 +0100
x11-apps (7.4+2) unstable; urgency=low
diff --git a/debian/patches/03_xconsole_implicit_pointer_conversion.diff
b/debian/patches/03_xconsole_implicit_pointer_conversion.diff
index 00dc3c4..2cc8903 100644
--- a/debian/patches/03_xconsole_implicit_pointer_conversion.diff
+++ b/debian/patches/03_xconsole_implicit_pointer_conversion.diff
@@ -1,8 +1,14 @@
---- xbase-clients-7.1.ds.orig/xconsole/xconsole.c 2006-05-23
20:11:37.000000000 -0600
-+++ xbase-clients-7.1.ds/xconsole/xconsole.c 2006-06-17 14:11:47.000000000
-0600
-@@ -28,6 +28,7 @@
-
- /* $XFree86: xc/programs/xconsole/xconsole.c,v 3.31tsi Exp $ */
+---
+ xconsole/xconsole.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: x11-apps/xconsole/xconsole.c
+===================================================================
+--- x11-apps.orig/xconsole/xconsole.c 2009-07-27 18:42:39.000000000 +0200
++++ x11-apps/xconsole/xconsole.c 2009-12-06 11:57:56.000000000 +0100
+@@ -32,6 +32,7 @@
+ #include "config.h"
+ #endif
+#define _XOPEN_SOURCE
#include <X11/Intrinsic.h>
diff --git a/debian/patches/05_xmore_fix_segv_without_xprint.diff
b/debian/patches/05_xmore_fix_segv_without_xprint.diff
index ea9afd2..cbcc3d5 100644
--- a/debian/patches/05_xmore_fix_segv_without_xprint.diff
+++ b/debian/patches/05_xmore_fix_segv_without_xprint.diff
@@ -1,9 +1,14 @@
This patch by Eugene Konev.
-diff -u a/xmore/xmore.c b/xmore/xmore.c
---- a/xmore/xmore.c Sun Apr 30 13:40:29 2006 +0800
-+++ b/xmore/xmore.c Sun Apr 30 13:40:40 2006 +0800
-@@ -150,7 +150,9 @@ static void
+---
+ xmore/xmore.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+Index: x11-apps/xmore/xmore.c
+===================================================================
+--- x11-apps.orig/xmore/xmore.c 2009-12-06 11:58:01.000000000 +0100
++++ x11-apps/xmore/xmore.c 2009-12-06 11:58:14.000000000 +0100
+@@ -150,7 +150,9 @@
static void
printshellDestroyXtProc(Widget w, XtPointer client_data, XtPointer callData)
{
@@ -13,7 +18,7 @@ diff -u a/xmore/xmore.c b/xmore/xmore.c
}
#ifdef USE_XPRINT
-@@ -302,7 +304,12 @@ int main( int argc, char *argv[] )
+@@ -302,7 +304,12 @@
#endif
n = 0;
commit c16b17f7b3c27df35868178a7f7ac0d8acd5ee48
Author: Brice Goglin <bgog...@debian.org>
Date: Sun Dec 6 12:09:27 2009 +0100
Drop 01_xwd_do_not_spew_usage_on_connection_error.diff, applied upstream
diff --git a/debian/changelog b/debian/changelog
index 5b6415f..ee397a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,9 +17,10 @@ x11-apps (7.5+1) UNRELEASED; urgency=low
* xmag 1.0.3.
* xman 1.1.0.
* xwd 1.0.3.
+ + Drop 01_xwd_do_not_spew_usage_on_connection_error.diff, applied upstream.
* xwud 1.0.2.
- -- Brice Goglin <bgog...@debian.org> Sun, 06 Dec 2009 12:03:24 +0100
+ -- Brice Goglin <bgog...@debian.org> Sun, 06 Dec 2009 12:09:04 +0100
x11-apps (7.4+2) unstable; urgency=low
diff --git a/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff
b/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff
deleted file mode 100644
index 1678de2..0000000
--- a/debian/patches/01_xwd_do_not_spew_usage_on_connection_error.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-$Id: 099r_xlsfonts_do_not_spew_usage_on_connection_error.diff 480 2005-08-02
20:14:26Z branden $
-
-This patch by Branden Robinson.
-
-General philosophy:
-
-The user should only be shown a usage messages when:
- * it is asked for with a --help option or the like.
- * the command line is syntactically invalid.
-
-Not submitted upstream to XFree86 or X.Org.
-
-Index: xwd/dsimple.c
-===================================================================
---- a/xwd/dsimple.c.orig 2007-02-11 08:15:57.000000000 +0100
-+++ b/xwd/dsimple.c 2007-02-11 08:16:10.000000000 +0100
-@@ -188,8 +188,7 @@
- if (d == NULL) {
- fprintf (stderr, "%s: unable to open display '%s'\n",
- program_name, XDisplayName (display_name));
-- usage ();
-- /* doesn't return */
-+ exit(1);
- }
-
- return(d);
diff --git a/debian/patches/series b/debian/patches/series
index 18aded6..a77af23 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01_xwd_do_not_spew_usage_on_connection_error.diff
#02_xedit_manpage_typos.diff
03_xconsole_implicit_pointer_conversion.diff
05_xmore_fix_segv_without_xprint.diff
commit aae827c45bec869a0d529490ef9948c52cd6c4a8
Author: Brice Goglin <bgog...@debian.org>
Date: Sun Dec 6 11:56:26 2009 +0100
Drop 06_xclock_geometry.diff, applied upstream
diff --git a/debian/changelog b/debian/changelog
index 0d05649..5b6415f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ x11-apps (7.5+1) UNRELEASED; urgency=low
* xclipboard 1.1.0.
+ Add UTF8 support, closes: #489998.
* xclock 1.0.4.
+ + Drop 06_xclock_geometry.diff, applied upstream.
* xcursorgen 1.0.3.
* xeyes 1.0.991.
* xgc 1.0.2.
@@ -18,7 +19,7 @@ x11-apps (7.5+1) UNRELEASED; urgency=low
* xwd 1.0.3.
* xwud 1.0.2.
- -- Brice Goglin <bgog...@debian.org> Sun, 06 Dec 2009 12:02:51 +0100
+ -- Brice Goglin <bgog...@debian.org> Sun, 06 Dec 2009 12:03:24 +0100
x11-apps (7.4+2) unstable; urgency=low
diff --git a/debian/patches/06_xclock_geometry.diff
b/debian/patches/06_xclock_geometry.diff
deleted file mode 100644
index 9b14768..0000000
--- a/debian/patches/06_xclock_geometry.diff
+++ /dev/null
@@ -1,92 +0,0 @@
-From upstream commits 870ebb6762f63c6587ee75aba50ee93257fa610b and
-8c6739ba1179337c7f8fa25680871e0813ef5181.
-
-Index: x11-apps-7.3+1.0/xclock/Clock.c
-===================================================================
---- x11-apps-7.3+1.0.orig/xclock/Clock.c 2008-05-12 19:43:06.000000000
-0400
-+++ x11-apps-7.3+1.0/xclock/Clock.c 2008-05-12 20:29:19.000000000 -0400
-@@ -656,46 +656,48 @@
- 2 * w->clock.padding;
- }
- else
-+ {
- #endif
- #ifndef NO_I18N
-- if (!no_locale) {
-- XFontSetExtents *fse;
-+ if (!no_locale) {
-+ XFontSetExtents *fse;
-
-- if(w->clock.fontSet == NULL) {
-- char **missing, *default_str;
-- int n_missing;
-- w->clock.fontSet = XCreateFontSet( XtDisplay(w),
-- XtDefaultFontSet,
-- &missing,
-- &n_missing,
-- &default_str);
-- }
-- if (w->clock.fontSet != NULL)
-- {
-- /* don't free this... it's freed with the XFontSet. */
-- fse = XExtentsOfFontSet(w->clock.fontSet);
--
-- min_width = XmbTextEscapement(w->clock.fontSet,str,
-- len)
-- + 2 * w->clock.padding;
-- min_height = fse->max_logical_extent.height +
-- 3 * w->clock.padding;
-- } else {
-- no_locale = True;
-- }
-- }
-+ if(w->clock.fontSet == NULL) {
-+ char **missing, *default_str;
-+ int n_missing;
-+ w->clock.fontSet = XCreateFontSet( XtDisplay(w),
-+ XtDefaultFontSet,
-+ &missing,
-+ &n_missing,
-+ &default_str);
-+ }
-+ if (w->clock.fontSet != NULL)
-+ {
-+ /* don't free this... it's freed with the XFontSet. */
-+ fse = XExtentsOfFontSet(w->clock.fontSet);
-+
-+ min_width = XmbTextEscapement(w->clock.fontSet,str,
-+ len)
-+ + 2 * w->clock.padding;
-+ min_height = fse->max_logical_extent.height +
-+ 3 * w->clock.padding;
-+ } else {
-+ no_locale = True;
-+ }
-+ }
-
-- if (!no_locale)
--#endif /* NO_I18N */
-- {
-- if (w->clock.font == NULL)
-- w->clock.font = XQueryFont( XtDisplay(w),
-- XGContextFromGC(
-- DefaultGCOfScreen(XtScreen(w))) );
-- min_width = XTextWidth(w->clock.font, str, len) +
-- 2 * w->clock.padding;
-- min_height = w->clock.font->ascent +
-- w->clock.font->descent + 2 * w->clock.padding;
-+ if (no_locale)
-+ #endif /* NO_I18N */
-+ {
-+ if (w->clock.font == NULL)
-+ w->clock.font = XQueryFont( XtDisplay(w),
-+ XGContextFromGC(
-+ DefaultGCOfScreen(XtScreen(w)))
);
-+ min_width = XTextWidth(w->clock.font, str, len) +
-+ 2 * w->clock.padding;
-+ min_height = w->clock.font->ascent +
-+ w->clock.font->descent + 2 * w->clock.padding;
-+ }
- }
- }
- if (w->core.width == 0)
diff --git a/debian/patches/series b/debian/patches/series
index 7a16eb8..18aded6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
#02_xedit_manpage_typos.diff
03_xconsole_implicit_pointer_conversion.diff
05_xmore_fix_segv_without_xprint.diff
-06_xclock_geometry.diff
commit 4e5913e30f248e597b1ba472890d690c7880d0c2
Author: Brice Goglin <bgog...@debian.org>
Date: Sun Dec 6 11:49:51 2009 +0100
Add bug closers, sort changelog entries, and bump to 7.5+1
diff --git a/debian/changelog b/debian/changelog
index 4df16b9..0d05649 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11-apps (7.4+3) UNRELEASED; urgency=low
+x11-apps (7.5+1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Update xload config.{guess,sub}, adding avr32 support (closes: #536410)
@@ -6,18 +6,19 @@ x11-apps (7.4+3) UNRELEASED; urgency=low
#549457). Thanks!
[ Brice Goglin ]
- * xmag 1.0.3.
* bitmap 1.0.4.
* xclipboard 1.1.0.
- * xcursorgen 1.0.3.
+ + Add UTF8 support, closes: #489998.
* xclock 1.0.4.
+ * xcursorgen 1.0.3.
+ * xeyes 1.0.991.
* xgc 1.0.2.
+ * xmag 1.0.3.
* xman 1.1.0.
- * xeyes 1.0.991.
* xwd 1.0.3.
* xwud 1.0.2.
- -- Brice Goglin <bgog...@debian.org> Sun, 06 Dec 2009 12:02:06 +0100
+ -- Brice Goglin <bgog...@debian.org> Sun, 06 Dec 2009 12:02:51 +0100
x11-apps (7.4+2) unstable; urgency=low
commit 20c297b423b2da23715283c2546ccfef23fcdd72
Author: Brice Goglin <bgog...@debian.org>
Date: Sun Dec 6 11:28:59 2009 +0100
xeyes 1.0.991
diff --git a/debian/changelog b/debian/changelog
index 71df001..4df16b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ x11-apps (7.4+3) UNRELEASED; urgency=low
* xclock 1.0.4.
* xgc 1.0.2.
* xman 1.1.0.
+ * xeyes 1.0.991.
* xwd 1.0.3.
* xwud 1.0.2.
diff --git a/xeyes/ChangeLog b/xeyes/ChangeLog
index 6eb4c51..bcacd85 100644
--- a/xeyes/ChangeLog
+++ b/xeyes/ChangeLog
@@ -1,25 +1,293 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 59a5be39cdbddb070cd4e4758848fd08aa5910a4
+Author: James Cloos <cl...@jhcloos.com>
+Date: Mon Oct 5 18:07:53 2009 -0400
- * configure.ac:
- Update package version for X11R7 release.
+ Bump version for second beta release.
+
+ 1.0.991 as first beta of 1.1.0.
+
+ (The first beta was meant to be 1.0.90 rather than 1.0.99.
+ Having gotten that wrong, switch to three-digit release numbers
+ for subsequent betas.)
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 610889785caf41146505458beccc5e3662c233db
+Author: Dylan Simon <dy...@dylex.net>
+Date: Sun Oct 4 17:41:30 2009 -0400
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ New -distance mapping option
+
+ Distance mapping makes more efficient use of eye space.
+
+ Signed-off-by: Dylan Simon <dy...@dylex.net>
+ Signed-off-by: James Cloos <cl...@jhcloos.com>
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit dc0f730a4a49f0e436a0a915955997b07bbf56e0
+Author: Dylan Simon <dy...@dylex.net>
+Date: Sun Oct 4 17:38:43 2009 -0400
- * Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Cleanup and simplify calculation and drawing
+
+ By transforming the eyes’s space when calculating where to place the
+ pupils, the code effectively assumed that EYE_HEIGHT == EYE_WIDTH.
+
+ Make this assumption explicit and remove calculations which
+ are therefore unnecessary.
+
+ Clean up related code and, consequently, reduced redraw time
+ and tearing.
+
+ Signed-off-by: Dylan Simon <dy...@dylex.net>
+ Signed-off-by: James Cloos <cl...@jhcloos.com>
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 7cc3aa8ce30990e12e7b102f61dfcaaf8baa4d16
+Author: Dylan Simon <dy...@dylex.net>
+Date: Sun Oct 4 17:29:59 2009 -0400
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Fix excessive redraw bug
+
+ introduced by dbb8401026c421d64a2962e6ac6eb900f6dc141e
+
+ Signed-off-by: Dylan Simon <dy...@dylex.net>
+ Signed-off-by: James Cloos <cl...@jhcloos.com>
-2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 6d9fdcfb076f4c261b071cc5c454c8b9ce560e68
+Author: James Cloos <cl...@jhcloos.com>
+Date: Sat Oct 3 21:32:48 2009 -0400
- * configure.ac:
- Update package version number for RC1 release.
+ Bump version for beta release.
+
+ 1.0.99 as first beta of 1.1.0.
+
+ Signed-off-by: James Cloos <cl...@jhcloos.com>
+commit 41f604009c3c7b4a3d05311faa649c8152494700
+Author: James Cloos <cl...@jhcloos.com>
+Date: Sat Oct 3 21:28:35 2009 -0400
+
+ Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: James Cloos <cl...@jhcloos.com>
+
+commit fd754c702c789f15ac1c0241e50dbb23aed354fc
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Thu Oct 1 14:53:59 2009 -0700
+
+ Add README with pointers to mailing lists, bugzilla, & git
+
+ Signed-off-by: Alan Coopersmith <alan.coopersm...@sun.com>
+
+commit 5e825a140f4022b88dd7a1a20a9a01b653f1a95c
+Author: Dylan Simon <dy...@dylex.net>
+Date: Sun Sep 27 14:44:11 2009 -0400
+
+ Add xrender support
+
+ Optionally draw all components (except shape) with xrender.
+ Enabled by default. Xlib rendering can be restored by
+ "configure --without-xrender" or "xeyes +render".
+
+ Signed-off-by: Dylan Simon <dy...@dylex.net>
+ Signed-off-by: James Cloos <cl...@jhcloos.com>
+
+commit dbb8401026c421d64a2962e6ac6eb900f6dc141e
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Fri Jul 17 19:21:15 2009 +1000
+
+ Split drawing code into multiple functions.
+
+commit 85f1441378b47c01aa68dd1479850c4cd1c8eb72
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Fri Jul 17 18:41:07 2009 +1000
+
+ Remove unused NUM_EYES define.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit e8bd6bcaf2cbe8306cc9a4821e8ea7a54a7e56a2
+Author: Paulo Cesar Pereira de Andrade <p...@mandriva.com.br>
+Date: Tue Jan 13 17:42:23 2009 -0200
+
+ Ansification and compile warning fixes.
+
+ This also uses XORG_CHANGELOG and XORG_CWARNFLAGS, corrects
+ make distcheck and all gcc 4.3 and sparse warnings.
+
+commit 7e3208d263050d0ad4502f7d7d7d64d7ec84a4ad
+Author: Jeremy Huddleston <jerem...@freedesktop.org>
+Date: Thu Nov 27 22:46:26 2008 -0800
+
+ AM_CFLAGS instead of xeyes_CFLAGS to shut automake up
+
+commit 53488fad7ef10ff8c4835bcd497cd3980be38b7a
+Author: James Cloos <cl...@jhcloos.com>
+Date: Thu Dec 6 16:36:49 2007 -0500
+
+ Replace static ChangeLog with dist-hook to generate from git log
+
+commit ab449267ea2fcae6261e57f42bfb54d2205c470f
+Author: James Cloos <cl...@jhcloos.com>
+Date: Mon Sep 3 05:50:58 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 07dfa4cb3ff0c9a94bea85db0e571fbb2cfe9161
+Author: James Cloos <cl...@jhcloos.com>
+Date: Thu Aug 23 19:24:22 2007 -0400
+
+ Rename .cvsignore to .gitignore
+
+commit ecb2095318d7233e8cfa3a58626c31f770be6ee7
+Author: Kevin E Martin <k...@kem.org>
+Date: Wed Dec 21 02:29:27 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 3aae44d6b3c9332f73fbeacb39e9c928a2002164
+Author: Adam Jackson <a...@nwnk.net>
+Date: Mon Dec 19 16:22:21 2005 +0000
+
+ Stub COPYING files
+
+commit 41b039a4861154d82bdd3e6ea1b6697b16205b93
+Author: Kevin E Martin <k...@kem.org>
+Date: Thu Dec 15 00:23:44 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit bc99738464950416207d43a4a4db970bd0563d56
+Author: Kevin E Martin <k...@kem.org>
+Date: Tue Dec 6 22:47:59 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit 266b7244e16ec2f82bdfb1bd346951761e0d27e2
+Author: Kevin E Martin <k...@kem.org>
+Date: Sat Dec 3 05:48:58 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 4298a74b61a6aa8ac36b2d820e147e44ab0f5e32
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Mon Nov 28 22:01:19 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 69160791a057704e9a83794420d2349ae8bbbe1c
+Author: Eric Anholt <anh...@freebsd.org>
+Date: Mon Nov 21 10:34:38 2005 +0000
+
+ Another pass at .cvsignores for apps.
+
+commit ba6118981be2d3a058a08cd1621113cc8e4a42f8
+Author: Eric Anholt <anh...@freebsd.org>
+Date: Sun Nov 20 22:08:30 2005 +0000
+
+ Add/improve .cvsignore files for apps.
+
+commit 6772ce855c078b40635ad62f47da741c037e05c5
+Author: Kevin E Martin <k...@kem.org>
+Date: Wed Oct 19 02:47:31 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit 8001fd04f2d893e147b3b21fb4702c54e2919b1d
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Mon Oct 17 23:56:00 2005 +0000
+
+ Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
+ work better with BSD make
+
+commit 1f61a27ce249d94b4be20db22cb84642a4d8a480
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Fri Oct 14 00:25:23 2005 +0000
+
+ Use sed to fill in variables in man page
+
+commit 79456c023b864e06b3ab3c6c93106772286b10ae
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Mon Aug 1 20:25:07 2005 +0000
+
+ Install man pages to section 1 instead of section m (Patch from Donnie
+ Berkholz)
+
+commit 8119360377d17461578cfb26e07c98df6bbe560d
+Author: Kevin E Martin <k...@kem.org>
+Date: Fri Jul 29 21:22:10 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 9da2af8715937921c718733e309471f565614c99
+Author: Kevin E Martin <k...@kem.org>
+Date: Thu Jul 28 15:56:50 2005 +0000
+
+ Fix distcheck for remaining apps
+
+commit ae49bb18f5feab2b70e6faae046bb26058421d61
+Author: Adam Jackson <a...@nwnk.net>
+Date: Wed Jul 20 19:31:31 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 c903caebf875d510cbd1f720ccc02bd03250d7c6
+Author: Søren Sandmann Pedersen <sandm...@daimi.au.dk>
+Date: Fri Jul 1 18:06:56 2005 +0000
+
+ Xeyes build system
+
+commit 160c9f4f69bb2fd273c6223c7e4c6cda1523757f
+Author: Egbert Eich <e...@suse.de>
+Date: Fri Apr 23 19:54:25 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 37db892d918e67bb13652d48f76d3da4c67f5d58
+Author: Egbert Eich <e...@suse.de>
+Date: Sun Mar 14 08:34:58 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit e1eda60fd5b4634652d0505a13a2516515d8ff88
+Author: Egbert Eich <e...@suse.de>
+Date: Wed Mar 3 12:12:43 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit f8eb90ffc747cd45db069212031e1e41c797d378
+Author: Egbert Eich <e...@suse.de>
+Date: Thu Feb 26 13:36:02 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit cd8a87f77a8ee8b4d29c34cc2066a840964fe3b8
+Author: Egbert Eich <e...@suse.de>
+Date: Thu Feb 26 09:23:45 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit bd6d337e78c95b6cd3d831f6e6ad44afc6595520
+Author: Kaleb Keithley <ka...@freedesktop.org>
+Date: Tue Nov 25 19:28:50 2003 +0000
+
+ XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
+
+commit 2d36e110b8dbfa073bd533d7d0c720a4e51339a4
+Author: Kaleb Keithley <ka...@freedesktop.org>
+Date: Fri Nov 14 16:49:00 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit dfc0320568e5237fff45b3f7fb6f332d1bf5e9bf
+Author: Kaleb Keithley <ka...@freedesktop.org>
+Date: Fri Nov 14 16:49:00 2003 +0000
+
+ Initial revision
diff --git a/xeyes/Eyes.c b/xeyes/Eyes.c
index 181d794..e792445 100644
--- a/xeyes/Eyes.c
+++ b/xeyes/Eyes.c
@@ -36,6 +36,10 @@ from the X Consortium.
* a widget which follows the mouse around
*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
# include <X11/Xos.h>
# include <stdio.h>
# include <X11/IntrinsicP.h>
@@ -44,6 +48,8 @@ from the X Consortium.
# include "EyesP.h"
# include <math.h>
# include <X11/extensions/shape.h>
+# include <X11/Xlibint.h>
+# include <stdlib.h>
#if (defined(SVR4) || defined(SYSV) && defined(i386))
extern double hypot(double, double);
@@ -58,42 +64,46 @@ static XtResource resources[] = {
{XtNheight, XtCHeight, XtRDimension, sizeof(Dimension),
goffset(height), XtRImmediate, (XtPointer) 100},
{XtNforeground, XtCForeground, XtRPixel, sizeof(Pixel),
- offset(puppixel), XtRString, XtDefaultForeground},
+ offset(pixel[PART_PUPIL]), XtRString, XtDefaultForeground},
{XtNoutline, XtCForeground, XtRPixel, sizeof(Pixel),
- offset(outline), XtRString, XtDefaultForeground},
+ offset(pixel[PART_OUTLINE]), XtRString, XtDefaultForeground},
{XtNcenterColor, XtCBackground, XtRPixel, sizeof (Pixel),
- offset(center), XtRString, XtDefaultBackground},
+ offset(pixel[PART_CENTER]), XtRString, XtDefaultBackground},
{XtNreverseVideo, XtCReverseVideo, XtRBoolean, sizeof (Boolean),
offset (reverse_video), XtRImmediate, (XtPointer) FALSE},
{XtNbackingStore, XtCBackingStore, XtRBackingStore, sizeof (int),
offset (backing_store), XtRString, "default"},
{XtNshapeWindow, XtCShapeWindow, XtRBoolean, sizeof (Boolean),
offset (shape_window), XtRImmediate, (XtPointer) TRUE},
+#ifdef XRENDER
+ {XtNrender, XtCBoolean, XtRBoolean, sizeof(Boolean),
+ offset(render), XtRImmediate, (XtPointer) TRUE },
+#endif
+ {XtNdistance, XtCBoolean, XtRBoolean, sizeof(Boolean),
+ offset(distance), XtRImmediate, (XtPointer) FALSE },
};
#undef offset
#undef goffset
-# define NUM_EYES 2
# define EYE_X(n) ((n) * 2.0)
# define EYE_Y(n) (0.0)
# define EYE_OFFSET (0.1) /* padding between eyes */
# define EYE_THICK (0.175) /* thickness of eye rim */
-# define BALL_WIDTH (0.3)
-# define BALL_PAD (0.05)
-# define EYE_WIDTH (2.0 - (EYE_THICK + EYE_OFFSET) * 2)
-# define EYE_HEIGHT EYE_WIDTH
-# define EYE_HWIDTH (EYE_WIDTH / 2.0)
-# define EYE_HHEIGHT (EYE_HEIGHT / 2.0)
-# define BALL_HEIGHT BALL_WIDTH
-# define BALL_DIST ((EYE_WIDTH - BALL_WIDTH) / 2.0 - BALL_PAD)
+# define BALL_DIAM (0.3)
+# define BALL_PAD (0.175)
+# define EYE_DIAM (2.0 - (EYE_THICK + EYE_OFFSET) * 2)
+# define BALL_DIST ((EYE_DIAM - BALL_DIAM) / 2.0 - BALL_PAD)
# define W_MIN_X (-1.0 + EYE_OFFSET)
# define W_MAX_X (3.0 - EYE_OFFSET)
# define W_MIN_Y (-1.0 + EYE_OFFSET)
# define W_MAX_Y (1.0 - EYE_OFFSET)
+# define TPOINT_NONE (-1000) /* special value meaning "not yet set" */
# define TPointEqual(a, b) ((a).x == (b).x && (a).y == (b).y)
# define XPointEqual(a, b) ((a).x == (b).x && (a).y == (b).y)
+# define AngleBetween(A, A0, A1) (A0 <= A1 ? A0 <= A && A <= A1 : \
+ A0 <= A || A <= A1)
static int delays[] = { 50, 100, 200, 400, 0 };
@@ -116,6 +126,9 @@ static void Initialize (
XtGCMask valuemask;
XGCValues myXGCV;
int shape_event_base, shape_error_base;
+#ifdef XRENDER
+ enum EyesPart i;
+#endif
/*
* set the colors if reverse video; these are the colors used:
@@ -124,110 +137,232 @@ static void Initialize (
* foreground - text, ticks black
* border - border black (foreground)
*
- * This doesn't completely work since the parent has already made up a
+ * This doesn't completely work since the parent has already made up a
* border. Sigh.
*/
if (w->eyes.reverse_video) {
- Pixel fg = w->eyes.puppixel;
+ Pixel fg = w->eyes.pixel[PART_PUPIL];
Pixel bg = w->core.background_pixel;
if (w->core.border_pixel == fg)
w->core.border_pixel = bg;
- if (w->eyes.outline == fg)
- w->eyes.outline = bg;
- if (w->eyes.center == bg)
- w->eyes.center = fg;
- w->eyes.puppixel = bg;
+ if (w->eyes.pixel[PART_OUTLINE] == fg)
+ w->eyes.pixel[PART_OUTLINE] = bg;
+ if (w->eyes.pixel[PART_CENTER] == bg)
+ w->eyes.pixel[PART_CENTER] = fg;
+ w->eyes.pixel[PART_PUPIL] = bg;
w->core.background_pixel = fg;
}
- myXGCV.foreground = w->eyes.puppixel;
+ myXGCV.foreground = w->eyes.pixel[PART_PUPIL];
myXGCV.background = w->core.background_pixel;
valuemask = GCForeground | GCBackground;
- w->eyes.pupGC = XtGetGC(gnew, valuemask, &myXGCV);
+ w->eyes.gc[PART_PUPIL] = XtGetGC(gnew, valuemask, &myXGCV);
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
