CVS update by viteno MODIFIED: xemacs ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/02/26 23:51:18
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1080 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1079
retrieving revision 1.1080
diff -u -r1.1079 -r1.1080
--- version.sh 2005/02/25 22:51:12 1.1079
+++ version.sh 2005/02/26 22:51:17 1.1080
＠＠ -8,5 +8,5 ＠＠
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20050225)"
+xemacs_extra_name="(+CVS-20050226)"
xemacs_release_date="2005-02-18"
- 1 participants
- 0 comments
CVS update by simon MODIFIED: packages/xemacs-packages/mail-lib ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: simon
Date: 05/02/26 20:09:55
Modified: packages/xemacs-packages/mail-lib browse-url.el ChangeLog
Log:
2005-02-26 Simon Josefsson <jas(a)extundo.com>
* browse-url.el (browse-url-netscape): Fix last commit. Reported
by "Johann 'Myrkraverk' Oskarsson"
<myrkraverk(a)users.sourceforget.net>.
Revision Changes Path
1.35 +1 -1 XEmacs/packages/xemacs-packages/mail-lib/browse-url.el
Index: browse-url.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/browse-url.el,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- browse-url.el 2005/02/22 14:01:27 1.34
+++ browse-url.el 2005/02/26 19:09:55 1.35
＠＠ -897,7 +897,7 ＠＠
(concat "openURL(" url
(if (browse-url-maybe-new-window
new-window)
- (if browse-url-mozilla-new-window-is-tab
+ (if browse-url-netscape-new-window-is-tab
",new-tab"
",new-window"))
")"))))))))
1.154 +6 -0 XEmacs/packages/xemacs-packages/mail-lib/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/mail-lib/ChangeLog,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- ChangeLog 2005/02/22 14:01:28 1.153
+++ ChangeLog 2005/02/26 19:09:55 1.154
＠＠ -1,3 +1,9 ＠＠
+2005-02-26 Simon Josefsson <jas(a)extundo.com>
+
+ * browse-url.el (browse-url-netscape): Fix last commit. Reported
+ by "Johann 'Myrkraverk' Oskarsson"
+ <myrkraverk(a)users.sourceforget.net>.
+
2005-02-22 Simon Josefsson <jas(a)extundo.com>
* browse-url.el (browse-url-netscape-new-window-is-tab): New
- 1 participants
- 0 comments
CVS update by viteno MODIFIED: xemacs ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/02/25 23:51:13
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1079 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1078
retrieving revision 1.1079
diff -u -r1.1078 -r1.1079
--- version.sh 2005/02/24 22:51:09 1.1078
+++ version.sh 2005/02/25 22:51:12 1.1079
＠＠ -8,5 +8,5 ＠＠
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20050224)"
+xemacs_extra_name="(+CVS-20050225)"
xemacs_release_date="2005-02-18"
- 1 participants
- 0 comments
CVS update by stephent MODIFIED: xemacs/src, console-carbon.c, frame-carbon.c, glyphs.c, objects-carbon-impl.h, redisplay-carbon.c, select-carbon.c ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: stephent
Date: 05/02/25 18:17:48
Modified: xemacs/src Tag: carbon2 ChangeLog console-carbon-impl.h
console-carbon.c device-carbon.c event-carbon.c
frame-carbon.c glyphs-carbon.c glyphs-carbon.h
glyphs.c intl-carbon.c menubar-carbon.c
objects-carbon-impl.h objects-carbon.c
redisplay-carbon.c scrollbar-carbon.c
select-carbon.c toolbar-carbon.c
Log:
wrap permissions notices and #include provided xpm.h
Revision Changes Path
No revision
No revision
1.750.2.1 +21 -0 XEmacs/xemacs/src/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.750
retrieving revision 1.750.2.1
diff -u -r1.750 -r1.750.2.1
--- ChangeLog 2004/10/22 05:19:17 1.750
+++ ChangeLog 2005/02/25 17:17:39 1.750.2.1
＠＠ -1,3 +1,24 ＠＠
+2005-02-26 Stephen J. Turnbull <stephen(a)xemacs.org>
+
+ * glyphs.c: #include provided xpm.h #ifdef HAVE_CARBON.
+
+ * console-carbon-impl.h:
+ * console-carbon.c:
+ * device-carbon.c:
+ * event-carbon.c:
+ * frame-carbon.c:
+ * glyphs-carbon.c:
+ * glyphs-carbon.h:
+ * intl-carbon.c:
+ * menubar-carbon.c:
+ * objects-carbon-impl.h:
+ * objects-carbon.c:
+ * redisplay-carbon.c:
+ * scrollbar-carbon.c:
+ * select-carbon.c:
+ * toolbar-carbon.c:
+ Wrap permissions notices.
+
2004-10-22 Stephen J. Turnbull <stephen(a)xemacs.org>
* XEmacs 21.5.18 "chestnut" is released.
1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/console-carbon-impl.h
Index: console-carbon-impl.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/console-carbon-impl.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- console-carbon-impl.h 2005/02/25 16:29:56 1.1.2.1
+++ console-carbon-impl.h 2005/02/25 17:17:41 1.1.2.2
＠＠ -1,9 +1,22 ＠＠
/*
+ This file is part of XEmacs, a work distributed under the terms of the
+ GNU General Public License. It contains code by Andrew Choi, with the
+ original permissions notice:
+
The following code is original work by me, except where noted with
the comments "Taken from ..." or "Adapted from ...". I now place
it in the public domain.
- Andrew Choi. Calgary, Canada, February 9, 2005. */
+ Andrew Choi. Calgary, Canada, February 9, 2005.
+
+ Nevertheless, under the terms of the GNU GPL, we may distribute this file
+ with XEmacs only by relicensing it under the GNU GPL, and you are bound by
+ those terms. We're sorry for this double-talk, but we're afraid it is
+ necessary. Andrew Choi's code is available unencumbered by the GPL at
+
+ http://members.shaw.ca/akochoi-xemacs/diff/
+ ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/
+*/
#ifndef INCLUDED_console_carbon_impl_h_
#define INCLUDED_console_carbon_impl_h_
1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/console-carbon.c
Index: console-carbon.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/console-carbon.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- console-carbon.c 2005/02/25 16:29:57 1.1.2.1
+++ console-carbon.c 2005/02/25 17:17:41 1.1.2.2
＠＠ -1,9 +1,22 ＠＠
/*
+ This file is part of XEmacs, a work distributed under the terms of the
+ GNU General Public License. It contains code by Andrew Choi, with the
+ original permissions notice:
+
The following code is original work by me, except where noted with
the comments "Taken from ..." or "Adapted from ...". I now place
it in the public domain.
- Andrew Choi. Calgary, Canada, February 9, 2005. */
+ Andrew Choi. Calgary, Canada, February 9, 2005.
+
+ Nevertheless, under the terms of the GNU GPL, we may distribute this file
+ with XEmacs only by relicensing it under the GNU GPL, and you are bound by
+ those terms. We're sorry for this double-talk, but we're afraid it is
+ necessary. Andrew Choi's code is available unencumbered by the GPL at
+
+ http://members.shaw.ca/akochoi-xemacs/diff/
+ ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/
+*/
#include <config.h>
#include "lisp.h"
1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/device-carbon.c
Index: device-carbon.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/device-carbon.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- device-carbon.c 2005/02/25 16:29:58 1.1.2.1
+++ device-carbon.c 2005/02/25 17:17:41 1.1.2.2
＠＠ -1,9 +1,22 ＠＠
/*
+ This file is part of XEmacs, a work distributed under the terms of the
+ GNU General Public License. It contains code by Andrew Choi, with the
+ original permissions notice:
+
The following code is original work by me, except where noted with
the comments "Taken from ..." or "Adapted from ...". I now place
it in the public domain.
- Andrew Choi. Calgary, Canada, February 9, 2005. */
+ Andrew Choi. Calgary, Canada, February 9, 2005.
+
+ Nevertheless, under the terms of the GNU GPL, we may distribute this file
+ with XEmacs only by relicensing it under the GNU GPL, and you are bound by
+ those terms. We're sorry for this double-talk, but we're afraid it is
+ necessary. Andrew Choi's code is available unencumbered by the GPL at
+
+ http://members.shaw.ca/akochoi-xemacs/diff/
+ ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/
+*/
#include <config.h>
#include "lisp.h"
1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/event-carbon.c
Index: event-carbon.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/event-carbon.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- event-carbon.c 2005/02/25 16:29:59 1.1.2.1
+++ event-carbon.c 2005/02/25 17:17:41 1.1.2.2
＠＠ -1,9 +1,22 ＠＠
/*
+ This file is part of XEmacs, a work distributed under the terms of the
+ GNU General Public License. It contains code by Andrew Choi, with the
+ original permissions notice:
+
The following code is original work by me, except where noted with
the comments "Taken from ..." or "Adapted from ...". I now place
it in the public domain.
- Andrew Choi. Calgary, Canada, February 9, 2005. */
+ Andrew Choi. Calgary, Canada, February 9, 2005.
+
+ Nevertheless, under the terms of the GNU GPL, we may distribute this file
+ with XEmacs only by relicensing it under the GNU GPL, and you are bound by
+ those terms. We're sorry for this double-talk, but we're afraid it is
+ necessary. Andrew Choi's code is available unencumbered by the GPL at
+
+ http://members.shaw.ca/akochoi-xemacs/diff/
+ ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/
+*/
#include <config.h>
#include "lisp.h"
1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/frame-carbon.c
Index: frame-carbon.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/frame-carbon.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- frame-carbon.c 2005/02/25 16:30:01 1.1.2.1
+++ frame-carbon.c 2005/02/25 17:17:41 1.1.2.2
＠＠ -1,9 +1,22 ＠＠
/*
+ This file is part of XEmacs, a work distributed under the terms of the
+ GNU General Public License. It contains code by Andrew Choi, with the
+ original permissions notice:
+
The following code is original work by me, except where noted with
the comments "Taken from ..." or "Adapted from ...". I now place
it in the public domain.
- Andrew Choi. Calgary, Canada, February 9, 2005. */
+ Andrew Choi. Calgary, Canada, February 9, 2005.
+
+ Nevertheless, under the terms of the GNU GPL, we may distribute this file
+ with XEmacs only by relicensing it under the GNU GPL, and you are bound by
+ those terms. We're sorry for this double-talk, but we're afraid it is
+ necessary. Andrew Choi's code is available unencumbered by the GPL at
+
+ http://members.shaw.ca/akochoi-xemacs/diff/
+ ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/
+*/
#include <config.h>
#include "lisp.h"
1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/glyphs-carbon.c
Index: glyphs-carbon.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/glyphs-carbon.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- glyphs-carbon.c 2005/02/25 16:30:02 1.1.2.1
+++ glyphs-carbon.c 2005/02/25 17:17:42 1.1.2.2
＠＠ -1,9 +1,22 ＠＠
/*
+ This file is part of XEmacs, a work distributed under the terms of the
+ GNU General Public License. It contains code by Andrew Choi, with the
+ original permissions notice:
+
The following code is original work by me, except where noted with
the comments "Taken from ..." or "Adapted from ...". I now place
it in the public domain.
- Andrew Choi. Calgary, Canada, February 9, 2005. */
+ Andrew Choi. Calgary, Canada, February 9, 2005.
+
+ Nevertheless, under the terms of the GNU GPL, we may distribute this file
+ with XEmacs only by relicensing it under the GNU GPL, and you are bound by
+ those terms. We're sorry for this double-talk, but we're afraid it is
+ necessary. Andrew Choi's code is available unencumbered by the GPL at
+
+ http://members.shaw.ca/akochoi-xemacs/diff/
+ ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/
+*/
#include <config.h>
#include "lisp.h"
1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/glyphs-carbon.h
Index: glyphs-carbon.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/glyphs-carbon.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- glyphs-carbon.h 2005/02/25 16:30:03 1.1.2.1
+++ glyphs-carbon.h 2005/02/25 17:17:42 1.1.2.2
＠＠ -1,9 +1,22 ＠＠
/*
+ This file is part of XEmacs, a work distributed under the terms of the
+ GNU General Public License. It contains code by Andrew Choi, with the
+ original permissions notice:
+
The following code is original work by me, except where noted with
the comments "Taken from ..." or "Adapted from ...". I now place
it in the public domain.
- Andrew Choi. Calgary, Canada, February 9, 2005. */
+ Andrew Choi. Calgary, Canada, February 9, 2005.
+
+ Nevertheless, under the terms of the GNU GPL, we may distribute this file
+ with XEmacs only by relicensing it under the GNU GPL, and you are bound by
+ those terms. We're sorry for this double-talk, but we're afraid it is
+ necessary. Andrew Choi's code is available unencumbered by the GPL at
+
+ http://members.shaw.ca/akochoi-xemacs/diff/
+ ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/
+*/
#ifndef INCLUDED_glyphs_carbon_h_
#define INCLUDED_glyphs_carbon_h_
1.47.2.1 +6 -1 XEmacs/xemacs/src/glyphs.c
Index: glyphs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs.c,v
retrieving revision 1.47
retrieving revision 1.47.2.1
diff -u -r1.47 -r1.47.2.1
--- glyphs.c 2004/09/22 02:06:48 1.47
+++ glyphs.c 2005/02/25 17:17:42 1.47.2.1
＠＠ -49,8 +49,13 ＠＠
#include "sysfile.h"
-#if defined (HAVE_XPM) && !defined (HAVE_GTK)
+#if defined (HAVE_XPM)
+#if defined (HAVE_CARBON)
+#include "../carbon/xpm/xpm.h"
+void *XpmFree (void *ptr); /* local Xpm is missing this */
+#elif !defined (HAVE_GTK)
#include <X11/xpm.h>
+#endif
#endif
Lisp_Object Qimage_conversion_error;
1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/intl-carbon.c
Index: intl-carbon.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/intl-carbon.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- intl-carbon.c 2005/02/25 16:30:04 1.1.2.1
+++ intl-carbon.c 2005/02/25 17:17:42 1.1.2.2
＠＠ -1,9 +1,22 ＠＠
/*
+ This file is part of XEmacs, a work distributed under the terms of the
+ GNU General Public License. It contains code by Andrew Choi, with the
+ original permissions notice:
+
The following code is original work by me, except where noted with
the comments "Taken from ..." or "Adapted from ...". I now place
it in the public domain.
- Andrew Choi. Calgary, Canada, February 9, 2005. */
+ Andrew Choi. Calgary, Canada, February 9, 2005.
+
+ Nevertheless, under the terms of the GNU GPL, we may distribute this file
+ with XEmacs only by relicensing it under the GNU GPL, and you are bound by
+ those terms. We're sorry for this double-talk, but we're afraid it is
+ necessary. Andrew Choi's code is available unencumbered by the GPL at
+
+ http://members.shaw.ca/akochoi-xemacs/diff/
+ ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/
+*/
#include <config.h>
#include "lisp.h"
1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/menubar-carbon.c
Index: menubar-carbon.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/menubar-carbon.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- menubar-carbon.c 2005/02/25 16:30:04 1.1.2.1
+++ menubar-carbon.c 2005/02/25 17:17:42 1.1.2.2
＠＠ -1,9 +1,22 ＠＠
/*
+ This file is part of XEmacs, a work distributed under the terms of the
+ GNU General Public License. It contains code by Andrew Choi, with the
+ original permissions notice:
+
The following code is original work by me, except where noted with
the comments "Taken from ..." or "Adapted from ...". I now place
it in the public domain.
- Andrew Choi. Calgary, Canada, February 9, 2005. */
+ Andrew Choi. Calgary, Canada, February 9, 2005.
+
+ Nevertheless, under the terms of the GNU GPL, we may distribute this file
+ with XEmacs only by relicensing it under the GNU GPL, and you are bound by
+ those terms. We're sorry for this double-talk, but we're afraid it is
+ necessary. Andrew Choi's code is available unencumbered by the GPL at
+
+ http://members.shaw.ca/akochoi-xemacs/diff/
+ ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/
+*/
#include <config.h>
#include "lisp.h"
1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/objects-carbon-impl.h
Index: objects-carbon-impl.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/objects-carbon-impl.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- objects-carbon-impl.h 2005/02/25 16:30:05 1.1.2.1
+++ objects-carbon-impl.h 2005/02/25 17:17:43 1.1.2.2
＠＠ -1,9 +1,22 ＠＠
/*
+ This file is part of XEmacs, a work distributed under the terms of the
+ GNU General Public License. It contains code by Andrew Choi, with the
+ original permissions notice:
+
The following code is original work by me, except where noted with
the comments "Taken from ..." or "Adapted from ...". I now place
it in the public domain.
- Andrew Choi. Calgary, Canada, February 9, 2005. */
+ Andrew Choi. Calgary, Canada, February 9, 2005.
+
+ Nevertheless, under the terms of the GNU GPL, we may distribute this file
+ with XEmacs only by relicensing it under the GNU GPL, and you are bound by
+ those terms. We're sorry for this double-talk, but we're afraid it is
+ necessary. Andrew Choi's code is available unencumbered by the GPL at
+
+ http://members.shaw.ca/akochoi-xemacs/diff/
+ ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/
+*/
#ifndef INCLUDED_objects_carbon_impl_h_
#define INCLUDED_objects_carbon_impl_h_
1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/objects-carbon.c
Index: objects-carbon.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/objects-carbon.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- objects-carbon.c 2005/02/25 16:30:05 1.1.2.1
+++ objects-carbon.c 2005/02/25 17:17:43 1.1.2.2
＠＠ -1,9 +1,22 ＠＠
/*
+ This file is part of XEmacs, a work distributed under the terms of the
+ GNU General Public License. It contains code by Andrew Choi, with the
+ original permissions notice:
+
The following code is original work by me, except where noted with
the comments "Taken from ..." or "Adapted from ...". I now place
it in the public domain.
- Andrew Choi. Calgary, Canada, February 9, 2005. */
+ Andrew Choi. Calgary, Canada, February 9, 2005.
+
+ Nevertheless, under the terms of the GNU GPL, we may distribute this file
+ with XEmacs only by relicensing it under the GNU GPL, and you are bound by
+ those terms. We're sorry for this double-talk, but we're afraid it is
+ necessary. Andrew Choi's code is available unencumbered by the GPL at
+
+ http://members.shaw.ca/akochoi-xemacs/diff/
+ ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/
+*/
#include <config.h>
#include "lisp.h"
1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/redisplay-carbon.c
Index: redisplay-carbon.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/redisplay-carbon.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- redisplay-carbon.c 2005/02/25 16:30:06 1.1.2.1
+++ redisplay-carbon.c 2005/02/25 17:17:43 1.1.2.2
＠＠ -1,9 +1,22 ＠＠
/*
+ This file is part of XEmacs, a work distributed under the terms of the
+ GNU General Public License. It contains code by Andrew Choi, with the
+ original permissions notice:
+
The following code is original work by me, except where noted with
the comments "Taken from ..." or "Adapted from ...". I now place
it in the public domain.
- Andrew Choi. Calgary, Canada, February 9, 2005. */
+ Andrew Choi. Calgary, Canada, February 9, 2005.
+
+ Nevertheless, under the terms of the GNU GPL, we may distribute this file
+ with XEmacs only by relicensing it under the GNU GPL, and you are bound by
+ those terms. We're sorry for this double-talk, but we're afraid it is
+ necessary. Andrew Choi's code is available unencumbered by the GPL at
+
+ http://members.shaw.ca/akochoi-xemacs/diff/
+ ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/
+*/
#include <config.h>
#include "lisp.h"
1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/scrollbar-carbon.c
Index: scrollbar-carbon.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/scrollbar-carbon.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- scrollbar-carbon.c 2005/02/25 16:30:07 1.1.2.1
+++ scrollbar-carbon.c 2005/02/25 17:17:43 1.1.2.2
＠＠ -1,9 +1,22 ＠＠
/*
+ This file is part of XEmacs, a work distributed under the terms of the
+ GNU General Public License. It contains code by Andrew Choi, with the
+ original permissions notice:
+
The following code is original work by me, except where noted with
the comments "Taken from ..." or "Adapted from ...". I now place
it in the public domain.
- Andrew Choi. Calgary, Canada, February 9, 2005. */
+ Andrew Choi. Calgary, Canada, February 9, 2005.
+
+ Nevertheless, under the terms of the GNU GPL, we may distribute this file
+ with XEmacs only by relicensing it under the GNU GPL, and you are bound by
+ those terms. We're sorry for this double-talk, but we're afraid it is
+ necessary. Andrew Choi's code is available unencumbered by the GPL at
+
+ http://members.shaw.ca/akochoi-xemacs/diff/
+ ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/
+*/
#include <config.h>
#include "lisp.h"
1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/select-carbon.c
Index: select-carbon.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/select-carbon.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- select-carbon.c 2005/02/25 16:30:07 1.1.2.1
+++ select-carbon.c 2005/02/25 17:17:43 1.1.2.2
＠＠ -1,9 +1,22 ＠＠
/*
+ This file is part of XEmacs, a work distributed under the terms of the
+ GNU General Public License. It contains code by Andrew Choi, with the
+ original permissions notice:
+
The following code is original work by me, except where noted with
the comments "Taken from ..." or "Adapted from ...". I now place
it in the public domain.
- Andrew Choi. Calgary, Canada, February 9, 2005. */
+ Andrew Choi. Calgary, Canada, February 9, 2005.
+
+ Nevertheless, under the terms of the GNU GPL, we may distribute this file
+ with XEmacs only by relicensing it under the GNU GPL, and you are bound by
+ those terms. We're sorry for this double-talk, but we're afraid it is
+ necessary. Andrew Choi's code is available unencumbered by the GPL at
+
+ http://members.shaw.ca/akochoi-xemacs/diff/
+ ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/
+*/
#include <config.h>
#include "lisp.h"
1.1.2.2 +14 -1 XEmacs/xemacs/src/Attic/toolbar-carbon.c
Index: toolbar-carbon.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/toolbar-carbon.c,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- toolbar-carbon.c 2005/02/25 16:30:09 1.1.2.1
+++ toolbar-carbon.c 2005/02/25 17:17:44 1.1.2.2
＠＠ -1,9 +1,22 ＠＠
/*
+ This file is part of XEmacs, a work distributed under the terms of the
+ GNU General Public License. It contains code by Andrew Choi, with the
+ original permissions notice:
+
The following code is original work by me, except where noted with
the comments "Taken from ..." or "Adapted from ...". I now place
it in the public domain.
- Andrew Choi. Calgary, Canada, February 9, 2005. */
+ Andrew Choi. Calgary, Canada, February 9, 2005.
+
+ Nevertheless, under the terms of the GNU GPL, we may distribute this file
+ with XEmacs only by relicensing it under the GNU GPL, and you are bound by
+ those terms. We're sorry for this double-talk, but we're afraid it is
+ necessary. Andrew Choi's code is available unencumbered by the GPL at
+
+ http://members.shaw.ca/akochoi-xemacs/diff/
+ ftp://ftp.xemacs.org/pub/xemacs/permissively-licensed/
+*/
#include <config.h>
#include "lisp.h"
- 1 participants
- 0 comments
CVS update by stephent MODIFIED: xemacs/src, console-impl.h, device-impl.h, faces.c, redisplay.c ...
19 years, 2 months
CVS Monitor
CVS Monitor
User: stephent
Date: 05/02/25 17:30:16
Modified: xemacs/src Tag: carbon2 Makefile.in.in config.h.in
console-impl.h console.c console.h depend
device-impl.h doc.c emacs.c event-stream.c events.h
faces.c frame-impl.h frame.c general-slots.h
redisplay.c symsinit.h toolbar.c window.c
Added: xemacs/carbon Tag: carbon2 README build-app.sh
xemacs/carbon/XEmacs.app/Contents Tag: carbon2 Info.plist
PkgInfo
xemacs/carbon/XEmacs.app/Contents/Resources Tag: carbon2
Emacs.icns
xemacs/carbon/xpm Tag: carbon2 Attrib.c CrDatFrI.c
CrIFrBuf.c Image.c Info.c Makefile RdFToDat.c
RdFToI.c XpmI.h data.c hashtab.c misc.c parse.c
xpm.h
xemacs/lisp Tag: carbon2 carbon-faces.el carbon-glyphs.el
carbon-init.el
xemacs/src Tag: carbon2 console-carbon-impl.h
console-carbon.c device-carbon.c event-carbon.c
frame-carbon.c glyphs-carbon.c glyphs-carbon.h
intl-carbon.c menubar-carbon.c
objects-carbon-impl.h objects-carbon.c
redisplay-carbon.c scrollbar-carbon.c
select-carbon.c toolbar-carbon.c
Log:
patch up to akochoi-b1
Revision Changes Path
No revision
No revision
1.21.2.1 +8 -3 XEmacs/xemacs/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/Makefile.in.in,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -r1.21 -r1.21.2.1
--- Makefile.in.in 2004/09/10 11:58:08 1.21
+++ Makefile.in.in 2005/02/25 16:29:19 1.21.2.1
＠＠ -395,13 +395,18 ＠＠
${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}
-chmod 0755 ${bindir}/${PROGNAME}
#else
+# ifdef HAVE_CARBON
+ ${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/../../MacOS/XEmacs
+ -chmod 0755 ${bindir}/../../MacOS/XEmacs
+# else
${INSTALL_PROGRAM} src/${PROGNAME} ${bindir}/${PROGNAME}-${version}
-chmod 0755 ${bindir}/${PROGNAME}-${version}
-# ifdef CYGWIN
+# ifdef CYGWIN
cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version}.exe ./${PROGNAME}
-# else
+# else
cd ${bindir} && $(RM) ./${PROGNAME} && ${LN_S} ${PROGNAME}-${version} ./${PROGNAME}
-# endif /* CYGWIN */
+# endif /* CYGWIN */
+# endif /* HAVE_CARBON */
#endif /* WIN32_NATIVE */
if test "${prefix}" != "${exec_prefix}"; then \
$(MAKEPATH) ${exec_prefix}/lib/${instvardir}; \
1.230.2.1 +871 -833 XEmacs/xemacs/configure
Index: configure
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v
retrieving revision 1.230
retrieving revision 1.230.2.1
diff -u -r1.230 -r1.230.2.1
--- configure 2004/10/22 05:16:57 1.230
+++ configure 2005/02/25 16:29:20 1.230.2.1
＠＠ -256,6 +256,7 ＠＠
dynamic=''
with_x11=''
with_msw=''
+with_carbon=''
rel_alloc='default'
with_system_malloc='default'
with_dlmalloc='default'
＠＠ -327,6 +328,7 ＠＠
with_gtk | \
with_gnome | \
with_msw | \
+ with_carbon | \
with_gcc | \
dynamic | \
with_ncurses | \
＠＠ -779,6 +781,7 ＠＠
"") val=yes ;;
g | gt | gtk ) val=gtk ;;
ms | msw ) val=msw ;;
+ c | ca | car | carb | carbo | carbon ) val=carbon ;;
* ) (echo "$progname: Usage error:"
echo " " "The \`--$optname' option must have one of these values:
\`gtk', \`lucid', \`motif', \`athena', \`yes', or \`no'."
＠＠ -849,7 +852,7 ＠＠
fi
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:853: checking whether ln -s works" >&5
+echo "configure:856: checking whether ln -s works" >&5
rm -f conftestdata
if ln -s X conftestdata 2>/dev/null
＠＠ -1135,7 +1138,7 ＠＠
echo $ac_n "checking "host system type"""... $ac_c" 1>&6
-echo "configure:1139: checking "host system type"" >&5
+echo "configure:1142: checking "host system type"" >&5
internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'`
canonical=`${CONFIG_SHELL-/bin/sh} $srcdir/config.sub "$internal_configuration"`
configuration=`echo "$configuration" | sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'`
＠＠ -1673,7 +1676,7 ＠＠
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1677: checking for $ac_word" >&5
+echo "configure:1680: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -1700,7 +1703,7 ＠＠
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1704: checking for $ac_word" >&5
+echo "configure:1707: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -1748,7 +1751,7 ＠＠
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1752: checking for $ac_word" >&5
+echo "configure:1755: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -1777,7 +1780,7 ＠＠
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1781: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1784: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
＠＠ -1790,12 +1793,12 ＠＠
cat > conftest.$ac_ext << EOF
-#line 1794 "configure"
+#line 1797 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
＠＠ -1823,19 +1826,19 ＠＠
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1827: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1830: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1832: checking whether we are using GNU C" >&5
+echo "configure:1835: checking whether we are using GNU C" >&5
cat > conftest.c <<EOF
#ifdef __GNUC__
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
＠＠ -1853,7 +1856,7 ＠＠
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1857: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1860: checking whether ${CC-cc} accepts -g" >&5
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
＠＠ -1886,7 +1889,7 ＠＠
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1890: checking for $ac_word" >&5
+echo "configure:1893: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -1913,7 +1916,7 ＠＠
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1917: checking for $ac_word" >&5
+echo "configure:1920: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -1961,7 +1964,7 ＠＠
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1965: checking for $ac_word" >&5
+echo "configure:1968: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -1990,7 +1993,7 ＠＠
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1994: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1997: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
＠＠ -2003,12 +2006,12 ＠＠
cat > conftest.$ac_ext << EOF
-#line 2007 "configure"
+#line 2010 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:2012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
＠＠ -2036,19 +2039,19 ＠＠
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2040: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2043: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2045: checking whether we are using GNU C" >&5
+echo "configure:2048: checking whether we are using GNU C" >&5
cat > conftest.c <<EOF
#ifdef __GNUC__
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
＠＠ -2066,7 +2069,7 ＠＠
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2070: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2073: checking whether ${CC-cc} accepts -g" >&5
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
＠＠ -2099,7 +2102,7 ＠＠
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2103: checking for $ac_word" >&5
+echo "configure:2106: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -2126,7 +2129,7 ＠＠
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2130: checking for $ac_word" >&5
+echo "configure:2133: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -2174,7 +2177,7 ＠＠
# Extract the first word of "cl", so it can be a program name with args.
set dummy cl; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2178: checking for $ac_word" >&5
+echo "configure:2181: checking for $ac_word" >&5
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
＠＠ -2203,7 +2206,7 ＠＠
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2207: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2210: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
＠＠ -2216,12 +2219,12 ＠＠
cat > conftest.$ac_ext << EOF
-#line 2220 "configure"
+#line 2223 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:2225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
＠＠ -2249,19 +2252,19 ＠＠
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2253: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2256: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2258: checking whether we are using GNU C" >&5
+echo "configure:2261: checking whether we are using GNU C" >&5
cat > conftest.c <<EOF
#ifdef __GNUC__
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
＠＠ -2279,7 +2282,7 ＠＠
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2283: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2286: checking whether ${CC-cc} accepts -g" >&5
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
＠＠ -2312,7 +2315,7 ＠＠
if test "$GCC" = "yes"; then
cat > conftest.$ac_ext <<EOF
-#line 2316 "configure"
+#line 2319 "configure"
#include "confdefs.h"
int main () {
#if __GNUC__ >= 3
＠＠ -2322,7 +2325,7 ＠＠
#endif
}
EOF
-if { (eval echo configure:2326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:2329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
:
else
＠＠ -2348,7 +2351,7 ＠＠
test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP"
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2352: checking how to run the C preprocessor" >&5
+echo "configure:2355: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
＠＠ -2361,13 +2364,13 ＠＠
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 2365 "configure"
+#line 2368 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
＠＠ -2378,13 +2381,13 ＠＠
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 2382 "configure"
+#line 2385 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
＠＠ -2395,13 +2398,13 ＠＠
rm -rf conftest*
CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF
-#line 2399 "configure"
+#line 2402 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2408: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
:
＠＠ -2427,9 +2430,9 ＠＠
echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:2431: checking for AIX" >&5
+echo "configure:2434: checking for AIX" >&5
cat > conftest.$ac_ext <<EOF
-#line 2433 "configure"
+#line 2436 "configure"
#include "confdefs.h"
#ifdef _AIX
yes
＠＠ -2456,9 +2459,9 ＠＠
echo $ac_n "checking for GNU libc""... $ac_c" 1>&6
-echo "configure:2460: checking for GNU libc" >&5
+echo "configure:2463: checking for GNU libc" >&5
cat > conftest.$ac_ext <<EOF
-#line 2462 "configure"
+#line 2465 "configure"
#include "confdefs.h"
#include <features.h>
int main() {
＠＠ -2470,7 +2473,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:2474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
have_glibc=yes
else
＠＠ -2565,7 +2568,7 ＠＠
esac
cat > conftest.$ac_ext <<EOF
-#line 2569 "configure"
+#line 2572 "configure"
#include "confdefs.h"
int main () {
#if defined __SUNPRO_C
＠＠ -2581,7 +2584,7 ＠＠
#endif
}
EOF
-if { (eval echo configure:2585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:2588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
:
else
＠＠ -2835,17 +2838,17 ＠＠
if test "$__USLC__" = yes; then
echo $ac_n "checking for whether the -Kalloca compiler flag is needed""... $ac_c" 1>&6
-echo "configure:2839: checking for whether the -Kalloca compiler flag is needed" >&5
+echo "configure:2842: checking for whether the -Kalloca compiler flag is needed" >&5
need_kalloca=no
cat > conftest.$ac_ext <<EOF
-#line 2842 "configure"
+#line 2845 "configure"
#include "confdefs.h"
int main() {
void *x = alloca(4);
; return 0; }
EOF
-if { (eval echo configure:2849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
:
else
＠＠ -2856,14 +2859,14 ＠＠
xe_save_c_switch_system="$c_switch_system"
c_switch_system="$c_switch_system -Kalloca"
cat > conftest.$ac_ext <<EOF
-#line 2860 "configure"
+#line 2863 "configure"
#include "confdefs.h"
int main() {
void *x = alloca(4);
; return 0; }
EOF
-if { (eval echo configure:2867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
need_kalloca=yes
else
＠＠ -2892,7 +2895,7 ＠＠
echo $ac_n "checking for preferred CFLAGS""... $ac_c" 1>&6
-echo "configure:2896: checking for preferred CFLAGS" >&5
+echo "configure:2899: checking for preferred CFLAGS" >&5
if test "$cflags_specified" = "no"; then
if test "$GCC" = "yes"; then
＠＠ -2915,7 +2918,7 ＠＠
echo $ac_n "checking for preferred warning flags for XEMACS_CC""... $ac_c" 1>&6
-echo "configure:2919: checking for preferred warning flags for XEMACS_CC" >&5
+echo "configure:2922: checking for preferred warning flags for XEMACS_CC" >&5
xe_cflags_warning=""
＠＠ -2948,7 +2951,7 ＠＠
echo "$ac_t""${xe_cflags_warning}" 1>&6
echo $ac_n "checking for preferred warning flags for CC""... $ac_c" 1>&6
-echo "configure:2952: checking for preferred warning flags for CC" >&5
+echo "configure:2955: checking for preferred warning flags for CC" >&5
echo "$ac_t""${cflags_warning}" 1>&6
XE_CFLAGS="$xe_cflags_warning $CFLAGS"
＠＠ -2956,7 +2959,7 ＠＠
if test "$GCC" = "yes"; then
echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6
-echo "configure:2960: checking for buggy gcc versions" >&5
+echo "configure:2963: checking for buggy gcc versions" >&5
GCC_VERSION=`$CC --version`
case `uname -s`:`uname -m`:$GCC_VERSION in
*:sun4*:2.8.1|*:sun4*:egcs-2.90.*)
＠＠ -3014,7 +3017,7 ＠＠
if test "$pdump" != "yes"; then
echo $ac_n "checking for \"-z nocombreloc\" linker flag""... $ac_c" 1>&6
-echo "configure:3018: checking for \"-z nocombreloc\" linker flag" >&5
+echo "configure:3021: checking for \"-z nocombreloc\" linker flag" >&5
case "`ld --help 2>&1`" in
*-z\ nocombreloc* ) echo "$ac_t""yes" 1>&6
ld_switch_site="-z nocombreloc $ld_switch_site" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-z nocombreloc\" to \$ld_switch_site"; fi ;;
＠＠ -3103,7 +3106,7 ＠＠
fi
echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:3107: checking for dynodump" >&5
+echo "configure:3110: checking for dynodump" >&5
if test "$unexec" != "unexsol2.o"; then
echo "$ac_t""no" 1>&6
else
＠＠ -3140,12 +3143,12 ＠＠
done
echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6
-echo "configure:3144: checking for terminateAndUnload in -lC" >&5
+echo "configure:3147: checking for terminateAndUnload in -lC" >&5
ac_lib_var=`echo C'_'terminateAndUnload | sed 'y%./+-%__p_%'`
xe_check_libs=" -lC "
cat > conftest.$ac_ext <<EOF
-#line 3149 "configure"
+#line 3152 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -3156,7 +3159,7 ＠＠
terminateAndUnload()
; return 0; }
EOF
-if { (eval echo configure:3160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -3198,7 +3201,7 ＠＠
libc_version=""
echo $ac_n "checking for compiler version information""... $ac_c" 1>&6
-echo "configure:3202: checking for compiler version information" >&5
+echo "configure:3205: checking for compiler version information" >&5
if test "$GCC" = "yes"; then
compiler_version=`$XEMACS_CC --version | head -1`
＠＠ -3249,7 +3252,7 ＠＠
fi
echo $ac_n "checking for standard C library version information""... $ac_c" 1>&6
-echo "configure:3253: checking for standard C library version information" >&5
+echo "configure:3256: checking for standard C library version information" >&5
case "$canonical" in
*-*-linux*)
＠＠ -3361,7 +3364,7 ＠＠
if test "$add_runtime_path" = "yes"; then
echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:3365: checking "for runtime libraries flag"" >&5
+echo "configure:3368: checking "for runtime libraries flag"" >&5
case "$opsys" in
sol2 ) dash_r="-R" ;;
decosf* | linux* | irix*) dash_r="-rpath " ;;
＠＠ -3383,14 +3386,14 ＠＠
done
fi
cat > conftest.$ac_ext <<EOF
-#line 3387 "configure"
+#line 3390 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:3394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
dash_r="$try_dash_r"
else
＠＠ -3491,10 +3494,10 ＠＠
fi
after_morecore_hook_exists=yes
echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
-echo "configure:3495: checking for malloc_set_state" >&5
+echo "configure:3498: checking for malloc_set_state" >&5
cat > conftest.$ac_ext <<EOF
-#line 3498 "configure"
+#line 3501 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char malloc_set_state(); below. */
＠＠ -3517,7 +3520,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:3521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_malloc_set_state=yes"
else
＠＠ -3537,16 +3540,16 ＠＠
fi
echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
-echo "configure:3541: checking whether __after_morecore_hook exists" >&5
+echo "configure:3544: checking whether __after_morecore_hook exists" >&5
cat > conftest.$ac_ext <<EOF
-#line 3543 "configure"
+#line 3546 "configure"
#include "confdefs.h"
extern void (* __after_morecore_hook)();
int main() {
__after_morecore_hook = 0
; return 0; }
EOF
-if { (eval echo configure:3550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
＠＠ -3602,7 +3605,7 ＠＠
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3606: checking for $ac_word" >&5
+echo "configure:3609: checking for $ac_word" >&5
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
＠＠ -3657,7 +3660,7 ＠＠
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:3661: checking for a BSD compatible install" >&5
+echo "configure:3664: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
＠＠ -3711,7 +3714,7 ＠＠
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3715: checking for $ac_word" >&5
+echo "configure:3718: checking for $ac_word" >&5
if test -n "$YACC"; then
ac_cv_prog_YACC="$YACC" # Let the user override the test.
＠＠ -3743,15 +3746,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3747: checking for $ac_hdr" >&5
+echo "configure:3750: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 3750 "configure"
+#line 3753 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -3781,10 +3784,10 ＠＠
done
echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3785: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3788: checking for sys/wait.h that is POSIX.1 compatible" >&5
cat > conftest.$ac_ext <<EOF
-#line 3788 "configure"
+#line 3791 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/wait.h>
＠＠ -3800,7 +3803,7 ＠＠
s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
; return 0; }
EOF
-if { (eval echo configure:3804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_sys_wait_h=yes
else
＠＠ -3824,10 +3827,10 ＠＠
fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3828: checking for ANSI C header files" >&5
+echo "configure:3831: checking for ANSI C header files" >&5
cat > conftest.$ac_ext <<EOF
-#line 3831 "configure"
+#line 3834 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
＠＠ -3835,7 +3838,7 ＠＠
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -3852,7 +3855,7 ＠＠
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 3856 "configure"
+#line 3859 "configure"
#include "confdefs.h"
#include <string.h>
EOF
＠＠ -3870,7 +3873,7 ＠＠
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 3874 "configure"
+#line 3877 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
＠＠ -3888,7 +3891,7 ＠＠
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
cat > conftest.$ac_ext <<EOF
-#line 3892 "configure"
+#line 3895 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
＠＠ -3899,7 +3902,7 ＠＠
exit (0); }
EOF
-if { (eval echo configure:3903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
:
else
＠＠ -3925,10 +3928,10 ＠＠
fi
echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3929: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3932: checking whether time.h and sys/time.h may both be included" >&5
cat > conftest.$ac_ext <<EOF
-#line 3932 "configure"
+#line 3935 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
＠＠ -3937,7 +3940,7 ＠＠
struct tm *tp;
; return 0; }
EOF
-if { (eval echo configure:3941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_header_time=yes
else
＠＠ -3961,10 +3964,10 ＠＠
fi
echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:3965: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:3968: checking for sys_siglist declaration in signal.h or unistd.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 3968 "configure"
+#line 3971 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
＠＠ -3976,7 +3979,7 ＠＠
char *msg = *(sys_siglist + 1);
; return 0; }
EOF
-if { (eval echo configure:3980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_decl_sys_siglist=yes
else
＠＠ -4002,9 +4005,9 ＠＠
echo $ac_n "checking for utime""... $ac_c" 1>&6
-echo "configure:4006: checking for utime" >&5
+echo "configure:4009: checking for utime" >&5
cat > conftest.$ac_ext <<EOF
-#line 4008 "configure"
+#line 4011 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <utime.h>
＠＠ -4012,7 +4015,7 ＠＠
struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x);
; return 0; }
EOF
-if { (eval echo configure:4016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
{ test "$extra_verbose" = "yes" && cat << \EOF
＠＠ -4031,10 +4034,10 ＠＠
for ac_func in utimes
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4035: checking for $ac_func" >&5
+echo "configure:4038: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 4038 "configure"
+#line 4041 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -4057,7 +4060,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:4061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -4089,10 +4092,10 ＠＠
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:4093: checking return type of signal handlers" >&5
+echo "configure:4096: checking return type of signal handlers" >&5
cat > conftest.$ac_ext <<EOF
-#line 4096 "configure"
+#line 4099 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
＠＠ -4109,7 +4112,7 ＠＠
int i;
; return 0; }
EOF
-if { (eval echo configure:4113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
＠＠ -4131,10 +4134,10 ＠＠
echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:4135: checking for size_t" >&5
+echo "configure:4138: checking for size_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 4138 "configure"
+#line 4141 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
＠＠ -4165,10 +4168,10 ＠＠
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:4169: checking for pid_t" >&5
+echo "configure:4172: checking for pid_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 4172 "configure"
+#line 4175 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
＠＠ -4199,10 +4202,10 ＠＠
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:4203: checking for uid_t in sys/types.h" >&5
+echo "configure:4206: checking for uid_t in sys/types.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 4206 "configure"
+#line 4209 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
＠＠ -4238,10 +4241,10 ＠＠
fi
echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:4242: checking for mode_t" >&5
+echo "configure:4245: checking for mode_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 4245 "configure"
+#line 4248 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
＠＠ -4272,10 +4275,10 ＠＠
fi
echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:4276: checking for off_t" >&5
+echo "configure:4279: checking for off_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 4279 "configure"
+#line 4282 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
＠＠ -4306,10 +4309,10 ＠＠
fi
echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:4310: checking for ssize_t" >&5
+echo "configure:4313: checking for ssize_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 4313 "configure"
+#line 4316 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
＠＠ -4342,9 +4345,9 ＠＠
if test "$ac_cv_header_inttypes_h" != "yes"; then
echo $ac_n "checking for intptr_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:4346: checking for intptr_t in sys/types.h" >&5
+echo "configure:4349: checking for intptr_t in sys/types.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 4348 "configure"
+#line 4351 "configure"
#include "confdefs.h"
#include <sys/types.h>
intptr_t x;
＠＠ -4353,7 +4356,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:4357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
{ test "$extra_verbose" = "yes" && cat << \EOF
＠＠ -4374,9 +4377,9 ＠＠
fi
echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:4378: checking for socklen_t" >&5
+echo "configure:4381: checking for socklen_t" >&5
cat > conftest.$ac_ext <<EOF
-#line 4380 "configure"
+#line 4383 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/socket.h>
＠＠ -4386,7 +4389,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:4390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4393: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
＠＠ -4395,7 +4398,7 ＠＠
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 4399 "configure"
+#line 4402 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/socket.h>
＠＠ -4405,7 +4408,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:4409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4412: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""size_t" 1>&6
＠＠ -4437,9 +4440,9 ＠＠
rm -f conftest*
echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:4441: checking for struct timeval" >&5
+echo "configure:4444: checking for struct timeval" >&5
cat > conftest.$ac_ext <<EOF
-#line 4443 "configure"
+#line 4446 "configure"
#include "confdefs.h"
#ifdef TIME_WITH_SYS_TIME
#include <sys/time.h>
＠＠ -4455,7 +4458,7 ＠＠
static struct timeval x; x.tv_sec = x.tv_usec;
; return 0; }
EOF
-if { (eval echo configure:4459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
HAVE_TIMEVAL=yes
＠＠ -4477,10 +4480,10 ＠＠
rm -f conftest*
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:4481: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:4484: checking whether struct tm is in sys/time.h or time.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 4484 "configure"
+#line 4487 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
＠＠ -4488,7 +4491,7 ＠＠
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
-if { (eval echo configure:4492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
＠＠ -4512,10 +4515,10 ＠＠
fi
echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:4516: checking for tm_zone in struct tm" >&5
+echo "configure:4519: checking for tm_zone in struct tm" >&5
cat > conftest.$ac_ext <<EOF
-#line 4519 "configure"
+#line 4522 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_cv_struct_tm>
＠＠ -4523,7 +4526,7 ＠＠
struct tm tm; tm.tm_zone;
; return 0; }
EOF
-if { (eval echo configure:4527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm_zone=yes
else
＠＠ -4546,10 +4549,10 ＠＠
else
echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:4550: checking for tzname" >&5
+echo "configure:4553: checking for tzname" >&5
cat > conftest.$ac_ext <<EOF
-#line 4553 "configure"
+#line 4556 "configure"
#include "confdefs.h"
#include <time.h>
#ifndef tzname /* For SGI. */
＠＠ -4559,7 +4562,7 ＠＠
atoi(*tzname);
; return 0; }
EOF
-if { (eval echo configure:4563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_var_tzname=yes
else
＠＠ -4585,10 +4588,10 ＠＠
echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4589: checking for working const" >&5
+echo "configure:4592: checking for working const" >&5
cat > conftest.$ac_ext <<EOF
-#line 4592 "configure"
+#line 4595 "configure"
#include "confdefs.h"
int main() {
＠＠ -4637,7 +4640,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:4641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
＠＠ -4662,7 +4665,7 ＠＠
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:4666: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:4669: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
cat > conftestmake <<\EOF
＠＠ -4687,12 +4690,12 ＠＠
echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:4691: checking whether byte ordering is bigendian" >&5
+echo "configure:4694: checking whether byte ordering is bigendian" >&5
ac_cv_c_bigendian=unknown
# See if sys/param.h defines the BYTE_ORDER macro.
cat > conftest.$ac_ext <<EOF
-#line 4696 "configure"
+#line 4699 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
＠＠ -4703,11 +4706,11 ＠＠
#endif
; return 0; }
EOF
-if { (eval echo configure:4707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# It does; now see whether it defined to BIG_ENDIAN or not.
cat > conftest.$ac_ext <<EOF
-#line 4711 "configure"
+#line 4714 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/param.h>
＠＠ -4718,7 +4721,7 ＠＠
#endif
; return 0; }
EOF
-if { (eval echo configure:4722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4725: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_bigendian=yes
else
＠＠ -4735,7 +4738,7 ＠＠
rm -f conftest*
if test $ac_cv_c_bigendian = unknown; then
cat > conftest.$ac_ext <<EOF
-#line 4739 "configure"
+#line 4742 "configure"
#include "confdefs.h"
main () {
/* Are we little or big endian? From Harbison&Steele. */
＠＠ -4748,7 +4751,7 ＠＠
exit (u.c[sizeof (long) - 1] == 1);
}
EOF
-if { (eval echo configure:4752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_c_bigendian=no
else
＠＠ -4775,13 +4778,12 ＠＠
echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:4779: checking size of short" >&5
+echo "configure:4782: checking size of short" >&5
cat > conftest.$ac_ext <<EOF
-#line 4782 "configure"
+#line 4785 "configure"
#include "confdefs.h"
#include <stdio.h>
-#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
＠＠ -4790,7 +4792,7 ＠＠
exit(0);
}
EOF
-if { (eval echo configure:4794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_short=`cat conftestval`
else
＠＠ -4818,13 +4820,12 ＠＠
exit 1
fi
echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4822: checking size of int" >&5
+echo "configure:4824: checking size of int" >&5
cat > conftest.$ac_ext <<EOF
-#line 4825 "configure"
+#line 4827 "configure"
#include "confdefs.h"
#include <stdio.h>
-#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
＠＠ -4833,7 +4834,7 ＠＠
exit(0);
}
EOF
-if { (eval echo configure:4837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_int=`cat conftestval`
else
＠＠ -4855,13 +4856,12 ＠＠
echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4859: checking size of long" >&5
+echo "configure:4860: checking size of long" >&5
cat > conftest.$ac_ext <<EOF
-#line 4862 "configure"
+#line 4863 "configure"
#include "confdefs.h"
#include <stdio.h>
-#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
＠＠ -4898,7 +4898,6 ＠＠
#line 4899 "configure"
#include "confdefs.h"
#include <stdio.h>
-#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
＠＠ -4907,7 +4906,7 ＠＠
exit(0);
}
EOF
-if { (eval echo configure:4911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_long_long=`cat conftestval`
else
＠＠ -4929,13 +4928,12 ＠＠
echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:4933: checking size of void *" >&5
+echo "configure:4932: checking size of void *" >&5
cat > conftest.$ac_ext <<EOF
-#line 4936 "configure"
+#line 4935 "configure"
#include "confdefs.h"
#include <stdio.h>
-#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
＠＠ -4944,7 +4942,7 ＠＠
exit(0);
}
EOF
-if { (eval echo configure:4948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_void_p=`cat conftestval`
else
＠＠ -4966,13 +4964,12 ＠＠
echo $ac_n "checking size of double""... $ac_c" 1>&6
-echo "configure:4970: checking size of double" >&5
+echo "configure:4968: checking size of double" >&5
cat > conftest.$ac_ext <<EOF
-#line 4973 "configure"
+#line 4971 "configure"
#include "confdefs.h"
#include <stdio.h>
-#include <sys/types.h>
main()
{
FILE *f=fopen("conftestval", "w");
＠＠ -4981,7 +4978,7 ＠＠
exit(0);
}
EOF
-if { (eval echo configure:4985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_sizeof_double=`cat conftestval`
else
＠＠ -5004,7 +5001,7 ＠＠
echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:5008: checking for long file names" >&5
+echo "configure:5005: checking for long file names" >&5
ac_cv_sys_long_file_names=yes
# Test for long file names in all the places we know might matter:
＠＠ -5050,10 +5047,10 ＠＠
echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:5054: checking for sin" >&5
+echo "configure:5051: checking for sin" >&5
cat > conftest.$ac_ext <<EOF
-#line 5057 "configure"
+#line 5054 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char sin(); below. */
＠＠ -5076,7 +5073,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:5080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_sin=yes"
else
＠＠ -5094,12 +5091,12 ＠＠
echo "$ac_t""no" 1>&6
echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:5098: checking for sin in -lm" >&5
+echo "configure:5095: checking for sin in -lm" >&5
ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
xe_check_libs=" -lm "
cat > conftest.$ac_ext <<EOF
-#line 5103 "configure"
+#line 5100 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -5110,7 +5107,7 ＠＠
sin()
; return 0; }
EOF
-if { (eval echo configure:5114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -5145,14 +5142,14 ＠＠
cat > conftest.$ac_ext <<EOF
-#line 5149 "configure"
+#line 5146 "configure"
#include "confdefs.h"
#include <math.h>
int main() {
return atanh(1.0) + asinh(1.0) + acosh(1.0);
; return 0; }
EOF
-if { (eval echo configure:5156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_INVERSE_HYPERBOLIC
＠＠ -5171,10 +5168,10 ＠＠
for ac_func in mkstemp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5175: checking for $ac_func" >&5
+echo "configure:5172: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 5178 "configure"
+#line 5175 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -5197,7 +5194,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:5201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -5226,14 +5223,14 ＠＠
echo "checking type of mail spool file locking" 1>&6
-echo "configure:5230: checking type of mail spool file locking" >&5
+echo "configure:5227: checking type of mail spool file locking" >&5
for ac_func in lockf flock
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5234: checking for $ac_func" >&5
+echo "configure:5231: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 5237 "configure"
+#line 5234 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -5256,7 +5253,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:5260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -5338,12 +5335,12 ＠＠
case "$opsys" in decosf*)
echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:5342: checking for cma_open in -lpthreads" >&5
+echo "configure:5339: checking for cma_open in -lpthreads" >&5
ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lpthreads "
cat > conftest.$ac_ext <<EOF
-#line 5347 "configure"
+#line 5344 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -5354,7 +5351,7 ＠＠
cma_open()
; return 0; }
EOF
-if { (eval echo configure:5358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -5391,7 +5388,7 ＠＠
echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:5395: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:5392: checking whether the -xildoff compiler flag is required" >&5
if ${CC-cc} '-###' -xildon no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then
if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ;
then echo "$ac_t""no" 1>&6;
＠＠ -5403,7 +5400,7 ＠＠
if test "$opsys" = "sol2"; then
if test "$os_release" -ge 506; then
echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:5407: checking for \"-z ignore\" linker flag" >&5
+echo "configure:5404: checking for \"-z ignore\" linker flag" >&5
case "`ld -h 2>&1`" in
*-z\ ignore\|record* ) echo "$ac_t""yes" 1>&6
ld_switch_site="-z ignore $ld_switch_site" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-z ignore\" to \$ld_switch_site"; fi ;;
＠＠ -5414,7 +5411,7 ＠＠
echo "checking "for specified window system"" 1>&6
-echo "configure:5418: checking "for specified window system"" >&5
+echo "configure:5415: checking "for specified window system"" >&5
GNOME_CONFIG=no
＠＠ -5422,7 +5419,7 ＠＠
if test "$with_gnome" != "no"; then
echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6
-echo "configure:5426: checking for GNOME configuration script" >&5
+echo "configure:5423: checking for GNOME configuration script" >&5
for possible in gnome-config
do
possible_version=`${possible} --version 2> /dev/null`
＠＠ -5453,7 +5450,7 ＠＠
if test "$with_gtk" != "no";then
echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6
-echo "configure:5457: checking for GTK configuration script" >&5
+echo "configure:5454: checking for GTK configuration script" >&5
for possible in gtk12-config gtk14-config gtk-config
do
possible_version=`${possible} --version 2> /dev/null`
＠＠ -5475,18 +5472,18 ＠＠
if test "${GTK_CONFIG}" != "no"; then
echo $ac_n "checking gtk version""... $ac_c" 1>&6
-echo "configure:5479: checking gtk version" >&5
+echo "configure:5476: checking gtk version" >&5
GTK_VERSION=`${GTK_CONFIG} --version`
echo "$ac_t""${GTK_VERSION}" 1>&6
echo $ac_n "checking gtk libs""... $ac_c" 1>&6
-echo "configure:5484: checking gtk libs" >&5
+echo "configure:5481: checking gtk libs" >&5
GTK_LIBS=`${GTK_CONFIG} --libs`
libs_gtk="$libs_gtk ${GTK_LIBS}" && if test "$extra_verbose" = "yes"; then echo " Appending \"${GTK_LIBS}\" to \$libs_gtk"; fi
echo "$ac_t""${GTK_LIBS}" 1>&6
echo $ac_n "checking gtk cflags""... $ac_c" 1>&6
-echo "configure:5490: checking gtk cflags" >&5
+echo "configure:5487: checking gtk cflags" >&5
GTK_CFLAGS=`${GTK_CONFIG} --cflags`
if test "$GCC" = "yes"; then
GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow"
＠＠ -5496,19 +5493,19 ＠＠
echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6
-echo "configure:5500: checking for main in -lgdk_imlib" >&5
+echo "configure:5497: checking for main in -lgdk_imlib" >&5
ac_lib_var=`echo gdk_imlib'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgdk_imlib "
cat > conftest.$ac_ext <<EOF
-#line 5505 "configure"
+#line 5502 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -5530,12 +5527,12 ＠＠
echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6
-echo "configure:5534: checking for Imlib_init in -lImlib" >&5
+echo "configure:5531: checking for Imlib_init in -lImlib" >&5
ac_lib_var=`echo Imlib'_'Imlib_init | sed 'y%./+-%__p_%'`
xe_check_libs=" -lImlib "
cat > conftest.$ac_ext <<EOF
-#line 5539 "configure"
+#line 5536 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -5546,7 +5543,7 ＠＠
Imlib_init()
; return 0; }
EOF
-if { (eval echo configure:5550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -5569,10 +5566,10 ＠＠
for ac_func in gdk_imlib_init
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5573: checking for $ac_func" >&5
+echo "configure:5570: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 5576 "configure"
+#line 5573 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -5595,7 +5592,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:5599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -5679,15 +5676,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5683: checking for $ac_hdr" >&5
+echo "configure:5680: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 5686 "configure"
+#line 5683 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5688: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -5718,19 +5715,19 ＠＠
echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6
-echo "configure:5722: checking for main in -lxml" >&5
+echo "configure:5719: checking for main in -lxml" >&5
ac_lib_var=`echo xml'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lxml "
cat > conftest.$ac_ext <<EOF
-#line 5727 "configure"
+#line 5724 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -5752,19 +5749,19 ＠＠
echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6
-echo "configure:5756: checking for main in -lglade" >&5
+echo "configure:5753: checking for main in -lglade" >&5
ac_lib_var=`echo glade'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lglade "
cat > conftest.$ac_ext <<EOF
-#line 5761 "configure"
+#line 5758 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -5786,19 +5783,19 ＠＠
echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6
-echo "configure:5790: checking for main in -lglade-gnome" >&5
+echo "configure:5787: checking for main in -lglade-gnome" >&5
ac_lib_var=`echo glade-gnome'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lglade-gnome "
cat > conftest.$ac_ext <<EOF
-#line 5795 "configure"
+#line 5792 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:5802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -5819,7 +5816,7 ＠＠
cat > conftest.$ac_ext <<EOF
-#line 5823 "configure"
+#line 5820 "configure"
#include "confdefs.h"
#include <glade/glade-xml.h>
EOF
＠＠ -5846,7 +5843,34 ＠＠
LDFLAGS="${OLD_LDFLAGS}"
fi
+if test "$with_carbon" != "no"; then
+ if test "$opsys" = "darwin"; then
+ { test "$extra_verbose" = "yes" && cat << \EOF
+ Defining HAVE_CARBON
+EOF
+cat >> confdefs.h <<\EOF
+#define HAVE_CARBON 1
+EOF
+}
+ window_system=carbon
+ with_carbon=yes
+ with_x11=no
+ with_xpm=yes
+ test "${with_jpeg}" != "yes" && with_jpeg=no
+ test "${with_tiff}" != "yes" && with_tiff=no
+ test "${with_png}" != "yes" && with_png=no
+ test "${with_scrollbars}" != "no" && with_scrollbars=carbon
+ test "${with_toolbars}" != "no" && with_toolbars=carbon
+ test "${with_menubars}" != "no" && with_menubars=carbon
+ if test "$with_dragndrop" != no; then
+ dragndrop_proto="$dragndrop_proto Carbon" && if test "$extra_verbose" = "yes"; then echo " Appending \"Carbon\" to \$dragndrop_proto"; fi
+ with_dragndrop=yes
+ fi
+ fi
+fi
+
+
if test "$with_x11" != "no"; then
test "$x_includes $x_libraries" != "NONE NONE" && \
window_system=x11 with_x11=yes
＠＠ -5878,7 +5902,7 ＠＠
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:5882: checking for X" >&5
+echo "configure:5906: checking for X" >&5
# Check whether --with-x or --without-x was given.
if test "${with_x+set}" = set; then
＠＠ -5938,12 +5962,12 ＠＠
# First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
-#line 5942 "configure"
+#line 5966 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5971: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -6012,14 +6036,14 ＠＠
ac_save_LIBS="$LIBS"
LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6016 "configure"
+#line 6040 "configure"
#include "confdefs.h"
int main() {
${x_direct_test_function}()
; return 0; }
EOF
-if { (eval echo configure:6023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
LIBS="$ac_save_LIBS"
# We can link X programs with no special library path.
＠＠ -6128,17 +6152,17 ＠＠
case "`(uname -sr) 2>/dev/null`" in
"SunOS 5"*)
echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:6132: checking whether -R must be followed by a space" >&5
+echo "configure:6156: checking whether -R must be followed by a space" >&5
ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 6135 "configure"
+#line 6159 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:6142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_nospace=yes
else
＠＠ -6154,14 +6178,14 ＠＠
else
LIBS="$ac_xsave_LIBS -R $x_libraries"
cat > conftest.$ac_ext <<EOF
-#line 6158 "configure"
+#line 6182 "configure"
#include "confdefs.h"
int main() {
; return 0; }
EOF
-if { (eval echo configure:6165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_R_space=yes
else
＠＠ -6197,12 +6221,12 ＠＠
else
echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:6201: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:6225: checking for dnet_ntoa in -ldnet" >&5
ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldnet "
cat > conftest.$ac_ext <<EOF
-#line 6206 "configure"
+#line 6230 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6213,7 +6237,7 ＠＠
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:6217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6237,12 +6261,12 ＠＠
if test $ac_cv_lib_dnet_dnet_ntoa = no; then
echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:6241: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:6265: checking for dnet_ntoa in -ldnet_stub" >&5
ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldnet_stub "
cat > conftest.$ac_ext <<EOF
-#line 6246 "configure"
+#line 6270 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6253,7 +6277,7 ＠＠
dnet_ntoa()
; return 0; }
EOF
-if { (eval echo configure:6257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6282,10 +6306,10 ＠＠
# The nsl library prevents programs from opening the X display
# on Irix 5.2, according to dickey(a)clark.net.
echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:6286: checking for gethostbyname" >&5
+echo "configure:6310: checking for gethostbyname" >&5
cat > conftest.$ac_ext <<EOF
-#line 6289 "configure"
+#line 6313 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gethostbyname(); below. */
＠＠ -6308,7 +6332,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:6312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gethostbyname=yes"
else
＠＠ -6329,12 +6353,12 ＠＠
if test $ac_cv_func_gethostbyname = no; then
echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:6333: checking for gethostbyname in -lnsl" >&5
+echo "configure:6357: checking for gethostbyname in -lnsl" >&5
ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
xe_check_libs=" -lnsl "
cat > conftest.$ac_ext <<EOF
-#line 6338 "configure"
+#line 6362 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6345,7 +6369,7 ＠＠
gethostbyname()
; return 0; }
EOF
-if { (eval echo configure:6349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6375,10 +6399,10 ＠＠
# -lsocket must be given before -lnsl if both are needed.
# We assume that if connect needs -lnsl, so does gethostbyname.
echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:6379: checking for connect" >&5
+echo "configure:6403: checking for connect" >&5
cat > conftest.$ac_ext <<EOF
-#line 6382 "configure"
+#line 6406 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char connect(); below. */
＠＠ -6401,7 +6425,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:6405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_connect=yes"
else
＠＠ -6424,12 +6448,12 ＠＠
xe_msg_checking="for connect in -lsocket"
test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6428: checking "$xe_msg_checking"" >&5
+echo "configure:6452: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
xe_check_libs=" -lsocket $X_EXTRA_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6433 "configure"
+#line 6457 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6440,7 +6464,7 ＠＠
connect()
; return 0; }
EOF
-if { (eval echo configure:6444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6464,10 +6488,10 ＠＠
# gomez(a)mi.uni-erlangen.de says -lposix is necessary on A/UX.
echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:6468: checking for remove" >&5
+echo "configure:6492: checking for remove" >&5
cat > conftest.$ac_ext <<EOF
-#line 6471 "configure"
+#line 6495 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char remove(); below. */
＠＠ -6490,7 +6514,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:6494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_remove=yes"
else
＠＠ -6511,12 +6535,12 ＠＠
if test $ac_cv_func_remove = no; then
echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:6515: checking for remove in -lposix" >&5
+echo "configure:6539: checking for remove in -lposix" >&5
ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
xe_check_libs=" -lposix "
cat > conftest.$ac_ext <<EOF
-#line 6520 "configure"
+#line 6544 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6527,7 +6551,7 ＠＠
remove()
; return 0; }
EOF
-if { (eval echo configure:6531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6551,10 +6575,10 ＠＠
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:6555: checking for shmat" >&5
+echo "configure:6579: checking for shmat" >&5
cat > conftest.$ac_ext <<EOF
-#line 6558 "configure"
+#line 6582 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char shmat(); below. */
＠＠ -6577,7 +6601,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:6581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_shmat=yes"
else
＠＠ -6598,12 +6622,12 ＠＠
if test $ac_cv_func_shmat = no; then
echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:6602: checking for shmat in -lipc" >&5
+echo "configure:6626: checking for shmat in -lipc" >&5
ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
xe_check_libs=" -lipc "
cat > conftest.$ac_ext <<EOF
-#line 6607 "configure"
+#line 6631 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6614,7 +6638,7 ＠＠
shmat()
; return 0; }
EOF
-if { (eval echo configure:6618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6650,12 +6674,12 ＠＠
xe_msg_checking="for IceConnectionNumber in -lICE"
test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6654: checking "$xe_msg_checking"" >&5
+echo "configure:6678: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
xe_check_libs=" -lICE $X_EXTRA_LIBS"
cat > conftest.$ac_ext <<EOF
-#line 6659 "configure"
+#line 6683 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6666,7 +6690,7 ＠＠
IceConnectionNumber()
; return 0; }
EOF
-if { (eval echo configure:6670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6712,15 +6736,15 ＠＠
ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:6716: checking for Xm/Xm.h" >&5
+echo "configure:6740: checking for Xm/Xm.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 6719 "configure"
+#line 6743 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6724: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -6737,12 +6761,12 ＠＠
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:6741: checking for XmStringFree in -lXm" >&5
+echo "configure:6765: checking for XmStringFree in -lXm" >&5
ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXm "
cat > conftest.$ac_ext <<EOF
-#line 6746 "configure"
+#line 6770 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -6753,7 +6777,7 ＠＠
XmStringFree()
; return 0; }
EOF
-if { (eval echo configure:6757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -6905,7 +6929,7 ＠＠
echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:6909: checking for X defines extracted by xmkmf" >&5
+echo "configure:6933: checking for X defines extracted by xmkmf" >&5
rm -fr conftestdir
if mkdir conftestdir; then
cd conftestdir
＠＠ -6954,15 +6978,15 ＠＠
ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:6958: checking for X11/Intrinsic.h" >&5
+echo "configure:6982: checking for X11/Intrinsic.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 6961 "configure"
+#line 6985 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -6986,12 +7010,12 ＠＠
echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:6990: checking for XOpenDisplay in -lX11" >&5
+echo "configure:7014: checking for XOpenDisplay in -lX11" >&5
ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
xe_check_libs=" -lX11 "
cat > conftest.$ac_ext <<EOF
-#line 6995 "configure"
+#line 7019 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -7002,7 +7026,7 ＠＠
XOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:7006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7027,12 +7051,12 ＠＠
xe_msg_checking="for XGetFontProperty in -lX11"
test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7031: checking "$xe_msg_checking"" >&5
+echo "configure:7055: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'`
xe_check_libs=" -lX11 -b i486-linuxaout"
cat > conftest.$ac_ext <<EOF
-#line 7036 "configure"
+#line 7060 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -7043,7 +7067,7 ＠＠
XGetFontProperty()
; return 0; }
EOF
-if { (eval echo configure:7047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7070,12 +7094,12 ＠＠
echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:7074: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:7098: checking for XShapeSelectInput in -lXext" >&5
ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXext "
cat > conftest.$ac_ext <<EOF
-#line 7079 "configure"
+#line 7103 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -7086,7 +7110,7 ＠＠
XShapeSelectInput()
; return 0; }
EOF
-if { (eval echo configure:7090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7109,12 +7133,12 ＠＠
echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:7113: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:7137: checking for XtOpenDisplay in -lXt" >&5
ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXt "
cat > conftest.$ac_ext <<EOF
-#line 7118 "configure"
+#line 7142 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -7125,7 +7149,7 ＠＠
XtOpenDisplay()
; return 0; }
EOF
-if { (eval echo configure:7129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7148,14 +7172,14 ＠＠
echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:7152: checking the version of X11 being used" >&5
+echo "configure:7176: checking the version of X11 being used" >&5
cat > conftest.$ac_ext <<EOF
-#line 7154 "configure"
+#line 7178 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
EOF
-if { (eval echo configure:7159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
./conftest foobar; x11_release=$?
else
＠＠ -7186,10 +7210,10 ＠＠
for ac_func in XConvertCase
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7190: checking for $ac_func" >&5
+echo "configure:7214: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 7193 "configure"
+#line 7217 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -7212,7 +7236,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:7216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -7244,15 +7268,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7248: checking for $ac_hdr" >&5
+echo "configure:7272: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 7251 "configure"
+#line 7275 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -7285,10 +7309,10 ＠＠
for ac_func in XRegisterIMInstantiateCallback
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7289: checking for $ac_func" >&5
+echo "configure:7313: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 7292 "configure"
+#line 7316 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -7311,7 +7335,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:7315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -7339,9 +7363,9 ＠＠
done
echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6
-echo "configure:7343: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+echo "configure:7367: checking for standard XRegisterIMInstantiateCallback prototype" >&5
cat > conftest.$ac_ext <<EOF
-#line 7345 "configure"
+#line 7369 "configure"
#include "confdefs.h"
#define NeedFunctionPrototypes 1
＠＠ -7353,7 +7377,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:7357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
else
＠＠ -7374,12 +7398,12 ＠＠
test -z "$with_xmu" && {
echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:7378: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:7402: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
ac_lib_var=`echo Xmu'_'XmuReadBitmapDataFromFile | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXmu "
cat > conftest.$ac_ext <<EOF
-#line 7383 "configure"
+#line 7407 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -7390,7 +7414,7 ＠＠
XmuReadBitmapDataFromFile()
; return 0; }
EOF
-if { (eval echo configure:7394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7429,19 +7453,19 ＠＠
echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:7433: checking for main in -lXbsd" >&5
+echo "configure:7457: checking for main in -lXbsd" >&5
ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXbsd "
cat > conftest.$ac_ext <<EOF
-#line 7438 "configure"
+#line 7462 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:7445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7478,22 +7502,22 ＠＠
fi
if test "$with_msw" != "no"; then
echo "checking for MS-Windows" 1>&6
-echo "configure:7482: checking for MS-Windows" >&5
+echo "configure:7506: checking for MS-Windows" >&5
echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:7485: checking for main in -lgdi32" >&5
+echo "configure:7509: checking for main in -lgdi32" >&5
ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgdi32 "
cat > conftest.$ac_ext <<EOF
-#line 7490 "configure"
+#line 7514 "configure"
#include "confdefs.h"
int main() {
main()
; return 0; }
EOF
-if { (eval echo configure:7497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7544,12 +7568,12 ＠＠
test "$with_widgets" != "no" && with_widgets=msw
fi
cat > conftest.$ac_ext <<EOF
-#line 7548 "configure"
+#line 7572 "configure"
#include "confdefs.h"
#include <fcntl.h>
int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
EOF
-if { (eval echo configure:7553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_MSG_SELECT
＠＠ -7610,15 +7634,15 ＠＠
if test "$with_x11" = "yes"; then
ac_safe=`echo "X11/extensions/shape.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6
-echo "configure:7614: checking for X11/extensions/shape.h" >&5
+echo "configure:7638: checking for X11/extensions/shape.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7617 "configure"
+#line 7641 "configure"
#include "confdefs.h"
#include <X11/extensions/shape.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -7659,6 +7683,7 ＠＠
test "$with_gnome" = "yes" && echo " Using GNOME."
test "$with_gnome" = "no" && echo " Using GTK."
;;
+ carbon ) HAVE_XWINDOWS=no ; echo " Using Carbon." ;;
none ) HAVE_X_WINDOWS=no ; echo " Using no window system." ;;
esac
＠＠ -7668,7 +7693,7 ＠＠
esac
echo "checking for WM_COMMAND option" 1>&6
-echo "configure:7672: checking for WM_COMMAND option" >&5;
+echo "configure:7697: checking for WM_COMMAND option" >&5;
if test "$with_wmcommand" != "no"; then
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_WMCOMMAND
＠＠ -7683,15 +7708,15 ＠＠
test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6
-echo "configure:7687: checking for X11/Xauth.h" >&5
+echo "configure:7712: checking for X11/Xauth.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7690 "configure"
+#line 7715 "configure"
#include "confdefs.h"
#include <X11/Xauth.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -7714,12 +7739,12 ＠＠
}
test -z "$with_xauth" && {
echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:7718: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:7743: checking for XauGetAuthByAddr in -lXau" >&5
ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXau "
cat > conftest.$ac_ext <<EOF
-#line 7723 "configure"
+#line 7748 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -7730,7 +7755,7 ＠＠
XauGetAuthByAddr()
; return 0; }
EOF
-if { (eval echo configure:7734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -7781,7 +7806,7 ＠＠
if test "$with_modules" != "no"; then
echo "checking for module support" 1>&6
-echo "configure:7785: checking for module support" >&5
+echo "configure:7810: checking for module support" >&5
case "$opsys" in
mingw* | cygwin* ) have_dl=yes ;;
＠＠ -7798,15 +7823,15 ＠＠
* )
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:7802: checking for dlfcn.h" >&5
+echo "configure:7827: checking for dlfcn.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7805 "configure"
+#line 7830 "configure"
#include "confdefs.h"
#include <dlfcn.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7835: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -7823,16 +7848,16 ＠＠
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:7827: checking for dlopen in -lc" >&5
+echo "configure:7852: checking for dlopen in -lc" >&5
cat > conftest.$ac_ext <<EOF
-#line 7829 "configure"
+#line 7854 "configure"
#include "confdefs.h"
#include <dlfcn.h>
int main() {
dlopen ("", 0);
; return 0; }
EOF
-if { (eval echo configure:7836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
＠＠ -7841,18 +7866,18 ＠＠
rm -rf conftest*
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:7845: checking for dlopen in -ldl" >&5
+echo "configure:7870: checking for dlopen in -ldl" >&5
ac_save_LIBS="$LIBS"
LIBS="$LIBS -ldl"
cat > conftest.$ac_ext <<EOF
-#line 7849 "configure"
+#line 7874 "configure"
#include "confdefs.h"
#include <dlfcn.h>
int main() {
dlopen ("", 0);
; return 0; }
EOF
-if { (eval echo configure:7856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
＠＠ -7861,17 +7886,17 ＠＠
rm -rf conftest*
echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
-echo "configure:7865: checking for dlopen in -lsvld" >&5
+echo "configure:7890: checking for dlopen in -lsvld" >&5
LIBS="$ac_save_LIBS -lsvld"
cat > conftest.$ac_ext <<EOF
-#line 7868 "configure"
+#line 7893 "configure"
#include "confdefs.h"
#include <dlfcn.h>
int main() {
dlopen ("", 0);
; return 0; }
EOF
-if { (eval echo configure:7875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
＠＠ -7901,15 +7926,15 ＠＠
else
ac_safe=`echo "dl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dl.h""... $ac_c" 1>&6
-echo "configure:7905: checking for dl.h" >&5
+echo "configure:7930: checking for dl.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7908 "configure"
+#line 7933 "configure"
#include "confdefs.h"
#include <dl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -7926,16 +7951,16 ＠＠
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for shl_load in -lc""... $ac_c" 1>&6
-echo "configure:7930: checking for shl_load in -lc" >&5
+echo "configure:7955: checking for shl_load in -lc" >&5
cat > conftest.$ac_ext <<EOF
-#line 7932 "configure"
+#line 7957 "configure"
#include "confdefs.h"
#include <dl.h>
int main() {
shl_load ("", 0, 0);
; return 0; }
EOF
-if { (eval echo configure:7939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
＠＠ -7944,18 +7969,18 ＠＠
rm -rf conftest*
echo $ac_n "checking for shl_load in -ldl""... $ac_c" 1>&6
-echo "configure:7948: checking for shl_load in -ldl" >&5
+echo "configure:7973: checking for shl_load in -ldl" >&5
ac_save_LIBS="$LIBS"
LIBS="$LIBS -ldld"
cat > conftest.$ac_ext <<EOF
-#line 7952 "configure"
+#line 7977 "configure"
#include "confdefs.h"
#include <dl.h>
int main() {
shl_load ("", 0, 0);
; return 0; }
EOF
-if { (eval echo configure:7959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
＠＠ -7983,15 +8008,15 ＠＠
else
ac_safe=`echo "ltdl.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ltdl.h""... $ac_c" 1>&6
-echo "configure:7987: checking for ltdl.h" >&5
+echo "configure:8012: checking for ltdl.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 7990 "configure"
+#line 8015 "configure"
#include "confdefs.h"
#include <ltdl.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -8008,18 +8033,18 ＠＠
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for lt_dlinit in -lltdl""... $ac_c" 1>&6
-echo "configure:8012: checking for lt_dlinit in -lltdl" >&5
+echo "configure:8037: checking for lt_dlinit in -lltdl" >&5
ac_save_LIBS="$LIBS"
LIBS="$LIBS -lltdl"
cat > conftest.$ac_ext <<EOF
-#line 8016 "configure"
+#line 8041 "configure"
#include "confdefs.h"
#include <ltdl.h>
int main() {
lt_dlinit ();
; return 0; }
EOF
-if { (eval echo configure:8023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
have_dl=yes
else
＠＠ -8060,7 +8085,7 ＠＠
xealias=$internal_configuration
echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:8064: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:8089: checking how to build dynamic libraries for ${xehost}" >&5
# Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
case "$xehost" in
*-*-linux-gnu*) ;;
＠＠ -8088,9 +8113,9 ＠＠
XEGCC=yes
else
echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:8092: checking checking whether we are using GNU C" >&5
+echo "configure:8117: checking checking whether we are using GNU C" >&5
cat > conftest.$ac_ext <<EOF
-#line 8094 "configure"
+#line 8119 "configure"
#include "confdefs.h"
#ifdef __GNUC__
＠＠ -8112,7 +8137,7 ＠＠
fi
echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:8116: checking how to produce PIC code" >&5
+echo "configure:8141: checking how to produce PIC code" >&5
wl=
can_build_shared=yes
＠＠ -8216,18 +8241,18 ＠＠
# Check to make sure the dll_cflags actually works.
echo $ac_n "checking if PIC flag ${dll_cflags} really works""... $ac_c" 1>&6
-echo "configure:8220: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:8245: checking if PIC flag ${dll_cflags} really works" >&5
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $dll_cflags -DPIC"
cat > conftest.$ac_ext <<EOF
-#line 8224 "configure"
+#line 8249 "configure"
#include "confdefs.h"
int main() {
int x=0;
; return 0; }
EOF
-if { (eval echo configure:8231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
# On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also
＠＠ -8258,7 +8283,7 ＠＠
xldf=
xcldf=
echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:8262: checking if C compiler can produce shared libraries" >&5
+echo "configure:8287: checking if C compiler can produce shared libraries" >&5
if test "$XEGCC" = yes -o "$__ICC" = yes; then
case "$xehost_os" in
*darwin*)
＠＠ -8317,14 +8342,14 ＠＠
xe_libs=
ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
cat > conftest.$ac_ext <<EOF
-#line 8321 "configure"
+#line 8346 "configure"
#include "confdefs.h"
int main() {
int x=0;
; return 0; }
EOF
-if { (eval echo configure:8328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
cc_produces_so=yes
else
＠＠ -8349,7 +8374,7 ＠＠
if test "$XEGCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:8353: checking for ld used by GCC" >&5
+echo "configure:8378: checking for ld used by GCC" >&5
ac_prog=`($CC -print-prog-name=ld) 2>&5`
case "$ac_prog" in
# Accept absolute paths.
＠＠ -8375,7 +8400,7 ＠＠
esac
else
echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:8379: checking for GNU ld" >&5
+echo "configure:8404: checking for GNU ld" >&5
fi
if test -z "$LTLD"; then
＠＠ -8413,7 +8438,7 ＠＠
# Check to see if it really is or isn't GNU ld.
echo $ac_n "checking if the linker is GNU ld""... $ac_c" 1>&6
-echo "configure:8417: checking if the linker is GNU ld" >&5
+echo "configure:8442: checking if the linker is GNU ld" >&5
# I'd rather use --version here, but apparently some GNU ld's only accept -v.
if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
xe_gnu_ld=yes
＠＠ -8448,7 +8473,7 ＠＠
# OK - only NOW do we futz about with ld.
# See if the linker supports building shared libraries.
echo $ac_n "checking whether the linker supports shared libraries""... $ac_c" 1>&6
-echo "configure:8452: checking whether the linker supports shared libraries" >&5
+echo "configure:8477: checking whether the linker supports shared libraries" >&5
dll_ld=$CC
dll_ldflags=$LDFLAGS
ld_shlibs=yes
＠＠ -8661,10 +8686,10 ＠＠
for ac_func in dlerror _dlerror
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8665: checking for $ac_func" >&5
+echo "configure:8690: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 8668 "configure"
+#line 8693 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -8687,7 +8712,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:8691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -8751,15 +8776,15 ＠＠
for dir in "" "Tt/" "desktop/" ; do
ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6
-echo "configure:8755: checking for ${dir}tt_c.h" >&5
+echo "configure:8780: checking for ${dir}tt_c.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 8758 "configure"
+#line 8783 "configure"
#include "confdefs.h"
#include <${dir}tt_c.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -8795,12 +8820,12 ＠＠
xe_msg_checking="for tt_message_create in -ltt"
test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:8799: checking "$xe_msg_checking"" >&5
+echo "configure:8824: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'`
xe_check_libs=" -ltt $extra_libs"
cat > conftest.$ac_ext <<EOF
-#line 8804 "configure"
+#line 8829 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -8811,7 +8836,7 ＠＠
tt_message_create()
; return 0; }
EOF
-if { (eval echo configure:8815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -8865,15 +8890,15 ＠＠
test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6
-echo "configure:8869: checking for Dt/Dt.h" >&5
+echo "configure:8894: checking for Dt/Dt.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 8872 "configure"
+#line 8897 "configure"
#include "confdefs.h"
#include <Dt/Dt.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8877: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -8896,12 +8921,12 ＠＠
}
test -z "$with_cde" && {
echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:8900: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:8925: checking for DtDndDragStart in -lDtSvc" >&5
ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'`
xe_check_libs=" -lDtSvc "
cat > conftest.$ac_ext <<EOF
-#line 8905 "configure"
+#line 8930 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -8912,7 +8937,7 ＠＠
DtDndDragStart()
; return 0; }
EOF
-if { (eval echo configure:8916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -8993,7 +9018,7 ＠＠
if test "$with_dragndrop" != "no" ; then
echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
-echo "configure:8997: checking if drag and drop API is needed" >&5
+echo "configure:9022: checking if drag and drop API is needed" >&5
if test -n "$dragndrop_proto" ; then
with_dragndrop=yes
echo "$ac_t""yes (${dragndrop_proto} )" 1>&6
＠＠ -9013,19 +9038,19 ＠＠
fi
echo "checking for LDAP" 1>&6
-echo "configure:9017: checking for LDAP" >&5
+echo "configure:9042: checking for LDAP" >&5
ldap_libs=
test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ldap.h""... $ac_c" 1>&6
-echo "configure:9021: checking for ldap.h" >&5
+echo "configure:9046: checking for ldap.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9024 "configure"
+#line 9049 "configure"
#include "confdefs.h"
#include <ldap.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -9048,15 +9073,15 ＠＠
}
test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for lber.h""... $ac_c" 1>&6
-echo "configure:9052: checking for lber.h" >&5
+echo "configure:9077: checking for lber.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9055 "configure"
+#line 9080 "configure"
#include "confdefs.h"
#include <lber.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9085: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -9080,12 +9105,12 ＠＠
if test "$with_ldap" != "no"; then
echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
-echo "configure:9084: checking for ldap_search in -lldap" >&5
+echo "configure:9109: checking for ldap_search in -lldap" >&5
ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'`
xe_check_libs=" -lldap "
cat > conftest.$ac_ext <<EOF
-#line 9089 "configure"
+#line 9114 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9096,7 +9121,7 ＠＠
ldap_search()
; return 0; }
EOF
-if { (eval echo configure:9100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9121,12 +9146,12 ＠＠
xe_msg_checking="for ldap_open in -lldap"
test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:9125: checking "$xe_msg_checking"" >&5
+echo "configure:9150: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lldap -llber"
cat > conftest.$ac_ext <<EOF
-#line 9130 "configure"
+#line 9155 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9137,7 +9162,7 ＠＠
ldap_open()
; return 0; }
EOF
-if { (eval echo configure:9141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9162,12 +9187,12 ＠＠
xe_msg_checking="for ldap_open in -lldap"
test -n "-llber -lkrb" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:9166: checking "$xe_msg_checking"" >&5
+echo "configure:9191: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lldap -llber -lkrb"
cat > conftest.$ac_ext <<EOF
-#line 9171 "configure"
+#line 9196 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9178,7 +9203,7 ＠＠
ldap_open()
; return 0; }
EOF
-if { (eval echo configure:9182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9203,12 +9228,12 ＠＠
xe_msg_checking="for ldap_open in -lldap"
test -n "-llber -lkrb -ldes" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb -ldes"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:9207: checking "$xe_msg_checking"" >&5
+echo "configure:9232: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lldap -llber -lkrb -ldes"
cat > conftest.$ac_ext <<EOF
-#line 9212 "configure"
+#line 9237 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9219,7 +9244,7 ＠＠
ldap_open()
; return 0; }
EOF
-if { (eval echo configure:9223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9268,10 +9293,10 ＠＠
for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9272: checking for $ac_func" >&5
+echo "configure:9297: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 9275 "configure"
+#line 9300 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -9294,7 +9319,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:9298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -9333,20 +9358,20 ＠＠
postgresql_libs=
if test "$with_postgresql" != "no"; then
echo "checking for PostgreSQL" 1>&6
-echo "configure:9337: checking for PostgreSQL" >&5
+echo "configure:9362: checking for PostgreSQL" >&5
for header_dir in "" "pgsql/" "postgresql/"; do
ac_safe=`echo "${header_dir}libpq-fe.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ${header_dir}libpq-fe.h""... $ac_c" 1>&6
-echo "configure:9342: checking for ${header_dir}libpq-fe.h" >&5
+echo "configure:9367: checking for ${header_dir}libpq-fe.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9345 "configure"
+#line 9370 "configure"
#include "confdefs.h"
#include <${header_dir}libpq-fe.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9350: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9375: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -9370,12 +9395,12 ＠＠
test -n "$libpq_fe_h_file" && {
echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:9374: checking for PQconnectdb in -lpq" >&5
+echo "configure:9399: checking for PQconnectdb in -lpq" >&5
ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'`
xe_check_libs=" -lpq "
cat > conftest.$ac_ext <<EOF
-#line 9379 "configure"
+#line 9404 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9386,7 +9411,7 ＠＠
PQconnectdb()
; return 0; }
EOF
-if { (eval echo configure:9390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9419,12 +9444,12 ＠＠
echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
-echo "configure:9423: checking for PQconnectStart in -lpq" >&5
+echo "configure:9448: checking for PQconnectStart in -lpq" >&5
ac_lib_var=`echo pq'_'PQconnectStart | sed 'y%./+-%__p_%'`
xe_check_libs=" -lpq "
cat > conftest.$ac_ext <<EOF
-#line 9428 "configure"
+#line 9453 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9435,7 +9460,7 ＠＠
PQconnectStart()
; return 0; }
EOF
-if { (eval echo configure:9439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9486,7 +9511,7 ＠＠
if test "$window_system" != "none"; then
echo "checking for graphics libraries" 1>&6
-echo "configure:9490: checking for graphics libraries" >&5
+echo "configure:9515: checking for graphics libraries" >&5
libpath_xpm=
incpath_xpm=
＠＠ -9505,6 +9530,12 ＠＠
*) ;;
esac
;;
+ darwin*)
+ if test "$with_carbon" == "yes"; then
+ libpath_xpm="-L${srcdir}/carbon/xpm"
+ incpath_xpm="-I${srcdir}/carbon/xpm"
+ fi
+ ;;
*) ;;
esac
xpm_problem=""
＠＠ -9512,10 +9543,10 ＠＠
CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:9516: checking for Xpm - no older than 3.4f" >&5
+echo "configure:9547: checking for Xpm - no older than 3.4f" >&5
xe_check_libs=-lXpm
cat > conftest.$ac_ext <<EOF
-#line 9519 "configure"
+#line 9550 "configure"
#include "confdefs.h"
#define XPM_NUMBERS
#include <X11/xpm.h>
＠＠ -9524,7 +9555,7 ＠＠
XpmIncludeVersion != XpmLibraryVersion() ? 1 :
XpmIncludeVersion < 30406 ? 2 : 0 ;}
EOF
-if { (eval echo configure:9528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
./conftest dummy_arg; xpm_status=$?;
if test "$xpm_status" = "0"; then
＠＠ -9567,18 +9598,19 ＠＠
LDFLAGS=""$libpath_xpm" $LDFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
libs_x="-lXpm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXpm\" to \$libs_x"; fi
CFLAGS=""$incpath_xpm" $CFLAGS" && if test "$extra_verbose" = "yes"; then echo " Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
- echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6
-echo "configure:9572: checking for \"FOR_MSW\" xpm" >&5
- xe_check_libs=-lXpm
- cat > conftest.$ac_ext <<EOF
-#line 9575 "configure"
+ if test "$with_carbon" != "yes"; then
+ echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6
+echo "configure:9604: checking for \"FOR_MSW\" xpm" >&5
+ xe_check_libs=-lXpm
+ cat > conftest.$ac_ext <<EOF
+#line 9607 "configure"
#include "confdefs.h"
int main() {
XpmCreatePixmapFromData()
; return 0; }
EOF
-if { (eval echo configure:9582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
xpm_for_msw=no
else
＠＠ -9588,10 +9620,10 ＠＠
xpm_for_msw=yes
fi
rm -f conftest*
- xe_check_libs=
- echo "$ac_t""$xpm_for_msw" 1>&6
- if test "$xpm_for_msw" = "yes"; then
- { test "$extra_verbose" = "yes" && cat << \EOF
+ xe_check_libs=
+ echo "$ac_t""$xpm_for_msw" 1>&6
+ if test "$xpm_for_msw" = "yes"; then
+ { test "$extra_verbose" = "yes" && cat << \EOF
Defining FOR_MSW
EOF
cat >> confdefs.h <<\EOF
＠＠ -9599,20 +9631,21 ＠＠
EOF
}
+ fi
fi
fi
test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:9608: checking for compface.h" >&5
+echo "configure:9641: checking for compface.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9611 "configure"
+#line 9644 "configure"
#include "confdefs.h"
#include <compface.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -9635,12 +9668,12 ＠＠
}
test -z "$with_xface" && {
echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:9639: checking for UnGenFace in -lcompface" >&5
+echo "configure:9672: checking for UnGenFace in -lcompface" >&5
ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcompface "
cat > conftest.$ac_ext <<EOF
-#line 9644 "configure"
+#line 9677 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9651,7 +9684,7 ＠＠
UnGenFace()
; return 0; }
EOF
-if { (eval echo configure:9655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9700,12 +9733,12 ＠＠
if test "$with_png $with_tiff" != "no no"; then
echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
-echo "configure:9704: checking for inflate in -lc" >&5
+echo "configure:9737: checking for inflate in -lc" >&5
ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'`
xe_check_libs=" -lc "
cat > conftest.$ac_ext <<EOF
-#line 9709 "configure"
+#line 9742 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9716,7 +9749,7 ＠＠
inflate()
; return 0; }
EOF
-if { (eval echo configure:9720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9735,12 +9768,12 ＠＠
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:9739: checking for inflate in -lz" >&5
+echo "configure:9772: checking for inflate in -lz" >&5
ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'`
xe_check_libs=" -lz "
cat > conftest.$ac_ext <<EOF
-#line 9744 "configure"
+#line 9777 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9751,7 +9784,7 ＠＠
inflate()
; return 0; }
EOF
-if { (eval echo configure:9755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9770,12 +9803,12 ＠＠
echo "$ac_t""no" 1>&6
echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:9774: checking for inflate in -lgz" >&5
+echo "configure:9807: checking for inflate in -lgz" >&5
ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgz "
cat > conftest.$ac_ext <<EOF
-#line 9779 "configure"
+#line 9812 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9786,7 +9819,7 ＠＠
inflate()
; return 0; }
EOF
-if { (eval echo configure:9790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9816,15 +9849,15 ＠＠
test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:9820: checking for jpeglib.h" >&5
+echo "configure:9853: checking for jpeglib.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9823 "configure"
+#line 9856 "configure"
#include "confdefs.h"
#include <jpeglib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -9847,12 +9880,12 ＠＠
}
test -z "$with_jpeg" && {
echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:9851: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:9884: checking for jpeg_destroy_decompress in -ljpeg" >&5
ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'`
xe_check_libs=" -ljpeg "
cat > conftest.$ac_ext <<EOF
-#line 9856 "configure"
+#line 9889 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9863,7 +9896,7 ＠＠
jpeg_destroy_decompress()
; return 0; }
EOF
-if { (eval echo configure:9867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -9899,10 +9932,10 ＠＠
png_problem=""
test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:9903: checking for pow" >&5
+echo "configure:9936: checking for pow" >&5
cat > conftest.$ac_ext <<EOF
-#line 9906 "configure"
+#line 9939 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char pow(); below. */
＠＠ -9925,7 +9958,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:9929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_pow=yes"
else
＠＠ -9946,15 +9979,15 ＠＠
}
test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:9950: checking for png.h" >&5
+echo "configure:9983: checking for png.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 9953 "configure"
+#line 9986 "configure"
#include "confdefs.h"
#include <png.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9958: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -9977,12 +10010,12 ＠＠
}
test -z "$with_png" && {
echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:9981: checking for png_read_image in -lpng" >&5
+echo "configure:10014: checking for png_read_image in -lpng" >&5
ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`
xe_check_libs=" -lpng "
cat > conftest.$ac_ext <<EOF
-#line 9986 "configure"
+#line 10019 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -9993,7 +10026,7 ＠＠
png_read_image()
; return 0; }
EOF
-if { (eval echo configure:9997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10016,10 +10049,10 ＠＠
}
if test -z "$with_png"; then
echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:10020: checking for workable png version information" >&5
+echo "configure:10053: checking for workable png version information" >&5
xe_check_libs="-lpng -lz"
cat > conftest.$ac_ext <<EOF
-#line 10023 "configure"
+#line 10056 "configure"
#include "confdefs.h"
#include <png.h>
int main(int c, char **v) {
＠＠ -10027,7 +10060,7 ＠＠
if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1;
return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}
EOF
-if { (eval echo configure:10031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:10064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
./conftest dummy_arg; png_status=$?;
if test "$png_status" = "0"; then
＠＠ -10070,15 +10103,15 ＠＠
test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:10074: checking for tiffio.h" >&5
+echo "configure:10107: checking for tiffio.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10077 "configure"
+#line 10110 "configure"
#include "confdefs.h"
#include <tiffio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10082: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10115: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10101,12 +10134,12 ＠＠
}
test -z "$with_tiff" && {
echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:10105: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:10138: checking for TIFFClientOpen in -ltiff" >&5
ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'`
xe_check_libs=" -ltiff "
cat > conftest.$ac_ext <<EOF
-#line 10110 "configure"
+#line 10143 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10117,7 +10150,7 ＠＠
TIFFClientOpen()
; return 0; }
EOF
-if { (eval echo configure:10121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10156,15 +10189,15 ＠＠
if test "$with_gtk" = "yes"; then
test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:10160: checking for compface.h" >&5
+echo "configure:10193: checking for compface.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10163 "configure"
+#line 10196 "configure"
#include "confdefs.h"
#include <compface.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10187,12 +10220,12 ＠＠
}
test -z "$with_xface" && {
echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:10191: checking for UnGenFace in -lcompface" >&5
+echo "configure:10224: checking for UnGenFace in -lcompface" >&5
ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcompface "
cat > conftest.$ac_ext <<EOF
-#line 10196 "configure"
+#line 10229 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10203,7 +10236,7 ＠＠
UnGenFace()
; return 0; }
EOF
-if { (eval echo configure:10207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10242,7 +10275,7 ＠＠
if test "$with_x11" = "yes"; then
echo "checking for X11 graphics libraries" 1>&6
-echo "configure:10246: checking for X11 graphics libraries" >&5
+echo "configure:10279: checking for X11 graphics libraries" >&5
fi
case "$with_widgets" in
＠＠ -10252,7 +10285,7 ＠＠
if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then
echo "checking for the Athena widgets" 1>&6
-echo "configure:10256: checking for the Athena widgets" >&5
+echo "configure:10289: checking for the Athena widgets" >&5
case "$with_athena" in
"xaw" | "") athena_variant=Xaw athena_3d=no ;;
＠＠ -10266,12 +10299,12 ＠＠
if test "$athena_3d" = "no"; then
echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:10270: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:10303: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
ac_lib_var=`echo $athena_variant'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$athena_variant "
cat > conftest.$ac_ext <<EOF
-#line 10275 "configure"
+#line 10308 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10282,7 +10315,7 ＠＠
XawScrollbarSetThumb()
; return 0; }
EOF
-if { (eval echo configure:10286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10298,12 +10331,12 ＠＠
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:10302: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:10335: checking for threeDClassRec in -l$athena_variant" >&5
ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$athena_variant "
cat > conftest.$ac_ext <<EOF
-#line 10307 "configure"
+#line 10340 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10314,7 +10347,7 ＠＠
threeDClassRec()
; return 0; }
EOF
-if { (eval echo configure:10318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10345,12 +10378,12 ＠＠
else
echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:10349: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:10382: checking for threeDClassRec in -l$athena_variant" >&5
ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$athena_variant "
cat > conftest.$ac_ext <<EOF
-#line 10354 "configure"
+#line 10387 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10361,7 +10394,7 ＠＠
threeDClassRec()
; return 0; }
EOF
-if { (eval echo configure:10365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10379,12 +10412,12 ＠＠
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6
-echo "configure:10383: checking for threeDClassRec in -lXaw" >&5
+echo "configure:10416: checking for threeDClassRec in -lXaw" >&5
ac_lib_var=`echo Xaw'_'threeDClassRec | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXaw "
cat > conftest.$ac_ext <<EOF
-#line 10388 "configure"
+#line 10421 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10395,7 +10428,7 ＠＠
threeDClassRec()
; return 0; }
EOF
-if { (eval echo configure:10399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10426,15 +10459,15 ＠＠
if test "$athena_3d" = "no"; then
ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10430: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:10463: checking for X11/Xaw/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10433 "configure"
+#line 10466 "configure"
#include "confdefs.h"
#include <X11/Xaw/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10454,15 +10487,15 ＠＠
echo "$ac_t""no" 1>&6
ac_safe=`echo "X11/Xaw/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw/XawInit.h""... $ac_c" 1>&6
-echo "configure:10458: checking for X11/Xaw/XawInit.h" >&5
+echo "configure:10491: checking for X11/Xaw/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10461 "configure"
+#line 10494 "configure"
#include "confdefs.h"
#include <X11/Xaw/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10466: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10488,15 +10521,15 ＠＠
else
ac_safe=`echo "X11/$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/$athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:10492: checking for X11/$athena_variant/XawInit.h" >&5
+echo "configure:10525: checking for X11/$athena_variant/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10495 "configure"
+#line 10528 "configure"
#include "confdefs.h"
#include <X11/$athena_variant/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10500: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10513,15 +10546,15 ＠＠
echo "$ac_t""yes" 1>&6
ac_safe=`echo "X11/$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/$athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10517: checking for X11/$athena_variant/ThreeD.h" >&5
+echo "configure:10550: checking for X11/$athena_variant/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10520 "configure"
+#line 10553 "configure"
#include "confdefs.h"
#include <X11/$athena_variant/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10525: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10549,15 +10582,15 ＠＠
if test -z "$athena_h_path"; then
ac_safe=`echo "$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:10553: checking for $athena_variant/XawInit.h" >&5
+echo "configure:10586: checking for $athena_variant/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10556 "configure"
+#line 10589 "configure"
#include "confdefs.h"
#include <$athena_variant/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10561: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10574,15 +10607,15 ＠＠
echo "$ac_t""yes" 1>&6
ac_safe=`echo "$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10578: checking for $athena_variant/ThreeD.h" >&5
+echo "configure:10611: checking for $athena_variant/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10581 "configure"
+#line 10614 "configure"
#include "confdefs.h"
#include <$athena_variant/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10619: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10611,15 +10644,15 ＠＠
if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
ac_safe=`echo "X11/Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:10615: checking for X11/Xaw3d/XawInit.h" >&5
+echo "configure:10648: checking for X11/Xaw3d/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10618 "configure"
+#line 10651 "configure"
#include "confdefs.h"
#include <X11/Xaw3d/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10636,15 +10669,15 ＠＠
echo "$ac_t""yes" 1>&6
ac_safe=`echo "X11/Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10640: checking for X11/Xaw3d/ThreeD.h" >&5
+echo "configure:10673: checking for X11/Xaw3d/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10643 "configure"
+#line 10676 "configure"
#include "confdefs.h"
#include <X11/Xaw3d/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10648: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10676,15 +10709,15 ＠＠
if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
ac_safe=`echo "Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:10680: checking for Xaw3d/XawInit.h" >&5
+echo "configure:10713: checking for Xaw3d/XawInit.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10683 "configure"
+#line 10716 "configure"
#include "confdefs.h"
#include <Xaw3d/XawInit.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10688: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10721: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10701,15 +10734,15 ＠＠
echo "$ac_t""yes" 1>&6
ac_safe=`echo "Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10705: checking for Xaw3d/ThreeD.h" >&5
+echo "configure:10738: checking for Xaw3d/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10708 "configure"
+#line 10741 "configure"
#include "confdefs.h"
#include <Xaw3d/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10741,15 +10774,15 ＠＠
if test -z "$athena_h_path"; then
ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:10745: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:10778: checking for X11/Xaw/ThreeD.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10748 "configure"
+#line 10781 "configure"
#include "confdefs.h"
#include <X11/Xaw/ThreeD.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10786: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10788,15 +10821,15 ＠＠
if test "$with_x11" = "yes"; then
ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:10792: checking for Xm/Xm.h" >&5
+echo "configure:10825: checking for Xm/Xm.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 10795 "configure"
+#line 10828 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -10813,12 +10846,12 ＠＠
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:10817: checking for XmStringFree in -lXm" >&5
+echo "configure:10850: checking for XmStringFree in -lXm" >&5
ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXm "
cat > conftest.$ac_ext <<EOF
-#line 10822 "configure"
+#line 10855 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -10829,7 +10862,7 ＠＠
XmStringFree()
; return 0; }
EOF
-if { (eval echo configure:10833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -10858,9 +10891,9 ＠＠
if test "$have_motif" = "yes"; then
echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:10862: checking for Lesstif" >&5
+echo "configure:10895: checking for Lesstif" >&5
cat > conftest.$ac_ext <<EOF
-#line 10864 "configure"
+#line 10897 "configure"
#include "confdefs.h"
#include <Xm/Xm.h>
#ifdef LESSTIF_VERSION
＠＠ -11233,7 +11266,7 ＠＠
if test "$with_mule" = "yes" ; then
echo "checking for Mule-related features" 1>&6
-echo "configure:11237: checking for Mule-related features" >&5
+echo "configure:11270: checking for Mule-related features" >&5
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining MULE
EOF
＠＠ -11247,15 +11280,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11251: checking for $ac_hdr" >&5
+echo "configure:11284: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 11254 "configure"
+#line 11287 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -11286,12 +11319,12 ＠＠
echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:11290: checking for strerror in -lintl" >&5
+echo "configure:11323: checking for strerror in -lintl" >&5
ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'`
xe_check_libs=" -lintl "
cat > conftest.$ac_ext <<EOF
-#line 11295 "configure"
+#line 11328 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11302,7 +11335,7 ＠＠
strerror()
; return 0; }
EOF
-if { (eval echo configure:11306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11335,18 +11368,18 ＠＠
echo "checking for Mule input methods" 1>&6
-echo "configure:11339: checking for Mule input methods" >&5
+echo "configure:11372: checking for Mule input methods" >&5
case "$with_xim" in "" | "yes" )
echo "checking for XIM" 1>&6
-echo "configure:11342: checking for XIM" >&5
+echo "configure:11375: checking for XIM" >&5
echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:11345: checking for XOpenIM in -lX11" >&5
+echo "configure:11378: checking for XOpenIM in -lX11" >&5
ac_lib_var=`echo X11'_'XOpenIM | sed 'y%./+-%__p_%'`
xe_check_libs=" -lX11 "
cat > conftest.$ac_ext <<EOF
-#line 11350 "configure"
+#line 11383 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11357,7 +11390,7 ＠＠
XOpenIM()
; return 0; }
EOF
-if { (eval echo configure:11361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11381,12 +11414,12 ＠＠
if test "$have_motif $have_lesstif" = "yes no"; then
echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:11385: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:11418: checking for XmImMbLookupString in -lXm" >&5
ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'`
xe_check_libs=" -lXm "
cat > conftest.$ac_ext <<EOF
-#line 11390 "configure"
+#line 11423 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11397,7 +11430,7 ＠＠
XmImMbLookupString()
; return 0; }
EOF
-if { (eval echo configure:11401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11462,15 +11495,15 ＠＠
if test "$with_xfs" = "yes" ; then
echo "checking for XFontSet" 1>&6
-echo "configure:11466: checking for XFontSet" >&5
+echo "configure:11499: checking for XFontSet" >&5
echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:11469: checking for XmbDrawString in -lX11" >&5
+echo "configure:11502: checking for XmbDrawString in -lX11" >&5
ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'`
xe_check_libs=" -lX11 "
cat > conftest.$ac_ext <<EOF
-#line 11474 "configure"
+#line 11507 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11481,7 +11514,7 ＠＠
XmbDrawString()
; return 0; }
EOF
-if { (eval echo configure:11485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11521,15 +11554,15 ＠＠
test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6
-echo "configure:11525: checking for wnn/jllib.h" >&5
+echo "configure:11558: checking for wnn/jllib.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11528 "configure"
+#line 11561 "configure"
#include "confdefs.h"
#include <wnn/jllib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -11552,15 +11585,15 ＠＠
}
test -z "$with_wnn" && { ac_safe=`echo "wnn/commonhd.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for wnn/commonhd.h""... $ac_c" 1>&6
-echo "configure:11556: checking for wnn/commonhd.h" >&5
+echo "configure:11589: checking for wnn/commonhd.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11559 "configure"
+#line 11592 "configure"
#include "confdefs.h"
#include <wnn/commonhd.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11597: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -11585,10 +11618,10 ＠＠
for ac_func in crypt
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11589: checking for $ac_func" >&5
+echo "configure:11622: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 11592 "configure"
+#line 11625 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -11611,7 +11644,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:11615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -11640,12 +11673,12 ＠＠
test "$ac_cv_func_crypt" != "yes" && {
echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:11644: checking for crypt in -lcrypt" >&5
+echo "configure:11677: checking for crypt in -lcrypt" >&5
ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcrypt "
cat > conftest.$ac_ext <<EOF
-#line 11649 "configure"
+#line 11682 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11656,7 +11689,7 ＠＠
crypt()
; return 0; }
EOF
-if { (eval echo configure:11660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11691,12 +11724,12 ＠＠
if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6
-echo "configure:11695: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:11728: checking for jl_dic_list_e in -lwnn" >&5
ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
xe_check_libs=" -lwnn "
cat > conftest.$ac_ext <<EOF
-#line 11700 "configure"
+#line 11733 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11707,7 +11740,7 ＠＠
jl_dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:11711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11725,12 +11758,12 ＠＠
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6
-echo "configure:11729: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:11762: checking for jl_dic_list_e in -lwnn4" >&5
ac_lib_var=`echo wnn4'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
xe_check_libs=" -lwnn4 "
cat > conftest.$ac_ext <<EOF
-#line 11734 "configure"
+#line 11767 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11741,7 +11774,7 ＠＠
jl_dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:11745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11759,12 +11792,12 ＠＠
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6
-echo "configure:11763: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:11796: checking for jl_dic_list_e in -lwnn6" >&5
ac_lib_var=`echo wnn6'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
xe_check_libs=" -lwnn6 "
cat > conftest.$ac_ext <<EOF
-#line 11768 "configure"
+#line 11801 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11775,7 +11808,7 ＠＠
jl_dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:11779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11793,12 +11826,12 ＠＠
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6
-echo "configure:11797: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:11830: checking for dic_list_e in -lwnn6_fromsrc" >&5
ac_lib_var=`echo wnn6_fromsrc'_'dic_list_e | sed 'y%./+-%__p_%'`
xe_check_libs=" -lwnn6_fromsrc "
cat > conftest.$ac_ext <<EOF
-#line 11802 "configure"
+#line 11835 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11809,7 +11842,7 ＠＠
dic_list_e()
; return 0; }
EOF
-if { (eval echo configure:11813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11854,12 +11887,12 ＠＠
if test "$with_wnn6" != "no"; then
echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6
-echo "configure:11858: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:11891: checking for jl_fi_dic_list in -l$libwnn" >&5
ac_lib_var=`echo $libwnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$libwnn "
cat > conftest.$ac_ext <<EOF
-#line 11863 "configure"
+#line 11896 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -11870,7 +11903,7 ＠＠
jl_fi_dic_list()
; return 0; }
EOF
-if { (eval echo configure:11874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -11905,15 +11938,15 ＠＠
if test "$with_canna" != "no"; then
ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:11909: checking for canna/jrkanji.h" >&5
+echo "configure:11942: checking for canna/jrkanji.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11912 "configure"
+#line 11945 "configure"
#include "confdefs.h"
#include <canna/jrkanji.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -11940,15 +11973,15 ＠＠
c_switch_site="$c_switch_site -I/usr/local/canna/include"
ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:11944: checking for canna/jrkanji.h" >&5
+echo "configure:11977: checking for canna/jrkanji.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11947 "configure"
+#line 11980 "configure"
#include "confdefs.h"
#include <canna/jrkanji.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11952: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -11976,15 +12009,15 ＠＠
test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6
-echo "configure:11980: checking for canna/RK.h" >&5
+echo "configure:12013: checking for canna/RK.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 11983 "configure"
+#line 12016 "configure"
#include "confdefs.h"
#include <canna/RK.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12021: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12007,12 +12040,12 ＠＠
}
test -z "$with_canna" && {
echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:12011: checking for RkBgnBun in -lRKC" >&5
+echo "configure:12044: checking for RkBgnBun in -lRKC" >&5
ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'`
xe_check_libs=" -lRKC "
cat > conftest.$ac_ext <<EOF
-#line 12016 "configure"
+#line 12049 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -12023,7 +12056,7 ＠＠
RkBgnBun()
; return 0; }
EOF
-if { (eval echo configure:12027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -12046,12 +12079,12 ＠＠
}
test -z "$with_canna" && {
echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:12050: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:12083: checking for jrKanjiControl in -lcanna" >&5
ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcanna "
cat > conftest.$ac_ext <<EOF
-#line 12055 "configure"
+#line 12088 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -12062,7 +12095,7 ＠＠
jrKanjiControl()
; return 0; }
EOF
-if { (eval echo configure:12066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -12108,12 +12141,12 ＠＠
libs_x="-lXm $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXm\" to \$libs_x"; fi
echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6
-echo "configure:12112: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:12145: checking for layout_object_getvalue in -li18n" >&5
ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'`
xe_check_libs=" -li18n "
cat > conftest.$ac_ext <<EOF
-#line 12117 "configure"
+#line 12150 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -12124,7 +12157,7 ＠＠
layout_object_getvalue()
; return 0; }
EOF
-if { (eval echo configure:12128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -12211,10 +12244,10 ＠＠
for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize getrlimit gettimeofday getcwd getwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror strlwr strupr symlink tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask wcslen wcscmp vlimit
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12215: checking for $ac_func" >&5
+echo "configure:12248: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 12218 "configure"
+#line 12251 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -12237,7 +12270,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:12241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -12278,10 +12311,10 ＠＠
for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12282: checking for $ac_func" >&5
+echo "configure:12315: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 12285 "configure"
+#line 12318 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -12304,7 +12337,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:12308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -12333,10 +12366,10 ＠＠
echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:12337: checking for openpty" >&5
+echo "configure:12370: checking for openpty" >&5
cat > conftest.$ac_ext <<EOF
-#line 12340 "configure"
+#line 12373 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char openpty(); below. */
＠＠ -12359,7 +12392,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:12363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_openpty=yes"
else
＠＠ -12378,12 +12411,12 ＠＠
echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:12382: checking for openpty in -lutil" >&5
+echo "configure:12415: checking for openpty in -lutil" >&5
ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
xe_check_libs=" -lutil "
cat > conftest.$ac_ext <<EOF
-#line 12387 "configure"
+#line 12420 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -12394,7 +12427,7 ＠＠
openpty()
; return 0; }
EOF
-if { (eval echo configure:12398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -12429,15 +12462,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12433: checking for $ac_hdr" >&5
+echo "configure:12466: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12436 "configure"
+#line 12469 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12441: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12474: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12474,15 +12507,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12478: checking for $ac_hdr" >&5
+echo "configure:12511: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12481 "configure"
+#line 12514 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12519: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12515,15 +12548,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12519: checking for $ac_hdr" >&5
+echo "configure:12552: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12522 "configure"
+#line 12555 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12556,15 +12589,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12560: checking for $ac_hdr" >&5
+echo "configure:12593: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12563 "configure"
+#line 12596 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12600,15 +12633,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12604: checking for $ac_hdr" >&5
+echo "configure:12637: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12607 "configure"
+#line 12640 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12612: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12641,10 +12674,10 ＠＠
for ac_func in isastream
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12645: checking for $ac_func" >&5
+echo "configure:12678: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 12648 "configure"
+#line 12681 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -12667,7 +12700,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:12671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -12698,15 +12731,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12702: checking for $ac_hdr" >&5
+echo "configure:12735: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12705 "configure"
+#line 12738 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12739,10 +12772,10 ＠＠
for ac_func in getloadavg
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12743: checking for $ac_func" >&5
+echo "configure:12776: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 12746 "configure"
+#line 12779 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -12765,7 +12798,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:12769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -12798,15 +12831,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12802: checking for $ac_hdr" >&5
+echo "configure:12835: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12805 "configure"
+#line 12838 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12842,12 +12875,12 ＠＠
echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:12846: checking for kstat_open in -lkstat" >&5
+echo "configure:12879: checking for kstat_open in -lkstat" >&5
ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lkstat "
cat > conftest.$ac_ext <<EOF
-#line 12851 "configure"
+#line 12884 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -12858,7 +12891,7 ＠＠
kstat_open()
; return 0; }
EOF
-if { (eval echo configure:12862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -12893,15 +12926,15 ＠＠
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12897: checking for $ac_hdr" >&5
+echo "configure:12930: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 12900 "configure"
+#line 12933 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -12933,12 +12966,12 ＠＠
echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:12937: checking for kvm_read in -lkvm" >&5
+echo "configure:12970: checking for kvm_read in -lkvm" >&5
ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'`
xe_check_libs=" -lkvm "
cat > conftest.$ac_ext <<EOF
-#line 12942 "configure"
+#line 12975 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -12949,7 +12982,7 ＠＠
kvm_read()
; return 0; }
EOF
-if { (eval echo configure:12953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -12983,16 +13016,16 ＠＠
fi
echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:12987: checking whether netdb declares h_errno" >&5
+echo "configure:13020: checking whether netdb declares h_errno" >&5
cat > conftest.$ac_ext <<EOF
-#line 12989 "configure"
+#line 13022 "configure"
#include "confdefs.h"
#include <netdb.h>
int main() {
return h_errno;
; return 0; }
EOF
-if { (eval echo configure:12996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
{ test "$extra_verbose" = "yes" && cat << \EOF
＠＠ -13012,16 +13045,16 ＠＠
rm -f conftest*
echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:13016: checking for sigsetjmp" >&5
+echo "configure:13049: checking for sigsetjmp" >&5
cat > conftest.$ac_ext <<EOF
-#line 13018 "configure"
+#line 13051 "configure"
#include "confdefs.h"
#include <setjmp.h>
int main() {
sigjmp_buf bar; sigsetjmp (bar, 0);
; return 0; }
EOF
-if { (eval echo configure:13025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6
{ test "$extra_verbose" = "yes" && cat << \EOF
＠＠ -13041,11 +13074,11 ＠＠
rm -f conftest*
echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:13045: checking whether localtime caches TZ" >&5
+echo "configure:13078: checking whether localtime caches TZ" >&5
if test "$ac_cv_func_tzset" = "yes"; then
cat > conftest.$ac_ext <<EOF
-#line 13049 "configure"
+#line 13082 "configure"
#include "confdefs.h"
#include <time.h>
#if STDC_HEADERS
＠＠ -13080,7 +13113,7 ＠＠
exit (0);
}
EOF
-if { (eval echo configure:13084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
emacs_cv_localtime_cache=no
else
＠＠ -13110,9 +13143,9 ＠＠
if test "$HAVE_TIMEVAL" = "yes"; then
echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:13114: checking whether gettimeofday accepts one or two arguments" >&5
+echo "configure:13147: checking whether gettimeofday accepts one or two arguments" >&5
cat > conftest.$ac_ext <<EOF
-#line 13116 "configure"
+#line 13149 "configure"
#include "confdefs.h"
#ifdef TIME_WITH_SYS_TIME
＠＠ -13133,7 +13166,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:13137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""two" 1>&6
else
＠＠ -13155,19 +13188,19 ＠＠
echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:13159: checking for inline" >&5
+echo "configure:13192: checking for inline" >&5
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 13164 "configure"
+#line 13197 "configure"
#include "confdefs.h"
int main() {
} $ac_kw foo() {
; return 0; }
EOF
-if { (eval echo configure:13171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13204: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
else
＠＠ -13204,16 +13237,16 ＠＠
fi
echo $ac_n "checking for typeof""... $ac_c" 1>&6
-echo "configure:13208: checking for typeof" >&5
+echo "configure:13241: checking for typeof" >&5
cat > conftest.$ac_ext <<EOF
-#line 13210 "configure"
+#line 13243 "configure"
#include "confdefs.h"
int main() {
int i; __typeof__(i) j;
; return 0; }
EOF
-if { (eval echo configure:13217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
typeofname="__typeof__"
else
＠＠ -13221,14 +13254,14 ＠＠
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 13225 "configure"
+#line 13258 "configure"
#include "confdefs.h"
int main() {
int i; typeof(i) j;
; return 0; }
EOF
-if { (eval echo configure:13232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13265: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
typeofname="typeof"
else
＠＠ -13257,17 +13290,17 ＠＠
# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
# for constant arguments. Useless!
echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:13261: checking for working alloca.h" >&5
+echo "configure:13294: checking for working alloca.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13264 "configure"
+#line 13297 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:13271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
＠＠ -13291,10 +13324,10 ＠＠
fi
echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:13295: checking for alloca" >&5
+echo "configure:13328: checking for alloca" >&5
cat > conftest.$ac_ext <<EOF
-#line 13298 "configure"
+#line 13331 "configure"
#include "confdefs.h"
#ifdef __GNUC__
＠＠ -13322,7 +13355,7 ＠＠
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:13326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
ac_cv_func_alloca_works=yes
else
＠＠ -13361,10 +13394,10 ＠＠
echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:13365: checking whether alloca needs Cray hooks" >&5
+echo "configure:13398: checking whether alloca needs Cray hooks" >&5
cat > conftest.$ac_ext <<EOF
-#line 13368 "configure"
+#line 13401 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
＠＠ -13388,10 +13421,10 ＠＠
if test $ac_cv_os_cray = yes; then
for ac_func in _getb67 GETB67 getb67; do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13392: checking for $ac_func" >&5
+echo "configure:13425: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 13395 "configure"
+#line 13428 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -13414,7 +13447,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:13418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -13444,10 +13477,10 ＠＠
fi
echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:13448: checking stack direction for C alloca" >&5
+echo "configure:13481: checking stack direction for C alloca" >&5
cat > conftest.$ac_ext <<EOF
-#line 13451 "configure"
+#line 13484 "configure"
#include "confdefs.h"
find_stack_direction ()
{
＠＠ -13466,7 +13499,7 ＠＠
exit (find_stack_direction() < 0);
}
EOF
-if { (eval echo configure:13470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_c_stack_direction=1
else
＠＠ -13495,9 +13528,9 ＠＠
fi
echo $ac_n "checking for working alloca in function calls""... $ac_c" 1>&6
-echo "configure:13499: checking for working alloca in function calls" >&5
+echo "configure:13532: checking for working alloca in function calls" >&5
cat > conftest.$ac_ext <<EOF
-#line 13501 "configure"
+#line 13534 "configure"
#include "confdefs.h"
#if defined (__CYGWIN__)
＠＠ -13550,7 +13583,7 ＠＠
}
EOF
-if { (eval echo configure:13554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
working_alloca_in_function_calls=yes
else
＠＠ -13573,10 +13606,10 ＠＠
echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:13577: checking for working strcoll" >&5
+echo "configure:13610: checking for working strcoll" >&5
cat > conftest.$ac_ext <<EOF
-#line 13580 "configure"
+#line 13613 "configure"
#include "confdefs.h"
#include <string.h>
main ()
＠＠ -13586,7 +13619,7 ＠＠
strcoll ("123", "456") >= 0);
}
EOF
-if { (eval echo configure:13590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_func_strcoll_works=yes
else
＠＠ -13614,10 +13647,10 ＠＠
for ac_func in getpgrp
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13618: checking for $ac_func" >&5
+echo "configure:13651: checking for $ac_func" >&5
cat > conftest.$ac_ext <<EOF
-#line 13621 "configure"
+#line 13654 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
＠＠ -13640,7 +13673,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:13644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
＠＠ -13668,10 +13701,10 ＠＠
done
echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:13672: checking whether getpgrp takes no argument" >&5
+echo "configure:13705: checking whether getpgrp takes no argument" >&5
cat > conftest.$ac_ext <<EOF
-#line 13675 "configure"
+#line 13708 "configure"
#include "confdefs.h"
/*
＠＠ -13726,7 +13759,7 ＠＠
}
EOF
-if { (eval echo configure:13730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
ac_cv_func_getpgrp_void=yes
else
＠＠ -13753,10 +13786,10 ＠＠
echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:13757: checking for working mmap" >&5
+echo "configure:13790: checking for working mmap" >&5
case "$opsys" in ultrix* ) have_mmap=no ;; *)
cat > conftest.$ac_ext <<EOF
-#line 13760 "configure"
+#line 13793 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <unistd.h>
＠＠ -13789,7 +13822,7 ＠＠
return 1;
}
EOF
-if { (eval echo configure:13793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:13826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
have_mmap=yes
else
＠＠ -13818,9 +13851,9 ＠＠
if test "$rel_alloc $have_mmap" = "default yes"; then
if test "$doug_lea_malloc" = "yes"; then
echo $ac_n "checking for M_MMAP_THRESHOLD""... $ac_c" 1>&6
-echo "configure:13822: checking for M_MMAP_THRESHOLD" >&5
+echo "configure:13855: checking for M_MMAP_THRESHOLD" >&5
cat > conftest.$ac_ext <<EOF
-#line 13824 "configure"
+#line 13857 "configure"
#include "confdefs.h"
#include <malloc.h>
int main() {
＠＠ -13832,7 +13865,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:13836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
rel_alloc=no; echo "$ac_t""yes" 1>&6;
else
＠＠ -13857,15 +13890,15 ＠＠
ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:13861: checking for termios.h" >&5
+echo "configure:13894: checking for termios.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13864 "configure"
+#line 13897 "configure"
#include "confdefs.h"
#include <termios.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -13908,15 +13941,15 ＠＠
echo "$ac_t""no" 1>&6
ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for termio.h""... $ac_c" 1>&6
-echo "configure:13912: checking for termio.h" >&5
+echo "configure:13945: checking for termio.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13915 "configure"
+#line 13948 "configure"
#include "confdefs.h"
#include <termio.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -13948,10 +13981,10 ＠＠
echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:13952: checking for socket" >&5
+echo "configure:13985: checking for socket" >&5
cat > conftest.$ac_ext <<EOF
-#line 13955 "configure"
+#line 13988 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char socket(); below. */
＠＠ -13974,7 +14007,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:13978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_socket=yes"
else
＠＠ -13989,15 +14022,15 ＠＠
echo "$ac_t""yes" 1>&6
ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6
-echo "configure:13993: checking for netinet/in.h" >&5
+echo "configure:14026: checking for netinet/in.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 13996 "configure"
+#line 14029 "configure"
#include "confdefs.h"
#include <netinet/in.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14034: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14014,15 +14047,15 ＠＠
echo "$ac_t""yes" 1>&6
ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6
-echo "configure:14018: checking for arpa/inet.h" >&5
+echo "configure:14051: checking for arpa/inet.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14021 "configure"
+#line 14054 "configure"
#include "confdefs.h"
#include <arpa/inet.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14047,9 +14080,9 ＠＠
}
echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:14051: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:14084: checking "for sun_len member in struct sockaddr_un"" >&5
cat > conftest.$ac_ext <<EOF
-#line 14053 "configure"
+#line 14086 "configure"
#include "confdefs.h"
#include <sys/types.h>
＠＠ -14060,7 +14093,7 ＠＠
static struct sockaddr_un x; x.sun_len = 1;
; return 0; }
EOF
-if { (eval echo configure:14064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_SOCKADDR_SUN_LEN
＠＠ -14078,9 +14111,9 ＠＠
fi
rm -f conftest*
echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:14082: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:14115: checking "for ip_mreq struct in netinet/in.h"" >&5
cat > conftest.$ac_ext <<EOF
-#line 14084 "configure"
+#line 14117 "configure"
#include "confdefs.h"
#include <sys/types.h>
＠＠ -14090,7 +14123,7 ＠＠
static struct ip_mreq x;
; return 0; }
EOF
-if { (eval echo configure:14094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_MULTICAST
＠＠ -14121,10 +14154,10 ＠＠
echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:14125: checking for msgget" >&5
+echo "configure:14158: checking for msgget" >&5
cat > conftest.$ac_ext <<EOF
-#line 14128 "configure"
+#line 14161 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char msgget(); below. */
＠＠ -14147,7 +14180,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:14151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_msgget=yes"
else
＠＠ -14162,15 +14195,15 ＠＠
echo "$ac_t""yes" 1>&6
ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6
-echo "configure:14166: checking for sys/ipc.h" >&5
+echo "configure:14199: checking for sys/ipc.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14169 "configure"
+#line 14202 "configure"
#include "confdefs.h"
#include <sys/ipc.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14187,15 +14220,15 ＠＠
echo "$ac_t""yes" 1>&6
ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
-echo "configure:14191: checking for sys/msg.h" >&5
+echo "configure:14224: checking for sys/msg.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14194 "configure"
+#line 14227 "configure"
#include "confdefs.h"
#include <sys/msg.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14199: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14233,15 +14266,15 ＠＠
ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:14237: checking for dirent.h" >&5
+echo "configure:14270: checking for dirent.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14240 "configure"
+#line 14273 "configure"
#include "confdefs.h"
#include <dirent.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14278: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14268,15 +14301,15 ＠＠
echo "$ac_t""no" 1>&6
ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6
-echo "configure:14272: checking for sys/dir.h" >&5
+echo "configure:14305: checking for sys/dir.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14275 "configure"
+#line 14308 "configure"
#include "confdefs.h"
#include <sys/dir.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14309,15 +14342,15 ＠＠
ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:14313: checking for nlist.h" >&5
+echo "configure:14346: checking for nlist.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14316 "configure"
+#line 14349 "configure"
#include "confdefs.h"
#include <nlist.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14321: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14347,22 +14380,22 ＠＠
echo "checking "for sound support"" 1>&6
-echo "configure:14351: checking "for sound support"" >&5
+echo "configure:14384: checking "for sound support"" >&5
test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes
if test "$with_native_sound" != "no"; then
if test -n "$native_sound_lib"; then
ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6
-echo "configure:14358: checking for multimedia/audio_device.h" >&5
+echo "configure:14391: checking for multimedia/audio_device.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14361 "configure"
+#line 14394 "configure"
#include "confdefs.h"
#include <multimedia/audio_device.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14366: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14418,12 +14451,12 ＠＠
if test -z "$native_sound_lib"; then
echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:14422: checking for ALopenport in -laudio" >&5
+echo "configure:14455: checking for ALopenport in -laudio" >&5
ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'`
xe_check_libs=" -laudio "
cat > conftest.$ac_ext <<EOF
-#line 14427 "configure"
+#line 14460 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -14434,7 +14467,7 ＠＠
ALopenport()
; return 0; }
EOF
-if { (eval echo configure:14438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -14465,12 +14498,12 ＠＠
if test -z "$native_sound_lib"; then
echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:14469: checking for AOpenAudio in -lAlib" >&5
+echo "configure:14502: checking for AOpenAudio in -lAlib" >&5
ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'`
xe_check_libs=" -lAlib "
cat > conftest.$ac_ext <<EOF
-#line 14474 "configure"
+#line 14507 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -14481,7 +14514,7 ＠＠
AOpenAudio()
; return 0; }
EOF
-if { (eval echo configure:14485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -14529,15 +14562,15 ＠＠
for dir in "machine" "sys" "linux"; do
ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6
-echo "configure:14533: checking for ${dir}/soundcard.h" >&5
+echo "configure:14566: checking for ${dir}/soundcard.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14536 "configure"
+#line 14569 "configure"
#include "confdefs.h"
#include <${dir}/soundcard.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14541: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14591,15 +14624,15 ＠＠
if test "$with_nas_sound" != "no"; then
ac_safe=`echo "audio/audiolib.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for audio/audiolib.h""... $ac_c" 1>&6
-echo "configure:14595: checking for audio/audiolib.h" >&5
+echo "configure:14628: checking for audio/audiolib.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14598 "configure"
+#line 14631 "configure"
#include "confdefs.h"
#include <audio/audiolib.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14603: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14617,12 +14650,12 ＠＠
echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6
-echo "configure:14621: checking for AuOpenServer in -laudio" >&5
+echo "configure:14654: checking for AuOpenServer in -laudio" >&5
ac_lib_var=`echo audio'_'AuOpenServer | sed 'y%./+-%__p_%'`
xe_check_libs=" -laudio "
cat > conftest.$ac_ext <<EOF
-#line 14626 "configure"
+#line 14659 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -14633,7 +14666,7 ＠＠
AuOpenServer()
; return 0; }
EOF
-if { (eval echo configure:14637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -14672,7 +14705,7 ＠＠
fi
libs_x="-laudio $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$libs_x"; fi
cat > conftest.$ac_ext <<EOF
-#line 14676 "configure"
+#line 14709 "configure"
#include "confdefs.h"
#include <audio/Xtutil.h>
EOF
＠＠ -14703,7 +14736,7 ＠＠
# Extract the first word of "esd-config", so it can be a program name with args.
set dummy esd-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14707: checking for $ac_word" >&5
+echo "configure:14740: checking for $ac_word" >&5
if test -n "$have_esd_config"; then
ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test.
＠＠ -14732,10 +14765,10 ＠＠
c_switch_site="$c_switch_site `esd-config --cflags`" && if test "$extra_verbose" = "yes"; then echo " Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi
LIBS="`esd-config --libs` $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"`esd-config --libs`\" to \$LIBS"; fi
echo $ac_n "checking for esd_play_stream""... $ac_c" 1>&6
-echo "configure:14736: checking for esd_play_stream" >&5
+echo "configure:14769: checking for esd_play_stream" >&5
cat > conftest.$ac_ext <<EOF
-#line 14739 "configure"
+#line 14772 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char esd_play_stream(); below. */
＠＠ -14758,7 +14791,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:14762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_esd_play_stream=yes"
else
＠＠ -14809,7 +14842,7 ＠＠
if test "$with_tty" = "yes" ; then
echo "checking for TTY-related features" 1>&6
-echo "configure:14813: checking for TTY-related features" >&5
+echo "configure:14846: checking for TTY-related features" >&5
{ test "$extra_verbose" = "yes" && cat << \EOF
Defining HAVE_TTY
EOF
＠＠ -14822,12 +14855,12 ＠＠
if test -z "$with_ncurses"; then
echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:14826: checking for tgetent in -lncurses" >&5
+echo "configure:14859: checking for tgetent in -lncurses" >&5
ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
xe_check_libs=" -lncurses "
cat > conftest.$ac_ext <<EOF
-#line 14831 "configure"
+#line 14864 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -14838,7 +14871,7 ＠＠
tgetent()
; return 0; }
EOF
-if { (eval echo configure:14842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -14871,15 +14904,15 ＠＠
ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:14875: checking for ncurses/curses.h" >&5
+echo "configure:14908: checking for ncurses/curses.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14878 "configure"
+#line 14911 "configure"
#include "confdefs.h"
#include <ncurses/curses.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14901,15 +14934,15 ＠＠
ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:14905: checking for ncurses/term.h" >&5
+echo "configure:14938: checking for ncurses/term.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14908 "configure"
+#line 14941 "configure"
#include "confdefs.h"
#include <ncurses/term.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14939,15 +14972,15 ＠＠
c_switch_site="$c_switch_site -I/usr/include/ncurses"
ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:14943: checking for ncurses/curses.h" >&5
+echo "configure:14976: checking for ncurses/curses.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 14946 "configure"
+#line 14979 "configure"
#include "confdefs.h"
#include <ncurses/curses.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -14982,12 +15015,12 ＠＠
for lib in curses termlib termcap; do
echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:14986: checking for tgetent in -l$lib" >&5
+echo "configure:15019: checking for tgetent in -l$lib" >&5
ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'`
xe_check_libs=" -l$lib "
cat > conftest.$ac_ext <<EOF
-#line 14991 "configure"
+#line 15024 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -14998,7 +15031,7 ＠＠
tgetent()
; return 0; }
EOF
-if { (eval echo configure:15002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15029,12 +15062,12 ＠＠
else
echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:15033: checking for tgetent in -lcurses" >&5
+echo "configure:15066: checking for tgetent in -lcurses" >&5
ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
xe_check_libs=" -lcurses "
cat > conftest.$ac_ext <<EOF
-#line 15038 "configure"
+#line 15071 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15045,7 +15078,7 ＠＠
tgetent()
; return 0; }
EOF
-if { (eval echo configure:15049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15063,12 +15096,12 ＠＠
else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:15067: checking for tgetent in -ltermcap" >&5
+echo "configure:15100: checking for tgetent in -ltermcap" >&5
ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
xe_check_libs=" -ltermcap "
cat > conftest.$ac_ext <<EOF
-#line 15072 "configure"
+#line 15105 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15079,7 +15112,7 ＠＠
tgetent()
; return 0; }
EOF
-if { (eval echo configure:15083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15128,15 +15161,15 ＠＠
if test "$with_gpm" != "no"; then
ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for gpm.h""... $ac_c" 1>&6
-echo "configure:15132: checking for gpm.h" >&5
+echo "configure:15165: checking for gpm.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 15135 "configure"
+#line 15168 "configure"
#include "confdefs.h"
#include <gpm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -15154,12 +15187,12 ＠＠
echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:15158: checking for Gpm_Open in -lgpm" >&5
+echo "configure:15191: checking for Gpm_Open in -lgpm" >&5
ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgpm "
cat > conftest.$ac_ext <<EOF
-#line 15163 "configure"
+#line 15196 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15170,7 +15203,7 ＠＠
Gpm_Open()
; return 0; }
EOF
-if { (eval echo configure:15174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15222,20 +15255,20 ＠＠
test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
!= "no no no" && echo "checking for database support" 1>&6
-echo "configure:15226: checking for database support" >&5
+echo "configure:15259: checking for database support" >&5
if test "$with_database_gdbm $with_database_dbm" != "no no"; then
ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6
-echo "configure:15231: checking for ndbm.h" >&5
+echo "configure:15264: checking for ndbm.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 15234 "configure"
+#line 15267 "configure"
#include "confdefs.h"
#include <ndbm.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -15265,12 +15298,12 ＠＠
if test "$with_database_gdbm" != "no"; then
echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:15269: checking for dbm_open in -lgdbm" >&5
+echo "configure:15302: checking for dbm_open in -lgdbm" >&5
ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgdbm "
cat > conftest.$ac_ext <<EOF
-#line 15274 "configure"
+#line 15307 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15281,7 +15314,7 ＠＠
dbm_open()
; return 0; }
EOF
-if { (eval echo configure:15285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15309,10 +15342,10 ＠＠
if test "$with_database_dbm" != "no"; then
echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:15313: checking for dbm_open" >&5
+echo "configure:15346: checking for dbm_open" >&5
cat > conftest.$ac_ext <<EOF
-#line 15316 "configure"
+#line 15349 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dbm_open(); below. */
＠＠ -15335,7 +15368,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:15339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_dbm_open=yes"
else
＠＠ -15354,12 +15387,12 ＠＠
echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:15358: checking for dbm_open in -ldbm" >&5
+echo "configure:15391: checking for dbm_open in -ldbm" >&5
ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldbm "
cat > conftest.$ac_ext <<EOF
-#line 15363 "configure"
+#line 15396 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15370,7 +15403,7 ＠＠
dbm_open()
; return 0; }
EOF
-if { (eval echo configure:15374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15411,10 +15444,10 ＠＠
if test "$with_database_berkdb" != "no"; then
echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:15415: checking for Berkeley db.h" >&5
+echo "configure:15448: checking for Berkeley db.h" >&5
for header in "db/db.h" "db.h"; do
cat > conftest.$ac_ext <<EOF
-#line 15418 "configure"
+#line 15451 "configure"
#include "confdefs.h"
#include <stdlib.h>
＠＠ -15436,7 +15469,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:15440: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
db_h_file="$header"; break
else
＠＠ -15452,9 +15485,9 ＠＠
if test "$with_database_berkdb" != "no"; then
echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:15456: checking for Berkeley DB version" >&5
+echo "configure:15489: checking for Berkeley DB version" >&5
cat > conftest.$ac_ext <<EOF
-#line 15458 "configure"
+#line 15491 "configure"
#include "confdefs.h"
#include <$db_h_file>
#if DB_VERSION_MAJOR > 1
＠＠ -15466,7 +15499,7 ＠＠
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 15470 "configure"
+#line 15503 "configure"
#include "confdefs.h"
#include <$db_h_file>
#if DB_VERSION_MAJOR > 2
＠＠ -15478,7 +15511,7 ＠＠
egrep "yes" >/dev/null 2>&1; then
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 15482 "configure"
+#line 15515 "configure"
#include "confdefs.h"
#include <$db_h_file>
#if DB_VERSION_MAJOR > 3
＠＠ -15512,10 +15545,10 ＠＠
rm -f conftest*
echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:15516: checking for $dbfunc" >&5
+echo "configure:15549: checking for $dbfunc" >&5
cat > conftest.$ac_ext <<EOF
-#line 15519 "configure"
+#line 15552 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $dbfunc(); below. */
＠＠ -15538,7 +15571,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:15542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$dbfunc=yes"
else
＠＠ -15557,12 +15590,12 ＠＠
echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:15561: checking for $dbfunc in -ldb" >&5
+echo "configure:15594: checking for $dbfunc in -ldb" >&5
ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldb "
cat > conftest.$ac_ext <<EOF
-#line 15566 "configure"
+#line 15599 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15573,7 +15606,7 ＠＠
$dbfunc()
; return 0; }
EOF
-if { (eval echo configure:15577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15607,12 +15640,12 ＠＠
echo "configure: warning: "db_create is really $dbfunc"" 1>&2
echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:15611: checking for $dbfunc in -ldb" >&5
+echo "configure:15644: checking for $dbfunc in -ldb" >&5
ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'`
xe_check_libs=" -ldb "
cat > conftest.$ac_ext <<EOF
-#line 15616 "configure"
+#line 15649 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15623,7 +15656,7 ＠＠
$dbfunc()
; return 0; }
EOF
-if { (eval echo configure:15627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15682,12 +15715,12 ＠＠
if test "$with_socks" = "yes"; then
echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:15686: checking for SOCKSinit in -lsocks" >&5
+echo "configure:15719: checking for SOCKSinit in -lsocks" >&5
ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'`
xe_check_libs=" -lsocks "
cat > conftest.$ac_ext <<EOF
-#line 15691 "configure"
+#line 15724 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15698,7 +15731,7 ＠＠
SOCKSinit()
; return 0; }
EOF
-if { (eval echo configure:15702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15754,15 +15787,15 ＠＠
if test "$use_number_lib" = "gmp"; then
ac_safe=`echo "gmp.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for gmp.h""... $ac_c" 1>&6
-echo "configure:15758: checking for gmp.h" >&5
+echo "configure:15791: checking for gmp.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 15761 "configure"
+#line 15794 "configure"
#include "confdefs.h"
#include <gmp.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -15780,12 +15813,12 ＠＠
echo $ac_n "checking for __gmpz_init in -lgmp""... $ac_c" 1>&6
-echo "configure:15784: checking for __gmpz_init in -lgmp" >&5
+echo "configure:15817: checking for __gmpz_init in -lgmp" >&5
ac_lib_var=`echo gmp'_'__gmpz_init | sed 'y%./+-%__p_%'`
xe_check_libs=" -lgmp "
cat > conftest.$ac_ext <<EOF
-#line 15789 "configure"
+#line 15822 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15796,7 +15829,7 ＠＠
__gmpz_init()
; return 0; }
EOF
-if { (eval echo configure:15800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15845,15 +15878,15 ＠＠
for library in "" "-lcrypto"; do
ac_safe=`echo "mp.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for mp.h""... $ac_c" 1>&6
-echo "configure:15849: checking for mp.h" >&5
+echo "configure:15882: checking for mp.h" >&5
cat > conftest.$ac_ext <<EOF
-#line 15852 "configure"
+#line 15885 "configure"
#include "confdefs.h"
#include <mp.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
＠＠ -15873,12 +15906,12 ＠＠
xe_msg_checking="for mp_mfree in -lmp"
test -n "$library" && xe_msg_checking="$xe_msg_checking using extra libs $library"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:15877: checking "$xe_msg_checking"" >&5
+echo "configure:15910: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo mp'_'mp_mfree | sed 'y%./+-%__p_%'`
xe_check_libs=" -lmp $library"
cat > conftest.$ac_ext <<EOF
-#line 15882 "configure"
+#line 15915 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15889,7 +15922,7 ＠＠
mp_mfree()
; return 0; }
EOF
-if { (eval echo configure:15893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15910,12 +15943,12 ＠＠
xe_msg_checking="for mfree in -lmp"
test -n "$library" && xe_msg_checking="$xe_msg_checking using extra libs $library"
echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:15914: checking "$xe_msg_checking"" >&5
+echo "configure:15947: checking "$xe_msg_checking"" >&5
ac_lib_var=`echo mp'_'mfree | sed 'y%./+-%__p_%'`
xe_check_libs=" -lmp $library"
cat > conftest.$ac_ext <<EOF
-#line 15919 "configure"
+#line 15952 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
＠＠ -15926,7 +15959,7 ＠＠
mfree()
; return 0; }
EOF
-if { (eval echo configure:15930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
＠＠ -15968,10 +16001,10 ＠＠
LIBS="$LIBS $library" && if test "$extra_verbose" = "yes"; then echo " Appending \"$library\" to \$LIBS"; fi
fi
echo $ac_n "checking for mp_move""... $ac_c" 1>&6
-echo "configure:15972: checking for mp_move" >&5
+echo "configure:16005: checking for mp_move" >&5
cat > conftest.$ac_ext <<EOF
-#line 15975 "configure"
+#line 16008 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char mp_move(); below. */
＠＠ -15994,7 +16027,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:15998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_mp_move=yes"
else
＠＠ -16025,10 +16058,10 ＠＠
LIBS="$LIBS $library" && if test "$extra_verbose" = "yes"; then echo " Appending \"$library\" to \$LIBS"; fi
fi
echo $ac_n "checking for move""... $ac_c" 1>&6
-echo "configure:16029: checking for move" >&5
+echo "configure:16062: checking for move" >&5
cat > conftest.$ac_ext <<EOF
-#line 16032 "configure"
+#line 16065 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char move(); below. */
＠＠ -16051,7 +16084,7 ＠＠
; return 0; }
EOF
-if { (eval echo configure:16055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_move=yes"
else
＠＠ -16098,11 +16131,11 ＠＠
fi
cat > conftest.$ac_ext <<EOF
-#line 16102 "configure"
+#line 16135 "configure"
#include "confdefs.h"
int main(int c,char *v[]){return 0;}
EOF
-if { (eval echo configure:16106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:16139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
then
:
else
＠＠ -16786,6 +16819,9 ＠＠
echo " - Athena headers location: $athena_h_path"
echo " - Athena library to link: $athena_lib"
fi
+if test "$with_carbon" = "yes"; then
+ echo " Compiling in support for Mac OS X Carbon."
+fi
case "$with_menubars" in
gtk ) echo " Using GTK menubars." ;;
lucid ) echo " Using Lucid menubars." ;;
＠＠ -16794,6 +16830,7 ＠＠
echo " We recommend using the Lucid menubar instead."
echo " Re-run configure with --with-menubars='lucid'." ;;
msw ) echo " Using MS-Windows menubars." ;;
+ carbon ) echo " Using Carbon menubars." ;;
esac
case "$with_scrollbars" in
gtk ) echo " Using GTK scrollbars." ;;
＠＠ -16801,6 +16838,7 ＠＠
motif ) echo " Using Motif scrollbars." ;;
athena ) echo " Using Athena scrollbars." ;;
msw ) echo " Using MS-Windows scrollbars." ;;
+ carbon ) echo " Using Carbon scrollbars." ;;
esac
case "$with_dialogs" in
gtk ) echo " Using GTK dialog boxes." ;;
1.231.2.1 +50 -9 XEmacs/xemacs/configure.in
Index: configure.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.in,v
retrieving revision 1.231
retrieving revision 1.231.2.1
diff -u -r1.231 -r1.231.2.1
--- configure.in 2004/09/29 15:38:31 1.231
+++ configure.in 2005/02/25 16:29:27 1.231.2.1
＠＠ -380,6 +380,7 ＠＠
dynamic=''
with_x11=''
with_msw=''
+with_carbon=''
rel_alloc='default'
with_system_malloc='default'
with_dlmalloc='default'
＠＠ -492,6 +493,7 ＠＠
with_gtk | \
with_gnome | \
with_msw | \
+ with_carbon | \
with_gcc | \
dynamic | \
with_ncurses | \
＠＠ -840,6 +842,7 ＠＠
"") val=yes ;;
g | gt | gtk ) val=gtk ;;
ms | msw ) val=msw ;;
+ c | ca | car | carb | carbo | carbon ) val=carbon ;;
* ) USAGE_ERROR(["The \`--$optname' option must have one of these values:
\`gtk', \`lucid', \`motif', \`athena', \`yes', or \`no'."]) ;;
esac
＠＠ -2975,6 +2978,28 ＠＠
LDFLAGS="${OLD_LDFLAGS}"
fi
+dnl Prefer Carbon over X11.
+if test "$with_carbon" != "no"; then
+ if test "$opsys" = "darwin"; then
+ AC_DEFINE(HAVE_CARBON)
+ window_system=carbon
+ with_carbon=yes
+ with_x11=no
+ with_xpm=yes
+ dnl Don't use by default: not all users install these dynamic libraries.
+ test "${with_jpeg}" != "yes" && with_jpeg=no
+ test "${with_tiff}" != "yes" && with_tiff=no
+ test "${with_png}" != "yes" && with_png=no
+ test "${with_scrollbars}" != "no" && with_scrollbars=carbon
+ test "${with_toolbars}" != "no" && with_toolbars=carbon
+ test "${with_menubars}" != "no" && with_menubars=carbon
+ if test "$with_dragndrop" != no; then
+ XE_APPEND(Carbon, dragndrop_proto)
+ with_dragndrop=yes
+ fi
+ fi
+fi
+
dnl We may eventually prefer gtk/gdk over vanilla X11...
if test "$with_x11" != "no"; then
＠＠ -3327,6 +3352,7 ＠＠
test "$with_gnome" = "yes" && echo " Using GNOME."
test "$with_gnome" = "no" && echo " Using GTK."
;;
+ carbon ) HAVE_XWINDOWS=no ; echo " Using Carbon." ;;
none ) HAVE_X_WINDOWS=no ; echo " Using no window system." ;;
esac
＠＠ -3682,6 +3708,13 ＠＠
*) ;;
esac
;;
+ dnl Use the mini version of Xpm in the carbon directory.
+ darwin*)
+ if test "$with_carbon" == "yes"; then
+ libpath_xpm="-L${srcdir}/carbon/xpm"
+ incpath_xpm="-I${srcdir}/carbon/xpm"
+ fi
+ ;;
dnl use "standard" search pattern for all other OS's
*) ;;
esac
＠＠ -3728,15 +3761,18 ＠＠
XE_PREPEND("$libpath_xpm", LDFLAGS)
XE_PREPEND(-lXpm, libs_x)
XE_PREPEND("$incpath_xpm", CFLAGS)
- AC_MSG_CHECKING(for \"FOR_MSW\" xpm)
- xe_check_libs=-lXpm
- AC_TRY_LINK(, [XpmCreatePixmapFromData()],
- [xpm_for_msw=no],
- [xpm_for_msw=yes])
- xe_check_libs=
- AC_MSG_RESULT($xpm_for_msw)
- if test "$xpm_for_msw" = "yes"; then
- AC_DEFINE(FOR_MSW)
+ dnl Don't define FOR_MSW for Carbon.
+ if test "$with_carbon" != "yes"; then
+ AC_MSG_CHECKING(for \"FOR_MSW\" xpm)
+ xe_check_libs=-lXpm
+ AC_TRY_LINK(, [XpmCreatePixmapFromData()],
+ [xpm_for_msw=no],
+ [xpm_for_msw=yes])
+ xe_check_libs=
+ AC_MSG_RESULT($xpm_for_msw)
+ if test "$xpm_for_msw" = "yes"; then
+ AC_DEFINE(FOR_MSW)
+ fi
fi
fi
＠＠ -5454,6 +5490,9 ＠＠
echo " - Athena headers location: $athena_h_path"
echo " - Athena library to link: $athena_lib"
fi
+if test "$with_carbon" = "yes"; then
+ echo " Compiling in support for Mac OS X Carbon."
+fi
case "$with_menubars" in
gtk ) echo " Using GTK menubars." ;;
lucid ) echo " Using Lucid menubars." ;;
＠＠ -5462,6 +5501,7 ＠＠
echo " We recommend using the Lucid menubar instead."
echo " Re-run configure with --with-menubars='lucid'." ;;
msw ) echo " Using MS-Windows menubars." ;;
+ carbon ) echo " Using Carbon menubars." ;;
esac
case "$with_scrollbars" in
gtk ) echo " Using GTK scrollbars." ;;
＠＠ -5469,6 +5509,7 ＠＠
motif ) echo " Using Motif scrollbars." ;;
athena ) echo " Using Athena scrollbars." ;;
msw ) echo " Using MS-Windows scrollbars." ;;
+ carbon ) echo " Using Carbon scrollbars." ;;
esac
case "$with_dialogs" in
gtk ) echo " Using GTK dialog boxes." ;;
1.36.4.1 +1 -0 XEmacs/xemacs/configure.usage
Index: configure.usage
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.usage,v
retrieving revision 1.36
retrieving revision 1.36.4.1
diff -u -r1.36 -r1.36.4.1
--- configure.usage 2004/04/06 12:13:55 1.36
+++ configure.usage 2005/02/25 16:29:28 1.36.4.1
＠＠ -126,6 +126,7 ＠＠
--with-msw (*) Support MS Windows as a window system (only under
Cygwin and MinGW). `--with-msw=no' may be needed on
*nix systems with Wine installed.
+--with-carbon Support Mac OS X Carbon. (EXPERIMENTAL)
--with-toolbars=no Don't compile with any toolbar support.
--with-wmcommand=no Compile without realized leader window which will
keep the WM_COMMAND property.
No revision
No revision
1.1.2.1 +82 -0 XEmacs/xemacs/carbon/Attic/README
Index: README
===================================================================
RCS file: README
diff -N README
--- /dev/null Fri Feb 25 17:29:35 2005
+++ /tmp/cvsAAAEKaWlg Fri Feb 25 17:29:36 2005
＠＠ -0,0 +1,82 ＠＠
+CARBON XEMACS
+
+
+Building Carbon XEmacs
+----------------------
+
+The procedure described below has only been tested on Mac OS X 10.3
+with Xcode Tools v1.5 installed.
+
+The port uses Carbon features introduced in OS X 10.3 (e.g., the
+Pasteboard Manager) so it won't work without modification on earlier
+versions of OS X.
+
+Download and untar the file xemacs-21.5.18.tar.bz (or .gz) from of the
+XEmacs mirrors:
+
+ http://xemacs.org/Download/index.html
+
+Download and bunzip2 the file xemacs-21.5.18-carbon-<nn>.diff.bz2 from:
+
+ http://members.shaw.ca/akochoi-xemacs/index.html
+
+(where <nn> in the filename is b1, b2, etc.: a higher number
+represents a later release).
+
+Apply the patch. In the xemacs-21.5.18 directory, type:
+
+ patch -p1 < <dir_of_patch_file>/xemacs-21.5.18-carbon-<nn>.diff
+
+Then in the directory /carbon/, type:
+
+ sh < build-app.sh
+
+Follow the instructions in the section "Installing Packages" below to
+install additional packages.
+
+
+Downloading the Binary Distribution
+-----------------------------------
+
+Download and untar the file xemacs-21.5.18-<nn>.tar.bz2 from:
+
+ <<available soon!!>>
+
+An application (bundle) should result. This application will only run
+on Mac OS X 10.3 and not on earlier versions of OS X. The following
+are the only libraries it uses (otool -L), which are present on any
+standard Mac OS X 10.3.7 installation.
+
+ /System/Library/Frameworks/Carbon.framework/Versions/A/Carbon
+ (compatibility version 2.0.0, current version 128.0.0)
+ /System/Library/Frameworks/ApplicationServices.framework/
+ Versions/A/ApplicationServices
+ (compatibility version 1.0.0, current version 19.0.0)
+ /usr/lib/libncurses.5.dylib
+ (compatibility version 5.0.0, current version 5.0.0)
+ /usr/lib/libSystem.B.dylib
+ (compatibility version 1.0.0, current version 71.1.1)
+
+Follow the instructions in the section "Installing Packages" below to
+install additional packages.
+
+
+Installing Packages
+-------------------
+
+Read the file README.packages in the xemacs-21.5.18 directory. In
+addition to the locations listed there, Carbon XEmacs will also find
+packages in the directory XEmacs.app/Contents/Resources/lib/. An
+XEmacs application bundle with packages installed in this directory is
+therefore self-contained and can be moved to a different location on
+the disk.
+
+Another covenient directory to install your packages is ~/.xemacs.
+
+If you just want all the packages installed, download the files:
+
+ xemacs-sumo-<date>.tar.bz2
+ xemacs-mule-sumo-<date>.tar.bz2
+
+from the /packages/ directory in one of the XEmacs mirror sites.
+Untar them into one of the package directories.
1.1.2.1 +29 -0 XEmacs/xemacs/carbon/Attic/build-app.sh
Index: build-app.sh
===================================================================
RCS file: build-app.sh
diff -N build-app.sh
--- /dev/null Fri Feb 25 17:29:35 2005
+++ /tmp/cvsAAAKLaimg Fri Feb 25 17:29:36 2005
＠＠ -0,0 +1,29 ＠＠
+#!/bin/sh
+
+carbondir="`pwd`"
+
+(cd xpm; make)
+
+cd ..
+./configure --with-carbon --with-mule --prefix=${carbondir}/XEmacs.app/Contents/Resources
+mkdir -p ${carbondir}/XEmacs.app/Contents/MacOS
+make install
+
+echo
+echo "All done."
+echo
+echo "The XEmacs application bundle that is built can be found at"
+echo
+echo " ${carbondir}/XEmacs.app."
+echo
+echo "It can now be moved into any other folder (in its entirety) if"
+echo "necessary. By default, XEmacs will find packages installed in"
+echo
+echo " ~/.xemacs"
+echo
+echo "or"
+echo
+echo " XEmacs.app/Contents/Resources/lib."
+echo
+echo "Packages in the second directory are moved along with the"
+echo "application bundle when it is moved."
No revision
No revision
1.1.2.1 +39 -0 XEmacs/xemacs/carbon/XEmacs.app/Contents/Attic/Info.plist
Index: Info.plist
===================================================================
RCS file: Info.plist
diff -N Info.plist
--- /dev/null Fri Feb 25 17:29:35 2005
+++ /tmp/cvsAAAzaaqpg Fri Feb 25 17:29:38 2005
＠＠ -0,0 +1,39 ＠＠
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleDocumentTypes</key>
+ <array>
+ <dict>
+ <key>CFBundleTypeExtensions</key>
+ <array>
+ <string>*</string>
+ </array>
+ <key>CFBundleTypeName</key>
+ <string>All</string>
+ <key>CFBundleTypeOSTypes</key>
+ <array>
+ <string>****</string>
+ </array>
+ <key>CFBundleTypeRole</key>
+ <string>Viewer</string>
+ </dict>
+ </array>
+ <key>CFBundleExecutable</key>
+ <string>XEmacs</string>
+ <key>CFBundleIconFile</key>
+ <string>Emacs.icns</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.xemacs</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleSignature</key>
+ <string>EMAx</string>
+ <key>CFBundleVersion</key>
+ <string>1.0</string>
+</dict>
+</plist>
1.1.2.1 +1 -0 XEmacs/xemacs/carbon/XEmacs.app/Contents/Attic/PkgInfo
Index: PkgInfo
===================================================================
RCS file: PkgInfo
diff -N PkgInfo
--- /dev/null Fri Feb 25 17:29:35 2005
+++ /tmp/cvsAAANbaWpg Fri Feb 25 17:29:38 2005
＠＠ -0,0 +1 ＠＠
+APPLEMAx
\ No newline at end of file
No revision
No revision
1.1.2.1 +110 -0 XEmacs/xemacs/carbon/XEmacs.app/Contents/Resources/Attic/Emacs.icns
<<Binary file>>
No revision
No revision
1.1.2.1 +302 -0 XEmacs/xemacs/carbon/xpm/Attic/Attrib.c
Index: Attrib.c
===================================================================
RCS file: Attrib.c
diff -N Attrib.c
--- /dev/null Fri Feb 25 17:29:40 2005
+++ /tmp/cvsAAAbHaGwg Fri Feb 25 17:29:44 2005
＠＠ -0,0 +1,302 ＠＠
+/*
+ * Copyright (C) 1989-95 GROUPE BULL
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * GROUPE BULL 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 GROUPE BULL shall not be
+ * used in advertising or otherwise to promote the sale, use or other dealings
+ * in this Software without prior written authorization from GROUPE BULL.
+ */
+
+/*****************************************************************************\
+* Attrib.c: *
+* *
+* XPM library *
+* Functions related to the XpmAttributes structure *
+* *
+* Developed by Arnaud Le Hors *
+\*****************************************************************************/
+
+#include "XpmI.h"
+
+/* 3.2 backward compatibility code */
+LFUNC(CreateOldColorTable, int, (XpmColor *ct, int ncolors,
+ XpmColor ***oldct));
+
+LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors));
+
+/*
+ * Create a colortable compatible with the old style colortable
+ */
+static int
+CreateOldColorTable(ct, ncolors, oldct)
+ XpmColor *ct;
+ int ncolors;
+ XpmColor ***oldct;
+{
+ XpmColor **colorTable, **color;
+ int a;
+
+ colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *));
+ if (!colorTable) {
+ *oldct = NULL;
+ return (XpmNoMemory);
+ }
+ for (a = 0, color = colorTable; a < ncolors; a++, color++, ct++)
+ *color = ct;
+ *oldct = colorTable;
+ return (XpmSuccess);
+}
+
+static void
+FreeOldColorTable(colorTable, ncolors)
+ XpmColor **colorTable;
+ int ncolors;
+{
+ int a, b;
+ XpmColor **color;
+ char **sptr;
+
+ if (colorTable) {
+ for (a = 0, color = colorTable; a < ncolors; a++, color++) {
+ for (b = 0, sptr = (char **) *color; b <= NKEYS; b++, sptr++)
+ if (*sptr)
+ XpmFree(*sptr);
+ }
+ XpmFree(*colorTable);
+ XpmFree(colorTable);
+ }
+}
+
+/* end 3.2 bc */
+
+/*
+ * Free the computed color table
+ */
+void
+xpmFreeColorTable(colorTable, ncolors)
+ XpmColor *colorTable;
+ int ncolors;
+{
+ int a, b;
+ XpmColor *color;
+ char **sptr;
+
+ if (colorTable) {
+ for (a = 0, color = colorTable; a < ncolors; a++, color++) {
+ for (b = 0, sptr = (char **) color; b <= NKEYS; b++, sptr++)
+ if (*sptr)
+ XpmFree(*sptr);
+ }
+ XpmFree(colorTable);
+ }
+}
+
+/*
+ * Free array of extensions
+ */
+void
+XpmFreeExtensions(extensions, nextensions)
+ XpmExtension *extensions;
+ int nextensions;
+{
+ unsigned int i, j, nlines;
+ XpmExtension *ext;
+ char **sptr;
+
+ if (extensions) {
+ for (i = 0, ext = extensions; i < nextensions; i++, ext++) {
+ if (ext->name)
+ XpmFree(ext->name);
+ nlines = ext->nlines;
+ for (j = 0, sptr = ext->lines; j < nlines; j++, sptr++)
+ if (*sptr)
+ XpmFree(*sptr);
+ if (ext->lines)
+ XpmFree(ext->lines);
+ }
+ XpmFree(extensions);
+ }
+}
+
+/*
+ * Return the XpmAttributes structure size
+ */
+
+int
+XpmAttributesSize()
+{
+ return sizeof(XpmAttributes);
+}
+
+/*
+ * Init returned data to free safely later on
+ */
+void
+xpmInitAttributes(attributes)
+ XpmAttributes *attributes;
+{
+ if (attributes) {
+ attributes->pixels = NULL;
+ attributes->npixels = 0;
+ attributes->colorTable = NULL;
+ attributes->ncolors = 0;
+/* 3.2 backward compatibility code */
+ attributes->hints_cmt = NULL;
+ attributes->colors_cmt = NULL;
+ attributes->pixels_cmt = NULL;
+/* end 3.2 bc */
+ if (attributes->valuemask & XpmReturnExtensions) {
+ attributes->extensions = NULL;
+ attributes->nextensions = 0;
+ }
+ if (attributes->valuemask & XpmReturnAllocPixels) {
+ attributes->alloc_pixels = NULL;
+ attributes->nalloc_pixels = 0;
+ }
+ }
+}
+
+/*
+ * Fill in the XpmAttributes with the XpmImage and the XpmInfo
+ */
+void
+xpmSetAttributes(attributes, image, info)
+ XpmAttributes *attributes;
+ XpmImage *image;
+ XpmInfo *info;
+{
+ if (attributes->valuemask & XpmReturnColorTable) {
+ attributes->colorTable = image->colorTable;
+ attributes->ncolors = image->ncolors;
+
+ /* avoid deletion of copied data */
+ image->ncolors = 0;
+ image->colorTable = NULL;
+ }
+/* 3.2 backward compatibility code */
+ else if (attributes->valuemask & XpmReturnInfos) {
+ int ErrorStatus;
+
+ ErrorStatus = CreateOldColorTable(image->colorTable, image->ncolors,
+ (XpmColor ***)
+ &attributes->colorTable);
+
+ /* if error just say we can't return requested data */
+ if (ErrorStatus != XpmSuccess) {
+ attributes->valuemask &= ~XpmReturnInfos;
+ if (!(attributes->valuemask & XpmReturnPixels)) {
+ XpmFree(attributes->pixels);
+ attributes->pixels = NULL;
+ attributes->npixels = 0;
+ }
+ attributes->ncolors = 0;
+ } else {
+ attributes->ncolors = image->ncolors;
+ attributes->hints_cmt = info->hints_cmt;
+ attributes->colors_cmt = info->colors_cmt;
+ attributes->pixels_cmt = info->pixels_cmt;
+
+ /* avoid deletion of copied data */
+ image->ncolors = 0;
+ image->colorTable = NULL;
+ info->hints_cmt = NULL;
+ info->colors_cmt = NULL;
+ info->pixels_cmt = NULL;
+ }
+ }
+/* end 3.2 bc */
+ if (attributes->valuemask & XpmReturnExtensions) {
+ attributes->extensions = info->extensions;
+ attributes->nextensions = info->nextensions;
+
+ /* avoid deletion of copied data */
+ info->extensions = NULL;
+ info->nextensions = 0;
+ }
+ if (info->valuemask & XpmHotspot) {
+ attributes->valuemask |= XpmHotspot;
+ attributes->x_hotspot = info->x_hotspot;
+ attributes->y_hotspot = info->y_hotspot;
+ }
+ attributes->valuemask |= XpmCharsPerPixel;
+ attributes->cpp = image->cpp;
+ attributes->valuemask |= XpmSize;
+ attributes->width = image->width;
+ attributes->height = image->height;
+}
+
+/*
+ * Free the XpmAttributes structure members
+ * but the structure itself
+ */
+void
+XpmFreeAttributes(attributes)
+ XpmAttributes *attributes;
+{
+ if (attributes->valuemask & XpmReturnPixels && attributes->npixels) {
+ XpmFree(attributes->pixels);
+ attributes->pixels = NULL;
+ attributes->npixels = 0;
+ }
+ if (attributes->valuemask & XpmReturnColorTable) {
+ xpmFreeColorTable(attributes->colorTable, attributes->ncolors);
+ attributes->colorTable = NULL;
+ attributes->ncolors = 0;
+ }
+/* 3.2 backward compatibility code */
+ else if (attributes->valuemask & XpmInfos) {
+ if (attributes->colorTable) {
+ FreeOldColorTable((XpmColor **) attributes->colorTable,
+ attributes->ncolors);
+ attributes->colorTable = NULL;
+ attributes->ncolors = 0;
+ }
+ if (attributes->hints_cmt) {
+ XpmFree(attributes->hints_cmt);
+ attributes->hints_cmt = NULL;
+ }
+ if (attributes->colors_cmt) {
+ XpmFree(attributes->colors_cmt);
+ attributes->colors_cmt = NULL;
+ }
+ if (attributes->pixels_cmt) {
+ XpmFree(attributes->pixels_cmt);
+ attributes->pixels_cmt = NULL;
+ }
+ if (attributes->pixels) {
+ XpmFree(attributes->pixels);
+ attributes->pixels = NULL;
+ attributes->npixels = 0;
+ }
+ }
+/* end 3.2 bc */
+ if (attributes->valuemask & XpmReturnExtensions
+ && attributes->nextensions) {
+ XpmFreeExtensions(attributes->extensions, attributes->nextensions);
+ attributes->extensions = NULL;
+ attributes->nextensions = 0;
+ }
+ if (attributes->valuemask & XpmReturnAllocPixels
+ && attributes->nalloc_pixels) {
+ XpmFree(attributes->alloc_pixels);
+ attributes->alloc_pixels = NULL;
+ attributes->nalloc_pixels = 0;
+ }
+ attributes->valuemask = 0;
+}
1.1.2.1 +305 -0 XEmacs/xemacs/carbon/xpm/Attic/CrDatFrI.c
Index: CrDatFrI.c
===================================================================
RCS file: CrDatFrI.c
diff -N CrDatFrI.c
--- /dev/null Fri Feb 25 17:29:40 2005
+++ /tmp/cvsAAAnIa4wg Fri Feb 25 17:29:44 2005
＠＠ -0,0 +1,305 ＠＠
+/*
+ * Copyright (C) 1989-95 GROUPE BULL
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * GROUPE BULL 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 GROUPE BULL shall not be
+ * used in advertising or otherwise to promote the sale, use or other dealings
+ * in this Software without prior written authorization from GROUPE BULL.
+ */
+
+/*****************************************************************************\
+* CrDataFI.c: *
+* *
+* XPM library *
+* Scan an image and possibly its mask and create an XPM array *
+* *
+* Developed by Arnaud Le Hors *
+\*****************************************************************************/
+
+#include "XpmI.h"
+
+LFUNC(CreateColors, int, (char **dataptr, unsigned int *data_size,
+ XpmColor *colors, unsigned int ncolors,
+ unsigned int cpp));
+
+LFUNC(CreatePixels, void, (char **dataptr, unsigned int width,
+ unsigned int height, unsigned int cpp,
+ unsigned int *pixels, XpmColor *colors));
+
+LFUNC(CountExtensions, void, (XpmExtension *ext, unsigned int num,
+ unsigned int *ext_size,
+ unsigned int *ext_nlines));
+
+LFUNC(CreateExtensions, void, (char **dataptr, unsigned int offset,
+ XpmExtension *ext, unsigned int num,
+ unsigned int ext_nlines));
+
+#undef RETURN
+#define RETURN(status) \
+{ \
+ ErrorStatus = status; \
+ goto exit; \
+}
+
+int
+XpmCreateDataFromXpmImage(data_return, image, info)
+ char ***data_return;
+ XpmImage *image;
+ XpmInfo *info;
+{
+ /* calculation variables */
+ int ErrorStatus;
+ char buf[BUFSIZ];
+ char **header = NULL, **data, **sptr, **sptr2, *s;
+ unsigned int header_size, header_nlines;
+ unsigned int data_size, data_nlines;
+ unsigned int extensions = 0, ext_size = 0, ext_nlines = 0;
+ unsigned int offset, l, n;
+
+ *data_return = NULL;
+
+ extensions = info && (info->valuemask & XpmExtensions)
+ && info->nextensions;
+
+ /* compute the number of extensions lines and size */
+ if (extensions)
+ CountExtensions(info->extensions, info->nextensions,
+ &ext_size, &ext_nlines);
+
+ /*
+ * alloc a temporary array of char pointer for the header section which
+ * is the hints line + the color table lines
+ */
+ header_nlines = 1 + image->ncolors;
+ header_size = sizeof(char *) * header_nlines;
+ header = (char **) XpmCalloc(header_size, sizeof(char *));
+ if (!header)
+ return (XpmNoMemory);
+
+ /* print the hints line */
+ s = buf;
+#ifndef VOID_SPRINTF
+ s +=
+#endif
+ sprintf(s, "%d %d %d %d", image->width, image->height,
+ image->ncolors, image->cpp);
+#ifdef VOID_SPRINTF
+ s += strlen(s);
+#endif
+
+ if (info && (info->valuemask & XpmHotspot)) {
+#ifndef VOID_SPRINTF
+ s +=
+#endif
+ sprintf(s, " %d %d", info->x_hotspot, info->y_hotspot);
+#ifdef VOID_SPRINTF
+ s += strlen(s);
+#endif
+ }
+ if (extensions) {
+ strcpy(s, " XPMEXT");
+ s += 7;
+ }
+ l = s - buf + 1;
+ *header = (char *) XpmMalloc(l);
+ if (!*header)
+ RETURN(XpmNoMemory);
+ header_size += l;
+ strcpy(*header, buf);
+
+ /* print colors */
+ ErrorStatus = CreateColors(header + 1, &header_size,
+ image->colorTable, image->ncolors, image->cpp);
+
+ if (ErrorStatus != XpmSuccess)
+ RETURN(ErrorStatus);
+
+ /* now we know the size needed, alloc the data and copy the header lines */
+ offset = image->width * image->cpp + 1;
+ data_size = header_size + (image->height + ext_nlines) * sizeof(char *)
+ + image->height * offset + ext_size;
+
+ data = (char **) XpmMalloc(data_size);
+ if (!data)
+ RETURN(XpmNoMemory);
+
+ data_nlines = header_nlines + image->height + ext_nlines;
+ *data = (char *) (data + data_nlines);
+ n = image->ncolors;
+ for (l = 0, sptr = data, sptr2 = header; l <= n; l++, sptr++, sptr2++) {
+ strcpy(*sptr, *sptr2);
+ *(sptr + 1) = *sptr + strlen(*sptr2) + 1;
+ }
+
+ /* print pixels */
+ data[header_nlines] = (char *) data + header_size
+ + (image->height + ext_nlines) * sizeof(char *);
+
+ CreatePixels(data + header_nlines, image->width, image->height,
+ image->cpp, image->data, image->colorTable);
+
+ /* print extensions */
+ if (extensions)
+ CreateExtensions(data + header_nlines + image->height - 1, offset,
+ info->extensions, info->nextensions,
+ ext_nlines);
+
+ *data_return = data;
+ ErrorStatus = XpmSuccess;
+
+/* exit point, free only locally allocated variables */
+exit:
+ if (header) {
+ for (l = 0; l < header_nlines; l++)
+ if (header[l])
+ XpmFree(header[l]);
+ XpmFree(header);
+ }
+ return(ErrorStatus);
+}
+
+static int
+CreateColors(dataptr, data_size, colors, ncolors, cpp)
+ char **dataptr;
+ unsigned int *data_size;
+ XpmColor *colors;
+ unsigned int ncolors;
+ unsigned int cpp;
+{
+ char buf[BUFSIZ];
+ unsigned int a, key, l;
+ char *s, *s2;
+ char **defaults;
+
+ for (a = 0; a < ncolors; a++, colors++, dataptr++) {
+
+ defaults = (char **) colors;
+ strncpy(buf, *defaults++, cpp);
+ s = buf + cpp;
+
+ for (key = 1; key <= NKEYS; key++, defaults++) {
+ if (s2 = *defaults) {
+#ifndef VOID_SPRINTF
+ s +=
+#endif
+ sprintf(s, "\t%s %s", xpmColorKeys[key - 1], s2);
+#ifdef VOID_SPRINTF
+ s += strlen(s);
+#endif
+ }
+ }
+ l = s - buf + 1;
+ s = (char *) XpmMalloc(l);
+ if (!s)
+ return (XpmNoMemory);
+ *data_size += l;
+ *dataptr = strcpy(s, buf);
+ }
+ return (XpmSuccess);
+}
+
+static void
+CreatePixels(dataptr, width, height, cpp, pixels, colors)
+ char **dataptr;
+ unsigned int width;
+ unsigned int height;
+ unsigned int cpp;
+ unsigned int *pixels;
+ XpmColor *colors;
+{
+ char *s;
+ unsigned int x, y, h, offset;
+
+ h = height - 1;
+ offset = width * cpp + 1;
+ for (y = 0; y < h; y++, dataptr++) {
+ s = *dataptr;
+ for (x = 0; x < width; x++, pixels++) {
+ strncpy(s, colors[*pixels].string, cpp);
+ s += cpp;
+ }
+ *s = '\0';
+ *(dataptr + 1) = *dataptr + offset;
+ }
+ /* duplicate some code to avoid a test in the loop */
+ s = *dataptr;
+ for (x = 0; x < width; x++, pixels++) {
+ strncpy(s, colors[*pixels].string, cpp);
+ s += cpp;
+ }
+ *s = '\0';
+}
+
+static void
+CountExtensions(ext, num, ext_size, ext_nlines)
+ XpmExtension *ext;
+ unsigned int num;
+ unsigned int *ext_size;
+ unsigned int *ext_nlines;
+{
+ unsigned int x, y, a, size, nlines;
+ char **line;
+
+ size = 0;
+ nlines = 0;
+ for (x = 0; x < num; x++, ext++) {
+ /* 1 for the name */
+ nlines += ext->nlines + 1;
+ /* 8 = 7 (for "XPMEXT ") + 1 (for 0) */
+ size += strlen(ext->name) + 8;
+ a = ext->nlines;
+ for (y = 0, line = ext->lines; y < a; y++, line++)
+ size += strlen(*line) + 1;
+ }
+ /* 10 and 1 are for the ending "XPMENDEXT" */
+ *ext_size = size + 10;
+ *ext_nlines = nlines + 1;
+}
+
+static void
+CreateExtensions(dataptr, offset, ext, num, ext_nlines)
+ char **dataptr;
+ unsigned int offset;
+ XpmExtension *ext;
+ unsigned int num;
+ unsigned int ext_nlines;
+{
+ unsigned int x, y, a, b;
+ char **line;
+
+ *(dataptr + 1) = *dataptr + offset;
+ dataptr++;
+ a = 0;
+ for (x = 0; x < num; x++, ext++) {
+ sprintf(*dataptr, "XPMEXT %s", ext->name);
+ a++;
+ if (a < ext_nlines)
+ *(dataptr + 1) = *dataptr + strlen(ext->name) + 8;
+ dataptr++;
+ b = ext->nlines;
+ for (y = 0, line = ext->lines; y < b; y++, line++) {
+ strcpy(*dataptr, *line);
+ a++;
+ if (a < ext_nlines)
+ *(dataptr + 1) = *dataptr + strlen(*line) + 1;
+ dataptr++;
+ }
+ }
+ strcpy(*dataptr, "XPMENDEXT");
+}
1.1.2.1 +36 -0 XEmacs/xemacs/carbon/xpm/Attic/CrIFrBuf.c
Index: CrIFrBuf.c
===================================================================
RCS file: CrIFrBuf.c
diff -N CrIFrBuf.c
--- /dev/null Fri Feb 25 17:29:40 2005
+++ /tmp/cvsAAAEJayxg Fri Feb 25 17:29:45 2005
＠＠ -0,0 +1,36 ＠＠
+#include "XpmI.h"
+
+/*
+ * open the given buffer to be read or written as an xpmData which is returned
+ */
+static void
+OpenBuffer(buffer, mdata)
+char *buffer;
+xpmData *mdata;
+{
+ mdata->type = XPMBUFFER;
+ mdata->cptr = buffer;
+ mdata->CommentLength = 0;
+}
+
+int
+XpmCreateXpmImageFromBuffer(buffer, image, info)
+char *buffer;
+XpmImage *image;
+XpmInfo *info;
+{
+ xpmData mdata;
+ int ErrorStatus;
+
+ /* init returned values */
+ xpmInitXpmImage(image);
+ xpmInitXpmInfo(info);
+
+ /* open buffer to read */
+ OpenBuffer(buffer, &mdata);
+
+ /* create the XpmImage from the XpmData */
+ ErrorStatus = xpmParseData(&mdata, image, info);
+
+ return (ErrorStatus);
+}
1.1.2.1 +61 -0 XEmacs/xemacs/carbon/xpm/Attic/Image.c
Index: Image.c
===================================================================
RCS file: Image.c
diff -N Image.c
--- /dev/null Fri Feb 25 17:29:40 2005
+++ /tmp/cvsAAA2Kaqyg Fri Feb 25 17:29:45 2005
＠＠ -0,0 +1,61 ＠＠
+/*
+ * Copyright (C) 1989-95 GROUPE BULL
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * GROUPE BULL 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 GROUPE BULL shall not be
+ * used in advertising or otherwise to promote the sale, use or other dealings
+ * in this Software without prior written authorization from GROUPE BULL.
+ */
+
+/*****************************************************************************\
+* Image.c: *
+* *
+* XPM library *
+* Functions to init and free the XpmImage structure. *
+* *
+* Developed by Arnaud Le Hors *
+\*****************************************************************************/
+
+#include "XpmI.h"
+
+/*
+ * Init returned data to free safely later on
+ */
+void
+xpmInitXpmImage(image)
+ XpmImage *image;
+{
+ image->ncolors = 0;
+ image->colorTable = NULL;
+ image->data = NULL;
+}
+
+/*
+ * Free the XpmImage data which have been allocated
+ */
+void
+XpmFreeXpmImage(image)
+ XpmImage *image;
+{
+ if (image->colorTable)
+ xpmFreeColorTable(image->colorTable, image->ncolors);
+ if (image->data)
+ XpmFree(image->data);
+ image->data = NULL;
+}
1.1.2.1 +124 -0 XEmacs/xemacs/carbon/xpm/Attic/Info.c
Index: Info.c
===================================================================
RCS file: Info.c
diff -N Info.c
--- /dev/null Fri Feb 25 17:29:40 2005
+++ /tmp/cvsAAAgMaOyg Fri Feb 25 17:29:45 2005
＠＠ -0,0 +1,124 ＠＠
+/*
+ * Copyright (C) 1989-95 GROUPE BULL
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * GROUPE BULL 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 GROUPE BULL shall not be
+ * used in advertising or otherwise to promote the sale, use or other dealings
+ * in this Software without prior written authorization from GROUPE BULL.
+ */
+
+/*****************************************************************************\
+* Info.c: *
+* *
+* XPM library *
+* Functions related to the XpmInfo structure. *
+* *
+* Developed by Arnaud Le Hors *
+\*****************************************************************************/
+
+#include "XpmI.h"
+
+/*
+ * Init returned data to free safely later on
+ */
+void
+xpmInitXpmInfo(info)
+ XpmInfo *info;
+{
+ if (info) {
+ info->hints_cmt = NULL;
+ info->colors_cmt = NULL;
+ info->pixels_cmt = NULL;
+ info->extensions = NULL;
+ info->nextensions = 0;
+ }
+}
+
+/*
+ * Free the XpmInfo data which have been allocated
+ */
+void
+XpmFreeXpmInfo(info)
+ XpmInfo *info;
+{
+ if (info) {
+ if (info->valuemask & XpmComments) {
+ if (info->hints_cmt) {
+ XpmFree(info->hints_cmt);
+ info->hints_cmt = NULL;
+ }
+ if (info->colors_cmt) {
+ XpmFree(info->colors_cmt);
+ info->colors_cmt = NULL;
+ }
+ if (info->pixels_cmt) {
+ XpmFree(info->pixels_cmt);
+ info->pixels_cmt = NULL;
+ }
+ }
+ if (info->valuemask & XpmReturnExtensions && info->nextensions) {
+ XpmFreeExtensions(info->extensions, info->nextensions);
+ info->extensions = NULL;
+ info->nextensions = 0;
+ }
+ info->valuemask = 0;
+ }
+}
+
+/*
+ * Set the XpmInfo valuemask to retrieve required info
+ */
+void
+xpmSetInfoMask(info, attributes)
+ XpmInfo *info;
+ XpmAttributes *attributes;
+{
+ info->valuemask = 0;
+ if (attributes->valuemask & XpmReturnInfos)
+ info->valuemask |= XpmReturnComments;
+ if (attributes->valuemask & XpmReturnExtensions)
+ info->valuemask |= XpmReturnExtensions;
+}
+
+/*
+ * Fill in the XpmInfo with the XpmAttributes
+ */
+void
+xpmSetInfo(info, attributes)
+ XpmInfo *info;
+ XpmAttributes *attributes;
+{
+ info->valuemask = 0;
+ if (attributes->valuemask & XpmInfos) {
+ info->valuemask |= XpmComments | XpmColorTable;
+ info->hints_cmt = attributes->hints_cmt;
+ info->colors_cmt = attributes->colors_cmt;
+ info->pixels_cmt = attributes->pixels_cmt;
+ }
+ if (attributes->valuemask & XpmExtensions) {
+ info->valuemask |= XpmExtensions;
+ info->extensions = attributes->extensions;
+ info->nextensions = attributes->nextensions;
+ }
+ if (attributes->valuemask & XpmHotspot) {
+ info->valuemask |= XpmHotspot;
+ info->x_hotspot = attributes->x_hotspot;
+ info->y_hotspot = attributes->y_hotspot;
+ }
+}
1.1.2.1 +35 -0 XEmacs/xemacs/carbon/xpm/Attic/Makefile
Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null Fri Feb 25 17:29:40 2005
+++ /tmp/cvsAAAtNaazg Fri Feb 25 17:29:45 2005
＠＠ -0,0 +1,35 ＠＠
+CC = gcc
+AR = ar r
+RANLIB = ranlib
+RM = rm -f
+# on sysV, define this as cp.
+INSTALL = install -c
+MKDIRHIER = mkdir
+LN = ln -s
+CDEBUGFLAGS= -O
+
+OBJS= data.o hashtab.o misc.o parse.o Attrib.o CrDatFrI.o CrIFrBuf.o RdFToDat.o RdFToI.o Image.o Info.o
+
+CFLAGS= $(CDEBUGFLAGS) $(DEFINES) $(INCLUDES)
+
+all: libXpm.a
+
+clean:
+ $(RM) *.o libXpm.a
+
+libXpm.a: $(OBJS)
+ $(AR) libXpm.a $(OBJS)
+ $(RANLIB) libXpm.a
+
+# Other dependencies.
+data.o: XpmI.h xpm.h
+hashtab.o: XpmI.h xpm.h
+misc.o: XpmI.h xpm.h
+parse.o: XpmI.h xpm.h
+Attrib.o: XpmI.h xpm.h
+CrDatFrI.o: XpmI.h xpm.h
+CrIFrBuf.o: XpmI.h xpm.h
+Image.o: XpmI.h xpm.h
+Info.o: XpmI.h xpm.h
+RdFToDat.o: XpmI.h xpm.h
+RdFToI.o: XpmI.h xpm.h
1.1.2.1 +65 -0 XEmacs/xemacs/carbon/xpm/Attic/RdFToDat.c
Index: RdFToDat.c
===================================================================
RCS file: RdFToDat.c
diff -N RdFToDat.c
--- /dev/null Fri Feb 25 17:29:40 2005
+++ /tmp/cvsAAAQOayzg Fri Feb 25 17:29:45 2005
＠＠ -0,0 +1,65 ＠＠
+/*
+ * Copyright (C) 1989-95 GROUPE BULL
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * GROUPE BULL 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 GROUPE BULL shall not be
+ * used in advertising or otherwise to promote the sale, use or other dealings
+ * in this Software without prior written authorization from GROUPE BULL.
+ */
+
+/*****************************************************************************\
+* RdFToDat.c: *
+* *
+* XPM library *
+* Parse an XPM file and create an array of strings corresponding to it. *
+* *
+* Developed by Dan Greening dgreen(a)cs.ucla.edu / dgreen(a)sti.com *
+\*****************************************************************************/
+
+#include "XpmI.h"
+
+int
+XpmReadFileToData(filename, data_return)
+ char *filename;
+ char ***data_return;
+{
+ XpmImage image;
+ XpmInfo info;
+ int ErrorStatus;
+
+ info.valuemask = XpmReturnComments | XpmReturnExtensions;
+
+ /*
+ * initialize return value
+ */
+ if (data_return)
+ *data_return = NULL;
+
+ ErrorStatus = XpmReadFileToXpmImage(filename, &image, &info);
+ if (ErrorStatus != XpmSuccess)
+ return (ErrorStatus);
+
+ ErrorStatus =
+ XpmCreateDataFromXpmImage(data_return, &image, &info);
+
+ XpmFreeXpmImage(&image);
+ XpmFreeXpmInfo(&info);
+
+ return (ErrorStatus);
+}
1.1.2.1 +175 -0 XEmacs/xemacs/carbon/xpm/Attic/RdFToI.c
Index: RdFToI.c
===================================================================
RCS file: RdFToI.c
diff -N RdFToI.c
--- /dev/null Fri Feb 25 17:29:40 2005
+++ /tmp/cvsAAA0PaWzg Fri Feb 25 17:29:45 2005
＠＠ -0,0 +1,175 ＠＠
+/*
+ * Copyright (C) 1989-95 GROUPE BULL
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * GROUPE BULL 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 GROUPE BULL shall not be
+ * used in advertising or otherwise to promote the sale, use or other dealings
+ * in this Software without prior written authorization from GROUPE BULL.
+ */
+
+/*****************************************************************************\
+* RdFToI.c: *
+* *
+* XPM library *
+* Parse an XPM file and create the image and possibly its mask *
+* *
+* Developed by Arnaud Le Hors *
+\*****************************************************************************/
+
+#include "XpmI.h"
+#include <sys/stat.h>
+#if !defined(NO_ZPIPE) && defined(WIN32)
+# define popen _popen
+# define pclose _pclose
+# if defined(STAT_ZFILE)
+# include <io.h>
+# define stat _stat
+# define fstat _fstat
+# endif
+#endif
+
+LFUNC(OpenReadFile, int, (char *filename, xpmData *mdata));
+LFUNC(xpmDataClose, void, (xpmData *mdata));
+
+int
+XpmReadFileToXpmImage(filename, image, info)
+ char *filename;
+ XpmImage *image;
+ XpmInfo *info;
+{
+ xpmData mdata;
+ int ErrorStatus;
+
+ /* init returned values */
+ xpmInitXpmImage(image);
+ xpmInitXpmInfo(info);
+
+ /* open file to read */
+ if ((ErrorStatus = OpenReadFile(filename, &mdata)) != XpmSuccess)
+ return (ErrorStatus);
+
+ /* create the XpmImage from the XpmData */
+ ErrorStatus = xpmParseData(&mdata, image, info);
+
+ xpmDataClose(&mdata);
+
+ return (ErrorStatus);
+}
+
+/*
+ * open the given file to be read as an xpmData which is returned.
+ */
+static int
+OpenReadFile(filename, mdata)
+ char *filename;
+ xpmData *mdata;
+{
+#ifndef NO_ZPIPE
+ char *compressfile, buf[BUFSIZ];
+# ifdef STAT_ZFILE
+ struct stat status;
+# endif
+#endif
+
+ if (!filename) {
+ mdata->stream.file = (stdin);
+ mdata->type = XPMFILE;
+ } else {
+#ifndef NO_ZPIPE
+ int len = strlen(filename);
+ if ((len > 2) && !strcmp(".Z", filename + (len - 2))) {
+ mdata->type = XPMPIPE;
+ sprintf(buf, "uncompress -c \"%s\"", filename);
+ if (!(mdata->stream.file = popen(buf, "r")))
+ return (XpmOpenFailed);
+
+ } else if ((len > 3) && !strcmp(".gz", filename + (len - 3))) {
+ mdata->type = XPMPIPE;
+ sprintf(buf, "gunzip -qc \"%s\"", filename);
+ if (!(mdata->stream.file = popen(buf, "r")))
+ return (XpmOpenFailed);
+
+ } else {
+# ifdef STAT_ZFILE
+ if (!(compressfile = (char *) XpmMalloc(len + 4)))
+ return (XpmNoMemory);
+
+ sprintf(compressfile, "%s.Z", filename);
+ if (!stat(compressfile, &status)) {
+ sprintf(buf, "uncompress -c \"%s\"", compressfile);
+ if (!(mdata->stream.file = popen(buf, "r"))) {
+ XpmFree(compressfile);
+ return (XpmOpenFailed);
+ }
+ mdata->type = XPMPIPE;
+ } else {
+ sprintf(compressfile, "%s.gz", filename);
+ if (!stat(compressfile, &status)) {
+ sprintf(buf, "gunzip -c \"%s\"", compressfile);
+ if (!(mdata->stream.file = popen(buf, "r"))) {
+ XpmFree(compressfile);
+ return (XpmOpenFailed);
+ }
+ mdata->type = XPMPIPE;
+ } else {
+# endif
+#endif
+ if (!(mdata->stream.file = fopen(filename, "r"))) {
+#if !defined(NO_ZPIPE) && defined(STAT_ZFILE)
+ XpmFree(compressfile);
+#endif
+ return (XpmOpenFailed);
+ }
+ mdata->type = XPMFILE;
+#ifndef NO_ZPIPE
+# ifdef STAT_ZFILE
+ }
+ }
+ XpmFree(compressfile);
+# endif
+ }
+#endif
+ }
+ mdata->CommentLength = 0;
+#ifdef CXPMPROG
+ mdata->lineNum = 0;
+ mdata->charNum = 0;
+#endif
+ return (XpmSuccess);
+}
+
+/*
+ * close the file related to the xpmData if any
+ */
+static void
+xpmDataClose(mdata)
+ xpmData *mdata;
+{
+ switch (mdata->type) {
+ case XPMFILE:
+ if (mdata->stream.file != (stdin))
+ fclose(mdata->stream.file);
+ break;
+#ifndef NO_ZPIPE
+ case XPMPIPE:
+ pclose(mdata->stream.file);
+ break;
+#endif
+ }
+}
1.1.2.1 +343 -0 XEmacs/xemacs/carbon/xpm/Attic/XpmI.h
Index: XpmI.h
===================================================================
RCS file: XpmI.h
diff -N XpmI.h
--- /dev/null Fri Feb 25 17:29:40 2005
+++ /tmp/cvsAAAcRaiAg Fri Feb 25 17:29:45 2005
＠＠ -0,0 +1,343 ＠＠
+/*
+ * Copyright (C) 1989-95 GROUPE BULL
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * GROUPE BULL 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 GROUPE BULL shall not be
+ * used in advertising or otherwise to promote the sale, use or other dealings
+ * in this Software without prior written authorization from GROUPE BULL.
+ */
+
+/*****************************************************************************\
+* XpmI.h: *
+* *
+* XPM library *
+* Internal Include file *
+* *
+* ** Everything defined here is subject to changes any time. ** *
+* *
+* Developed by Arnaud Le Hors *
+\*****************************************************************************/
+
+/*
+ * The code related to FOR_MSW has been added by
+ * HeDu (hedu(a)cul-ipn.uni-kiel.de) 4/94
+ */
+
+#ifndef XPMI_h
+#define XPMI_h
+
+#include "xpm.h"
+
+/*
+ * lets try to solve include files
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+/* stdio.h doesn't declare popen on a Sequent DYNIX OS */
+#ifdef sequent
+extern FILE *popen();
+#endif
+
+#if defined(SYSV) || defined(SVR4) || defined(VMS) || defined(WIN32)
+#include <string.h>
+
+#ifndef index
+#define index strchr
+#endif
+
+#ifndef rindex
+#define rindex strrchr
+#endif
+
+#else /* defined(SYSV) || defined(SVR4) || defined(VMS) */
+#include <strings.h>
+#endif
+
+
+
+#if defined(SYSV) || defined(SVR4) || defined(VMS) || defined(WIN32)
+#ifndef bcopy
+#define bcopy(source, dest, count) memcpy(dest, source, count)
+#endif
+#ifndef bzero
+#define bzero(b, len) memset(b, 0, len)
+#endif
+#endif
+
+/* the following is defined in X11R6 but not in previous versions */
+#ifdef __alpha
+#ifndef LONG64
+#define LONG64
+#endif
+#endif
+
+#ifdef VMS
+#include <unixio.h>
+#include <file.h>
+#endif
+
+/* The following should help people wanting to use their own memory allocation
+ * functions. To avoid the overhead of a function call when the standard
+ * functions are used these are all macros, even the XpmFree function which
+ * needs to be a real function for the outside world though.
+ * So if change these be sure to change the XpmFree function in misc.c
+ * accordingly.
+ */
+#define XpmFree(ptr) free(ptr)
+
+#ifndef FOR_MSW
+#define XpmMalloc(size) malloc((size))
+#define XpmRealloc(ptr, size) realloc((ptr), (size))
+#define XpmCalloc(nelem, elsize) calloc((nelem), (elsize))
+#else
+/* checks for mallocs bigger than 64K */
+#define XpmMalloc(size) boundCheckingMalloc((long)(size))/* in simx.[ch] */
+#define XpmRealloc(ptr, size) boundCheckingRealloc((ptr),(long)(size))
+#define XpmCalloc(nelem, elsize) \
+ boundCheckingCalloc((long)(nelem),(long) (elsize))
+#endif
+
+#define XPMMAXCMTLEN BUFSIZ
+typedef struct {
+ unsigned int type;
+ union {
+ FILE *file;
+ char **data;
+ } stream;
+ char *cptr;
+ unsigned int line;
+ int CommentLength;
+ char Comment[XPMMAXCMTLEN];
+ char *Bcmt, *Ecmt, Bos, Eos;
+ int format; /* 1 if XPM1, 0 otherwise */
+#ifdef CXPMPROG
+ int lineNum;
+ int charNum;
+#endif
+} xpmData;
+
+#define XPMARRAY 0
+#define XPMFILE 1
+#define XPMPIPE 2
+#define XPMBUFFER 3
+
+#define EOL '\n'
+#define TAB '\t'
+#define SPC ' '
+
+typedef struct {
+ char *type; /* key word */
+ char *Bcmt; /* string beginning comments */
+ char *Ecmt; /* string ending comments */
+ char Bos; /* character beginning strings */
+ char Eos; /* character ending strings */
+ char *Strs; /* strings separator */
+ char *Dec; /* data declaration string */
+ char *Boa; /* string beginning assignment */
+ char *Eoa; /* string ending assignment */
+} xpmDataType;
+
+extern xpmDataType xpmDataTypes[];
+
+/*
+ * rgb values and ascii names (from rgb text file) rgb values,
+ * range of 0 -> 65535 color mnemonic of rgb value
+ */
+typedef struct {
+ int r, g, b;
+ char *name;
+} xpmRgbName;
+
+/* Maximum number of rgb mnemonics allowed in rgb text file. */
+#define MAX_RGBNAMES 1024
+
+extern char *xpmColorKeys[];
+
+#define TRANSPARENT_COLOR "None" /* this must be a string! */
+
+/* number of xpmColorKeys */
+#define NKEYS 5
+
+/* XPM internal routines */
+
+FUNC(xpmParseData, int, (xpmData *data, XpmImage *image, XpmInfo *info));
+FUNC(xpmParseDataAndCreate, int, (Display *display, xpmData *data,
+ XImage **image_return,
+ XImage **shapeimage_return,
+ XpmImage *image, XpmInfo *info,
+ XpmAttributes *attributes));
+
+FUNC(xpmFreeColorTable, void, (XpmColor *colorTable, int ncolors));
+
+FUNC(xpmInitAttributes, void, (XpmAttributes *attributes));
+
+FUNC(xpmInitXpmImage, void, (XpmImage *image));
+
+FUNC(xpmInitXpmInfo, void, (XpmInfo *info));
+
+FUNC(xpmSetInfoMask, void, (XpmInfo *info, XpmAttributes *attributes));
+FUNC(xpmSetInfo, void, (XpmInfo *info, XpmAttributes *attributes));
+FUNC(xpmSetAttributes, void, (XpmAttributes *attributes, XpmImage *image,
+ XpmInfo *info));
+
+#if !defined(FOR_MSW) && !defined(AMIGA)
+FUNC(xpmCreatePixmapFromImage, void, (Display *display, Drawable d,
+ XImage *ximage, Pixmap *pixmap_return));
+
+FUNC(xpmCreateImageFromPixmap, void, (Display *display, Pixmap pixmap,
+ XImage **ximage_return,
+ unsigned int *width,
+ unsigned int *height));
+#endif
+
+/* structures and functions related to hastable code */
+
+typedef struct _xpmHashAtom {
+ char *name;
+ void *data;
+} *xpmHashAtom;
+
+typedef struct {
+ int size;
+ int limit;
+ int used;
+ xpmHashAtom *atomTable;
+} xpmHashTable;
+
+FUNC(xpmHashTableInit, int, (xpmHashTable *table));
+FUNC(xpmHashTableFree, void, (xpmHashTable *table));
+FUNC(xpmHashSlot, xpmHashAtom *, (xpmHashTable *table, char *s));
+FUNC(xpmHashIntern, int, (xpmHashTable *table, char *tag, void *data));
+
+#define HashAtomData(i) ((void *)i)
+#define HashColorIndex(slot) ((unsigned int)((*slot)->data))
+#define USE_HASHTABLE (cpp > 2 && ncolors > 4)
+
+/* I/O utility */
+
+FUNC(xpmNextString, int, (xpmData *mdata));
+FUNC(xpmNextUI, int, (xpmData *mdata, unsigned int *ui_return));
+FUNC(xpmGetString, int, (xpmData *mdata, char **sptr, unsigned int *l));
+
+#define xpmGetC(mdata) \
+ ((!mdata->type || mdata->type == XPMBUFFER) ? \
+ (*mdata->cptr++) : (getc(mdata->stream.file)))
+
+FUNC(xpmNextWord, unsigned int,
+ (xpmData *mdata, char *buf, unsigned int buflen));
+FUNC(xpmGetCmt, int, (xpmData *mdata, char **cmt));
+FUNC(xpmParseHeader, int, (xpmData *mdata));
+FUNC(xpmParseValues, int, (xpmData *data, unsigned int *width,
+ unsigned int *height, unsigned int *ncolors,
+ unsigned int *cpp, unsigned int *x_hotspot,
+ unsigned int *y_hotspot, unsigned int *hotspot,
+ unsigned int *extensions));
+
+FUNC(xpmParseColors, int, (xpmData *data, unsigned int ncolors,
+ unsigned int cpp, XpmColor **colorTablePtr,
+ xpmHashTable *hashtable));
+
+FUNC(xpmParseExtensions, int, (xpmData *data, XpmExtension **extensions,
+ unsigned int *nextensions));
+
+/* RGB utility */
+
+FUNC(xpmReadRgbNames, int, (char *rgb_fname, xpmRgbName *rgbn));
+FUNC(xpmGetRgbName, char *, (xpmRgbName *rgbn, int rgbn_max,
+ int red, int green, int blue));
+FUNC(xpmFreeRgbNames, void, (xpmRgbName *rgbn, int rgbn_max));
+#ifdef FOR_MSW
+FUNC(xpmGetRGBfromName,int, (char *name, int *r, int *g, int *b));
+#endif
+
+#ifndef AMIGA
+FUNC(xpm_xynormalizeimagebits, void, (register unsigned char *bp,
+ register XImage *img));
+FUNC(xpm_znormalizeimagebits, void, (register unsigned char *bp,
+ register XImage *img));
+
+/*
+ * Macros
+ *
+ * The XYNORMALIZE macro determines whether XY format data requires
+ * normalization and calls a routine to do so if needed. The logic in
+ * this module is designed for LSBFirst byte and bit order, so
+ * normalization is done as required to present the data in this order.
+ *
+ * The ZNORMALIZE macro performs byte and nibble order normalization if
+ * required for Z format data.
+ *
+ * The XYINDEX macro computes the index to the starting byte (char) boundary
+ * for a bitmap_unit containing a pixel with coordinates x and y for image
+ * data in XY format.
+ *
+ * The ZINDEX* macros compute the index to the starting byte (char) boundary
+ * for a pixel with coordinates x and y for image data in ZPixmap format.
+ *
+ */
+
+#define XYNORMALIZE(bp, img) \
+ if ((img->byte_order == MSBFirst) || (img->bitmap_bit_order == MSBFirst)) \
+ xpm_xynormalizeimagebits((unsigned char *)(bp), img)
+
+#define ZNORMALIZE(bp, img) \
+ if (img->byte_order == MSBFirst) \
+ xpm_znormalizeimagebits((unsigned char *)(bp), img)
+
+#define XYINDEX(x, y, img) \
+ ((y) * img->bytes_per_line) + \
+ (((x) + img->xoffset) / img->bitmap_unit) * (img->bitmap_unit >> 3)
+
+#define ZINDEX(x, y, img) ((y) * img->bytes_per_line) + \
+ (((x) * img->bits_per_pixel) >> 3)
+
+#define ZINDEX32(x, y, img) ((y) * img->bytes_per_line) + ((x) << 2)
+
+#define ZINDEX16(x, y, img) ((y) * img->bytes_per_line) + ((x) << 1)
+
+#define ZINDEX8(x, y, img) ((y) * img->bytes_per_line) + (x)
+
+#define ZINDEX1(x, y, img) ((y) * img->bytes_per_line) + ((x) >> 3)
+#endif /* not AMIGA */
+
+#ifdef __STDC__
+#define Const const
+#else
+#define Const /**/
+#endif
+
+#ifdef NEED_STRDUP
+FUNC(xpmstrdup, char *, (char *s1));
+#else
+#undef xpmstrdup
+#define xpmstrdup strdup
+#endif
+
+#ifdef NEED_STRCASECMP
+FUNC(xpmstrcasecmp, int, (char *s1, char *s2));
+#else
+#undef xpmstrcasecmp
+#define xpmstrcasecmp strcasecmp
+#endif
+
+FUNC(xpmatoui, unsigned int,
+ (char *p, unsigned int l, unsigned int *ui_return));
+
+#endif
1.1.2.1 +479 -0 XEmacs/xemacs/carbon/xpm/Attic/data.c
Index: data.c
===================================================================
RCS file: data.c
diff -N data.c
--- /dev/null Fri Feb 25 17:29:40 2005
+++ /tmp/cvsAAAxSaGAg Fri Feb 25 17:29:45 2005
＠＠ -0,0 +1,479 ＠＠
+/*
+ * Copyright (C) 1989-95 GROUPE BULL
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * GROUPE BULL 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 GROUPE BULL shall not be
+ * used in advertising or otherwise to promote the sale, use or other dealings
+ * in this Software without prior written authorization from GROUPE BULL.
+ */
+
+/*****************************************************************************\
+* data.c: *
+* *
+* XPM library *
+* IO utilities *
+* *
+* Developed by Arnaud Le Hors *
+\*****************************************************************************/
+
+#ifndef CXPMPROG
+/* Official version number */
+static char *RCS_Version = "$XpmVersion: 3.4k $";
+
+/* Internal version number */
+static char *RCS_Id = "$Id: data.c,v 1.1.2.1 2005/02/25 16:29:43 stephent Exp $";
+
+#include "XpmI.h"
+#endif
+#include <ctype.h>
+
+#ifndef CXPMPROG
+#define Getc(data, file) getc(file)
+#define Ungetc(data, c, file) ungetc(c, file)
+#endif
+
+static int
+ParseComment(data)
+ xpmData *data;
+{
+ if (data->type == XPMBUFFER) {
+ register char c;
+ register unsigned int n = 0;
+ unsigned int notend;
+ char *s, *s2;
+
+ s = data->Comment;
+ *s = data->Bcmt[0];
+
+ /* skip the string beginning comment */
+ s2 = data->Bcmt;
+ do {
+ c = *data->cptr++;
+ *++s = c;
+ n++;
+ s2++;
+ } while (c == *s2 && *s2 != '\0' && c);
+
+ if (*s2 != '\0') {
+ /* this wasn't the beginning of a comment */
+ data->cptr -= n;
+ return 0;
+ }
+ /* store comment */
+ data->Comment[0] = *s;
+ s = data->Comment;
+ notend = 1;
+ n = 0;
+ while (notend) {
+ s2 = data->Ecmt;
+ while (*s != *s2 && c) {
+ c = *data->cptr++;
+ if (n == XPMMAXCMTLEN - 1) { /* forget it */
+ s = data->Comment;
+ n = 0;
+ }
+ *++s = c;
+ n++;
+ }
+ data->CommentLength = n;
+ do {
+ c = *data->cptr++;
+ if (n == XPMMAXCMTLEN - 1) { /* forget it */
+ s = data->Comment;
+ n = 0;
+ }
+ *++s = c;
+ n++;
+ s2++;
+ } while (c == *s2 && *s2 != '\0' && c);
+ if (*s2 == '\0') {
+ /* this is the end of the comment */
+ notend = 0;
+ data->cptr--;
+ }
+ }
+ return 0;
+ } else {
+ FILE *file = data->stream.file;
+ register int c;
+ register unsigned int n = 0, a;
+ unsigned int notend;
+ char *s, *s2;
+
+ s = data->Comment;
+ *s = data->Bcmt[0];
+
+ /* skip the string beginning comment */
+ s2 = data->Bcmt;
+ do {
+ c = Getc(data, file);
+ *++s = c;
+ n++;
+ s2++;
+ } while (c == *s2 && *s2 != '\0' && c != EOF);
+
+ if (*s2 != '\0') {
+ /* this wasn't the beginning of a comment */
+ /* put characters back in the order that we got them */
+ for (a = n; a > 0; a--, s--)
+ Ungetc(data, *s, file);
+ return 0;
+ }
+ /* store comment */
+ data->Comment[0] = *s;
+ s = data->Comment;
+ notend = 1;
+ n = 0;
+ while (notend) {
+ s2 = data->Ecmt;
+ while (*s != *s2 && c != EOF) {
+ c = Getc(data, file);
+ if (n == XPMMAXCMTLEN - 1) { /* forget it */
+ s = data->Comment;
+ n = 0;
+ }
+ *++s = c;
+ n++;
+ }
+ data->CommentLength = n;
+ do {
+ c = Getc(data, file);
+ if (n == XPMMAXCMTLEN - 1) { /* forget it */
+ s = data->Comment;
+ n = 0;
+ }
+ *++s = c;
+ n++;
+ s2++;
+ } while (c == *s2 && *s2 != '\0' && c != EOF);
+ if (*s2 == '\0') {
+ /* this is the end of the comment */
+ notend = 0;
+ Ungetc(data, *s, file);
+ }
+ }
+ return 0;
+ }
+}
+
+/*
+ * skip to the end of the current string and the beginning of the next one
+ */
+int
+xpmNextString(data)
+ xpmData *data;
+{
+ if (!data->type)
+ data->cptr = (data->stream.data)[++data->line];
+ else if (data->type == XPMBUFFER) {
+ register char c;
+
+ /* get to the end of the current string */
+ if (data->Eos)
+ while ((c = *data->cptr++) && c != data->Eos);
+
+ /*
+ * then get to the beginning of the next string looking for possible
+ * comment
+ */
+ if (data->Bos) {
+ while ((c = *data->cptr++) && c != data->Bos)
+ if (data->Bcmt && c == data->Bcmt[0])
+ ParseComment(data);
+ } else if (data->Bcmt) { /* XPM2 natural */
+ while ((c = *data->cptr++) == data->Bcmt[0])
+ ParseComment(data);
+ data->cptr--;
+ }
+ } else {
+ register int c;
+ FILE *file = data->stream.file;
+
+ /* get to the end of the current string */
+ if (data->Eos)
+ while ((c = Getc(data, file)) != data->Eos && c != EOF);
+
+ /*
+ * then get to the beginning of the next string looking for possible
+ * comment
+ */
+ if (data->Bos) {
+ while ((c = Getc(data, file)) != data->Bos && c != EOF)
+ if (data->Bcmt && c == data->Bcmt[0])
+ ParseComment(data);
+
+ } else if (data->Bcmt) { /* XPM2 natural */
+ while ((c = Getc(data, file)) == data->Bcmt[0])
+ ParseComment(data);
+ Ungetc(data, c, file);
+ }
+ }
+ return 0;
+}
+
+
+/*
+ * skip whitespace and return the following word
+ */
+unsigned int
+xpmNextWord(data, buf, buflen)
+ xpmData *data;
+ char *buf;
+ unsigned int buflen;
+{
+ register unsigned int n = 0;
+ int c;
+
+ if (!data->type || data->type == XPMBUFFER) {
+ while (isspace(c = *data->cptr) && c != data->Eos)
+ data->cptr++;
+ do {
+ c = *data->cptr++;
+ *buf++ = c;
+ n++;
+ } while (!isspace(c) && c != data->Eos && n < buflen);
+ n--;
+ data->cptr--;
+ } else {
+ FILE *file = data->stream.file;
+
+ while ((c = Getc(data, file)) != EOF && isspace(c) && c != data->Eos);
+ while (!isspace(c) && c != data->Eos && c != EOF && n < buflen) {
+ *buf++ = c;
+ n++;
+ c = Getc(data, file);
+ }
+ Ungetc(data, c, file);
+ }
+ return (n);
+}
+
+/*
+ * skip whitespace and compute the following unsigned int,
+ * returns 1 if one is found and 0 if not
+ */
+int
+xpmNextUI(data, ui_return)
+ xpmData *data;
+ unsigned int *ui_return;
+{
+ char buf[BUFSIZ];
+ int l;
+
+ l = xpmNextWord(data, buf, BUFSIZ);
+ return xpmatoui(buf, l, ui_return);
+}
+
+/*
+ * return end of string - WARNING: malloc!
+ */
+int
+xpmGetString(data, sptr, l)
+ xpmData *data;
+ char **sptr;
+ unsigned int *l;
+{
+ unsigned int i, n = 0;
+ int c;
+ char *p = NULL, *q, buf[BUFSIZ];
+
+ if (!data->type || data->type == XPMBUFFER) {
+ if (data->cptr) {
+ char *start = data->cptr;
+ while ((c = *data->cptr) && c != data->Eos)
+ data->cptr++;
+ n = data->cptr - start + 1;
+ p = (char *) XpmMalloc(n);
+ if (!p)
+ return (XpmNoMemory);
+ strncpy(p, start, n);
+ if (data->type) /* XPMBUFFER */
+ p[n - 1] = '\0';
+ }
+ } else {
+ FILE *file = data->stream.file;
+
+ if ((c = Getc(data, file)) == EOF)
+ return (XpmFileInvalid);
+
+ i = 0;
+ q = buf;
+ p = (char *) XpmMalloc(1);
+ while (c != data->Eos && c != EOF) {
+ if (i == BUFSIZ) {
+ /* get to the end of the buffer */
+ /* malloc needed memory */
+ q = (char *) XpmRealloc(p, n + i);
+ if (!q) {
+ XpmFree(p);
+ return (XpmNoMemory);
+ }
+ p = q;
+ q += n;
+ /* and copy what we already have */
+ strncpy(q, buf, i);
+ n += i;
+ i = 0;
+ q = buf;
+ }
+ *q++ = c;
+ i++;
+ c = Getc(data, file);
+ }
+ if (c == EOF) {
+ XpmFree(p);
+ return (XpmFileInvalid);
+ }
+ if (n + i != 0) {
+ /* malloc needed memory */
+ q = (char *) XpmRealloc(p, n + i + 1);
+ if (!q) {
+ XpmFree(p);
+ return (XpmNoMemory);
+ }
+ p = q;
+ q += n;
+ /* and copy the buffer */
+ strncpy(q, buf, i);
+ n += i;
+ p[n++] = '\0';
+ } else {
+ *p = '\0';
+ n = 1;
+ }
+ Ungetc(data, c, file);
+ }
+ *sptr = p;
+ *l = n;
+ return (XpmSuccess);
+}
+
+/*
+ * get the current comment line
+ */
+int
+xpmGetCmt(data, cmt)
+ xpmData *data;
+ char **cmt;
+{
+ if (!data->type)
+ *cmt = NULL;
+ else if (data->CommentLength) {
+ *cmt = (char *) XpmMalloc(data->CommentLength + 1);
+ strncpy(*cmt, data->Comment, data->CommentLength);
+ (*cmt)[data->CommentLength] = '\0';
+ data->CommentLength = 0;
+ } else
+ *cmt = NULL;
+ return 0;
+}
+
+xpmDataType xpmDataTypes[] =
+{
+ "", "!", "\n", '\0', '\n', "", "", "", "", /* Natural type */
+ "C", "/*", "*/", '"', '"', ",\n", "static char *", "[] = {\n", "};\n",
+ "Lisp", ";", "\n", '"', '"', "\n", "(setq ", " '(\n", "))\n",
+#ifdef VMS
+ NULL
+#else
+ NULL, NULL, NULL, 0, 0, NULL, NULL, NULL, NULL
+#endif
+};
+
+/*
+ * parse xpm header
+ */
+int
+xpmParseHeader(data)
+ xpmData *data;
+{
+ char buf[BUFSIZ];
+ int l, n = 0;
+
+ if (data->type) {
+ data->Bos = '\0';
+ data->Eos = '\n';
+ data->Bcmt = data->Ecmt = NULL;
+ l = xpmNextWord(data, buf, BUFSIZ);
+ if (l == 7 && !strncmp("#define", buf, 7)) {
+ /* this maybe an XPM 1 file */
+ char *ptr;
+
+ l = xpmNextWord(data, buf, BUFSIZ);
+ if (!l)
+ return (XpmFileInvalid);
+ buf[l] = '\0';
+ ptr = rindex(buf, '_');
+ if (!ptr || strncmp("_format", ptr, l - (ptr - buf)))
+ return XpmFileInvalid;
+ /* this is definitely an XPM 1 file */
+ data->format = 1;
+ n = 1; /* handle XPM1 as mainly XPM2 C */
+ } else {
+
+ /*
+ * skip the first word, get the second one, and see if this is
+ * XPM 2 or 3
+ */
+ l = xpmNextWord(data, buf, BUFSIZ);
+ if ((l == 3 && !strncmp("XPM", buf, 3)) ||
+ (l == 4 && !strncmp("XPM2", buf, 4))) {
+ if (l == 3)
+ n = 1; /* handle XPM as XPM2 C */
+ else {
+ /* get the type key word */
+ l = xpmNextWord(data, buf, BUFSIZ);
+
+ /*
+ * get infos about this type
+ */
+ while (xpmDataTypes[n].type
+ && strncmp(xpmDataTypes[n].type, buf, l))
+ n++;
+ }
+ data->format = 0;
+ } else
+ /* nope this is not an XPM file */
+ return XpmFileInvalid;
+ }
+ if (xpmDataTypes[n].type) {
+ if (n == 0) { /* natural type */
+ data->Bcmt = xpmDataTypes[n].Bcmt;
+ data->Ecmt = xpmDataTypes[n].Ecmt;
+ xpmNextString(data); /* skip the end of the headerline */
+ data->Bos = xpmDataTypes[n].Bos;
+ data->Eos = xpmDataTypes[n].Eos;
+ } else {
+ data->Bcmt = xpmDataTypes[n].Bcmt;
+ data->Ecmt = xpmDataTypes[n].Ecmt;
+ if (!data->format) { /* XPM 2 or 3 */
+ data->Bos = xpmDataTypes[n].Bos;
+ data->Eos = '\0';
+ /* get to the beginning of the first string */
+ xpmNextString(data);
+ data->Eos = xpmDataTypes[n].Eos;
+ } else /* XPM 1 skip end of line */
+ xpmNextString(data);
+ }
+ } else
+ /* we don't know about that type of XPM file... */
+ return XpmFileInvalid;
+ }
+ return XpmSuccess;
+}
1.1.2.1 +234 -0 XEmacs/xemacs/carbon/xpm/Attic/hashtab.c
Index: hashtab.c
===================================================================
RCS file: hashtab.c
diff -N hashtab.c
--- /dev/null Fri Feb 25 17:29:40 2005
+++ /tmp/cvsAAAUTaaBg Fri Feb 25 17:29:45 2005
＠＠ -0,0 +1,234 ＠＠
+/*
+ * Copyright (C) 1989-95 GROUPE BULL
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * GROUPE BULL 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 GROUPE BULL shall not be
+ * used in advertising or otherwise to promote the sale, use or other dealings
+ * in this Software without prior written authorization from GROUPE BULL.
+ */
+
+/*****************************************************************************\
+* hashtab.c: *
+* *
+* XPM library *
+* *
+* Developed by Arnaud Le Hors *
+* this originaly comes from Colas Nahaboo as a part of Wool *
+* *
+\*****************************************************************************/
+
+#include "XpmI.h"
+
+LFUNC(AtomMake, xpmHashAtom, (char *name, void *data));
+LFUNC(HashTableGrows, int, (xpmHashTable * table));
+
+static xpmHashAtom
+AtomMake(name, data) /* makes an atom */
+ char *name; /* WARNING: is just pointed to */
+ void *data;
+{
+ xpmHashAtom object = (xpmHashAtom) XpmMalloc(sizeof(struct _xpmHashAtom));
+
+ if (object) {
+ object->name = name;
+ object->data = data;
+ }
+ return object;
+}
+
+/************************\
+* *
+* hash table routines *
+* *
+\************************/
+
+/*
+ * Hash function definition:
+ * HASH_FUNCTION: hash function, hash = hashcode, hp = pointer on char,
+ * hash2 = temporary for hashcode.
+ * INITIAL_TABLE_SIZE in slots
+ * HASH_TABLE_GROWS how hash table grows.
+ */
+
+/* Mock lisp function */
+#define HASH_FUNCTION hash = (hash << 5) - hash + *hp++;
+/* #define INITIAL_HASH_SIZE 2017 */
+#define INITIAL_HASH_SIZE 256 /* should be enough for colors */
+#define HASH_TABLE_GROWS size = size * 2;
+
+/* aho-sethi-ullman's HPJ (sizes should be primes)*/
+#ifdef notdef
+#define HASH_FUNCTION hash <<= 4; hash += *hp++; \
+ if(hash2 = hash & 0xf0000000) hash ^= (hash2 >> 24) ^ hash2;
+#define INITIAL_HASH_SIZE 4095 /* should be 2^n - 1 */
+#define HASH_TABLE_GROWS size = size << 1 + 1;
+#endif
+
+/* GNU emacs function */
+/*
+#define HASH_FUNCTION hash = (hash << 3) + (hash >> 28) + *hp++;
+#define INITIAL_HASH_SIZE 2017
+#define HASH_TABLE_GROWS size = size * 2;
+*/
+
+/* end of hash functions */
+
+/*
+ * The hash table is used to store atoms via their NAME:
+ *
+ * NAME --hash--> ATOM |--name--> "foo"
+ * |--data--> any value which has to be stored
+ *
+ */
+
+/*
+ * xpmHashSlot gives the slot (pointer to xpmHashAtom) of a name
+ * (slot points to NULL if it is not defined)
+ *
+ */
+
+xpmHashAtom *
+xpmHashSlot(table, s)
+ xpmHashTable *table;
+ char *s;
+{
+ xpmHashAtom *atomTable = table->atomTable;
+ unsigned int hash;
+ xpmHashAtom *p;
+ char *hp = s;
+ char *ns;
+
+ hash = 0;
+ while (*hp) { /* computes hash function */
+ HASH_FUNCTION
+ }
+ p = atomTable + hash % table->size;
+ while (*p) {
+ ns = (*p)->name;
+ if (ns[0] == s[0] && strcmp(ns, s) == 0)
+ break;
+ p--;
+ if (p < atomTable)
+ p = atomTable + table->size - 1;
+ }
+ return p;
+}
+
+static int
+HashTableGrows(table)
+ xpmHashTable *table;
+{
+ xpmHashAtom *atomTable = table->atomTable;
+ int size = table->size;
+ xpmHashAtom *t, *p;
+ int i;
+ int oldSize = size;
+
+ t = atomTable;
+ HASH_TABLE_GROWS
+ table->size = size;
+ table->limit = size / 3;
+ atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable));
+ if (!atomTable)
+ return (XpmNoMemory);
+ table->atomTable = atomTable;
+ for (p = atomTable + size; p > atomTable;)
+ *--p = NULL;
+ for (i = 0, p = t; i < oldSize; i++, p++)
+ if (*p) {
+ xpmHashAtom *ps = xpmHashSlot(table, (*p)->name);
+
+ *ps = *p;
+ }
+ XpmFree(t);
+ return (XpmSuccess);
+}
+
+/*
+ * xpmHashIntern(table, name, data)
+ * an xpmHashAtom is created if name doesn't exist, with the given data.
+ */
+
+int
+xpmHashIntern(table, tag, data)
+ xpmHashTable *table;
+ char *tag;
+ void *data;
+{
+ xpmHashAtom *slot;
+
+ if (!*(slot = xpmHashSlot(table, tag))) {
+ /* undefined, make a new atom with the given data */
+ if (!(*slot = AtomMake(tag, data)))
+ return (XpmNoMemory);
+ if (table->used >= table->limit) {
+ int ErrorStatus;
+
+ if ((ErrorStatus = HashTableGrows(table)) != XpmSuccess)
+ return (ErrorStatus);
+ table->used++;
+ return (XpmSuccess);
+ }
+ table->used++;
+ }
+ return (XpmSuccess);
+}
+
+/*
+ * must be called before allocating any atom
+ */
+
+int
+xpmHashTableInit(table)
+ xpmHashTable *table;
+{
+ xpmHashAtom *p;
+ xpmHashAtom *atomTable;
+
+ table->size = INITIAL_HASH_SIZE;
+ table->limit = table->size / 3;
+ table->used = 0;
+ atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable));
+ if (!atomTable)
+ return (XpmNoMemory);
+ for (p = atomTable + table->size; p > atomTable;)
+ *--p = NULL;
+ table->atomTable = atomTable;
+ return (XpmSuccess);
+}
+
+/*
+ * frees a hashtable and all the stored atoms
+ */
+
+void
+xpmHashTableFree(table)
+ xpmHashTable *table;
+{
+ xpmHashAtom *p;
+ xpmHashAtom *atomTable = table->atomTable;
+
+ if (!atomTable)
+ return;
+ for (p = atomTable + table->size; p > atomTable;)
+ if (*--p)
+ XpmFree(*p);
+ XpmFree(atomTable);
+ table->atomTable = NULL;
+}
1.1.2.1 +124 -0 XEmacs/xemacs/carbon/xpm/Attic/misc.c
Index: misc.c
===================================================================
RCS file: misc.c
diff -N misc.c
--- /dev/null Fri Feb 25 17:29:40 2005
+++ /tmp/cvsAAA8UayBg Fri Feb 25 17:29:45 2005
＠＠ -0,0 +1,124 ＠＠
+/*
+ * Copyright (C) 1989-95 GROUPE BULL
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * GROUPE BULL 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 GROUPE BULL shall not be
+ * used in advertising or otherwise to promote the sale, use or other dealings
+ * in this Software without prior written authorization from GROUPE BULL.
+ */
+
+/*****************************************************************************\
+* misc.c: *
+* *
+* XPM library *
+* Miscellaneous utilities *
+* *
+* Developed by Arnaud Le Hors *
+\*****************************************************************************/
+
+#include "XpmI.h"
+
+#ifdef NEED_STRDUP
+/*
+ * in case strdup is not provided by the system here is one
+ * which does the trick
+ */
+char *
+xpmstrdup(s1)
+ char *s1;
+{
+ char *s2;
+ int l = strlen(s1) + 1;
+
+ if (s2 = (char *) XpmMalloc(l))
+ strcpy(s2, s1);
+ return s2;
+}
+
+#endif
+
+unsigned int
+xpmatoui(p, l, ui_return)
+ register char *p;
+ unsigned int l;
+ unsigned int *ui_return;
+{
+ register unsigned int n, i;
+
+ n = 0;
+ for (i = 0; i < l; i++)
+ if (*p >= '0' && *p <= '9')
+ n = n * 10 + *p++ - '0';
+ else
+ break;
+
+ if (i != 0 && i == l) {
+ *ui_return = n;
+ return 1;
+ } else
+ return 0;
+}
+
+/*
+ * Function returning a character string related to an error code.
+ */
+char *
+XpmGetErrorString(errcode)
+ int errcode;
+{
+ switch (errcode) {
+ case XpmColorError:
+ return ("XpmColorError");
+ case XpmSuccess:
+ return ("XpmSuccess");
+ case XpmOpenFailed:
+ return ("XpmOpenFailed");
+ case XpmFileInvalid:
+ return ("XpmFileInvalid");
+ case XpmNoMemory:
+ return ("XpmNoMemory");
+ case XpmColorFailed:
+ return ("XpmColorFailed");
+ default:
+ return ("Invalid XpmError");
+ }
+}
+
+/*
+ * The following function provides a way to figure out if the linked library is
+ * newer or older than the one with which a program has been first compiled.
+ */
+int
+XpmLibraryVersion()
+{
+ return XpmIncludeVersion;
+}
+
+
+/* The following should help people wanting to use their own functions */
+#ifdef XpmFree
+#undef XpmFree
+#endif
+
+void
+XpmFree(ptr)
+ void *ptr;
+{
+ free(ptr);
+}
1.1.2.1 +745 -0 XEmacs/xemacs/carbon/xpm/Attic/parse.c
Index: parse.c
===================================================================
RCS file: parse.c
diff -N parse.c
--- /dev/null Fri Feb 25 17:29:40 2005
+++ /tmp/cvsAAAmWaWBg Fri Feb 25 17:29:45 2005
＠＠ -0,0 +1,745 ＠＠
+/*
+ * Copyright (C) 1989-95 GROUPE BULL
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * GROUPE BULL 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 GROUPE BULL shall not be
+ * used in advertising or otherwise to promote the sale, use or other dealings
+ * in this Software without prior written authorization from GROUPE BULL.
+ */
+
+/*****************************************************************************\
+* parse.c: *
+* *
+* XPM library *
+* Parse an XPM file or array and store the found informations *
+* in the given XpmImage structure. *
+* *
+* Developed by Arnaud Le Hors *
+\*****************************************************************************/
+
+/*
+ * The code related to FOR_MSW has been added by
+ * HeDu (hedu(a)cul-ipn.uni-kiel.de) 4/94
+ */
+
+#include "XpmI.h"
+#include <ctype.h>
+
+LFUNC(ParsePixels, int, (xpmData *data, unsigned int width,
+ unsigned int height, unsigned int ncolors,
+ unsigned int cpp, XpmColor *colorTable,
+ xpmHashTable *hashtable, unsigned int **pixels));
+
+char *xpmColorKeys[] = {
+ "s", /* key #1: symbol */
+ "m", /* key #2: mono visual */
+ "g4", /* key #3: 4 grays visual */
+ "g", /* key #4: gray visual */
+ "c", /* key #5: color visual */
+};
+
+int
+xpmParseValues(data, width, height, ncolors, cpp,
+ x_hotspot, y_hotspot, hotspot, extensions)
+ xpmData *data;
+ unsigned int *width, *height, *ncolors, *cpp;
+ unsigned int *x_hotspot, *y_hotspot, *hotspot;
+ unsigned int *extensions;
+{
+ unsigned int l;
+ char buf[BUFSIZ];
+
+ if (!data->format) { /* XPM 2 or 3 */
+
+ /*
+ * read values: width, height, ncolors, chars_per_pixel
+ */
+ if (!(xpmNextUI(data, width) && xpmNextUI(data, height)
+ && xpmNextUI(data, ncolors) && xpmNextUI(data, cpp)))
+ return (XpmFileInvalid);
+
+ /*
+ * read optional information (hotspot and/or XPMEXT) if any
+ */
+ l = xpmNextWord(data, buf, BUFSIZ);
+ if (l) {
+ *extensions = (l == 6 && !strncmp("XPMEXT", buf, 6));
+ if (*extensions)
+ *hotspot = (xpmNextUI(data, x_hotspot)
+ && xpmNextUI(data, y_hotspot));
+ else {
+ *hotspot = (xpmatoui(buf, l, x_hotspot)
+ && xpmNextUI(data, y_hotspot));
+ l = xpmNextWord(data, buf, BUFSIZ);
+ *extensions = (l == 6 && !strncmp("XPMEXT", buf, 6));
+ }
+ }
+ } else {
+
+ /*
+ * XPM 1 file read values: width, height, ncolors, chars_per_pixel
+ */
+ int i;
+ char *ptr;
+ Bool got_one, saw_width = False, saw_height = False;
+ Bool saw_ncolors = False, saw_chars_per_pixel = False;
+
+ for (i = 0; i < 4; i++) {
+ l = xpmNextWord(data, buf, BUFSIZ);
+ if (l != 7 || strncmp("#define", buf, 7))
+ return (XpmFileInvalid);
+ l = xpmNextWord(data, buf, BUFSIZ);
+ if (!l)
+ return (XpmFileInvalid);
+ buf[l] = '\0';
+ ptr = buf;
+ got_one = False;
+ while (!got_one) {
+ ptr = index(ptr, '_');
+ if (!ptr)
+ return (XpmFileInvalid);
+ switch (l - (ptr - buf)) {
+ case 6:
+ if (saw_width || strncmp("_width", ptr, 6)
+ || !xpmNextUI(data, width))
+ return (XpmFileInvalid);
+ else
+ saw_width = True;
+ got_one = True;
+ break;
+ case 7:
+ if (saw_height || strncmp("_height", ptr, 7)
+ || !xpmNextUI(data, height))
+ return (XpmFileInvalid);
+ else
+ saw_height = True;
+ got_one = True;
+ break;
+ case 8:
+ if (saw_ncolors || strncmp("_ncolors", ptr, 8)
+ || !xpmNextUI(data, ncolors))
+ return (XpmFileInvalid);
+ else
+ saw_ncolors = True;
+ got_one = True;
+ break;
+ case 16:
+ if (saw_chars_per_pixel
+ || strncmp("_chars_per_pixel", ptr, 16)
+ || !xpmNextUI(data, cpp))
+ return (XpmFileInvalid);
+ else
+ saw_chars_per_pixel = True;
+ got_one = True;
+ break;
+ default:
+ ptr++;
+ }
+ }
+ /* skip the end of line */
+ xpmNextString(data);
+ }
+ if (!saw_width || !saw_height || !saw_ncolors || !saw_chars_per_pixel)
+ return (XpmFileInvalid);
+
+ *hotspot = 0;
+ *extensions = 0;
+ }
+ return (XpmSuccess);
+}
+
+int
+xpmParseColors(data, ncolors, cpp, colorTablePtr, hashtable)
+ xpmData *data;
+ unsigned int ncolors;
+ unsigned int cpp;
+ XpmColor **colorTablePtr;
+ xpmHashTable *hashtable;
+{
+ unsigned int key, l, a, b;
+ unsigned int curkey; /* current color key */
+ unsigned int lastwaskey; /* key read */
+ char buf[BUFSIZ];
+ char curbuf[BUFSIZ]; /* current buffer */
+ char **sptr, *s;
+ XpmColor *color;
+ XpmColor *colorTable;
+ char **defaults;
+ int ErrorStatus;
+
+ colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor));
+ if (!colorTable)
+ return (XpmNoMemory);
+
+ if (!data->format) { /* XPM 2 or 3 */
+ for (a = 0, color = colorTable; a < ncolors; a++, color++) {
+ xpmNextString(data); /* skip the line */
+
+ /*
+ * read pixel value
+ */
+ color->string = (char *) XpmMalloc(cpp + 1);
+ if (!color->string) {
+ xpmFreeColorTable(colorTable, ncolors);
+ return (XpmNoMemory);
+ }
+ for (b = 0, s = color->string; b < cpp; b++, s++)
+ *s = xpmGetC(data);
+ *s = '\0';
+
+ /*
+ * store the string in the hashtable with its color index number
+ */
+ if (USE_HASHTABLE) {
+ ErrorStatus =
+ xpmHashIntern(hashtable, color->string, HashAtomData(a));
+ if (ErrorStatus != XpmSuccess) {
+ xpmFreeColorTable(colorTable, ncolors);
+ return (ErrorStatus);
+ }
+ }
+
+ /*
+ * read color keys and values
+ */
+ defaults = (char **) color;
+ curkey = 0;
+ lastwaskey = 0;
+ *curbuf = '\0'; /* init curbuf */
+ while (l = xpmNextWord(data, buf, BUFSIZ)) {
+ if (!lastwaskey) {
+ for (key = 0, sptr = xpmColorKeys; key < NKEYS; key++,
+ sptr++)
+ if ((strlen(*sptr) == l) && (!strncmp(*sptr, buf, l)))
+ break;
+ }
+ if (!lastwaskey && key < NKEYS) { /* open new key */
+ if (curkey) { /* flush string */
+ s = (char *) XpmMalloc(strlen(curbuf) + 1);
+ if (!s) {
+ xpmFreeColorTable(colorTable, ncolors);
+ return (XpmNoMemory);
+ }
+ defaults[curkey] = s;
+ strcpy(s, curbuf);
+ }
+ curkey = key + 1; /* set new key */
+ *curbuf = '\0'; /* reset curbuf */
+ lastwaskey = 1;
+ } else {
+ if (!curkey) { /* key without value */
+ xpmFreeColorTable(colorTable, ncolors);
+ return (XpmFileInvalid);
+ }
+ if (!lastwaskey)
+ strcat(curbuf, " "); /* append space */
+ buf[l] = '\0';
+ strcat(curbuf, buf);/* append buf */
+ lastwaskey = 0;
+ }
+ }
+ if (!curkey) { /* key without value */
+ xpmFreeColorTable(colorTable, ncolors);
+ return (XpmFileInvalid);
+ }
+ s = defaults[curkey] = (char *) XpmMalloc(strlen(curbuf) + 1);
+ if (!s) {
+ xpmFreeColorTable(colorTable, ncolors);
+ return (XpmNoMemory);
+ }
+ strcpy(s, curbuf);
+ }
+ } else { /* XPM 1 */
+ /* get to the beginning of the first string */
+ data->Bos = '"';
+ data->Eos = '\0';
+ xpmNextString(data);
+ data->Eos = '"';
+ for (a = 0, color = colorTable; a < ncolors; a++, color++) {
+
+ /*
+ * read pixel value
+ */
+ color->string = (char *) XpmMalloc(cpp + 1);
+ if (!color->string) {
+ xpmFreeColorTable(colorTable, ncolors);
+ return (XpmNoMemory);
+ }
+ for (b = 0, s = color->string; b < cpp; b++, s++)
+ *s = xpmGetC(data);
+ *s = '\0';
+
+ /*
+ * store the string in the hashtable with its color index number
+ */
+ if (USE_HASHTABLE) {
+ ErrorStatus =
+ xpmHashIntern(hashtable, color->string, HashAtomData(a));
+ if (ErrorStatus != XpmSuccess) {
+ xpmFreeColorTable(colorTable, ncolors);
+ return (ErrorStatus);
+ }
+ }
+
+ /*
+ * read color values
+ */
+ xpmNextString(data); /* get to the next string */
+ *curbuf = '\0'; /* init curbuf */
+ while (l = xpmNextWord(data, buf, BUFSIZ)) {
+ if (*curbuf != '\0')
+ strcat(curbuf, " ");/* append space */
+ buf[l] = '\0';
+ strcat(curbuf, buf); /* append buf */
+ }
+ s = (char *) XpmMalloc(strlen(curbuf) + 1);
+ if (!s) {
+ xpmFreeColorTable(colorTable, ncolors);
+ return (XpmNoMemory);
+ }
+ strcpy(s, curbuf);
+ color->c_color = s;
+ *curbuf = '\0'; /* reset curbuf */
+ if (a < ncolors - 1)
+ xpmNextString(data); /* get to the next string */
+ }
+ }
+ *colorTablePtr = colorTable;
+ return (XpmSuccess);
+}
+
+static int
+ParsePixels(data, width, height, ncolors, cpp, colorTable, hashtable, pixels)
+ xpmData *data;
+ unsigned int width;
+ unsigned int height;
+ unsigned int ncolors;
+ unsigned int cpp;
+ XpmColor *colorTable;
+ xpmHashTable *hashtable;
+ unsigned int **pixels;
+{
+ unsigned int *iptr, *iptr2;
+ unsigned int a, x, y;
+
+#ifndef FOR_MSW
+ iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height);
+#else
+
+ /*
+ * special treatment to trick DOS malloc(size_t) where size_t is 16 bit!!
+ * XpmMalloc is defined to longMalloc(long) and checks the 16 bit boundary
+ */
+ iptr2 = (unsigned int *)
+ XpmMalloc((long) sizeof(unsigned int) * (long) width * (long) height);
+#endif
+ if (!iptr2)
+ return (XpmNoMemory);
+
+ iptr = iptr2;
+
+ switch (cpp) {
+
+ case (1): /* Optimize for single character
+ * colors */
+ {
+ unsigned short colidx[256];
+
+ bzero((char *)colidx, 256 * sizeof(short));
+ for (a = 0; a < ncolors; a++)
+ colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
+
+ for (y = 0; y < height; y++) {
+ xpmNextString(data);
+ for (x = 0; x < width; x++, iptr++) {
+ int c = xpmGetC(data);
+
+ if (c > 0 && c < 256 && colidx[c] != 0)
+ *iptr = colidx[c] - 1;
+ else {
+ XpmFree(iptr2);
+ return (XpmFileInvalid);
+ }
+ }
+ }
+ }
+ break;
+
+ case (2): /* Optimize for double character
+ * colors */
+ {
+
+/* free all allocated pointers at all exits */
+#define FREE_CIDX {int f; for (f = 0; f < 256; f++) \
+if (cidx[f]) XpmFree(cidx[f]);}
+
+ /* array of pointers malloced by need */
+ unsigned short *cidx[256];
+ int char1;
+
+ bzero((char *)cidx, 256 * sizeof(unsigned short *)); /* init */
+ for (a = 0; a < ncolors; a++) {
+ char1 = colorTable[a].string[0];
+ if (cidx[char1] == NULL) { /* get new memory */
+ cidx[char1] = (unsigned short *)
+ XpmCalloc(256, sizeof(unsigned short));
+ if (cidx[char1] == NULL) { /* new block failed */
+ FREE_CIDX;
+ XpmFree(iptr2);
+ return (XpmNoMemory);
+ }
+ }
+ cidx[char1][(unsigned char)colorTable[a].string[1]] = a + 1;
+ }
+
+ for (y = 0; y < height; y++) {
+ xpmNextString(data);
+ for (x = 0; x < width; x++, iptr++) {
+ int cc1 = xpmGetC(data);
+ if (cc1 > 0 && cc1 < 256) {
+ int cc2 = xpmGetC(data);
+ if (cc2 > 0 && cc2 < 256 &&
+ cidx[cc1] && cidx[cc1][cc2] != 0)
+ *iptr = cidx[cc1][cc2] - 1;
+ else {
+ FREE_CIDX;
+ XpmFree(iptr2);
+ return (XpmFileInvalid);
+ }
+ } else {
+ FREE_CIDX;
+ XpmFree(iptr2);
+ return (XpmFileInvalid);
+ }
+ }
+ }
+ FREE_CIDX;
+ }
+ break;
+
+ default: /* Non-optimized case of long color
+ * names */
+ {
+ char *s;
+ char buf[BUFSIZ];
+
+ buf[cpp] = '\0';
+ if (USE_HASHTABLE) {
+ xpmHashAtom *slot;
+
+ for (y = 0; y < height; y++) {
+ xpmNextString(data);
+ for (x = 0; x < width; x++, iptr++) {
+ for (a = 0, s = buf; a < cpp; a++, s++)
+ *s = xpmGetC(data);
+ slot = xpmHashSlot(hashtable, buf);
+ if (!*slot) { /* no color matches */
+ XpmFree(iptr2);
+ return (XpmFileInvalid);
+ }
+ *iptr = HashColorIndex(slot);
+ }
+ }
+ } else {
+ for (y = 0; y < height; y++) {
+ xpmNextString(data);
+ for (x = 0; x < width; x++, iptr++) {
+ for (a = 0, s = buf; a < cpp; a++, s++)
+ *s = xpmGetC(data);
+ for (a = 0; a < ncolors; a++)
+ if (!strcmp(colorTable[a].string, buf))
+ break;
+ if (a == ncolors) { /* no color matches */
+ XpmFree(iptr2);
+ return (XpmFileInvalid);
+ }
+ *iptr = a;
+ }
+ }
+ }
+ }
+ break;
+ }
+ *pixels = iptr2;
+ return (XpmSuccess);
+}
+
+int
+xpmParseExtensions(data, extensions, nextensions)
+ xpmData *data;
+ XpmExtension **extensions;
+ unsigned int *nextensions;
+{
+ XpmExtension *exts = NULL, *ext;
+ unsigned int num = 0;
+ unsigned int nlines, a, l, notstart, notend = 0;
+ int status;
+ char *string, *s, *s2, **sp;
+
+ xpmNextString(data);
+ exts = (XpmExtension *) XpmMalloc(sizeof(XpmExtension));
+ /* get the whole string */
+ status = xpmGetString(data, &string, &l);
+ if (status != XpmSuccess) {
+ XpmFree(exts);
+ return (status);
+ }
+ /* look for the key word XPMEXT, skip lines before this */
+ while ((notstart = strncmp("XPMEXT", string, 6))
+ && (notend = strncmp("XPMENDEXT", string, 9))) {
+ XpmFree(string);
+ xpmNextString(data);
+ status = xpmGetString(data, &string, &l);
+ if (status != XpmSuccess) {
+ XpmFree(exts);
+ return (status);
+ }
+ }
+ if (!notstart)
+ notend = strncmp("XPMENDEXT", string, 9);
+ while (!notstart && notend) {
+ /* there starts an extension */
+ ext = (XpmExtension *)
+ XpmRealloc(exts, (num + 1) * sizeof(XpmExtension));
+ if (!ext) {
+ XpmFree(string);
+ XpmFreeExtensions(exts, num);
+ return (XpmNoMemory);
+ }
+ exts = ext;
+ ext += num;
+ /* skip whitespace and store its name */
+ s2 = s = string + 6;
+ while (isspace(*s2))
+ s2++;
+ a = s2 - s;
+ ext->name = (char *) XpmMalloc(l - a - 6);
+ if (!ext->name) {
+ XpmFree(string);
+ ext->lines = NULL;
+ ext->nlines = 0;
+ XpmFreeExtensions(exts, num + 1);
+ return (XpmNoMemory);
+ }
+ strncpy(ext->name, s + a, l - a - 6);
+ XpmFree(string);
+ /* now store the related lines */
+ xpmNextString(data);
+ status = xpmGetString(data, &string, &l);
+ if (status != XpmSuccess) {
+ ext->lines = NULL;
+ ext->nlines = 0;
+ XpmFreeExtensions(exts, num + 1);
+ return (status);
+ }
+ ext->lines = (char **) XpmMalloc(sizeof(char *));
+ nlines = 0;
+ while ((notstart = strncmp("XPMEXT", string, 6))
+ && (notend = strncmp("XPMENDEXT", string, 9))) {
+ sp = (char **)
+ XpmRealloc(ext->lines, (nlines + 1) * sizeof(char *));
+ if (!sp) {
+ XpmFree(string);
+ ext->nlines = nlines;
+ XpmFreeExtensions(exts, num + 1);
+ return (XpmNoMemory);
+ }
+ ext->lines = sp;
+ ext->lines[nlines] = string;
+ nlines++;
+ xpmNextString(data);
+ status = xpmGetString(data, &string, &l);
+ if (status != XpmSuccess) {
+ ext->nlines = nlines;
+ XpmFreeExtensions(exts, num + 1);
+ return (status);
+ }
+ }
+ if (!nlines) {
+ XpmFree(ext->lines);
+ ext->lines = NULL;
+ }
+ ext->nlines = nlines;
+ num++;
+ }
+ if (!num) {
+ XpmFree(string);
+ XpmFree(exts);
+ exts = NULL;
+ } else if (!notend)
+ XpmFree(string);
+ *nextensions = num;
+ *extensions = exts;
+ return (XpmSuccess);
+}
+
+
+/* function call in case of error */
+#undef RETURN
+#define RETURN(status) \
+{ \
+ goto error; \
+}
+
+/*
+ * This function parses an Xpm file or data and store the found informations
+ * in an an XpmImage structure which is returned.
+ */
+int
+xpmParseData(data, image, info)
+ xpmData *data;
+ XpmImage *image;
+ XpmInfo *info;
+{
+ /* variables to return */
+ unsigned int width, height, ncolors, cpp;
+ unsigned int x_hotspot, y_hotspot, hotspot = 0, extensions = 0;
+ XpmColor *colorTable = NULL;
+ unsigned int *pixelindex = NULL;
+ char *hints_cmt = NULL;
+ char *colors_cmt = NULL;
+ char *pixels_cmt = NULL;
+
+ unsigned int cmts;
+ int ErrorStatus;
+ xpmHashTable hashtable;
+
+ cmts = info && (info->valuemask & XpmReturnComments);
+
+ /*
+ * parse the header
+ */
+ ErrorStatus = xpmParseHeader(data);
+ if (ErrorStatus != XpmSuccess)
+ return (ErrorStatus);
+
+ /*
+ * read values
+ */
+ ErrorStatus = xpmParseValues(data, &width, &height, &ncolors, &cpp,
+ &x_hotspot, &y_hotspot, &hotspot,
+ &extensions);
+ if (ErrorStatus != XpmSuccess)
+ return (ErrorStatus);
+
+ /*
+ * store the hints comment line
+ */
+ if (cmts)
+ xpmGetCmt(data, &hints_cmt);
+
+ /*
+ * init the hastable
+ */
+ if (USE_HASHTABLE) {
+ ErrorStatus = xpmHashTableInit(&hashtable);
+ if (ErrorStatus != XpmSuccess)
+ return (ErrorStatus);
+ }
+
+ /*
+ * read colors
+ */
+ ErrorStatus = xpmParseColors(data, ncolors, cpp, &colorTable, &hashtable);
+ if (ErrorStatus != XpmSuccess) {
+ if (USE_HASHTABLE)
+ xpmHashTableFree(&hashtable);
+ RETURN(ErrorStatus);
+ }
+
+ /*
+ * store the colors comment line
+ */
+ if (cmts)
+ xpmGetCmt(data, &colors_cmt);
+
+ /*
+ * read pixels and index them on color number
+ */
+ ErrorStatus = ParsePixels(data, width, height, ncolors, cpp, colorTable,
+ &hashtable, &pixelindex);
+
+ /*
+ * free the hastable
+ */
+ if (USE_HASHTABLE)
+ xpmHashTableFree(&hashtable);
+
+ if (ErrorStatus != XpmSuccess)
+ RETURN(ErrorStatus);
+
+ /*
+ * store the pixels comment line
+ */
+ if (cmts)
+ xpmGetCmt(data, &pixels_cmt);
+
+ /*
+ * parse extensions
+ */
+ if (info && (info->valuemask & XpmReturnExtensions))
+ if (extensions) {
+ ErrorStatus = xpmParseExtensions(data, &info->extensions,
+ &info->nextensions);
+ if (ErrorStatus != XpmSuccess)
+ RETURN(ErrorStatus);
+ } else {
+ info->extensions = NULL;
+ info->nextensions = 0;
+ }
+
+ /*
+ * store found informations in the XpmImage structure
+ */
+ image->width = width;
+ image->height = height;
+ image->cpp = cpp;
+ image->ncolors = ncolors;
+ image->colorTable = colorTable;
+ image->data = pixelindex;
+
+ if (info) {
+ if (cmts) {
+ info->hints_cmt = hints_cmt;
+ info->colors_cmt = colors_cmt;
+ info->pixels_cmt = pixels_cmt;
+ }
+ if (hotspot) {
+ info->x_hotspot = x_hotspot;
+ info->y_hotspot = y_hotspot;
+ info->valuemask |= XpmHotspot;
+ }
+ }
+ return (XpmSuccess);
+
+/* exit point in case of error, free only locally allocated variables */
+error:
+ if (colorTable)
+ xpmFreeColorTable(colorTable, ncolors);
+ if (pixelindex)
+ XpmFree(pixelindex);
+ if (hints_cmt)
+ XpmFree(hints_cmt);
+ if (colors_cmt)
+ XpmFree(colors_cmt);
+ if (pixels_cmt)
+ XpmFree(pixels_cmt);
+
+ return(ErrorStatus);
+}
1.1.2.1 +233 -0 XEmacs/xemacs/carbon/xpm/Attic/xpm.h
Index: xpm.h
===================================================================
RCS file: xpm.h
diff -N xpm.h
--- /dev/null Fri Feb 25 17:29:40 2005
+++ /tmp/cvsAAAPXaiCg Fri Feb 25 17:29:45 2005
＠＠ -0,0 +1,233 ＠＠
+typedef int Bool;
+
+#define True 1
+#define False 0
+
+typedef unsigned long Pixel;
+typedef void *Visual;
+typedef void *Colormap;
+typedef void *Display;
+typedef void *Drawable;
+typedef void *Pixmap;
+typedef void *XImage;
+typedef struct {
+ Pixel pixel;
+ unsigned char red, green, blue;
+} XColor;
+
+/*
+ * first some identification numbers:
+ * the version and revision numbers are determined with the following rule:
+ * SO Major number = LIB minor version number.
+ * SO Minor number = LIB sub-minor version number.
+ * e.g: Xpm version 3.2f
+ * we forget the 3 which is the format number, 2 gives 2, and f gives 6.
+ * thus we have XpmVersion = 2 and XpmRevision = 6
+ * which gives SOXPMLIBREV = 2.6
+ *
+ * Then the XpmIncludeVersion number is built from these numbers.
+ */
+#define XpmFormat 3
+#define XpmVersion 4
+#define XpmRevision 11
+#define XpmIncludeVersion ((XpmFormat * 100 + XpmVersion) * 100 + XpmRevision)
+
+/* Return ErrorStatus codes:
+ * null if full success
+ * positive if partial success
+ * negative if failure
+ */
+
+#define XpmColorError 1
+#define XpmSuccess 0
+#define XpmOpenFailed -1
+#define XpmFileInvalid -2
+#define XpmNoMemory -3
+#define XpmColorFailed -4
+
+typedef struct {
+ char *name; /* Symbolic color name */
+ char *value; /* Color value */
+ Pixel pixel; /* Color pixel */
+} XpmColorSymbol;
+
+typedef struct {
+ char *name; /* name of the extension */
+ unsigned int nlines; /* number of lines in this extension */
+ char **lines; /* pointer to the extension array of strings */
+} XpmExtension;
+
+typedef struct {
+ char *string; /* characters string */
+ char *symbolic; /* symbolic name */
+ char *m_color; /* monochrom default */
+ char *g4_color; /* 4 level grayscale default */
+ char *g_color; /* other level grayscale default */
+ char *c_color; /* color default */
+} XpmColor;
+
+typedef struct {
+ unsigned int width; /* image width */
+ unsigned int height; /* image height */
+ unsigned int cpp; /* number of characters per pixel */
+ unsigned int ncolors; /* number of colors */
+ XpmColor *colorTable; /* list of related colors */
+ unsigned int *data; /* image data */
+} XpmImage;
+
+typedef struct {
+ unsigned long valuemask; /* Specifies which attributes are defined */
+ char *hints_cmt; /* Comment of the hints section */
+ char *colors_cmt; /* Comment of the colors section */
+ char *pixels_cmt; /* Comment of the pixels section */
+ unsigned int x_hotspot; /* Returns the x hotspot's coordinate */
+ unsigned int y_hotspot; /* Returns the y hotspot's coordinate */
+ unsigned int nextensions; /* number of extensions */
+ XpmExtension *extensions; /* pointer to array of extensions */
+} XpmInfo;
+
+typedef int (*XpmAllocColorFunc)(Display *, Colormap, char *, XColor *, void *);
+typedef int (*XpmFreeColorsFunc)(Display *, Colormap, Pixel *, int, void *);
+
+typedef struct {
+ unsigned long valuemask; /* Specifies which attributes are
+ defined */
+
+ Visual *visual; /* Specifies the visual to use */
+ Colormap colormap; /* Specifies the colormap to use */
+ unsigned int depth; /* Specifies the depth */
+ unsigned int width; /* Returns the width of the created
+ pixmap */
+ unsigned int height; /* Returns the height of the created
+ pixmap */
+ unsigned int x_hotspot; /* Returns the x hotspot's
+ coordinate */
+ unsigned int y_hotspot; /* Returns the y hotspot's
+ coordinate */
+ unsigned int cpp; /* Specifies the number of char per
+ pixel */
+ Pixel *pixels; /* List of used color pixels */
+ unsigned int npixels; /* Number of used pixels */
+ XpmColorSymbol *colorsymbols; /* List of color symbols to override */
+ unsigned int numsymbols; /* Number of symbols */
+ char *rgb_fname; /* RGB text file name */
+ unsigned int nextensions; /* Number of extensions */
+ XpmExtension *extensions; /* List of extensions */
+
+ unsigned int ncolors; /* Number of colors */
+ XpmColor *colorTable; /* List of colors */
+/* 3.2 backward compatibility code */
+ char *hints_cmt; /* Comment of the hints section */
+ char *colors_cmt; /* Comment of the colors section */
+ char *pixels_cmt; /* Comment of the pixels section */
+/* end 3.2 bc */
+ unsigned int mask_pixel; /* Color table index of transparent
+ color */
+
+ /* Color Allocation Directives */
+ Bool exactColors; /* Only use exact colors for visual */
+ unsigned int closeness; /* Allowable RGB deviation */
+ unsigned int red_closeness; /* Allowable red deviation */
+ unsigned int green_closeness; /* Allowable green deviation */
+ unsigned int blue_closeness; /* Allowable blue deviation */
+ int color_key; /* Use colors from this color set */
+
+ Pixel *alloc_pixels; /* Returns the list of alloc'ed color
+ pixels */
+ int nalloc_pixels; /* Returns the number of alloc'ed
+ color pixels */
+
+ Bool alloc_close_colors; /* Specify whether close colors should
+ be allocated using XAllocColor
+ or not */
+ int bitmap_format; /* Specify the format of 1bit depth
+ images: ZPixmap or XYBitmap */
+
+ /* Color functions */
+ XpmAllocColorFunc alloc_color; /* Application color allocator */
+ XpmFreeColorsFunc free_colors; /* Application color de-allocator */
+ void *color_closure; /* Application private data to pass to
+ alloc_color and free_colors */
+
+} XpmAttributes;
+
+/* XpmAttributes value masks bits */
+#define XpmVisual (1L<<0)
+#define XpmColormap (1L<<1)
+#define XpmDepth (1L<<2)
+#define XpmSize (1L<<3) /* width & height */
+#define XpmHotspot (1L<<4) /* x_hotspot & y_hotspot */
+#define XpmCharsPerPixel (1L<<5)
+#define XpmColorSymbols (1L<<6)
+#define XpmRgbFilename (1L<<7)
+/* 3.2 backward compatibility code */
+#define XpmInfos (1L<<8)
+#define XpmReturnInfos XpmInfos
+/* end 3.2 bc */
+#define XpmReturnPixels (1L<<9)
+#define XpmExtensions (1L<<10)
+#define XpmReturnExtensions XpmExtensions
+
+#define XpmExactColors (1L<<11)
+#define XpmCloseness (1L<<12)
+#define XpmRGBCloseness (1L<<13)
+#define XpmColorKey (1L<<14)
+
+#define XpmColorTable (1L<<15)
+#define XpmReturnColorTable XpmColorTable
+
+#define XpmReturnAllocPixels (1L<<16)
+#define XpmAllocCloseColors (1L<<17)
+#define XpmBitmapFormat (1L<<18)
+
+#define XpmAllocColor (1L<<19)
+#define XpmFreeColors (1L<<20)
+#define XpmColorClosure (1L<<21)
+
+
+/* XpmInfo value masks bits */
+#define XpmComments XpmInfos
+#define XpmReturnComments XpmComments
+
+/* XpmAttributes mask_pixel value when there is no mask */
+#ifndef FOR_MSW
+#define XpmUndefPixel 0x80000000
+#else
+/* int is only 16 bit for MSW */
+#define XpmUndefPixel 0x8000
+#endif
+
+/*
+ * color keys for visual type, they must fit along with the number key of
+ * each related element in xpmColorKeys[] defined in XpmI.h
+ */
+#define XPM_MONO 2
+#define XPM_GREY4 3
+#define XPM_GRAY4 3
+#define XPM_GREY 4
+#define XPM_GRAY 4
+#define XPM_COLOR 5
+
+#define NeedFunctionPrototypes 1
+
+/* macros for forward declarations of functions with prototypes */
+#ifdef NeedFunctionPrototypes
+#define FUNC(f, t, p) extern t f p
+#define LFUNC(f, t, p) static t f p
+#else
+#define FUNC(f, t, p) extern t f()
+#define LFUNC(f, t, p) static t f()
+#endif
+
+
+/*
+ * functions declarations
+ */
+
+FUNC(XpmFreeXpmImage, void, (XpmImage *image));
+FUNC(XpmFreeXpmInfo, void, (XpmInfo *info));
+FUNC(XpmCreateXpmImageFromBuffer, int, (char *buffer, XpmImage *image, XpmInfo *info));
+FUNC(XpmReadFileToData, int, (char *filename, char ***data_return));
+FUNC(XpmReadFileToXpmImage, int, (char *filename, XpmImage *image, XpmInfo *info));
+FUNC(XpmCreateDataFromXpmImage, int, (char ***data_return, XpmImage *image, XpmInfo *info));
+FUNC(XpmFreeExtensions, void, (XpmExtension *extensions, int nextensions));
No revision
No revision
1.2.40.1 +269 -42 XEmacs/xemacs/etc/toolbar/compile-cap-up.xpm
Index: compile-cap-up.xpm
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/toolbar/compile-cap-up.xpm,v
retrieving revision 1.2
retrieving revision 1.2.40.1
diff -u -r1.2 -r1.2.40.1
--- compile-cap-up.xpm 1997/12/21 06:28:47 1.2
+++ compile-cap-up.xpm 2005/02/25 16:29:47 1.2.40.1
＠＠ -1,43 +1,270 ＠＠
/* XPM */
-static char * makefile[] = {
-"33 33 7 1",
-"X c Gray75 s backgroundToolBarColor",
-"u c #000000000000 s foregroundToolBarColor",
-"o c black",
-"O c white",
-"+ c Gray40",
-"＠ c Gray90",
-"# c white",
-"XXXXXXXXXXoooXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXoooOoooXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXo++o++oXXXXXXXXXXXXXXXXXX",
-"XXXXXXXoo+ooo+ooXXXXXXXXXXXXXXXXX",
-"XXXXXXXo++o++++oXXXXXXXXXXXXXXXXX",
-"XXXXXXXoo++o++ooXXXXXXXXXXXXXXXXX",
-"XXXXXXXXo+++++ooooXXXXXXXXXXXXXXX",
-"XXXXXXXXooo+oooo＠oXXoXXXXXXXXXXXX",
-"XXXXXXXXXXooo＠o＠＠＠oo＠oXXXXXXXXXXX",
-"XXXXXXXXXXo＠＠＠＠＠＠＠＠＠＠ooXXXXXXXXXX",
-"XXXXXXXXXXXo＠＠o＠o#o＠＠oXXXXXXXXXXX",
-"XXXXXXXXXoo＠＠o＠o###o＠＠ooXXXXXXXXX",
-"XXXXXXXXXo＠＠＠oo####o＠＠＠oXXXXXXXXX",
-"XXXXXXXXXooo＠o＠o###o＠oooXXXXXXXXX",
-"XXXXXXXXXXXo＠＠o＠o#o＠＠oXXXXXXXXXXX",
-"XXXXXXXXXXo＠＠＠＠＠＠＠＠＠＠＠oXXXXXXXXXX",
-"XXXXXXXXXXoo＠oo＠＠oooooXXXXXXXXXXX",
-"XXXXXXXXoooXooo＠＠oXXoXXXXXXXXXXXX",
-"XXXXXXXXo++o++ooooXXXXXXXXXXXXXXX",
-"XXXXXXXoo+ooo+ooXXXXXXXXXXXXXXXXX",
-"XXXXXXXo++o++++oXXXXXXXXXXXXXXXXX",
-"XXXXXXXoo++o++ooXXXXXXXXXXXXXXXXX",
-"XXXXXXXXo+++++oXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXooo+oooXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXoooXXXXXXXXXXXuXuXXXXXX",
-"XXXuuuXXXXXXXXXXXXXXXXXXXXuXXXXXX",
-"XXuXXXuXXuuXXuuuuXXuuuXXuXuXXuXXX",
-"XXuXXXXXuXXuXuXuXuXuXXuXuXuXuXuXX",
-"XXuXXXXXuXXuXuXuXuXuXXuXuXuXuuuXX",
-"XXuXXXuXuXXuXuXuXuXuXXuXuXuXuXXXX",
-"XXXuuuXXXuuXXuXuXuXuuuXXuXuXXuuXX",
-"XXXXXXXXXXXXXXXXXXXuXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"};
+static char * compile_xpm[] = {
+"48 48 219 2",
+" c None",
+". c #000000",
+"+ c #090909",
+"＠ c #414141",
+"# c #8F8F8F",
+"$ c #9F9F9F",
+"% c #666666",
+"& c #080808",
+"* c #373737",
+"= c #ACACAC",
+"- c #AFAFAF",
+"; c #949494",
+"> c #7D7D7D",
+", c #454545",
+"' c #0B0B0B",
+") c #808080",
+"! c #868686",
+"~ c #282828",
+"{ c #3B3B3B",
+"] c #D7D7D7",
+"^ c #6E6E6E",
+"/ c #838383",
+"( c #676767",
+"_ c #818181",
+": c #BEBEBE",
+"< c #919191",
+"[ c #797979",
+"} c #313131",
+"| c #2A2A2A",
+"1 c #474747",
+"2 c #5C5C5C",
+"3 c #CFCFCF",
+"4 c #7E7E7E",
+"5 c #939393",
+"6 c #979797",
+"7 c #C3C3C3",
+"8 c #B5B5B5",
+"9 c #8B8B8B",
+"0 c #9B9B9B",
+"a c #999999",
+"b c #434343",
+"c c #292929",
+"d c #CACACA",
+"e c #D3D3D3",
+"f c #545454",
+"g c #909090",
+"h c #B1B1B1",
+"i c #A8A8A8",
+"j c #8A8A8A",
+"k c #A2A2A2",
+"l c #A6A6A6",
+"m c #A4A4A4",
+"n c #959595",
+"o c #ABABAB",
+"p c #7C7C7C",
+"q c #1B1B1B",
+"r c #B2B2B2",
+"s c #898989",
+"t c #878787",
+"u c #B0B0B0",
+"v c #B4B4B4",
+"w c #B7B7B7",
+"x c #B9B9B9",
+"y c #BABABA",
+"z c #B8B8B8",
+"A c #AAAAAA",
+"B c #393939",
+"C c #8D8D8D",
+"D c #8E8E8E",
+"E c #848484",
+"F c #9A9A9A",
+"G c #A3A3A3",
+"H c #A5A5A5",
+"I c #BDBDBD",
+"J c #C0C0C0",
+"K c #C5C5C5",
+"L c #C6C6C6",
+"M c #555555",
+"N c #404040",
+"O c #9C9C9C",
+"P c #C8C8C8",
+"Q c #CBCBCB",
+"R c #CECECE",
+"S c #D0D0D0",
+"T c #D1D1D1",
+"U c #BFBFBF",
+"V c #656565",
+"W c #171717",
+"X c #262626",
+"Y c #6D6D6D",
+"Z c #6C6C6C",
+"` c #747474",
+" . c #A1A1A1",
+".. c #C1C1C1",
+"+. c #4D4D4D",
+"＠. c #0D0D0D",
+"#. c #CCCCCC",
+"$. c #DADADA",
+"%. c #343434",
+"&. c #BCBCBC",
+"*. c #B6B6B6",
+"=. c #9D9D9D",
+"-. c #525252",
+";. c #131313",
+">. c #5F5F5F",
+",. c #1E1E1E",
+"'. c #323232",
+"). c #888888",
+"!. c #2C2C2C",
+"~. c #DBDBDB",
+"{. c #7B7B7B",
+"]. c #7A7A7A",
+"^. c #717171",
+"/. c #303030",
+"(. c #3E3E3E",
+"_. c #161616",
+":. c #D2D2D2",
+"<. c #353535",
+"[. c #585858",
+"}. c #A0A0A0",
+"|. c #777777",
+"1. c #DDDDDD",
+"2. c #828282",
+"3. c #C4C4C4",
+"4. c #A9A9A9",
+"5. c #3F3F3F",
+"6. c #222222",
+"7. c #B3B3B3",
+"8. c #BBBBBB",
+"9. c #969696",
+"0. c #363636",
+"a. c #D8D8D8",
+"b. c #737373",
+"c. c #D5D5D5",
+"d. c #8C8C8C",
+"e. c #929292",
+"f. c #C9C9C9",
+"g. c #5D5D5D",
+"h. c #AEAEAE",
+"i. c #C7C7C7",
+"j. c #595959",
+"k. c #616161",
+"l. c #232323",
+"m. c #4F4F4F",
+"n. c #2F2F2F",
+"o. c #C2C2C2",
+"p. c #D4D4D4",
+"q. c #ADADAD",
+"r. c #D9D9D9",
+"s. c #E1E1E1",
+"t. c #9E9E9E",
+"u. c #626262",
+"v. c #DCDCDC",
+"w. c #E3E3E3",
+"x. c #767676",
+"y. c #333333",
+"z. c #4C4C4C",
+"A. c #191919",
+"B. c #070707",
+"C. c #DEDEDE",
+"D. c #E5E5E5",
+"E. c #2E2E2E",
+"F. c #4A4A4A",
+"G. c #989898",
+"H. c #646464",
+"I. c #7F7F7F",
+"J. c #E0E0E0",
+"K. c #E7E7E7",
+"L. c #3C3C3C",
+"M. c #6B6B6B",
+"N. c #A7A7A7",
+"O. c #707070",
+"P. c #858585",
+"Q. c #575757",
+"R. c #535353",
+"S. c #272727",
+"T. c #D6D6D6",
+"U. c #0C0C0C",
+"V. c #2B2B2B",
+"W. c #0E0E0E",
+"X. c #CDCDCD",
+"Y. c #DFDFDF",
+"Z. c #181818",
+"`. c #050505",
+" + c #040404",
+".+ c #696969",
+"++ c #0F0F0F",
+"＠+ c #636363",
+"#+ c #E4E4E4",
+"$+ c #E2E2E2",
+"%+ c #1D1D1D",
+"&+ c #565656",
+"*+ c #E8E8E8",
+"=+ c #202020",
+"-+ c #ECECEC",
+";+ c #EBEBEB",
+">+ c #EAEAEA",
+",+ c #E9E9E9",
+"'+ c #727272",
+")+ c #383838",
+"!+ c #1C1C1C",
+"~+ c #EFEFEF",
+"{+ c #EEEEEE",
+"]+ c #EDEDED",
+"^+ c #F1F1F1",
+"/+ c #F0F0F0",
+"(+ c #5E5E5E",
+"_+ c #F2F2F2",
+":+ c #787878",
+"<+ c #5B5B5B",
+"[+ c #3D3D3D",
+"}+ c #484848",
+"|+ c #4E4E4E",
+"1+ c #101010",
+"2+ c #E6E6E6",
+"3+ c #2D2D2D",
+"4+ c #111111",
+"5+ c #686868",
+"6+ c #4B4B4B",
+" ",
+" ",
+" ",
+" ",
+" ",
+" . ",
+" + ＠ # $ % . & & ",
+" * = - ; > , ' ) ! ~ ",
+" { ] ^ / ! ( _ : < [ } ",
+" | 1 . . 2 3 4 5 6 ! 7 8 9 0 a b ",
+" c d e f g h i j k l m n # = o i p . ",
+" q r : $ s t < < o u v w x y x z A ' . ",
+" B C D E F G H r z I J 7 K L L K p M ~ . ",
+" . N [ O l - w : 7 P Q R S T U V W X Y Z N . . ",
+" . ` .h y ..P J +.＠.{ #.$.6 %.g &.K *.=.-.. ;.>.,.. ",
+" . '.).` y 7 d *.＠. !.u ~.O {.8 . .s ].^./.' j a / (.. ",
+" _.5 - I / C 7 Q :.<. [.u 3 }.|.1.# |./ ! )., 2.3.4.t p 5.. ",
+" 6.7.8.O 9.7.d :.I . . 0.4.a.V b.c.F d.# e.; s :.f.l ! 6 n g.. ",
+" c h.< h I i.S a.l . . j.:.k.W l.m.k I F 6 0 =.}.j O A j G k .$ j.. ",
+" n.K ; *.o.#.c.1.c.W B ] p.#.b.9 x q. .# k H i o = h.=.- h.q.= A (.. ",
+" ＠.= 6 8.L T r.s.$ | *...J F ).j G l s t.= u r 8 *.z z z z w *.V . ",
+" . [.u.( G v.w._.x.$ H ; / 9.=.a C q.r *.x &.: J ....o...J F y.z.A.. ",
+" B.+.g.p C.D.E.F.> ) ) G.$ l = h *.8.: o.3.i.P f.d d d f.o H.% % X . ",
+" { I.b...J.K.a.L.X M.G.}.N.h.v y U 7 L d #.R S T :.:.T T 3 O.M.P.O . ",
+" ' Q.m a.s.K.3.i.q R.0 i - *.&...L d ..( S.＠.t c.a.r.a.a.T.c.:.3 #.U. ",
+" . [.a.J.8.V.Q.W.s Z =.w I 7 P X.O ＠. [.r v.Y.C.C.v.~.r.T.e %. ",
+" 0.=.Z.`. +[.# .+/ I 3.d 3 o ++ . ＠+u d #+#+w.$+J.C.v.r.~ ",
+" %+P.z R y ; &+- 7 d 3 p.~ . F u : *+*+*+K.D.w.s.C.. ",
+" =+I Y.d 8 e.) o.f.3 p.u . %.= = 7 -+-+;+>+,+q.'+)+. ",
+" z.$ o 0 G.h J i.R p.r.^ !+n . .:.~+~+{+]+F.. ",
+" &+7.=.A v &.3.Q :.a.1.O.. . 6.).n 6 k ^+^+/+/+s.. ",
+" n.3.k h.z J P 3 c.~.J.h X '.(+E ).9 5 Y._+_+_+^+9.. ",
+" Z.7 4.r 8.3.Q :.a.C.w.K.; ( ^.[ > # 1._+_+_+_+_+_+:+. ",
+" ~ j 8 : L *.c.~.J.D.,+-+o.G.; o._+_+_+_+_+_+_+_+_+d.. ",
+" `.<+%.[+H.3 1.$+K.;+]+/+^+_+_+_+_+_+_+_+_+_+_+_+.+ ",
+" ++}+&+% t.Y.#+*+-+{+/+^+_+_+_+_+_+_+_+_+_+_+l . ",
+" . |+b.'+O.y J.D.,+]+~+^+_+_+_+_+_+_+.+.+_+_+3.1+ ",
+" . '+s E m ~.s.2+>+]+/+^+_+_+_+_+3.3+. . 3+l 1+ ",
+" . g.; p.~.s.2+>+m i.:._+_+_+_+[ . ",
+" . -.p.~.s.2+% B [.^._+_+_+_+[ ",
+" . <.X.J.# . 6.f O._+_+_+_+[ ",
+" W.u.1+ . 4+5+^+_+$+6 3+ ",
+" 6.6+3+. . ",
+" ",
+" ",
+" ",
+" ",
+" "};
1.2.40.1 +143 -40 XEmacs/xemacs/etc/toolbar/copy-cap-up.xpm
Index: copy-cap-up.xpm
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/toolbar/copy-cap-up.xpm,v
retrieving revision 1.2
retrieving revision 1.2.40.1
diff -u -r1.2 -r1.2.40.1
--- copy-cap-up.xpm 1997/12/21 06:28:47 1.2
+++ copy-cap-up.xpm 2005/02/25 16:29:47 1.2.40.1
＠＠ -1,41 +1,144 ＠＠
/* XPM */
-static char * copy[] = {
-"33 33 5 1",
-"X c Gray75 s backgroundToolBarColor",
-"u c #000000000000 s foregroundToolBarColor",
-"o c black",
-"O c white",
-"+ c Gray60",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXoooooooooXXXXXXXXXXXXXXXX",
-"XXXXXXXXoOOOOOOOooXXXXXXXXXXXXXXX",
-"XXXXXXXXoOOOOOOOo+oXXXXXXXXXXXXXX",
-"XXXXXXXXoOoooooOooooXXXXXXXXXXXXX",
-"XXXXXXXXoOOOOOOOOOOoXXXXXXXXXXXXX",
-"XXXXXXXXoOooooOOOOOoXXXXXXXXXXXXX",
-"XXXXXXXXoOOOOOOOOOOoXXXXXXXXXXXXX",
-"XXXXXXXXoOOOOOoooooooooXXXXXXXXXX",
-"XXXXXXXXoOooOOoOOOOOOOooXXXXXXXXX",
-"XXXXXXXXoOOOOOoOOOOOOOo+oXXXXXXXX",
-"XXXXXXXXoOOOOOoOoooooOooooXXXXXXX",
-"XXXXXXXXoOOOOOoOOOOOOOOOOoXXXXXXX",
-"XXXXXXXXoOOOOOoOooooOOOOOoXXXXXXX",
-"XXXXXXXXoooooooOOOOOOOOOOoXXXXXXX",
-"XXXXXXXXXXXXXXoOOOOOOOOOOoXXXXXXX",
-"XXXXXXXXXXXXXXoOoooooooOOoXXXXXXX",
-"XXXXXXXXXXXXXXoOOOOOOOOOOoXXXXXXX",
-"XXXXXXXXXXXXXXoOOOOOOOOOOoXXXXXXX",
-"XXXXXXXXXXXXXXoOOOOOOOOOOoXXXXXXX",
-"XXXXXXXXXXXXXXoOOOOOOOOOOoXXXXXXX",
-"XXXXXXXXXXXXXXooooooooooooXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXuuuXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXuXXXuXXuuXXuuuXXuXXuXXXXXX",
-"XXXXXXXuXXXXXuXXuXuXXuXuXXuXXXXXX",
-"XXXXXXXuXXXXXuXXuXuXXuXuXXuXXXXXX",
-"XXXXXXXuXXXuXuXXuXuXXuXXuuXXXXXXX",
-"XXXXXXXXuuuXXXuuXXuuuXXXuXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXuXXXXuXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"};
+static char * copy_xpm[] = {
+"48 48 93 2",
+" c None",
+". c #000000",
+"+ c #393939",
+"＠ c #E6E6E6",
+"# c #E7E7E7",
+"$ c #E8E8E8",
+"% c #E9E9E9",
+"& c #EAEAEA",
+"* c #EBEBEB",
+"= c #ECECEC",
+"- c #EDEDED",
+"; c #EEEEEE",
+"> c #EFEFEF",
+", c #F0F0F0",
+"' c #F1F1F1",
+") c #F2F2F2",
+"! c #F3F3F3",
+"~ c #3A3A3A",
+"{ c #F4F4F4",
+"] c #F5F5F5",
+"^ c #DCDCDC",
+"/ c #D7D7D7",
+"( c #D8D8D8",
+"_ c #D9D9D9",
+": c #DADADA",
+"< c #E0E0E0",
+"[ c #DDDDDD",
+"} c #E3E3E3",
+"| c #F6F6F6",
+"1 c #CDCDCD",
+"2 c #C3C3C3",
+"3 c #C4C4C4",
+"4 c #C5C5C5",
+"5 c #C6C6C6",
+"6 c #C7C7C7",
+"7 c #F7F7F7",
+"8 c #3B3B3B",
+"9 c #F8F8F8",
+"0 c #F9F9F9",
+"a c #DFDFDF",
+"b c #DBDBDB",
+"c c #DEDEDE",
+"d c #FAFAFA",
+"e c #D0D0D0",
+"f c #4E4E4E",
+"g c #3D3D3D",
+"h c #2C2C2C",
+"i c #262626",
+"j c #3E3E3E",
+"k c #3C3C3C",
+"l c #D2D2D2",
+"m c #C8C8C8",
+"n c #E1E1E1",
+"o c #D4D4D4",
+"p c #C9C9C9",
+"q c #CACACA",
+"r c #FBFBFB",
+"s c #FCFCFC",
+"t c #E2E2E2",
+"u c #E4E4E4",
+"v c #CBCBCB",
+"w c #CCCCCC",
+"x c #FDFDFD",
+"y c #FEFEFE",
+"z c #FFFFFF",
+"A c #3F3F3F",
+"B c #E5E5E5",
+"C c #A5A5A5",
+"D c #BEBEBE",
+"E c #A9A9A9",
+"F c #949494",
+"G c #CECECE",
+"H c #BABABA",
+"I c #AFAFAF",
+"J c #A4A4A4",
+"K c #4D4D4D",
+"L c #C2C2C2",
+"M c #B1B1B1",
+"N c #A7A7A7",
+"O c #8A8A8A",
+"P c #0A0A0A",
+"Q c #D3D3D3",
+"R c #B5B5B5",
+"S c #AEAEAE",
+"T c #A6A6A6",
+"U c #1C1C1C",
+"V c #ADADAD",
+"W c #A8A8A8",
+"X c #A2A2A2",
+"Y c #6B6B6B",
+"Z c #D5D5D5",
+"` c #A1A1A1",
+" . c #626262",
+" ",
+" ",
+" ",
+" ",
+" . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+" + ＠ ＠ # # $ $ % & & * * = = - - ; ; > > , , ' ' ) ) ! . ",
+" + # # $ $ % & & * * = = - - ; ; > > , , ' ' ) ) ! ! ! . ",
+" ~ $ % % & & * * = = - - ; ; > > , , ' ' ) ) ! ! { { { . ",
+" ~ % & & * * = = - - ; ; > > , , ' ' ) ) ! ! { { { ] ] . ",
+" ~ & * * ^ / ( ( ( _ _ : : < ' ' ) - ^ ^ [ [ [ } ] | | . ",
+" ~ * = = 1 2 2 3 3 3 3 4 4 4 ) ) ! [ 5 5 6 6 6 6 | 7 7 . ",
+" 8 = - - ; ; > > , , ' ' ) ) ! ! { { { ] ] | | 7 7 9 9 . ",
+" 8 - ; ; > > , , ' ' ) ) ! ! { { { ] ] | | 7 7 9 9 9 0 . ",
+" 8 ; > > a : b b b ^ # ! { % c c c c a a < < < # 0 0 d . ",
+" 8 > , , e 4 4 5 5 5 f g g h i i i i i i i i i i j j j . . . . . . . . . . . ",
+" k , ' ' ) ) ! ! { { + ＠ ＠ # # $ $ % & & * * = = - - ; ; > > , , ' ' ) ) ! . ",
+" k ' ) ) ! ! { { ] ] + # # $ $ % & & * * = = - - ; ; > > , , ' ' ) ) ! ! ! . ",
+" k ) ! ! } [ c c c & ~ $ % % & & * * = = - - ; ; > > , , ' ' ) ) ! ! { { { . ",
+" k ! { { l 6 6 6 m a ~ % & & * * = = - - ; ; > > , , ' ' ) ) ! ! { { { ] ] . ",
+" g { ] ] | | | 7 7 9 ~ & * * ^ / ( ( ( _ _ : : < ' ' ) - ^ ^ [ [ [ } ] | | . ",
+" g ] | | | 7 7 9 9 0 ~ * = = 1 2 2 3 3 3 3 4 4 4 ) ) ! [ 5 5 6 6 6 6 | 7 7 . ",
+" g | | 7 ＠ < < n n n 8 = - - ; ; > > , , ' ' ) ) ! ! { { { ] ] | | 7 7 9 9 . ",
+" g 7 7 9 o p p p q q 8 - ; ; > > , , ' ' ) ) ! ! { { { ] ] | | 7 7 9 9 9 0 . ",
+" j 9 9 0 0 d d r r r 8 ; > > a : b b b ^ # ! { % c c c c a a < < < # 0 0 d . ",
+" j 0 0 d d r r r s s 8 > , , e 4 4 5 5 5 / { ] l 6 6 m m m m p p p p d d r . ",
+" j d d r t } } } u u k , ' ' ) ) ! ! { { ] ] ] | | 7 7 9 9 0 0 0 d d r r s . ",
+" j r r r q v v v v w k ' ) ) ! ! { { ] ] ] | | 7 7 9 9 0 0 0 d d r r s s x . ",
+" j r s s x x y y z z k ) ! ! } [ c c c & | ' < < < n # d $ t t } } % x x y . ",
+" A s x x y y z z z z k ! { { l 6 6 6 m a 7 ＠ p p p p p d e q q v v v y y y . ",
+" A x y y z z z z z z g { ] ] | | | 7 7 9 9 0 0 d d d r r s s x x y y y z z . ",
+" A y z z z z z z z z g ] | | | 7 7 9 9 0 0 d d d r r s s x x y y y z z z z . ",
+" A z z z z z z z z z g | | 7 ＠ < < n n n t t ] r } } u u u B B B B B 9 z z . ",
+" A z z z z z z z z z g 7 7 9 o p p p q q q q } s v v v w w w w w w w * z z . ",
+" . . . . . . . . . . j 9 9 0 0 d d r r r s s x x y y z z z z z z z z z z z . ",
+" j 0 0 d d r r r s s x x y y z z z z z z z z z z z z z . ",
+" j d d r t } } } u u u B B B B B B B * z z z z z z z = . ",
+" j r r r q v v v v w w w w w w w w w w z z z z z z a C . ",
+" j r s s x x y y z z z z z z z z z z z z z { ; a D E F . ",
+" A s x x y y z z z z z z z z z z z z z z s G 3 H I J K . ",
+" A x y y z z z z z z z z z z z z z z z z - L H M N O P ",
+" A y z z z z z z z z z z z z z z z z z z Q R S T F U ",
+" A z z z z z z z z z z z z z z z z z z < V W X Y P ",
+" A z z z z z z z z z z z z z z z z 9 Z ` F .i . ",
+" . . . . . . . . . . . . . . . . . . . . . . ",
+" ",
+" ",
+" ",
+" "};
1.2.40.1 +366 -39 XEmacs/xemacs/etc/toolbar/cut-cap-up.xpm
Index: cut-cap-up.xpm
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/toolbar/cut-cap-up.xpm,v
retrieving revision 1.2
retrieving revision 1.2.40.1
diff -u -r1.2 -r1.2.40.1
--- cut-cap-up.xpm 1997/12/21 06:28:48 1.2
+++ cut-cap-up.xpm 2005/02/25 16:29:47 1.2.40.1
＠＠ -1,40 +1,367 ＠＠
/* XPM */
-static char * cut[] = {
-"33 33 4 1",
-"X c Gray75 s backgroundToolBarColor",
-"o c black s foregroundToolBarColor",
-"O c Gray90",
-"+ c white",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXoooooXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXooXXXooXXXXXXXXXXXXXXXXXXXX",
-"XXXXXooXXXXXooXXXXXXXXXXoooXXXXXX",
-"XXXXXoXXXXXXXoXXXXXXXXooOOooXXXXX",
-"XXXXXooXXXXXoooXXXXXooOOooXXXXXXX",
-"XXXXXXooXXXoooooXXXoooooXXXXXXXXX",
-"XXXXXXXoooooXXXooooooXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXo+oXXXXXXXXXXXXXX",
-"XXXXXXXoooooXXXooooooXXXXXXXXXXXX",
-"XXXXXXooXXXoooooXXXoooooXXXXXXXXX",
-"XXXXXooXXXXXoooXXXXXooOOooXXXXXXX",
-"XXXXXoXXXXXXXoXXXXXXXXooOOooXXXXX",
-"XXXXXooXXXXXooXXXXXXXXXXoooXXXXXX",
-"XXXXXXooXXXooXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXoooooXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXoXXXXXXXXXXX",
-"XXXXXXXXXXXoooXXXXXXXoXXXXXXXXXXX",
-"XXXXXXXXXXoXXXoXoXoXoooXXXXXXXXXX",
-"XXXXXXXXXXoXXXXXoXoXXoXXXXXXXXXXX",
-"XXXXXXXXXXoXXXXXoXoXXoXXXXXXXXXXX",
-"XXXXXXXXXXoXXXoXoXoXXoXXXXXXXXXXX",
-"XXXXXXXXXXXoooXXXooXXoXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"};
+static char * cut_xpm[] = {
+"48 48 316 2",
+" c None",
+". c #000000",
+"+ c #5F5F5F",
+"＠ c #FEFEFE",
+"# c #BABABA",
+"$ c #686868",
+"% c #101010",
+"& c #1F1F1F",
+"* c #FFFFFF",
+"= c #FBFBFB",
+"- c #F1F1F1",
+"; c #CACACA",
+"> c #292929",
+", c #CFCFCF",
+"' c #FDFDFD",
+") c #F4F4F4",
+"! c #E9E9E9",
+"~ c #D1D1D1",
+"{ c #282828",
+"] c #393939",
+"^ c #E6E6E6",
+"/ c #E7E7E7",
+"( c #E8E8E8",
+"_ c #EAEAEA",
+": c #EBEBEB",
+"< c #ECECEC",
+"[ c #EDEDED",
+"} c #EEEEEE",
+"| c #EFEFEF",
+"1 c #F0F0F0",
+"2 c #878787",
+"3 c #7F7F7F",
+"4 c #F7F7F7",
+"5 c #E2E2E2",
+"6 c #0E0E0E",
+"7 c #D4D4D4",
+"8 c #2F2F2F",
+"9 c #FAFAFA",
+"0 c #E5E5E5",
+"a c #DADADA",
+"b c #838383",
+"c c #3A3A3A",
+"d c #F2F2F2",
+"e c #F3F3F3",
+"f c #2D2D2D",
+"g c #DFDFDF",
+"h c #FCFCFC",
+"i c #DDDDDD",
+"j c #D2D2D2",
+"k c #191919",
+"l c #7A7A7A",
+"m c #9F9F9F",
+"n c #F6F6F6",
+"o c #E0E0E0",
+"p c #D6D6D6",
+"q c #808080",
+"r c #B3B3B3",
+"s c #AEAEAE",
+"t c #E1E1E1",
+"u c #AFAFAF",
+"v c #F5F5F5",
+"w c #C7C7C7",
+"x c #4F4F4F",
+"y c #F9F9F9",
+"z c #E3E3E3",
+"A c #D9D9D9",
+"B c #C1C1C1",
+"C c #3B3B3B",
+"D c #1E1E1E",
+"E c #DCDCDC",
+"F c #3F3F3F",
+"G c #F8F8F8",
+"H c #5D5D5D",
+"I c #DBDBDB",
+"J c #DEDEDE",
+"K c #7C7C7C",
+"L c #D7D7D7",
+"M c #C0C0C0",
+"N c #C5C5C5",
+"O c #9E9E9E",
+"P c #6B6B6B",
+"Q c #D3D3D3",
+"R c #D8D8D8",
+"S c #C8C8C8",
+"T c #C9C9C9",
+"U c #7D7D7D",
+"V c #0F0F0F",
+"W c #D0D0D0",
+"X c #323232",
+"Y c #3C3C3C",
+"Z c #B6B6B6",
+"` c #6F6F6F",
+" . c #4C4C4C",
+".. c #999999",
+"+. c #656565",
+"＠. c #6E6E6E",
+"#. c #4D4D4D",
+"$. c #8B8B8B",
+"%. c #7E7E7E",
+"&. c #B5B5B5",
+"*. c #B0B0B0",
+"=. c #2C2C2C",
+"-. c #2E2E2E",
+";. c #B7B7B7",
+">. c #E4E4E4",
+",. c #CECECE",
+"'. c #5C5C5C",
+"). c #CBCBCB",
+"!. c #2A2A2A",
+"~. c #8E8E8E",
+"{. c #280D00",
+"]. c #340E00",
+"^. c #330900",
+"/. c #3D3D3D",
+"(. c #797979",
+"_. c #272727",
+":. c #8F8F8F",
+"<. c #D5D5D5",
+"[. c #333333",
+"}. c #623100",
+"|. c #C35C00",
+"1. c #DC5E00",
+"2. c #D74D00",
+"3. c #D13600",
+"4. c #CB1B00",
+"5. c #6F0300",
+"6. c #0E0000",
+"7. c #6D6D6D",
+"8. c #727272",
+"9. c #3E3E3E",
+"0. c #896034",
+"a. c #381B00",
+"b. c #8F5200",
+"c. c #E78A00",
+"d. c #E78B00",
+"e. c #E47F00",
+"f. c #DE6900",
+"g. c #D74E00",
+"h. c #D03000",
+"i. c #C81000",
+"j. c #9F0000",
+"k. c #B1B1B1",
+"l. c #4B4B4B",
+"m. c #CDCDCD",
+"n. c #E58500",
+"o. c #E27900",
+"p. c #D16400",
+"q. c #713B00",
+"r. c #EA9900",
+"s. c #EFAD00",
+"t. c #F0AE00",
+"u. c #835500",
+"v. c #381E00",
+"w. c #5F2700",
+"x. c #B93500",
+"y. c #CB1C00",
+"z. c #C40200",
+"A. c #6E0000",
+"B. c #C6C6C6",
+"C. c #DCD8CD",
+"D. c #EA9700",
+"E. c #E68900",
+"F. c #E27800",
+"G. c #E58400",
+"H. c #F7CB00",
+"I. c #3E3300",
+"J. c #0E0300",
+"K. c #B21D00",
+"L. c #C50400",
+"M. c #B70000",
+"N. c #BEBEBE",
+"O. c #795C20",
+"P. c #DB8C00",
+"Q. c #E58300",
+"R. c #F0AD00",
+"S. c #AA8B00",
+"T. c #580B00",
+"U. c #C50500",
+"V. c #C40100",
+"W. c #310000",
+"X. c #CCCCCC",
+"Y. c #8C8C8C",
+"Z. c #C4C4C4",
+"`. c #2B1C00",
+" + c #D88100",
+".+ c #EB9B00",
+"++ c #775600",
+"＠+ c #320400",
+"#+ c #1D1D1D",
+"$+ c #666666",
+"%+ c #ABABAB",
+"&+ c #5B5B5B",
+"*+ c #392100",
+"=+ c #DF6B00",
+"-+ c #E48000",
+";+ c #BC7200",
+">+ c #6F0500",
+",+ c #240000",
+"'+ c #515151",
+")+ c #151515",
+"!+ c #363636",
+"~+ c #343434",
+"{+ c #B78933",
+"]+ c #E5B132",
+"^+ c #F7D04F",
+"/+ c #6E6B5F",
+"(+ c #A44300",
+"_+ c #DC6000",
+":+ c #DF6A00",
+"<+ c #6E3300",
+"[+ c #AB0000",
+"}+ c #B2B2B2",
+"|+ c #A3A3A3",
+"1+ c #262626",
+"2+ c #A06400",
+"3+ c #ECA000",
+"4+ c #F0B000",
+"5+ c #795C00",
+"6+ c #1A0700",
+"7+ c #C73B00",
+"8+ c #D64700",
+"9+ c #AB3100",
+"0+ c #671400",
+"a+ c #8B1100",
+"b+ c #C50800",
+"c+ c #490000",
+"d+ c #C3C3C3",
+"e+ c #AAAAAA",
+"f+ c #563300",
+"g+ c #E99200",
+"h+ c #EC9F00",
+"i+ c #EEA700",
+"j+ c #593D00",
+"k+ c #4D0E00",
+"l+ c #C02200",
+"m+ c #CD2300",
+"n+ c #CB1D00",
+"o+ c #C81100",
+"p+ c #969696",
+"q+ c #1C1C1C",
+"r+ c #0E0700",
+"s+ c #D57500",
+"t+ c #E17500",
+"u+ c #DF6E00",
+"v+ c #DD6500",
+"w+ c #862E00",
+"x+ c #1A0800",
+"y+ c #180100",
+"z+ c #7B0400",
+"A+ c #B80200",
+"B+ c #860000",
+"C+ c #A7A7A7",
+"D+ c #959595",
+"E+ c #713C00",
+"F+ c #E17400",
+"G+ c #DF6D00",
+"H+ c #DB5C00",
+"I+ c #D54600",
+"J+ c #CF2B00",
+"K+ c #BB0E00",
+"L+ c #4E4E4E",
+"M+ c #0A0A0A",
+"N+ c #814C00",
+"O+ c #E99300",
+"P+ c #E78D00",
+"Q+ c #DB5D00",
+"R+ c #D33E00",
+"S+ c #CB1E00",
+"T+ c #C40300",
+"U+ c #1C1100",
+"V+ c #F1B200",
+"W+ c #E4AE00",
+"X+ c #0E0600",
+"Y+ c #6B2300",
+"Z+ c #CE2A00",
+"`+ c #C60900",
+" ＠ c #0D0000",
+".＠ c #824E00",
+"+＠ c #EEA600",
+"＠＠ c #F6C800",
+"#＠ c #4E4300",
+"$＠ c #671300",
+"%＠ c #C70C00",
+"&＠ c #AC6300",
+"*＠ c #EDA100",
+"=＠ c #E5B300",
+"-＠ c #0C0200",
+";＠ c #C60B00",
+">＠ c #620000",
+",＠ c #A95700",
+"'＠ c #CF8C00",
+")＠ c #C50600",
+"!＠ c #7C3600",
+"~＠ c #E07200",
+"{＠ c #E48100",
+"]＠ c #391F00",
+"^＠ c #570500",
+"/＠ c #550000",
+"(＠ c #351300",
+"_＠ c #D95300",
+":＠ c #CE5B00",
+"<＠ c #361400",
+"[＠ c #3E0600",
+"}＠ c #B90500",
+"|＠ c #1A0000",
+"1＠ c #832200",
+"2＠ c #D33B00",
+"3＠ c #D23900",
+"4＠ c #B52600",
+"5＠ c #BE1800",
+"6＠ c #C50700",
+"7＠ c #7F1200",
+"8＠ c #CA1A00",
+"9＠ c #C91600",
+"0＠ c #930000",
+"a＠ c #180000",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" . . . . ",
+" + ＠ # $ % ",
+" & * = - ; > ",
+" . . . . . . . . . . . . . . . . . . . . . , ' ) ! ~ { ",
+" ] ^ / / ( ( ! ! _ : : < < [ [ } | | 1 1 2 3 ＠ 4 < 5 ; 6 ",
+" ] / ( ( ! ! _ : : < < [ [ } | | 1 1 - - 7 8 * 9 | 0 a b . ",
+" c ( ! ! _ : : < < [ [ } | | 1 1 - - d e e f g h e ( i j k ",
+" c _ _ : : < < [ } } | | 1 1 - - d e e ) ) l m ＠ n : o p q . ",
+" c : : < r s s s s s s s - d t u u u u u v w x * y } z A B . ",
+" C < < [ } } | | 1 1 - d d e e ) ) v v n n 4 D | h - ^ E ~ F ",
+" C [ } } | | 1 1 - d d e e ) ) v v n n 4 4 G H u ' ) _ g 7 3 . ",
+" C } | | g a I I E [ e ( i J J J g g g o G y K + ＠ 4 [ 5 L M . ",
+" C | 1 - N N O 8 P Q ) R w w w S S S S T y 9 U V * 9 1 0 a W X ",
+" Y - - d d e Z & ` & .../ 4 4 G G y y 9 9 = U . , ' e ( J Q +. ",
+" Y d d e e ) p F * * , ＠.& #.$.a y 9 9 = = h %.. ` ＠ n : t p ... ",
+" Y e e ) &.*.*.k * * * ＠ 9 w 2 =.-.＠.O ;.h ' %. & * y } >.A ,.. ",
+" Y ) ) v v n n '.u * * * h 4 d [ ).q !.8 ~.J 3 . g h d / E j . . {.].^.. . ",
+" /.v v n n 4 4 # 8 * * * ＠ y ) | : ^ t B (._.V . . :.＠ v _ g <.[. . }.|.1.2.3.4.5.6. ",
+" /.n n 4 4 G G y 7.+ * * ＠ h 4 d [ ( z J a <.Z 8.9.8 ＠ G [ 5 R 0.a.. . b.c.d.e.f.g.h.i.j.6. ",
+" /.4 4 G ;.k.k.k.k.l.+ * * ' y ) | _ 0 t E L j m.S ;.= = 1 ^ I n.o.p.q.r.s.t.u.v.w.x.y.z.A.. ",
+" 9.G G y y 9 9 = = h ＠.F , ＠ = n - [ ( z J A 7 , ; B.( ' e ! C.D.E.F.G.s.H.I.. J.K.L.M.. ",
+" 9.y y 9 9 = = h h ' ' N.8 + N.y ) | _ 0 o I L j m.S p ＠ 4 < B O.P.Q.d.R.S.. T.U.V.W. ",
+" 9.9 9 v ; ; ; ).).).).X.X.Y.8 & P Z.< / z J A 7 , ; N * 9 o { . `. +e..+++. ＠+z.V.W. ",
+" 9.= = h z >.>.0 0 0 0 0 0 0 0 I m x #+$+%+o I p ~ X.S < h &+ *+=+-+;+. . >+V.V.,+ ",
+" F h h ' ' ＠ ＠ * * * * * * * * * * * | m '+)+> !+~+{+]+^+/+. . (+_+:+<+. . . ＠+L.V.[+. ",
+" F ' ' ＠ ＠ * * * * * * * * * * * * | A w }+|+1+ . 2+3+4+5+. 6+7+8+8+9+0+a+b+V.V.c+ ",
+" F ＠ ＠ * * * * * * * * * * * * * * t d+;.e+q . f+g+h+i+j+. . k+l+m+n+o+L.V.V.A.. ",
+" F * * * * * * * * * * * * * * * * N Z %+p+q+ r+s+t+u+v+w+x+. . y+z+A+V.V.B+W.. ",
+" F * * * * * * * * * * * * * * * t s C+D+#+ . E+F+G+H+I+J+K+c+. . . . . . ",
+" F * * * * * * * * * * * * * * I C+$.L+M+ . N+O+D.P+F.Q+R+S+T+c+ ",
+" . . . . . . . . . . . . . . . . . . U+r.V+W+j+. X+Y+Z+`+M. ＠ ",
+" .＠+＠＠＠#＠ . $＠%(a)V.c+ ",
+" . &＠*＠=＠. -＠;(a)V.>＠. ",
+" . ,＠P+'＠. . )(a)V.>＠. ",
+" . !＠~＠{＠]＠ . ^(a)V.V./＠ ",
+" (＠_＠1.:＠<＠. . [＠}(a)V.V.|＠ ",
+" . 1＠2＠R+3＠4＠5＠6(a)V.V.>＠. ",
+" . 7＠8＠9＠%(a)T+V.V.>＠. ",
+" . ,+A.0＠0＠>＠a＠. ",
+" . . ",
+" ",
+" "};
1.2.40.1 +476 -42 XEmacs/xemacs/etc/toolbar/debug-cap-up.xpm
Index: debug-cap-up.xpm
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/toolbar/debug-cap-up.xpm,v
retrieving revision 1.2
retrieving revision 1.2.40.1
diff -u -r1.2 -r1.2.40.1
--- debug-cap-up.xpm 1997/12/21 06:28:48 1.2
+++ debug-cap-up.xpm 2005/02/25 16:29:47 1.2.40.1
＠＠ -1,43 +1,477 ＠＠
/* XPM */
-static char * bug_xpm[] = {
-"33 33 7 1",
-"X c Gray75 s backgroundToolBarColor",
-"u c #000000000000 s foregroundToolBarColor",
-"o c black",
-"O c Gray40",
-"+ c Gray60",
-"＠ c white",
-"# c Gray90",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXooooooooooooooooXXXXXXXX",
-"XXXXXXXXoooooooooOoOoOoOooXXXXXXX",
-"XXXXXXXXoooooooooOoOoOoOooXXXXXXX",
-"XXXXXXXXoooooooooooooooooo+XXXXXX",
-"XXXXXXXXXo＠＠＠＠＠＠＠＠＠＠＠##Xo++XXXXXX",
-"XXXXXXXXo＠＠＠＠＠＠＠＠＠＠＠＠##XXo+XXXXXX",
-"XXXXXXXXo＠＠＠＠＠＠＠＠＠＠＠＠##XXo+XXXXXX",
-"XXXXXXXXo＠＠＠＠＠＠o＠＠oo＠##XXo+XXXXXX",
-"XXXXXXXXo＠＠＠o＠＠o＠oooo##XXo+XXXXXX",
-"XXXXXXXXo＠＠＠＠o＠oo＠ooo##XXo+XXXXXX",
-"XXXXXXXXo＠＠＠＠＠oooooo＠##XXo+XXXXXX",
-"XXXXXXXXo＠ooo＠ooooo＠＠##XXo+XXXXXX",
-"XXXXXXXXo＠＠＠oo＠oooooo##XXo+XXXXXX",
-"XXXXXXXXo＠＠o＠ooooo＠＠＠##XXo+XXXXXX",
-"XXXXXXXXo＠oooooo＠＠o＠＠##XXo+XXXXXX",
-"XXXXXXXXo＠oooooo＠＠＠o＠##XXo+XXXXXX",
-"XXXXXXXXo＠ooooooo＠＠＠＠##XXo+XXXXXX",
-"XXXXXXXXo＠ooooo＠o＠＠＠＠##XXo+XXXXXX",
-"XXXXXXXXo＠＠ooo＠＠o＠＠＠＠##XXo+XXXXXX",
-"XXXXXXXXo＠＠＠＠＠＠＠＠＠＠＠＠##XXo+XXXXXX",
-"XXXXXXXXXoooooooooooooooo++XXXXXX",
-"XXXXXXXXX++++++++++++++++++XXXXXX",
-"XXXXXXXXXX++++++++++++++++XXXXXXX",
-"XXXXXXXXXXXXXXXuXXXXXXXXXXXXXXXXX",
-"XXXXXuuuuXXXXXXuXXXXXXXXXXXXXXXXX",
-"XXXXXuXXXuXXuXXuuuXXuXuXXuuuXXXXX",
-"XXXXXuXXXuXuXuXuXXuXuXuXuXXuXXXXX",
-"XXXXXuXXXuXuuuXuXXuXuXuXuXXuXXXXX",
-"XXXXXuXXXuXuXXXuXXuXuXuXXuuuXXXXX",
-"XXXXXuuuuXXXuuXuuuXXXuuXXXXuXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXuuXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"};
+static char * debug_xpm[] = {
+"48 48 426 2",
+" c None",
+". c #000000",
+"+ c #180000",
+"＠ c #490000",
+"# c #7A0000",
+"$ c #888888",
+"% c #4A4A4A",
+"& c #0C0000",
+"* c #3D0000",
+"= c #AB0000",
+"- c #C40000",
+"; c #696969",
+"> c #EFEFEF",
+", c #E8E8E8",
+"' c #707070",
+") c #0D0000",
+"! c #6E0000",
+"~ c #9F0000",
+"{ c #B50000",
+"] c #A10000",
+"^ c #8D0000",
+"/ c #5C0000",
+"( c #111111",
+"_ c #CCCCCC",
+": c #E3E3E3",
+"< c #DCDCDC",
+"[ c #929292",
+"} c #AC0000",
+"| c #8C0000",
+"1 c #6C0000",
+"2 c #4C0000",
+"3 c #680000",
+"4 c #740000",
+"5 c #480000",
+"6 c #1D0000",
+"7 c #555555",
+"8 c #DDDDDD",
+"9 c #D7D7D7",
+"0 c #C4C4C4",
+"a c #353535",
+"b c #550000",
+"c c #C93636",
+"d c #D18787",
+"e c #D6BDBD",
+"f c #D5B0B0",
+"g c #C50D0D",
+"h c #450000",
+"i c #240000",
+"j c #3A3A3A",
+"k c #9E9E9E",
+"l c #C8C8C8",
+"m c #6E6E6E",
+"n c #BCBCBC",
+"o c #CACACA",
+"p c #B5B5B5",
+"q c #6C6C6C",
+"r c #CDB0B0",
+"s c #BDB0B0",
+"t c #987A7A",
+"u c #602828",
+"v c #270000",
+"w c #5B5B5B",
+"x c #B8B8B8",
+"y c #B0B0B0",
+"z c #310000",
+"A c #620000",
+"B c #930000",
+"C c #190C0C",
+"D c #6D6D6D",
+"E c #C1C1C1",
+"F c #ECECEC",
+"G c #5E5E5E",
+"H c #3A0000",
+"I c #3C0000",
+"J c #171717",
+"K c #BBBBBB",
+"L c #7B7B7B",
+"M c #C70000",
+"N c #800000",
+"O c #260000",
+"P c #F3F3F3",
+"Q c #F9F9F9",
+"R c #2D2D2D",
+"S c #2B0000",
+"T c #580000",
+"U c #730000",
+"V c #540000",
+"W c #656565",
+"X c #B4B4B4",
+"Y c #8B8B8B",
+"Z c #565656",
+"` c #1C1C1C",
+" . c #1F0000",
+".. c #EF0000",
+"+. c #F30000",
+"＠. c #BB0000",
+"#. c #190000",
+"$. c #7D7D7D",
+"%. c #F5F5F5",
+"&. c #DADADA",
+"*. c #1B1B1B",
+"=. c #380000",
+"-. c #4F0000",
+";. c #650000",
+">. c #7E0000",
+",. c #AA0000",
+"'. c #AF0000",
+"). c #590000",
+"!. c #6F6F6F",
+"~. c #E5E5E5",
+"{. c #393939",
+"]. c #120000",
+"^. c #CF0000",
+"/. c #FF0000",
+"(. c #A20000",
+"_. c #959595",
+":. c #E4E4E4",
+"<. c #AFAFAF",
+"[. c #110C0C",
+"}. c #5F0000",
+"|. c #890000",
+"1. c #970000",
+"2. c #9C0000",
+"3. c #A00000",
+"4. c #A50000",
+"5. c #A90000",
+"6. c #A40000",
+"7. c #210000",
+"8. c #C7C7C7",
+"9. c #ABABAB",
+"0. c #777777",
+"a. c #727272",
+"b. c #3F0000",
+"c. c #400000",
+"d. c #080000",
+"e. c #D2D2D2",
+"f. c #949494",
+"g. c #830000",
+"h. c #8F0000",
+"i. c #9B0000",
+"j. c #200000",
+"k. c #8F8F8F",
+"l. c #C0C0C0",
+"m. c #CECECE",
+"n. c #D4D4D4",
+"o. c #E2E2E2",
+"p. c #ACACAC",
+"q. c #4B0000",
+"r. c #660000",
+"s. c #750000",
+"t. c #150D0D",
+"u. c #B3B3B3",
+"v. c #BDBDBD",
+"w. c #2C0000",
+"x. c #3E0000",
+"y. c #8E0000",
+"z. c #9A0000",
+"A. c #AAAAAA",
+"B. c #C3C3C3",
+"C. c #D9D9D9",
+"D. c #E0E0E0",
+"E. c #4A0000",
+"F. c #560000",
+"G. c #630000",
+"H. c #6F0000",
+"I. c #770000",
+"J. c #780000",
+"K. c #7C0000",
+"L. c #600000",
+"M. c #242424",
+"N. c #A5A5A5",
+"O. c #424033",
+"P. c #8D7800",
+"Q. c #8B6E00",
+"R. c #2F0000",
+"S. c #950000",
+"T. c #1E0000",
+"U. c #B6B6B6",
+"V. c #D1D1D1",
+"W. c #A8A8A8",
+"X. c #737373",
+"Y. c #0F0F0F",
+"Z. c #B90000",
+"`. c #760000",
+" + c #510000",
+".+ c #918E81",
+"++ c #E0C213",
+"＠+ c #FAC900",
+"#+ c #D19A00",
+"$+ c #130000",
+"%+ c #D6D6D6",
+"&+ c #292929",
+"*+ c #060000",
+"=+ c #7B0000",
+"-+ c #7D0000",
+";+ c #2F2900",
+">+ c #EDCA00",
+",+ c #FCCC00",
+"'+ c #F4B900",
+")+ c #C68600",
+"!+ c #936F00",
+"~+ c #7B6100",
+"{+ c #BF0000",
+"]+ c #940000",
+"^+ c #530000",
+"/+ c #AD9600",
+"(+ c #FAC800",
+"_+ c #F1B300",
+":+ c #ECAA00",
+"<+ c #EAA700",
+"[+ c #DEA400",
+"}+ c #AE7000",
+"|+ c #7F5F00",
+"1+ c #343434",
+"2+ c #850000",
+"3+ c #910000",
+"4+ c #9E0000",
+"5+ c #A70000",
+"6+ c #AA0401",
+"7+ c #B81806",
+"8+ c #C62B0B",
+"9+ c #A0300D",
+"0+ c #1F1B00",
+"a+ c #3B2D00",
+"b+ c #BF9600",
+"c+ c #F3BA00",
+"d+ c #BE8200",
+"e+ c #B57900",
+"f+ c #B37600",
+"g+ c #B87E00",
+"h+ c #584200",
+"i+ c #505050",
+"j+ c #D5D5D5",
+"k+ c #C5C5C5",
+"l+ c #4D0000",
+"m+ c #DF0000",
+"n+ c #C30000",
+"o+ c #900000",
+"p+ c #9D0000",
+"q+ c #D43F11",
+"r+ c #DF4E15",
+"s+ c #C73F11",
+"t+ c #A82B0B",
+"u+ c #821305",
+"v+ c #E4C000",
+"w+ c #D49A00",
+"x+ c #B57A00",
+"y+ c #AD7100",
+"z+ c #BE8400",
+"A+ c #B17400",
+"B+ c #C38C00",
+"C+ c #3A2C00",
+"D+ c #535353",
+"E+ c #181818",
+"F+ c #3B0000",
+"G+ c #5E0000",
+"H+ c #5D0000",
+"I+ c #D30000",
+"J+ c #B51305",
+"K+ c #C3270A",
+"L+ c #D13A0F",
+"M+ c #891806",
+"N+ c #690401",
+"O+ c #610000",
+"P+ c #A78E00",
+"Q+ c #BA8400",
+"R+ c #B87D00",
+"S+ c #B57B00",
+"T+ c #B17700",
+"U+ c #C48D00",
+"V+ c #B47A00",
+"W+ c #C49100",
+"X+ c #2C2000",
+"Y+ c #2E0000",
+"Z+ c #5B0000",
+"`+ c #5A0000",
+" ＠ c #050000",
+".＠ c #D92C10",
+"+＠ c #A72B0B",
+"＠＠ c #881806",
+"#＠ c #680401",
+"$＠ c #939393",
+"%＠ c #A2A2A2",
+"&＠ c #1A180B",
+"*＠ c #CCAA00",
+"=＠ c #B98300",
+"-＠ c #C28A00",
+";＠ c #B98000",
+">＠ c #B77F00",
+",＠ c #C99200",
+"'＠ c #B47C00",
+")＠ c #B18700",
+"!＠ c #140A00",
+"~＠ c #4E0000",
+"{＠ c #570000",
+"]＠ c #500000",
+"^＠ c #751E11",
+"/＠ c #B5160C",
+"(＠ c #C24326",
+"_＠ c #280000",
+":＠ c #676767",
+"<＠ c #B9B9B9",
+"[＠ c #8C8C8C",
+"}＠ c #2E2700",
+"|＠ c #D6AE00",
+"1＠ c #BC8700",
+"2＠ c #CA9400",
+"3＠ c #BB8600",
+"4＠ c #CD9800",
+"5＠ c #A98100",
+"6＠ c #100000",
+"7＠ c #520000",
+"8＠ c #7A1E11",
+"9＠ c #9E341E",
+"0＠ c #AC341E",
+"a＠ c #B8341E",
+"b＠ c #94160C",
+"c＠ c #B20000",
+"d＠ c #EB160C",
+"e＠ c #C04326",
+"f＠ c #7C7C7C",
+"g＠ c #3D3300",
+"h＠ c #DBAF00",
+"i＠ c #BF8B00",
+"j＠ c #CF9A00",
+"k＠ c #BD8900",
+"l＠ c #C69300",
+"m＠ c #CC9700",
+"n＠ c #BD8A00",
+"o＠ c #643200",
+"p＠ c #440000",
+"q＠ c #791E11",
+"r＠ c #9F341E",
+"s＠ c #B2341E",
+"t＠ c #C3341E",
+"u＠ c #A4160C",
+"v＠ c #8A0000",
+"w＠ c #7F0000",
+"x＠ c #E60000",
+"y＠ c #E4160C",
+"z＠ c #BE4326",
+"A＠ c #360000",
+"B＠ c #4F4F4F",
+"C＠ c #5C4C00",
+"D＠ c #D6AA00",
+"E＠ c #BA8500",
+"F＠ c #9C5F00",
+"G＠ c #823C04",
+"H＠ c #953C15",
+"I＠ c #AB3C22",
+"J＠ c #B9341E",
+"K＠ c #CF341E",
+"L＠ c #840000",
+"M＠ c #790000",
+"N＠ c #DE0000",
+"O＠ c #DE160C",
+"P＠ c #BD4326",
+"Q＠ c #2A0000",
+"R＠ c #100B0B",
+"S＠ c #390000",
+"T＠ c #474747",
+"U＠ c #C1B8B8",
+"V＠ c #A48787",
+"W＠ c #481512",
+"X＠ c #993E15",
+"Y＠ c #AD3C22",
+"Z＠ c #CA9282",
+"`＠ c #E2C0B4",
+" # c #CB3F35",
+".# c #B40000",
+"+# c #AE0000",
+"＠# c #A30000",
+"## c #980000",
+"$# c #880000",
+"%# c #820000",
+"&# c #D50000",
+"*# c #DD2515",
+"=# c #BE4B2B",
+"-# c #330000",
+";# c #303030",
+"># c #410000",
+",# c #590704",
+"'# c #7A2515",
+")# c #A9341E",
+"!# c #C7341E",
+"~# c #DA2D19",
+"{# c #CB0F08",
+"]# c #CC8787",
+"^# c #AD0000",
+"/# c #860000",
+"(# c #810000",
+"_# c #CD0000",
+":# c #DC2D19",
+"<# c #BD4B2B",
+"[# c #440704",
+"}# c #7F2515",
+"|# c #D3A2A2",
+"1# c #CFA2A2",
+"2# c #B10000",
+"3# c #A60000",
+"4# c #C80000",
+"5# c #EB2D19",
+"6# c #B43C22",
+"7# c #CF8787",
+"8# c #C55151",
+"9# c #B00000",
+"0# c #E30000",
+"a# c #D10000",
+"b# c #C74343",
+"c# c #CB7A7A",
+"d# c #0F0000",
+"e# c #CF7A7A",
+"f# c #CC7A7A",
+"g# c #C24343",
+"h# c #300000",
+"i# c #070000",
+"j# c #B30000",
+"k# c #C10000",
+"l# c #BC0000",
+"m# c #B60000",
+"n# c #0E0000",
+"o# c #C00000",
+"p# c #BA0000",
+"q# c #140000",
+"r# c #B70000",
+"s# c #170000",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" . ",
+" . . . + ＠ # ＠ . ",
+" . $ % . . . & * # = - - - - ＠ . ",
+" ; > , ' . . ) * ! ~ - - - - - { ] ^ / . ",
+" ( _ : < [ . . ) * ! ~ - - - - - } | 1 2 3 4 5 6 . . ",
+" 7 8 9 0 a b ~ c d e f g } | 1 2 h h h h 3 i j k l m . ",
+" . . & n o p q * - g r s t u h h h h h h h h v w x y ' . ",
+" . . z A B - B C D E F G H 2 h h h h h h h h h h h I J K y L . ",
+" 2 M - - - - } N O 7 P Q R S h h h h h h h h h T U V W X p Y . . Z ` ",
+" ...+.＠.| 1 2 h h h #.$.%.&.*.=.h h h h -.;.>.~ ,.'.).!.p K E . . . Z ~.{. ",
+" ].^././.(.h h h h h h h & _.:.<.[.h }.4 |.1.2.3.4.5.6.7.k K E 8.9.0.a.~.~.` ",
+" b./././.(.h h h h h h h c.d.p e.f.#.g.h.B 1.i.3.6.~ j.k.8.y l.m.n.&.o.~.p.. ",
+" b./././.(.h h h h q.T r.s.r.t.u.v.q w.x.c.y.i.~ z. .k.8.A.<.B.C.&.D.~.9 ` ",
+" b./././.(.E.F.G.H.I.J.# K.>.L.M.9.N.O.P.Q.R.i.S.T.k.8.A.<.U.< V.W.p.X.Y. ",
+" b./././.Z.4 4 s.`.I.J.# K.>.N +a .+++＠+#+$+/ .k.8.A.<.U.< %+&+#.*+. ",
+" ./././.Z.4 4 s.`.I.J.# =+-+N ).;+>+,+'+)+!+~+` K A.<.U.< %+&+b.;. +*+ ",
+" . {+/./.Z.4 4 s.s.`.J.K.|.]+~ ^+/+(+_+:+<+[+}+|+1+<.U.< %+&+* G.A A -.*+ ",
+" -././.Z.4 4 J.2+3+4+5+6+7+8+9+0+a+b+c+d+e+f+g+h+i+j+k+&+I L.L.}.}.}.l+*+ ",
+" . m+/.n+o+p+5+6+7+8+q+r+s+t+u+F.].v+w+x+y+z+A+B+C+D+E+F+G+G+H+H+H+/ / E.*+ ",
+" R...I+J+K+L+r+s+t+M+N+O+O+I T.*+P+Q+R+S+T+U+V+W+X+Y+/ Z+Z+Z+`+`+`+).).5 ＠ ",
+" R..＠s++＠＠＠#(a)L.L.}.}.}.6 j $＠%＠&＠*＠=＠-＠;＠>＠,＠'＠)＠!＠~(a)).T T T {＠{＠F.^+](a)^＠. ",
+" . /＠((a)}.G+G+H+H+H+/ _＠:＠<＠y p [＠}＠|＠1＠2＠=＠3＠4＠1＠5＠6＠ +F.V 7＠]＠8＠9＠0＠a＠b＠. ",
+" . c＠d＠e＠/ Z+Z+`+`+~＠J K y p K E f＠g＠h＠i＠j＠k＠l＠m＠n＠o＠p＠q＠r＠s＠t＠u＠v＠2+w＠# . ",
+" . c＠x＠y＠z(a)).T T T A＠W X [ j q 9.m.B＠C＠D＠E＠F＠G＠H＠I＠J＠K＠/＠~ z.]+y.|.L(a)>.M＠. ",
+" . c＠x＠N＠O＠P(a)F.b b Q(a)!.[ R＠S＠T.T＠U＠V＠W＠X＠Y＠Z(a)`＠ #.#+#5.＠#4+##B ^ $#%#-+I.. ",
+" . c＠x＠N＠&#*#=#^+7＠-#;#R(a)>#-.,#'#)#!#~#{#- C.C.]#c(a)^#5+(.2.1.3+| /#(#=+`.. ",
+" . c＠x＠N＠&#_#:#<#-.~＠[#}#)#!#~#{#- - - - |#C.C.1#2#= 3#3.i.S.o+v＠2+w＠# 4 . ",
+" . c＠x＠N＠&#_#4#5#6#!#~#{#- - - - - - - - |#7#8#1#9#,.6.~ z.]+y.|.L＠>.M(a)U . ",
+" . ＠#x＠N＠&#_#4#0#a#- - - - - - - - - - - |#b#c#1#+#5.＠#4+##B ^ $#%#-+O+c.. ",
+" d#＠.N＠&#_#4#0#a#- - - - - - - - - - - e#f#g#c(a)^#5+(.2.1.3+# V h#i#. . ",
+" d#j#&#_#4#0#a#- - - - - - - - - - - k#l#m#2#= 3#| O+=.].. . ",
+" n#^#_#4#0#a#- - - - - - - - - - n+o#p#~ ! c.q#. . ",
+" n#3#4#0#a#- - - - - - - - - r## 5 s#. . ",
+" ) ＠#0#a#- - - - - r#/#b i . . ",
+" ) p#a#- r#/#b i . . ",
+" d#/ i . . ",
+" ",
+" ",
+" ",
+" "};
1.2.40.1 +454 -41 XEmacs/xemacs/etc/toolbar/disk-cap-up.xpm
Index: disk-cap-up.xpm
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/toolbar/disk-cap-up.xpm,v
retrieving revision 1.2
retrieving revision 1.2.40.1
diff -u -r1.2 -r1.2.40.1
--- disk-cap-up.xpm 1997/12/21 06:28:48 1.2
+++ disk-cap-up.xpm 2005/02/25 16:29:47 1.2.40.1
＠＠ -1,42 +1,455 ＠＠
/* XPM */
-static char * disk[] = {
-"33 33 6 1",
-"X c Gray75 s backgroundToolBarColor",
-"u c #000000000000 s foregroundToolBarColor",
-"o c black",
-"O c Gray60",
-"+ c Gray90",
-"＠ c Gray40",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXooooooooooooooooooXXXXXXX",
-"XXXXXXXXoOOo++++++++++oOOoXXXXXXX",
-"XXXXXXXXoOOo++++++++++oOOoXXXXXXX",
-"XXXXXXXXoOOo++++++++++oOooXXXXXXX",
-"XXXXXXXXoOOo++++++++++oOOoXXXXXXX",
-"XXXXXXXXoOOo++++++++++oOOoXXXXXXX",
-"XXXXXXXXoOOo++++++++++oOOoXXXXXXX",
-"XXXXXXXXoOOo++++++++++oOOoXXXXXXX",
-"XXXXXXXXoOOo++++++++++oOOoXXXXXXX",
-"XXXXXXXXoOOooooooooooooOOoXXXXXXX",
-"XXXXXXXXoOOOOOOOOOOOOOOOOoXXXXXXX",
-"XXXXXXXXoOOOOOOOOOOOOOOOOoXXXXXXX",
-"XXXXXXXXoOOooooooooooooOOoXXXXXXX",
-"XXXXXXXXoOOo＠＠＠＠＠＠＠o++oOOoXXXXXXX",
-"XXXXXXXXoOOo＠＠＠＠＠＠＠o++oOOoXXXXXXX",
-"XXXXXXXXoOOo＠＠＠＠＠＠＠o++oOOoXXXXXXX",
-"XXXXXXXXXoOo＠＠＠＠＠＠＠o++oOOoXXXXXXX",
-"XXXXXXXXXXooooooooooooooooXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXuuuXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXuXXXXuuXXuXXuXXuXXXXXXXXX",
-"XXXXXXXXuuuXXXXuXuXXuXuXuXXXXXXXX",
-"XXXXXXXXXXXuXuuuXuXXuXuuuXXXXXXXX",
-"XXXXXXXXXXXuXuXuXuXuXXuXXXXXXXXXX",
-"XXXXXXXXuuuXXuuXuXuXXXXuuXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"};
+static char * save_xpm[] = {
+"48 48 404 2",
+" c None",
+". c #000000",
+"+ c #050609",
+"＠ c #4A4F7E",
+"# c #555B91",
+"$ c #4E537F",
+"% c #4C4D51",
+"& c #B2B5C9",
+"* c #BBBED3",
+"= c #B4B7CE",
+"- c #686D9D",
+"; c #545A90",
+"> c #494F7E",
+", c #0F101A",
+"' c #151624",
+") c #4C5179",
+"! c #46464C",
+"~ c #A1A3B5",
+"{ c #BBBDD3",
+"] c #BBBDD2",
+"^ c #B4B6CE",
+"/ c #7A7EA7",
+"( c #53598E",
+"_ c #4E5384",
+": c #1F2134",
+"< c #52588B",
+"[ c #52556F",
+"} c #575A74",
+"| c #656777",
+"1 c #484849",
+"2 c #C0C1C6",
+"3 c #D9DADF",
+"4 c #D9D9DF",
+"5 c #D8D9DE",
+"6 c #D8D8DE",
+"7 c #D8D8DD",
+"8 c #D7D8DD",
+"9 c #D7D7DD",
+"0 c #D6D7DC",
+"a c #B9BAC4",
+"b c #73758A",
+"c c #4E506A",
+"d c #4D506A",
+"e c #4D5069",
+"f c #2E303D",
+"g c #4C5078",
+"h c #878CAF",
+"i c #A4AAD9",
+"j c #BABFE2",
+"k c #E5E5E5",
+"l c #F2F2F2",
+"m c #FFFFFF",
+"n c #FEFEFE",
+"o c #FDFDFD",
+"p c #FCFCFC",
+"q c #FAFAFA",
+"r c #F9F9F9",
+"s c #F8F8F8",
+"t c #F7F7F7",
+"u c #F6F6F6",
+"v c #F4F4F4",
+"w c #F3F3F3",
+"x c #F1F1F1",
+"y c #F0F0F0",
+"z c #EFEFEF",
+"A c #8187B9",
+"B c #8086B8",
+"C c #7F85B7",
+"D c #7D83B6",
+"E c #7C82B4",
+"F c #7A80B3",
+"G c #141623",
+"H c #53598D",
+"I c #4B4F77",
+"J c #FBFBFB",
+"K c #F5F5F5",
+"L c #EEEEEE",
+"M c #797FB2",
+"N c #141523",
+"O c #51578B",
+"P c #4A4E75",
+"Q c #333333",
+"R c #B4B6C2",
+"S c #EDEDED",
+"T c #6A6E94",
+"U c #4C4C4C",
+"V c #8084AA",
+"W c #141522",
+"X c #505689",
+"Y c #484D73",
+"Z c #666666",
+"` c #B4B6C1",
+" . c #ECECEC",
+".. c #757AA0",
+"+. c #727272",
+"＠. c #7E83A9",
+"#. c #131521",
+"$. c #4F5487",
+"%. c #484C71",
+"&. c #A0A4C7",
+"*. c #9FA3C6",
+"=. c #B6BAD8",
+"-. c #EBEBEB",
+";. c #7B80B0",
+">. c #777CAC",
+",. c #131421",
+"'. c #4D5384",
+"). c #474B70",
+"!. c #868BAE",
+"~. c #A1A7D6",
+"{. c #9FA5D5",
+"]. c #B6BBDE",
+"^. c #EAEAEA",
+"/. c #777DB0",
+"(. c #767CAF",
+"_. c #747AAE",
+":. c #7379AC",
+"<. c #131420",
+"[. c #4C5182",
+"}. c #454A6E",
+"|. c #858AAD",
+"1. c #9EA4D3",
+"2. c #B5BADD",
+"3. c #E9E9E9",
+"4. c #7278AB",
+"5. c #121420",
+"6. c #4B5080",
+"7. c #44496C",
+"8. c #8488AC",
+"9. c #9DA3D2",
+"0. c #B4B8DC",
+"a. c #E8E8E8",
+"b. c #7076AA",
+"c. c #12131F",
+"d. c #43476B",
+"e. c #8387AB",
+"f. c #9BA1D1",
+"g. c #B3B7DB",
+"h. c #E7E7E7",
+"i. c #6F75A8",
+"j. c #12131E",
+"k. c #484D7B",
+"l. c #424669",
+"m. c #8286AA",
+"n. c #9AA0D0",
+"o. c #B2B6DA",
+"p. c #6D73A7",
+"q. c #11131E",
+"r. c #474C79",
+"s. c #414567",
+"t. c #8185A9",
+"u. c #989ECE",
+"v. c #B1B5D9",
+"w. c #E6E6E6",
+"x. c #6C72A6",
+"y. c #11121D",
+"z. c #454A77",
+"A. c #404466",
+"B. c #8084A8",
+"C. c #979DCD",
+"D. c #AFB4D8",
+"E. c #6B71A5",
+"F. c #444974",
+"G. c #3F4364",
+"H. c #7F83A7",
+"I. c #959BCC",
+"J. c #AEB2D6",
+"K. c #696FA3",
+"L. c #10121C",
+"M. c #424772",
+"N. c #3E4262",
+"O. c #7E82A6",
+"P. c #949ACA",
+"Q. c #ACB1D5",
+"R. c #686EA2",
+"S. c #10111C",
+"T. c #414670",
+"U. c #3D4160",
+"V. c #7C81A5",
+"W. c #9399C9",
+"X. c #ABAFD4",
+"Y. c #666CA1",
+"Z. c #10111B",
+"`. c #40456E",
+" + c #3C405E",
+".+ c #7B80A4",
+"++ c #9197C8",
+"＠+ c #969CC9",
+"#+ c #656B9F",
+"$+ c #3E436B",
+"%+ c #3B3F5D",
+"&+ c #7A7FA3",
+"*+ c #9096C6",
+"=+ c #8E94C5",
+"-+ c #B4B7D6",
+";+ c #999DBD",
+">+ c #63699E",
+",+ c #3D4269",
+"'+ c #3A3E5B",
+")+ c #797EA2",
+"!+ c #8D93C4",
+"~+ c #8B91C2",
+"{+ c #9096C4",
+"]+ c #A3A7CC",
+"^+ c #A1A6CB",
+"/+ c #A0A4CA",
+"(+ c #9FA3C8",
+"_+ c #9DA2C7",
+":+ c #9CA0C6",
+"<+ c #9B9FC5",
+"[+ c #999EC4",
+"}+ c #989DC3",
+"|+ c #979BC1",
+"1+ c #969AC0",
+"2+ c #9499BF",
+"3+ c #9398BE",
+"4+ c #9296BD",
+"5+ c #9095BC",
+"6+ c #9094BB",
+"7+ c #8E93B9",
+"8+ c #8D92B9",
+"9+ c #8C91B8",
+"0+ c #8B90B6",
+"a+ c #62689D",
+"b+ c #0F1019",
+"c+ c #3C4067",
+"d+ c #393D5A",
+"e+ c #787DA1",
+"f+ c #8A90C1",
+"g+ c #898FC0",
+"h+ c #878DBF",
+"i+ c #868CBD",
+"j+ c #848ABC",
+"k+ c #8389BB",
+"l+ c #61679C",
+"m+ c #0E0F19",
+"n+ c #3A3F64",
+"o+ c #383C58",
+"p+ c #777CA0",
+"q+ c #6C72A4",
+"r+ c #6B71A3",
+"s+ c #6A70A2",
+"t+ c #696FA1",
+"u+ c #686EA0",
+"v+ c #676D9F",
+"w+ c #666B9E",
+"x+ c #656A9D",
+"y+ c #64699C",
+"z+ c #62689B",
+"A+ c #61679A",
+"B+ c #606699",
+"C+ c #5F6598",
+"D+ c #5E6497",
+"E+ c #5D6396",
+"F+ c #5C6295",
+"G+ c #5E6498",
+"H+ c #5F659A",
+"I+ c #0E0F18",
+"J+ c #393D62",
+"K+ c #373B56",
+"L+ c #767B9F",
+"M+ c #7278A9",
+"N+ c #3E4371",
+"O+ c #343652",
+"P+ c #34364F",
+"Q+ c #3A3F6E",
+"R+ c #3D4274",
+"S+ c #393E6F",
+"T+ c #3B4071",
+"U+ c #5B6094",
+"V+ c #5E6499",
+"W+ c #383C60",
+"X+ c #363A54",
+"Y+ c #75799E",
+"Z+ c #898DAB",
+"`+ c #F1F1F4",
+" ＠ c #ABABAB",
+".＠ c #5A5A5A",
+"+＠ c #353538",
+"＠＠ c #505685",
+"#＠ c #414679",
+"$＠ c #43487A",
+"%＠ c #5C6298",
+"&＠ c #0D0E17",
+"*＠ c #363B5D",
+"=＠ c #353852",
+"-＠ c #74789D",
+";＠ c #F0F1F4",
+">＠ c #BDBDBD",
+",＠ c #6A6A71",
+"'＠ c #767994",
+")＠ c #9799AD",
+"!＠ c #BABABA",
+"~＠ c #585858",
+"{＠ c #444762",
+"]＠ c #53588E",
+"^＠ c #353A6B",
+"/＠ c #5B6196",
+"(＠ c #06070B",
+"_＠ c #35395B",
+":＠ c #343751",
+"<＠ c #73779C",
+"[＠ c #A2A2A2",
+"}＠ c #3B3D4A",
+"|＠ c #565C92",
+"1＠ c #7C80A9",
+"2＠ c #B7B7B7",
+"3＠ c #6D6D6D",
+"4＠ c #595F95",
+"5＠ c #33364F",
+"6＠ c #72769B",
+"7＠ c #9D9D9D",
+"8＠ c #3D3E4C",
+"9＠ c #7E82AB",
+"0＠ c #E3E3E3",
+"a＠ c #E2E2E2",
+"b＠ c #E1E1E1",
+"c＠ c #E0E0E0",
+"d＠ c #DFDFDF",
+"e＠ c #DEDEDE",
+"f＠ c #B1B1B1",
+"g＠ c #6A6A6A",
+"h＠ c #474A65",
+"i＠ c #585E94",
+"j＠ c #1D1E28",
+"k＠ c #71759A",
+"l＠ c #989898",
+"m＠ c #3F404D",
+"n＠ c #8185AD",
+"o＠ c #D9D9D9",
+"p＠ c #D8D8D8",
+"q＠ c #D7D7D7",
+"r＠ c #D6D6D6",
+"s＠ c #D5D5D5",
+"t＠ c #D4D4D4",
+"u＠ c #686868",
+"v＠ c #4B4E68",
+"w＠ c #575D92",
+"x＠ c #4D516D",
+"y＠ c #939393",
+"z＠ c #40424F",
+"A＠ c #6A70A4",
+"B＠ c #8388AF",
+"C＠ c #D0D0D0",
+"D＠ c #CFCFCF",
+"E＠ c #CECECE",
+"F＠ c #CDCDCD",
+"G＠ c #CCCCCC",
+"H＠ c #CBCBCB",
+"I＠ c #A5A5A5",
+"J＠ c #656565",
+"K＠ c #4E516B",
+"L＠ c #515474",
+"M＠ c #8E8E8E",
+"N＠ c #424350",
+"O＠ c #868BB1",
+"P＠ c #C7C7C7",
+"Q＠ c #C6C6C6",
+"R＠ c #C5C5C5",
+"S＠ c #C4C4C4",
+"T＠ c #C3C3C3",
+"U＠ c #9F9F9F",
+"V＠ c #626262",
+"W＠ c #51546E",
+"X＠ c #3F425B",
+"Y＠ c #898989",
+"Z＠ c #444552",
+"`＠ c #898EB4",
+" # c #BFBFBF",
+".# c #BEBEBE",
+"+# c #BCBCBC",
+"＠# c #BBBBBB",
+"## c #999999",
+"$# c #606060",
+"%# c #555871",
+"&# c #2E3043",
+"*# c #ADADAD",
+"=# c #979797",
+"-# c #B8B8B8",
+";# c #B6B6B6",
+"># c #B5B5B5",
+",# c #B4B4B4",
+"'# c #5D5D5D",
+")# c #585B74",
+"!# c #7E84B6",
+"~# c #252737",
+"{# c #3C3F58",
+"]# c #161721",
+"^# c #B3B3B3",
+"/# c #B2B2B2",
+"(# c #B0B0B0",
+"_# c #AFAFAF",
+":# c #AEAEAE",
+"<# c #373737",
+"[# c #2D2F3B",
+"}# c #41445D",
+"|# c #1A1D35",
+"1# c #2A2D48",
+"2# c #5E5E5E",
+"3# c #575757",
+"4# c #565656",
+"5# c #555555",
+"6# c #545454",
+"7# c #151515",
+" ",
+" ",
+" ",
+" ",
+" ",
+" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+" + ＠ # # $ % & * * * * * * * * * * * * * * * * * * * * * * = - ; ; > , . ",
+" ' # # # # ) ! ~ * * * * * * * * * * * { { { { { { { { ] ] ] ^ / ( ( _ : . ",
+" ' # < [ } } | 1 2 3 3 3 3 3 3 3 3 3 3 3 4 5 5 5 6 7 8 8 9 9 0 a b c d e f . ",
+" ' ; g h i i j k l m m m m m m m m n o p q r s t u v w l x y z A B C D E F . ",
+" G H I h i i j m m m m m m m m n n o J q r s t K v w l x y z L B C D E F M . ",
+" N O P h Q Q R m m m m m m m n n p J q r s u K v w l x y z L S C D T Q U V . ",
+" W X Y h Z Z ` m m m m m m n n p J q r t u K v w l x y z L S .D E ..Z +.＠.. ",
+" #.$.%.h &.*.=.m m m m m n o p J q r t u K v w l x y z L S .-.E F ;.V ＠.>.. ",
+" ,.'.).!.~.{.].m m m m n o p J q s t u K v w l x z L S S .-.^.F M /.(._.:.. ",
+" <.[.}.|.{.1.2.m m m n o p J r s t u K v w x y z L S . .-.^.3.M /.(._.:.4.. ",
+" 5.6.7.8.1.9.0.m m n o p J r s t u K v l x y z L S .-.-.^.3.a./.(._.:.4.b.. ",
+" c.> d.e.9.f.g.m n o p q r s t u K w l x y z L S .-.^.^.3.a.h.(._.:.4.b.i.. ",
+" j.k.l.m.f.n.o.n o p q r s t u v w l x y z L S .-.^.^.3.a.h.h._.:.4.b.i.p.. ",
+" q.r.s.t.n.u.v.o J q r s t K v w l x y z L S .-.^.3.3.a.h.h.w.:.4.b.i.p.x.. ",
+" y.z.A.B.u.C.D.J q r s u K v w l x y z L S .-.^.3.3.a.h.h.w.w.4.b.i.p.x.E.. ",
+" y.F.G.H.C.I.J.q r s u K v w l x y z L S .-.^.3.3.a.h.w.w.w.w.b.i.p.x.E.K.. ",
+" L.M.N.O.I.P.Q.r t u K v w l x y z L S .-.^.3.a.a.h.w.w.w.w.w.i.p.x.E.K.R.. ",
+" S.T.U.V.P.W.X.t u K v w l x z L S S .-.^.3.a.a.h.w.w.w.w.w.w.p.x.E.K.R.Y.. ",
+" Z.`. +.+W.++＠+u K v w x y z L S . .-.^.3.a.a.h.w.w.w.w.w.w.w.x.E.K.R.Y.#+. ",
+" , $+%+&+++*+=+-+v l x y z L S .-.-.^.3.a.h.h.w.w.w.w.w.w.w.;+E.K.R.Y.#+>+. ",
+" , ,+'+)+*+=+!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+8+9+0+x.E.K.R.Y.#+>+a+. ",
+" b+c+d+e+=+!+~+f+g+h+i+j+k+A B C D E F M /.(._.:.4.b.i.p.x.E.K.R.Y.#+>+a+l+. ",
+" m+n+o+p+!+~+f+g+h+i+j+k+A B q+r+s+t+u+v+w+x+y+z+A+B+C+D+E+F+G+Y.#+>+a+l+H+. ",
+" I+J+K+L+~+f+g+h+i+j+k+A M+N+O+P+P+P+P+P+P+P+P+P+P+P+O+Q+R+R+S+T+U+a+l+H+V+. ",
+" I+W+X+Y+f+g+h+i+j+k+A B Z+`+n n n n n n n o o o p ＠.＠+＠＠＠# # #＠$＠l+H+V+%＠. ",
+" &＠*＠=＠-＠g+h+i+j+k+A B C ;＠o p >＠,＠'＠)＠s t u K v w l !＠~＠{＠# # ]＠^＠H+V+%＠/＠. ",
+" (＠_＠:＠<＠h+i+j+k+A B C D v w l [＠}＠|＠1＠S .-.^.^.a.h.2＠3＠{＠|＠|＠|＠^＠V+%＠/＠4＠. ",
+" . #.5＠6＠i+j+k+A B C D E ^.3.a.7＠8＠%＠9＠0＠a＠b＠c＠d＠e＠e＠f＠g＠h＠%＠%＠%＠^＠%＠/＠4＠i＠. ",
+" . j＠k＠j+k+A B C D E F c＠d＠e＠l＠m＠>+n＠o＠p＠p＠q＠r＠s＠t＠ ＠u＠v＠>+>+>+^＠/＠4＠i＠w＠. ",
+" . x＠k+A B C D E F M r＠s＠t＠y＠z＠A＠B＠C＠D＠E＠E＠F＠G＠H＠I＠J＠K＠A＠A＠A＠^＠4＠i＠w＠# . ",
+" . L＠B C D E F M /.F＠G＠H＠M＠N＠b.O＠P＠P＠Q＠R＠S＠S＠T＠U＠V＠W＠b.b.b.^＠i＠w(a)# # . ",
+" . X＠D E F M /.(.R＠S＠T＠Y＠Z(a)/.`＠ #.#.#>＠+#+#＠###$#%#/././.^＠w(a)# # # . ",
+" . &#F M /.(._.>＠+#＠#*#=#=#U＠-#2＠;#;#>#>#,#y＠'#)#!#!#!#^＠# # # # . ",
+" . ~#{#]#. . >#>#,#^#^#/#f＠f＠(#(#_#:#:#*#Z <#[#}#}#}#|#1#1#1#1#. ",
+" 2#~＠3#3#3#4#4#4#5#5#5#5#6#6#7#. ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "};
1.2.40.1 +437 -40 XEmacs/xemacs/etc/toolbar/file-cap-up.xpm
Index: file-cap-up.xpm
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/toolbar/file-cap-up.xpm,v
retrieving revision 1.2
retrieving revision 1.2.40.1
diff -u -r1.2 -r1.2.40.1
--- file-cap-up.xpm 1997/12/21 06:28:48 1.2
+++ file-cap-up.xpm 2005/02/25 16:29:47 1.2.40.1
＠＠ -1,41 +1,438 ＠＠
/* XPM */
-static char * file[] = {
-"33 33 5 1",
-"X c Gray75 s backgroundToolBarColor",
-"u c #000000000000 s foregroundToolBarColor",
-"o c black",
-"O c white",
-"+ c Gray60",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXooooooooooXXXXXXXXXXXXX",
-"XXXXXXXXXXoOOOOOOOOooXXXXXXXXXXXX",
-"XXXXXXXXXXoOOOOOOOOo+oXXXXXXXXXXX",
-"XXXXXXXXXXoOOOOOOOOo++oXXXXXXXXXX",
-"XXXXXXXXXXoOOOOOOOOoooooXXXXXXXXX",
-"XXXXXXXXXXoOOOOOOOOOOOOoXXXXXXXXX",
-"XXXXXXXXXXoOOOOOOOOOOOOoXXXXXXXXX",
-"XXXXXXXXXXoOOOOOOOOOOOOoXXXXXXXXX",
-"XXXXXXXXXXoOOOOOOOOOOOOoXXXXXXXXX",
-"XXXXXXXXXXoOOOOOOOOOOOOoXXXXXXXXX",
-"XXXXXXXXXXoOOOOOOOOOOOOoXXXXXXXXX",
-"XXXXXXXXXXoOOOOOOOOOOOOoXXXXXXXXX",
-"XXXXXXXXXXoOOOOOOOOOOOOoXXXXXXXXX",
-"XXXXXXXXXXoOOOOOOOOOOOOoXXXXXXXXX",
-"XXXXXXXXXXoOOOOOOOOOOOOoXXXXXXXXX",
-"XXXXXXXXXXoOOOOOOOOOOOOoXXXXXXXXX",
-"XXXXXXXXXXoOOOOOOOOOOOOoXXXXXXXXX",
-"XXXXXXXXXXooooooooooooooXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXuuuXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXuXXXuXuuuXXXuXXuuuXXXXXXX",
-"XXXXXXXXuXXXuXuXXuXuXuXuXXuXXXXXX",
-"XXXXXXXXuXXXuXuXXuXuuuXuXXuXXXXXX",
-"XXXXXXXXuXXXuXuXXuXuXXXuXXuXXXXXX",
-"XXXXXXXXXuuuXXuuuXXXuuXuXXuXXXXXX",
-"XXXXXXXXXXXXXXuXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"};
+static char * open_xpm[] = {
+"48 48 387 2",
+" c None",
+". c #000000",
+"+ c #CFCFCF",
+"＠ c #FBE9C6",
+"# c #F9D89A",
+"$ c #FAD99B",
+"% c #FBDA9C",
+"& c #FBDB9C",
+"* c #FCDB9D",
+"= c #FDDC9E",
+"- c #FEDD9F",
+"; c #FCDB9E",
+"> c #ECCD93",
+", c #1F1B13",
+"' c #FFFFFF",
+") c #FCE4B5",
+"! c #FCDA9D",
+"~ c #FBDA9D",
+"{ c #FAD99C",
+"] c #FAD89C",
+"^ c #F9D79B",
+"/ c #9B8660",
+"( c #FEE5B7",
+"_ c #F8D79B",
+": c #F8D69A",
+"< c #F7D599",
+"[ c #F6D499",
+"} c #F6D498",
+"| c #3D3426",
+"1 c #FCE3B5",
+"2 c #F5D398",
+"3 c #F4D297",
+"4 c #F3D197",
+"5 c #E3C38D",
+"6 c #695A41",
+"7 c #100D09",
+"8 c #BFBFBE",
+"9 c #FCEBCC",
+"0 c #F3D096",
+"a c #F2D096",
+"b c #F1CF95",
+"c c #F1CE95",
+"d c #F0CE94",
+"e c #F0CD94",
+"f c #EFCC93",
+"g c #EECC93",
+"h c #EECB92",
+"i c #EDCB92",
+"j c #EDCA91",
+"k c #ECC991",
+"l c #EBC890",
+"m c #EAC78F",
+"n c #EAC68F",
+"o c #E9C68F",
+"p c #E9C58E",
+"q c #E8C58E",
+"r c #E8C48D",
+"s c #E7C48D",
+"t c #D8B784",
+"u c #564934",
+"v c #FAE9CB",
+"w c #E7C38D",
+"x c #E6C38C",
+"y c #E6C28C",
+"z c #E5C28C",
+"A c #E5C18B",
+"B c #1C1811",
+"C c #AFAFAE",
+"D c #F9E8CA",
+"E c #F3D196",
+"F c #E4C18B",
+"G c #E4C08A",
+"H c #E3BF8A",
+"I c #7F6B4D",
+"J c #7F7F7E",
+"K c #F8E7C9",
+"L c #EDCA92",
+"M c #EBC790",
+"N c #E3BF89",
+"O c #E2BE89",
+"P c #A98E66",
+"Q c #F9ECD5",
+"R c #E5C388",
+"S c #D7B678",
+"T c #D6B678",
+"U c #D6B577",
+"V c #D5B577",
+"W c #D5B477",
+"X c #D5B476",
+"Y c #D4B476",
+"Z c #D4B376",
+"` c #D3B375",
+" . c #D3B275",
+".. c #D2B275",
+"+. c #D2B175",
+"＠. c #D2B174",
+"#. c #D1B074",
+"$. c #FAF1E1",
+"%. c #D9B87B",
+"&. c #C1A35F",
+"*. c #B4934F",
+"=. c #B3924F",
+"-. c #B2924E",
+";. c #B1914E",
+">. c #B1904E",
+",. c #B08F4D",
+"'. c #AF8F4D",
+"). c #AE8E4C",
+"!. c #AE8D4C",
+"~. c #AD8D4C",
+"{. c #AC8C4B",
+"]. c #AB8B4B",
+"^. c #AA8A4A",
+"/. c #7F7F7D",
+"(. c #FAF0E0",
+"_. c #E4C289",
+":. c #A98541",
+"<. c #976F2A",
+"[. c #926823",
+"}. c #9F7A3D",
+"|. c #AD8D58",
+"1. c #AC8C58",
+"2. c #A98A56",
+"3. c #A78855",
+"4. c #A58654",
+"5. c #A28453",
+"6. c #A08252",
+"7. c #9E8050",
+"8. c #9C7D4F",
+"9. c #997C4E",
+"0. c #97794D",
+"a. c #95774C",
+"b. c #93764A",
+"c. c #907349",
+"d. c #8E7148",
+"e. c #534B3F",
+"f. c #3F3F3D",
+"g. c #6D6659",
+"h. c #2F2F2E",
+"i. c #F9EFDF",
+"j. c #D6B578",
+"k. c #C0A25E",
+"l. c #A6813D",
+"m. c #BA9E6D",
+"n. c #F8F2E6",
+"o. c #FFFEFA",
+"p. c #FFFEF9",
+"q. c #FFFEF8",
+"r. c #FFFEF7",
+"s. c #FFFEF6",
+"t. c #FFFEF5",
+"u. c #FDF7E9",
+"v. c #3D3931",
+"w. c #C7A767",
+"x. c #B69652",
+"y. c #9E793D",
+"z. c #F8F4EC",
+"A. c #FCF1DC",
+"B. c #F9E0B2",
+"C. c #F9DFB1",
+"D. c #F8DAA5",
+"E. c #F4D197",
+"F. c #F2CF95",
+"G. c #EFCD94",
+"H. c #EECB93",
+"I. c #766549",
+"J. c #F8EEDE",
+"K. c #BD9D5C",
+"L. c #9D7936",
+"M. c #CCBA9A",
+"N. c #FDF8ED",
+"O. c #F4D298",
+"P. c #F1CE94",
+"Q. c #EFCD93",
+"R. c #EAC790",
+"S. c #2C251B",
+"T. c #7F7F7C",
+"U. c #F8EEDD",
+"V. c #AE8E4B",
+"W. c #8E6726",
+"X. c #F0EADD",
+"Y. c #F8E4C1",
+"Z. c #ECCA91",
+"`. c #E9C68E",
+" + c #E8C48E",
+".+ c #CAAB7B",
+"++ c #F7EEDD",
+"＠+ c #DEBA84",
+"#+ c #A68643",
+"$+ c #916E37",
+"%+ c #F2D6A6",
+"&+ c #E6C38D",
+"*+ c #806C4E",
+"=+ c #F7EEDC",
+"-+ c #D1AE76",
+";+ c #997736",
+">+ c #A68A5E",
+",+ c #FDFAF1",
+"'+ c #E4C08B",
+")+ c #2A2319",
+"!+ c #F5EAD5",
+"~+ c #D0AD74",
+"{+ c #8B6728",
+"]+ c #BCA887",
+"^+ c #F9F0DD",
+"/+ c #C5A677",
+"(+ c #F0DDC0",
+"_+ c #C5A268",
+":+ c #825D20",
+"<+ c #DCD2BE",
+"[+ c #F2E0C2",
+"}+ c #E3C08A",
+"|+ c #E2BF89",
+"1+ c #E1BD88",
+"2+ c #8D7655",
+"3+ c #AFAEA9",
+"4+ c #EFDDBF",
+"5+ c #B9965A",
+"6+ c #795319",
+"7+ c #EDE7DA",
+"8+ c #ECD3AC",
+"9+ c #E2BE88",
+"0+ c #463B2A",
+"a+ c #BFBEB9",
+"b+ c #EFDDBE",
+"c+ c #B69357",
+"d+ c #6C4510",
+"e+ c #E7CA9D",
+"f+ c #E1BD87",
+"g+ c #E0BC87",
+"h+ c #E0BC86",
+"i+ c #DFBB86",
+"j+ c #0E0B08",
+"k+ c #BFBEB8",
+"l+ c #EFDCBD",
+"m+ c #9A783A",
+"n+ c #8D7047",
+"o+ c #DFBB85",
+"p+ c #DEBA85",
+"q+ c #B4976C",
+"r+ c #EEDCBD",
+"s+ c #906D32",
+"t+ c #8A6E46",
+"u+ c #FBF5E7",
+"v+ c #DDB984",
+"w+ c #DDB983",
+"x+ c #DCB883",
+"y+ c #7C6749",
+"z+ c #DFDED6",
+"A+ c #E6CB9F",
+"B+ c #785419",
+"C+ c #AF9C7F",
+"D+ c #F7EDD9",
+"E+ c #DCB882",
+"F+ c #DBB782",
+"G+ c #DBB781",
+"H+ c #DAB681",
+"I+ c #DAB680",
+"J+ c #514430",
+"K+ c #DEC497",
+"L+ c #68440B",
+"M+ c #B7A68C",
+"N+ c #F1E0C4",
+"O+ c #D9B580",
+"P+ c #D9B57F",
+"Q+ c #D8B47E",
+"R+ c #D7B37D",
+"S+ c #D7B37C",
+"T+ c #D6B27C",
+"U+ c #352C1F",
+"V+ c #FFFDF4",
+"W+ c #C9AE80",
+"X+ c #603C07",
+"Y+ c #D5CAB8",
+"Z+ c #EEDBBC",
+"`+ c #D6B27B",
+" ＠ c #D5B17B",
+".＠ c #D5B17A",
+"+＠ c #D4B07A",
+"＠＠ c #D4B079",
+"#＠ c #D3AF79",
+"$＠ c #D3AF78",
+"%＠ c #D2AE78",
+"&＠ c #2A2A28",
+"*＠ c #AE8C53",
+"=＠ c #5A3605",
+"-＠ c #E9E3D5",
+";＠ c #E6CDA5",
+">＠ c #D8B47D",
+",＠ c #D2AE77",
+"'＠ c #D1AD77",
+")＠ c #D1AD76",
+"!＠ c #D0AC76",
+"~＠ c #D0AC75",
+"{＠ c #CFAB74",
+"]＠ c #CEAA73",
+"^＠ c #C19F6C",
+"/＠ c #555451",
+"(＠ c #FFFDF3",
+"_＠ c #906D2E",
+":＠ c #553104",
+"<＠ c #E2C69B",
+"[＠ c #CEAA72",
+"}＠ c #CDA972",
+"|＠ c #CCA871",
+"1＠ c #CBA770",
+"2＠ c #CBA76F",
+"3＠ c #CAA66F",
+"4＠ c #CAA66E",
+"5＠ c #C9A56D",
+"6＠ c #967B51",
+"7＠ c #745010",
+"8＠ c #745630",
+"9＠ c #D7B581",
+"0＠ c #CFAB75",
+"a＠ c #CCA870",
+"b＠ c #C9A56E",
+"c＠ c #C8A46C",
+"d＠ c #C7A36C",
+"e＠ c #C7A36B",
+"f＠ c #C6A26A",
+"g＠ c #C5A169",
+"h＠ c #C4A068",
+"i＠ c #C4A067",
+"j＠ c #C39F67",
+"k＠ c #6D5939",
+"l＠ c #FFFDF2",
+"m＠ c #664208",
+"n＠ c #947C5D",
+"o＠ c #FCF7EA",
+"p＠ c #CDA971",
+"q＠ c #C39F66",
+"r＠ c #C29E66",
+"s＠ c #C19D65",
+"t＠ c #C09C64",
+"u＠ c #C09C63",
+"v＠ c #BF9B63",
+"w＠ c #BE9A62",
+"x＠ c #BD9961",
+"y＠ c #BD9960",
+"z＠ c #BC985F",
+"A＠ c #524229",
+"B＠ c #151514",
+"C＠ c #A9967B",
+"D＠ c #D4C9B6",
+"E＠ c #EEE2C9",
+"F＠ c #C8A46D",
+"G＠ c #C6A26B",
+"H＠ c #C29E65",
+"I＠ c #BF9B62",
+"J＠ c #BE9A61",
+"K＠ c #BB975E",
+"L＠ c #BA965D",
+"M＠ c #B9955C",
+"N＠ c #B8945B",
+"O＠ c #B8945A",
+"P＠ c #B79359",
+"Q＠ c #B69258",
+"R＠ c #B59157",
+"S＠ c #B49056",
+"T＠ c #211B10",
+"U＠ c #6F6E69",
+"V＠ c #FFFDF1",
+"W＠ c #D4B88C",
+"X＠ c #C19D64",
+"Y＠ c #B7935A",
+"Z＠ c #B69259",
+"`＠ c #B38F55",
+" # c #B28E54",
+".# c #B18D53",
+"+# c #B08C52",
+"＠# c #AF8B51",
+"## c #AE8A50",
+"$# c #AE8A4F",
+"%# c #AD894E",
+"&# c #8C6F3F",
+"*# c #222120",
+"=# c #1F1F1E",
+"-# c #16120A",
+";# c #2C2315",
+"># c #2C2314",
+",# c #2B2214",
+"'# c #2B2213",
+")# c #2A2113",
+"!# c #2A2112",
+"~# c #292012",
+"{# c #0B0905",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" . . . . . . . . . . . . . . ",
+" . + ＠ # $ % & * = - - - = ; > , ",
+" . ' ) * = - - - = ; ! ~ { ] ^ / . ",
+" . ' ( - = ; ! ~ { ] ^ _ : < [ } | ",
+" . + 1 ~ { ] ^ _ : < [ } 2 3 3 4 5 6 7 . . . . . . . . . . . . . . . . . ",
+" . 8 9 _ : < [ } 2 3 3 4 0 a b c d e f g h i j k k l l m n o p q r s t u . ",
+" . 8 v } 2 3 3 4 0 a b c d e f g h i j k k l l m n o p q r s w x y z A A B ",
+" . C D E 0 a b c d e f g h i j k k l l m n o p q r s w x y z A A F G G H I . ",
+" . J K c d e f g h L j k k l M m n o p q r s w x y z A A F G G H H N O O P . ",
+" J Q g h L R S T T U U V W W X Y Z Z Z ` . . . ...+.＠.＠.＠.＠.＠.#.#.#.#.#.. ",
+" J $.k k %.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.*.=.-.;.>.,.'.).!.~.{.].^.. ",
+" /.(.m _.&.&.:.<.[.[.[.[.[.}.|.|.|.|.|.|.|.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.f.g.h.. ",
+" /.i.q j.k.l.m.n.o.o.p.p.p.p.p.p.p.q.q.q.q.q.q.q.r.r.r.r.r.r.r.s.s.s.s.s.s.s.t.t.u.v. ",
+" /.i.x w.x.y.z.A.B.B.C.D.< [ [ [ 2 2 2 3 3 E.4 E 0 a a F.b b c d e e G.f f g H.h i I. ",
+" /.J.A K.L.M.N.2 2 O.3 3 4 4 E 0 a a F.b c P.d e G.Q.f f H.h h L L j k k k l l M R.S. ",
+" T.U.H V.W.X.Y.a F.b b c d d e G.f f g H.h i L L Z.k k l l l R.m m o o `.q q +r .+. ",
+" T.++(a)+#+$+q.%+f f g H.h i L j k k k l l l R.m m o o p q q r s s w &+x y z A A F *+ ",
+" T.=+-+;+>+,+k k k l l M R.m n o `.p q q r s w w x y y z A A F '+G H H H O O O O )+ ",
+" T.!+~+{+]+^+o `.q q +s s w w x y y z A A '+G G H H N O O O O O O O O O O O O /+. ",
+" T.(+_+:+<+[+x y z A A F '+G }+H H |+O O O O O O O O O O O O O O O O O O O 1+1+2+. ",
+" 3+4+5+6+7+8+H H O O O O O O O O O O O O O O O O O O O 9+1+1+1+1+1+1+1+1+1+1+1+0+ ",
+" . a+b+c+d+s.e+O O O O O O O O O O O O 9+1+1+1+1+1+1+1+1+1+1+f+g+g+g+g+g+g+g+h+i+j+ ",
+" . k+l+m+n+s.O O O O 1+1+1+1+1+1+1+1+1+1+1+f+g+g+g+g+g+g+h+h+i+i+i+i+i+o+p+p+p+q+. ",
+" . k+r+s+t+u+1+1+1+1+1+1+f+g+g+g+g+g+g+h+i+i+i+i+i+o+o+p+p+p+p+＠+＠+v+v+w+w+x+x+y+. ",
+" . z+A+B+C+D+g+g+g+g+h+i+i+i+i+i+o+o+p+p+p+p+＠+＠+v+v+w+w+x+x+E+E+F+G+G+H+I+I+I+J+ ",
+" . t.K+L+M+N+i+o+p+p+p+p+＠+＠+v+v+w+w+w+x+E+E+E+F+G+G+H+I+I+O+P+P+Q+Q+Q+R+R+S+T+U+ ",
+" . V+W+X+Y+Z+v+w+w+x+x+E+E+F+G+G+G+I+I+I+P+P+P+Q+Q+Q+R+R+S+T+`+ ＠ ＠.＠+＠＠＠#＠$＠%＠. ",
+" &＠V+*＠=＠-＠;＠G+H+I+I+I+P+P+P+Q+Q+>＠R+R+T+T+`+ ＠.＠+＠+＠＠＠#＠$＠%＠,＠'＠)＠!＠~＠{＠{＠]＠^＠. ",
+" /＠(＠_＠:＠(＠<＠Q+R+R+S+T+T+ ＠ ＠.＠+＠＠＠#＠$＠$＠,＠,＠)＠)＠~＠~＠{＠{＠]＠[＠}＠|＠|＠1＠2＠3＠4＠5＠6＠. ",
+" /＠(＠7＠8＠(＠9＠+＠＠＠#＠$＠%＠,＠'＠)＠!＠~＠0＠{＠]＠]＠}＠}＠|＠a＠1＠2＠4＠b＠5＠c＠d＠e＠f＠f＠g＠h＠i＠j＠k＠. ",
+" /＠l＠m＠n＠o＠!＠~＠{＠{＠]＠]＠}＠p＠|＠1＠1＠3＠4＠b＠5＠c＠d＠e＠f＠g＠g＠h＠j＠q＠r＠s＠t＠u＠v＠w＠x＠y＠z＠A＠ ",
+" B＠l＠C＠D＠E＠1＠2＠3＠4＠5＠F＠c＠e＠G＠f＠g＠h＠h＠j＠r＠H＠s＠t＠u＠I＠J＠y＠y＠z＠K＠L＠M＠N＠O＠P＠Q＠R＠S＠T＠ ",
+" U＠V＠V＠W＠f＠g＠h＠i＠j＠r＠s＠X＠u＠v＠I＠J＠y＠z＠K＠K＠L＠M＠N＠Y＠Z＠Q＠R＠S＠`＠ #.#+#＠###$#%#&#. ",
+" . *#=#. . . . . . . . . . . . . . . . . . -#;#;#>#>#>#,#'#'#'#)#!#!#!#~#{# ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "};
1.2.40.1 +362 -40 XEmacs/xemacs/etc/toolbar/folder-cap-up.xpm
Index: folder-cap-up.xpm
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/toolbar/folder-cap-up.xpm,v
retrieving revision 1.2
retrieving revision 1.2.40.1
diff -u -r1.2 -r1.2.40.1
--- folder-cap-up.xpm 1997/12/21 06:28:48 1.2
+++ folder-cap-up.xpm 2005/02/25 16:29:47 1.2.40.1
＠＠ -1,41 +1,363 ＠＠
/* XPM */
-static char * folder[] = {
-"33 33 5 1",
-"X c Gray75 s backgroundToolBarColor",
-"u c #000000000000 s foregroundToolBarColor",
-"o c black",
-"O c white",
-"+ c Gray60",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXoXXXXXXXooXXXXXooXXXXX",
-"XXXXXXXXoooOoXXXoooOoXXooo+oXXXXX",
-"XXXXXXooOOOOooooOOOoooo++++oXXXXX",
-"XXXXXXoOOOOOOOOOooo+++++++oXXXXXX",
-"XXXXXXXoOOOOOOoo++++++++++oXXXXXX",
-"XXXXXXXoOOOOOOo++++ooo+++oXXXXXXX",
-"XXXXXXXoOOOOOOo+ooo++++++oXXXXXXX",
-"XXXXXXXXoOOOOo+++++++++++oXXXXXXX",
-"XXXXXXXXoOOOOo+++oo+++++oXXXXXXXX",
-"XXXXXXXXXoOOo++oo+++++oooXXXXXXXX",
-"XXXXXXXXXoOOo++++++oooXXXXXXXXXXX",
-"XXXXXXXXXoOOo+++oooXXXXXXXXXXXXXX",
-"XXXXXXXXXXoo+oooXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXoooXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXuXXXXXXXXXXXuXXXXXX",
-"XXXXXXXXuuuuXXXXXXXXXXXXXXuXXXXXX",
-"XXXXXXXXuXXXuXuXuXuXuXXXuuuXXXXXX",
-"XXXXXXXXuXXXuXuXuuXuXuXuXXuXXXXXX",
-"XXXXXXXXuXXXuXuXuXXuuuXuXXuXXXXXX",
-"XXXXXXXXuXXXuXuXuXXuXXXuXXuXXXXXX",
-"XXXXXXXXuuuuXXuXuXXXuuXXuuuXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"};
+static char * dired_xpm[] = {
+"48 48 312 2",
+" c None",
+". c #000000",
+"+ c #363636",
+"＠ c #6C6C6C",
+"# c #A2A2A2",
+"$ c #DDDDDD",
+"% c #E7E7E7",
+"& c #D3D3D3",
+"* c #0E0E0E",
+"= c #444444",
+"- c #7A7A7A",
+"; c #CECECE",
+"> c #B1B1B1",
+", c #7F7F7F",
+"' c #545454",
+") c #282828",
+"! c #1D1D1D",
+"~ c #484848",
+"{ c #808080",
+"] c #B7B7B7",
+"^ c #E1E1E1",
+"/ c #B3B3B3",
+"( c #868686",
+"_ c #616161",
+": c #393939",
+"< c #191919",
+"[ c #161616",
+"} c #131313",
+"| c #101010",
+"1 c #1F1F1F",
+"2 c #5A5A5A",
+"3 c #959595",
+"4 c #CFCFCF",
+"5 c #EBEBEB",
+"6 c #EFEFEF",
+"7 c #BBBBBB",
+"8 c #949494",
+"9 c #757575",
+"0 c #535353",
+"a c #2F2F2F",
+"b c #2C2C2C",
+"c c #252525",
+"d c #222222",
+"e c #1B1B1B",
+"f c #181818",
+"g c #F4F4F4",
+"h c #E3E3E3",
+"i c #AAAAAA",
+"j c #6F6F6F",
+"k c #373737",
+"l c #0B0B0B",
+"m c #3C3424",
+"n c #3B3B3B",
+"o c #383838",
+"p c #343434",
+"q c #2E2E2E",
+"r c #111111",
+"s c #060606",
+"t c #070707",
+"u c #9F9F9F",
+"v c #606060",
+"w c #7A694A",
+"x c #B89F70",
+"y c #F7D697",
+"z c #F9D99A",
+"A c #9D8862",
+"B c #151515",
+"C c #323232",
+"D c #1D1912",
+"E c #574B36",
+"F c #907C59",
+"G c #C8AD7C",
+"H c #E2C38C",
+"I c #61543C",
+"J c #828282",
+"K c #C5C5C5",
+"L c #6D6D6D",
+"M c #EBDBBB",
+"N c #FBDA9C",
+"O c #FBDA9D",
+"P c #FAD99C",
+"Q c #F7D69A",
+"R c #F3D398",
+"S c #594D37",
+"T c #817050",
+"U c #DFC08A",
+"V c #DBBD88",
+"W c #D8BA86",
+"X c #D5B784",
+"Y c #AA9369",
+"Z c #A9A9A9",
+"` c #DFDFDF",
+" . c #FDF1DA",
+".. c #D2B683",
+"+. c #95815D",
+"＠. c #3D3525",
+"#. c #2B251A",
+"$. c #CBAF7E",
+"%. c #D2B582",
+"&. c #CFB280",
+"*. c #9A845F",
+"=. c #594C37",
+"-. c #262017",
+";. c #393224",
+">. c #272727",
+",. c #4E4E4E",
+"'. c #DADADA",
+"). c #7E7E7E",
+"!. c #FAF2E3",
+"~. c #E9C991",
+"{. c #2C261B",
+"]. c #F6D697",
+"^. c #8D7B58",
+"/. c #403727",
+"(. c #66573F",
+"_. c #322B1F",
+":. c #E2C38D",
+"<. c #524733",
+"[. c #696969",
+"}. c #4F4F4F",
+"|. c #D6D6D6",
+"1. c #C2C2C2",
+"2. c #292929",
+"3. c #BDBBB7",
+"4. c #A58E66",
+"5. c #3F3F3F",
+"6. c #FCE7C0",
+"7. c #F7D79A",
+"8. c #F0D096",
+"9. c #927E5B",
+"0. c #DCBD88",
+"a. c #D5B884",
+"b. c #8E7A58",
+"c. c #5C5C5C",
+"d. c #D2D2D2",
+"e. c #D7D7D7",
+"f. c #707070",
+"g. c #3C3C3C",
+"h. c #BFBFBD",
+"i. c #B59B6F",
+"j. c #FAEACC",
+"k. c #ECCD93",
+"l. c #E9CA91",
+"m. c #C9AE7D",
+"n. c #8F7B59",
+"o. c #554935",
+"p. c #383023",
+"q. c #443B2A",
+"r. c #AE956C",
+"s. c #CCAF7E",
+"t. c #C9AD7C",
+"u. c #C6A975",
+"v. c #7B6947",
+"w. c #0D0D0D",
+"x. c #353535",
+"y. c #424242",
+"z. c #818181",
+"A. c #9C9C9A",
+"B. c #CEB791",
+"C. c #F6EBD5",
+"D. c #E5C68F",
+"E. c #D4B884",
+"F. c #1C1811",
+"G. c #2D271B",
+"H. c #6A5C41",
+"I. c #A89267",
+"J. c #AC956A",
+"K. c #937E56",
+"L. c #615337",
+"M. c #302919",
+"N. c #907D5A",
+"O. c #AB946A",
+"P. c #706146",
+"Q. c #6B6B6B",
+"R. c #505050",
+"S. c #CCCCCC",
+"T. c #E6E6E6",
+"U. c #838383",
+"V. c #ABABAB",
+"W. c #BCA98A",
+"X. c #2F2719",
+"Y. c #F5EEDF",
+"Z. c #433A29",
+"`. c #9C9485",
+" + c #E7C88E",
+".+ c #F9D89A",
+"++ c #FBDB9D",
+"＠+ c #F7D79B",
+"#+ c #695B42",
+"$+ c #0E0C09",
+"%+ c #483E2D",
+"&+ c #C8AD7D",
+"*+ c #E3C48D",
+"=+ c #DFC18B",
+"-+ c #DCBE88",
+";+ c #D9BB86",
+">+ c #C8AC7C",
+",+ c #1A1A1A",
+"'+ c #434343",
+")+ c #C9C9C9",
+"!+ c #BDBDBD",
+"~+ c #9C9893",
+"{+ c #2B2619",
+"]+ c #C9C5BD",
+"^+ c #EEE8DC",
+"/+ c #F4D498",
+"(+ c #EDCD94",
+"_+ c #E6C78F",
+":+ c #CCB07E",
+"<+ c #A48D65",
+"[+ c #252017",
+"}+ c #4A4A4A",
+"|+ c #EAEAEA",
+"1+ c #7C7C7C",
+"2+ c #C8C8C6",
+"3+ c #C1A576",
+"4+ c #54472F",
+"5+ c #BFBFBF",
+"6+ c #E2C48D",
+"7+ c #98825E",
+"8+ c #64563E",
+"9+ c #322B1E",
+"0+ c #B0B0B0",
+"a+ c #E9E9E9",
+"b+ c #E4E4E4",
+"c+ c #CACACA",
+"d+ c #C1C1C1",
+"e+ c #E5E5E5",
+"f+ c #ACABAB",
+"g+ c #B69C70",
+"h+ c #5F502E",
+"i+ c #9F9F9E",
+"j+ c #E3C999",
+"k+ c #C0A576",
+"l+ c #322A1E",
+"m+ c #7B7B7B",
+"n+ c #B9B9B9",
+"o+ c #CDCDCD",
+"p+ c #C4C4C4",
+"q+ c #E2E2E2",
+"r+ c #9E988D",
+"s+ c #73592C",
+"t+ c #7F7F7E",
+"u+ c #DDC7A0",
+"v+ c #8C7856",
+"w+ c #584B36",
+"x+ c #575757",
+"y+ c #909090",
+"z+ c #C7C7C7",
+"A+ c #E8E8E8",
+"B+ c #BEBEBE",
+"C+ c #C8C8C8",
+"D+ c #D1D1D1",
+"E+ c #D4D4D4",
+"F+ c #E0E0E0",
+"G+ c #8C8C8B",
+"H+ c #696968",
+"I+ c #D8C4A2",
+"J+ c #C4A777",
+"K+ c #31291C",
+"L+ c #686868",
+"M+ c #969696",
+"N+ c #F2F2F2",
+"O+ c #ECECEC",
+"P+ c #C0C0C0",
+"Q+ c #CBCBCB",
+"R+ c #D5D5D5",
+"S+ c #DCDCDC",
+"T+ c #D9D9D9",
+"U+ c #D8D8D8",
+"V+ c #DEDEDE",
+"W+ c #ACACAC",
+"X+ c #9C9C9B",
+"Y+ c #DDCFB6",
+"Z+ c #A68D5A",
+"`+ c #2B2B2B",
+" ＠ c #EDEDED",
+".＠ c #9C9C9C",
+"+＠ c #A8A8A8",
+"＠＠ c #D0D0D0",
+"#＠ c #DBDBDB",
+"$＠ c #A79F91",
+"%＠ c #897246",
+"&＠ c #AEAEAE",
+"*＠ c #9D9D9D",
+"=＠ c #A5A5A5",
+"-＠ c #A7A7A7",
+";＠ c #B2B2B2",
+">＠ c #807A6E",
+",＠ c #AFAFAF",
+"'＠ c #FFFFFF",
+")＠ c #333333",
+"!＠ c #8D8D8D",
+"~＠ c #525252",
+"{＠ c #BCBCBC",
+"]＠ c #F8F8F8",
+"^＠ c #A6A6A6",
+"/＠ c #999999",
+"(＠ c #B5B5B5",
+"_＠ c #BABABA",
+":＠ c #666666",
+"<＠ c #A1A1A1",
+"[＠ c #C3C3C3",
+"}＠ c #A0A0A0",
+"|＠ c #B6B6B6",
+"1＠ c #9B9B9B",
+"2＠ c #8C8C8C",
+"3＠ c #595959",
+"4＠ c #262626",
+"5＠ c #4D4D4D",
+"6＠ c #848484",
+"7＠ c #888888",
+" ",
+" ",
+" ",
+" ",
+" ",
+" . ",
+" . . + ＠ ＠ + . ",
+" . . + ＠ # $ % % $ & . ",
+" . . * = - # $ % % $ ; > , ' ) . ",
+" . . ! ~ { ] ^ % % $ ; / ( _ : < [ } | . ",
+" 1 2 3 4 5 6 6 ^ ; 7 8 9 0 a b ) c d 1 e f . ",
+" . $ g g h & i j k l m l + n o p q 1 r s . t . . ",
+" * % ; u v l m w x y z A B C 1 l D E F G H I . J . ",
+" . h K L 1 M z N O P Q R S D T G H U V W X Y . Z J . ",
+" . ` K 9 1 .Q R ..+.S D m ＠.#.$.X %.&.*.=.-.D ;.>.,.. ",
+" . '.K ).1 !.~.{.m w x ].z N ^./.(._.D E F G :.U <.[.}.. ",
+" . |.1., 2.3.4.5.6.N O P 7.R 8.9.F G :.U 0.W a.%.b.c.& }.. ",
+" . d.e.f.g.h.i.5.j.R 8.k.l.m.n.o.p.q.r.%.&.s.t.u.v.w.x.y.y.. ",
+" . ; % ( z.A.B.1 C.D.E.o.F.G.H.I.].J._.u.K.L.M.D E N.O.P.Q.R.. ",
+" . S.T.U.V.u W.X.Y.W Z.`. +.+N ++P ＠+#+$+%+T &+*+=+-+;+>+,+|.'+ . . ",
+" . S.T.U.)+!+~+{+]+s._.^+P ＠+/+8.(+l._+*+=+-+;+a.%.&.:+<+[+'+w.+ ＠ # Z }+. ",
+" . S.T.U.K |+!+1+2+3+4+5+(+l._+6+=+-+;+a.%.&.s.7+8+9+w.'+- 0+$ a+b+'.c+d+. ",
+" . S.T.U.K e+a+!+f+g+h+i+j+-+;+a.%.&.k+7+8+l+e 0 m+0+$ % % $ ; n+!+K o+& . ",
+" . S.T.U.p+h q+% !+r+s+t+u+&.s.v+w+[+! x+y+z+e+5 A+$ ; B+B+C+D+e.|.E+& d.. ",
+" . S.e+U.1.q+^ F+T.5+G+H+I+J+K+L+M+D+6 N+O+` ; B+P+Q+R+S+'.T+U+4 R+E+d.D+. ",
+" . S.h J d+F+` V+$ a+W+X+Y+Z+`+ ＠6 F+; B+d+o+U+F+` V+S+4 !+W+.＠+＠E+& D+＠＠. ",
+" . S.^ J P+V+$ S+#＠'.F+W+$(a)%＠: O+K 4 S+e+h q+^ d.P+&＠*＠=＠5+U+U+-＠& d.D+4 . ",
+" . ;＠` J B+S+#(a)'.T+U+e.` W+>＠o a+K T.e+b+T+,＠*＠=＠5+U+N+'＠'＠'＠e+-＠d.D+(a)＠; . ",
+" )＠$ z.!+'.T+U+e.|.R+E+$ W+!(a)T.K e+b+h ＠＠;＠'＠'＠'＠'＠'＠'＠'＠'＠e+-＠d.＠(a)4 ; . ",
+" ~＠z.{(a)U+e.|.R+E+& d.D+#(a)|.^ K e+b+q+4 ;＠'＠'＠'＠'＠'＠'＠'＠'＠e+-＠D+4 ; o+. ",
+" . b ＠(a)|.R+E+& d.D+＠＠4 ; T+4 K b+h ^ ; ;＠'＠'＠'＠'＠'＠'＠'＠'＠e+-＠＠＠4 o+S.. ",
+" . R.R+E+d.D+＠＠4 ; o+S.S.S.K h q+^ ; ;＠'＠'＠'＠'＠'＠'＠]＠` 5+^＠4 ; o+S.. ",
+" . }.d.D+＠＠4 o+S.S.S.S.S.K q+^ F+o+;＠'＠'＠N+U+K W+/＠-＠(＠K ; o+S.S.. ",
+" . ,.4 ; o+S.S.S.S.S.S.K q+F+` S.=＠5+=＠/＠+＠] _＠_＠i .＠d+; S.S.S.. ",
+" . :＠S.S.S.S.S.S.S.S.K ^ ` V+＠＠Z n+!+{＠W+.＠<(a)> [＠^(a)n+o+S.S.S.. ",
+" . , S.S.S.S.S.S.S.K F+` $ S+; *＠}＠,＠5+＠＠'.E+C+<＠|(a)S.S.S.S.. ",
+" . , S.S.S.S.S.S.K ` V+S+#＠c+-(a)d.o+5+> <＠/＠1＠=(a)!+S.S.S.S.. ",
+" . , S.S.S.S.S.K V+$ S+'.)+.＠}＠/＠u i ] [＠S.o+S.S.S.S.5+. ",
+" . , S.S.S.S.K V+S+#＠'.＠＠|＠!+c+D+D+＠(a)4 o+S.5+2＠3＠4＠. . ",
+" . , S.S.S.K $ #(a)'.T+e.|.R+& d.D+(＠z.5(a)< . . ",
+" . /(a)S.S.K S+#＠T+U+|.R+n+6(a),.,+. . ",
+" w.=(a)S.K #(a)'.!+( R.,+. . ",
+" w.=＠7＠~＠e . . ",
+" . . ",
+" ",
+" ",
+" ",
+" "};
1.2.40.1 +482 -37 XEmacs/xemacs/etc/toolbar/info-def-cap-up.xpm
Index: info-def-cap-up.xpm
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/toolbar/info-def-cap-up.xpm,v
retrieving revision 1.2
retrieving revision 1.2.40.1
diff -u -r1.2 -r1.2.40.1
--- info-def-cap-up.xpm 1997/12/21 06:28:48 1.2
+++ info-def-cap-up.xpm 2005/02/25 16:29:48 1.2.40.1
＠＠ -1,38 +1,483 ＠＠
/* XPM */
-static char * info[] = {
-"33 33 2 1",
-"X c Gray75 s backgroundToolBarColor",
-"o c black s foregroundToolBarColor",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXoXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXoooooXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXoooooXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXoooooooXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXoooooXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXoooooXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXoXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXooooooXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXoooooooXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXoooooXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXoooooXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXoooooXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXoooooXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXoooooXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXoooooXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXoooooXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXoooooXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXoooooXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXoooooooXXXXXXXXXXXXX",
-"XXXXXXXXXXXXoooooooooXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXoXXXXXXXXXXXXX",
-"XXXXXXXXXXoXXXXXXXoXXXXXXXXXXXXXX",
-"XXXXXXXXXXoXoooXXoooXooXXXXXXXXXX",
-"XXXXXXXXXXoXoXXoXXoXoXXoXXXXXXXXX",
-"XXXXXXXXXXoXoXXoXXoXoXXoXXXXXXXXX",
-"XXXXXXXXXXoXoXXoXXoXoXXoXXXXXXXXX",
-"XXXXXXXXXXoXoXXoXXoXXooXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"};
+static char * info_xpm[] = {
+"48 48 432 2",
+" c None",
+". c #000000",
+"+ c #1F1D02",
+"＠ c #3D3805",
+"# c #796B0B",
+"$ c #685909",
+"% c #2C2403",
+"& c #0F0C01",
+"* c #675609",
+"= c #C3A911",
+"- c #F4DB16",
+"; c #F7E316",
+"> c #F6E116",
+", c #F2D616",
+"' c #EEC915",
+") c #BE9B11",
+"! c #0F0000",
+"~ c #1D0000",
+"{ c #383838",
+"] c #3B3105",
+"^ c #695A09",
+"/ c #796C0B",
+"( c #4D4707",
+"_ c #6B620A",
+": c #C5AE11",
+"< c #EECA15",
+"[ c #0B0200",
+"} c #3F0E04",
+"| c #701806",
+"1 c #921B07",
+"2 c #951806",
+"3 c #8A1004",
+"4 c #7C0F0F",
+"5 c #EDEDED",
+"6 c #EAEAEA",
+"7 c #CBCBCB",
+"8 c #8F8F8F",
+"9 c #464646",
+"0 c #B5A010",
+"a c #755F0A",
+"b c #0C0301",
+"c c #5F1B07",
+"d c #B1310D",
+"e c #BC350E",
+"f c #BC340E",
+"g c #B9320D",
+"h c #B52F0C",
+"i c #A12008",
+"j c #953E3E",
+"k c #FAFAFA",
+"l c #F8F8F8",
+"m c #F6F6F6",
+"n c #F2F2F2",
+"o c #D7D7D7",
+"p c #707070",
+"q c #0E0E0E",
+"r c #1E1B02",
+"s c #DEBB14",
+"t c #1D1602",
+"u c #392B05",
+"v c #654E09",
+"w c #78680A",
+"x c #7B700B",
+"y c #6C650A",
+"z c #320E0E",
+"A c #9D2309",
+"B c #CE4111",
+"C c #D04312",
+"D c #D14412",
+"E c #CF4212",
+"F c #CC4011",
+"G c #9E1F08",
+"H c #B06F6F",
+"I c #FEFEFE",
+"J c #FCFCFC",
+"K c #F9F9F9",
+"L c #F4F4F4",
+"M c #C7C7C7",
+"N c #373737",
+"O c #5B5208",
+"P c #F1D216",
+"Q c #3B3205",
+"R c #594C08",
+"S c #CDA812",
+"T c #E6B314",
+"U c #E5AE14",
+"V c #EFCC15",
+"W c #F5DF16",
+"X c #E8D815",
+"Y c #2E2B04",
+"Z c #8D8D8D",
+"` c #AE7474",
+" . c #A6250A",
+".. c #DB4B14",
+"+. c #DC4C14",
+"＠. c #DD4C14",
+"#. c #B47A7A",
+"$. c #FDFDFD",
+"%. c #F1F1F1",
+"&. c #E6E6E6",
+"*. c #606060",
+"=. c #3C3505",
+"-. c #78690B",
+";. c #EDC615",
+">. c #E8B614",
+",. c #D6A112",
+"'. c #937A0D",
+"). c #7A6E0B",
+"!. c #A7250A",
+"~. c #D74813",
+"{. c #D34512",
+"]. c #D54713",
+"^. c #A62409",
+"/. c #AD7373",
+"(. c #E7E7E7",
+"_. c #EEEEEE",
+":. c #F3F3F3",
+"<. c #888888",
+"[. c #EFCD15",
+"}. c #EABC15",
+"|. c #8F6D0C",
+"1. c #100B01",
+"2. c #8B8B8B",
+"3. c #ECECEC",
+"4. c #F7F7F7",
+"5. c #C99E9E",
+"6. c #8E1305",
+"7. c #C2390F",
+"8. c #B8320D",
+"9. c #B8310D",
+"0. c #BD350E",
+"a. c #9A1C07",
+"b. c #A36969",
+"c. c #D5D5D5",
+"d. c #D8D8D8",
+"e. c #DEDEDE",
+"f. c #E5E5E5",
+"g. c #F5F5F5",
+"h. c #FBFBFB",
+"i. c #E4E4E4",
+"j. c #515151",
+"k. c #3C3405",
+"l. c #ECC415",
+"m. c #1C1502",
+"n. c #525252",
+"o. c #E4CECE",
+"p. c #7C0601",
+"q. c #AD290B",
+"r. c #A12108",
+"s. c #A01F08",
+"t. c #A02008",
+"u. c #A42309",
+"v. c #911505",
+"w. c #7A4747",
+"x. c #BEBEBE",
+"y. c #C3C3C3",
+"z. c #D4D4D4",
+"A. c #DFDFDF",
+"B. c #E9E9E9",
+"C. c #F1EAEA",
+"D. c #C8A4A4",
+"E. c #A26060",
+"F. c #0E0000",
+"G. c #EABD15",
+"H. c #E4AC14",
+"I. c #1D1702",
+"J. c #D3D3D3",
+"K. c #7B0F0F",
+"L. c #901505",
+"M. c #780D03",
+"N. c #3E0802",
+"O. c #120200",
+"P. c #222222",
+"Q. c #696969",
+"R. c #C1C1C1",
+"S. c #CECECE",
+"T. c #DCDCDC",
+"U. c #CCAFAF",
+"V. c #B57B7B",
+"W. c #8D2F2F",
+"X. c #740000",
+"Y. c #570000",
+"Z. c #BC9310",
+"`. c #E5AF14",
+" + c #6D6D6D",
+".+ c #9F5656",
+"++ c #7D0601",
+"＠+ c #4B0200",
+"#+ c #080000",
+"$+ c #171717",
+"%+ c #723030",
+"&+ c #860D03",
+"*+ c #941706",
+"=+ c #A22209",
+"-+ c #9B1C07",
+";+ c #810902",
+">+ c #150000",
+",+ c #554007",
+"'+ c #E8B914",
+")+ c #D6C013",
+"!+ c #111001",
+"~+ c #F0F0F0",
+"{+ c #C1A4A4",
+"]+ c #480000",
+"^+ c #070000",
+"/+ c #A9360E",
+"(+ c #C43A0F",
+"_+ c #AE2A0B",
+":+ c #931606",
+"<+ c #780300",
+"[+ c #410000",
+"}+ c #B29610",
+"|+ c #7C740B",
+"1+ c #353535",
+"2+ c #E2E2E2",
+"3+ c #D0D0D0",
+"4+ c #601818",
+"5+ c #341004",
+"6+ c #DA4A14",
+"7+ c #CD4111",
+"8+ c #BA330D",
+"9+ c #A22109",
+"0+ c #830B03",
+"a+ c #5E0000",
+"b+ c #2D2804",
+"c+ c #F7E317",
+"d+ c #9B910E",
+"e+ c #6C6C6C",
+"f+ c #E8E8E8",
+"g+ c #DBDBDB",
+"h+ c #2E2E2E",
+"i+ c #9F340E",
+"j+ c #D44612",
+"k+ c #AD2A0B",
+"l+ c #760100",
+"m+ c #7C730B",
+"n+ c #969696",
+"o+ c #D6D6D6",
+"p+ c #AAAAAA",
+"q+ c #4E1906",
+"r+ c #DC4B14",
+"s+ c #D84913",
+"t+ c #CA3F11",
+"u+ c #B6300D",
+"v+ c #4D4807",
+"w+ c #A4A4A4",
+"x+ c #909090",
+"y+ c #331004",
+"z+ c #CE4211",
+"A+ c #BB340E",
+"B+ c #856060",
+"C+ c #CFB2B2",
+"D+ c #CDC6C6",
+"E+ c #6A5454",
+"F+ c #320F04",
+"G+ c #D64813",
+"H+ c #D14312",
+"I+ c #BF360E",
+"J+ c #880F04",
+"K+ c #630802",
+"L+ c #7D0701",
+"M+ c #5B0300",
+"N+ c #3A0000",
+"O+ c #0E0B01",
+"P+ c #483806",
+"Q+ c #6C1A07",
+"R+ c #C53B10",
+"S+ c #B22D0C",
+"T+ c #9F1F08",
+"U+ c #0A0100",
+"V+ c #CDCDCD",
+"W+ c #E1E1E1",
+"X+ c #C6C6C6",
+"Y+ c #3A2D05",
+"Z+ c #D6A113",
+"`+ c #1E1702",
+" ＠ c #4F0F04",
+".＠ c #B12D0C",
+"+＠ c #C63C10",
+"＠＠ c #D44613",
+"#＠ c #B02C0C",
+"$＠ c #521204",
+"%＠ c #240000",
+"&＠ c #BBB4B4",
+"*＠ c #8C8C8C",
+"=＠ c #564307",
+"-＠ c #E3AA14",
+";＠ c #AE8B0F",
+">＠ c #1B0401",
+",＠ c #B7310D",
+"'＠ c #C93E10",
+")＠ c #C33A0F",
+"!＠ c #B42E0C",
+"~＠ c #210802",
+"{＠ c #230A02",
+"]＠ c #851204",
+"^＠ c #A06666",
+"/＠ c #EBEBEB",
+"(＠ c #535353",
+"_＠ c #D5A012",
+":＠ c #EBC215",
+"<＠ c #4B4306",
+"[＠ c #7B1004",
+"}＠ c #CB3F11",
+"|＠ c #D64713",
+"1＠ c #B0310D",
+"2＠ c #2E0C03",
+"3＠ c #B8370E",
+"4＠ c #801B1B",
+"5＠ c #564407",
+"6＠ c #C7B512",
+"7＠ c #2E0200",
+"8＠ c #8D1204",
+"9＠ c #A52409",
+"0＠ c #D24412",
+"a＠ c #C73C10",
+"b＠ c #651505",
+"c＠ c #240A02",
+"d＠ c #7A2409",
+"e＠ c #D1B4B4",
+"f＠ c #636363",
+"g＠ c #F1D215",
+"h＠ c #F3D916",
+"i＠ c #2B2203",
+"j＠ c #610200",
+"k＠ c #8B1104",
+"l＠ c #B52F0D",
+"m＠ c #C53B0F",
+"n＠ c #B9330D",
+"o＠ c #800902",
+"p＠ c #7E1919",
+"q＠ c #995F5F",
+"r＠ c #A59E9E",
+"s＠ c #868686",
+"t＠ c #5B0B0B",
+"u＠ c #B2330D",
+"v＠ c #D94A14",
+"w＠ c #9E1E08",
+"x＠ c #AE6D6D",
+"y＠ c #BCBCBC",
+"z＠ c #E5CE15",
+"A＠ c #382804",
+"B＠ c #6E0100",
+"C＠ c #7B0501",
+"D＠ c #943D3D",
+"E＠ c #B17777",
+"F＠ c #CDB8B8",
+"G＠ c #D1D1D1",
+"H＠ c #883131",
+"I＠ c #CF4211",
+"J＠ c #963F3F",
+"K＠ c #DDDDDD",
+"L＠ c #2A2A2A",
+"M＠ c #F5DE16",
+"N＠ c #E6B114",
+"O＠ c #362204",
+"P＠ c #372929",
+"Q＠ c #C8ABAB",
+"R＠ c #E3D4D4",
+"S＠ c #E3E3E3",
+"T＠ c #A86E6E",
+"U＠ c #A52309",
+"V＠ c #AB280A",
+"W＠ c #2B2B2B",
+"X＠ c #0E0A01",
+"Y＠ c #473606",
+"Z＠ c #F3D816",
+"`＠ c #F1D115",
+" # c #B57F0F",
+".# c #574507",
+"+# c #454545",
+"＠# c #D9D9D9",
+"## c #EFEFEF",
+"$# c #B07676",
+"%# c #9C1D07",
+"&# c #A8260A",
+"*# c #9C1D08",
+"=# c #947C0D",
+"-# c #E9BA14",
+";# c #E4AB14",
+"># c #E7B514",
+",# c #AF8D0F",
+"'# c #1D1302",
+")# c #B98B10",
+"!# c #BBBBBB",
+"~# c #8F1305",
+"{# c #971906",
+"]# c #8C1104",
+"^# c #800802",
+"/# c #2C2A1E",
+"(# c #957E0D",
+"_# c #EABE15",
+":# c #AC840F",
+"<# c #AB810F",
+"[# c #A2840E",
+"}# c #2E2904",
+"|# c #82670B",
+"1# c #8E6B0C",
+"2# c #565656",
+"3# c #870E03",
+"4# c #7E0702",
+"5# c #790301",
+"6# c #660000",
+"7# c #2B0000",
+"8# c #ECC215",
+"9# c #E9BB15",
+"0# c #2B2303",
+"a# c #484848",
+"b# c #939393",
+"c# c #EDE6E6",
+"d# c #6C0000",
+"e# c #A5900F",
+"f# c #DFBB14",
+"g# c #594B08",
+"h# c #75610A",
+"i# c #675409",
+"j# c #1D1D1D",
+"k# c #3A3A3A",
+"l# c #332C2C",
+"m# c #100E01",
+"n# c #A8970F",
+"o# c #F4DA16",
+"p# c #F2D516",
+"q# c #F0D016",
+"r# c #F0CF16",
+"s# c #E1C214",
+"t# c #95800D",
+"u# c #0E0C01",
+"v# c #3E3905",
+"w# c #7B720B",
+"x# c #7A6F0B",
+"y# c #4C4406",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" . + ＠ # $ % . ",
+" . & * = - ; > , ' ) & ",
+" . . ! ~ ~ { . ] ^ / ( _ : < ) . ",
+" . [ } | 1 2 3 4 5 6 7 8 9 . . . 0 ' a ",
+" . b c d e f g h i j k l m n 5 o p q r , s . ",
+" . t u v w x y . z A B C D D E F G H I I I J K L 5 M N O P Q ",
+" . R S T U V W X Y Z ` ...+.＠.＠.+... .#.m l k $.I J l %.&.*.=.^ ",
+" . -.;.>.,.'.).( + Z 5 #.!.~.{.C C D ].^./.(.6 _.:.K $.I k :.(.<.. . ",
+" . [.}.|.1.. . 2.3.4.5.6.7.f 8.9.g 0.a.b.c.d.e.f.5 g.h.I h.n i.j.. ",
+" k.l.T m. n.(.g.J o.p.q.^.r.s.t.u.v.w.x.y.7 z.A.B.:.h.I C.D.E.F. ",
+" . G.H.I. q J.%.h.I K K.2 L.3 M.N.O.. . . P.Q.R.S.T.U.V.W.X.X.X.Y.. ",
+" . Z.`.$ +B.4.I h.%..+++++＠+#+ . $+%+X.&+*+=+-+;+X.X.>+ ",
+" ,+'+)+!+. y.~+h.I m B.{+X.]+. ^+/++.{.(+_+:+<+X.[+ ",
+" . }+> |+1+i.L $.J %.2+3+4+. 5+6+6+7+8+9+0+X.a+. ",
+" b+c+d+e+f+4.I K 3.g+M h+ . i+＠.j+(+k+v.l+X.. ",
+" . m+|+n+3.K I 4.f+o+p+. q+r+s+t+u+-+p.X.. ",
+" . v+w+5 k I g.&.J.x+. y+s+..z+A+9+0+X.~ ",
+" . B+C+k I g.&.D+E+. F+G++.H+I+ .J+X.F.. ",
+" . K+L+X.X.X.X.X.M+. N+X.X.X.X.X.X.X.O+P+ ",
+" . Q+I+C ..s+R+S+T+U+ . n+V+W+%.J $.:.X+Y+Z+`+ ",
+" ＠.＠+＠＠＠＠.j+7.#(a)$＠. %＠&(a)z.&.L $.h.~+*＠=＠-＠;＠. ",
+" >＠t.,＠'＠G+＠.j+)＠!(a)~＠ {＠]＠^(a)T.3.l I K /＠(＠O+_＠:＠<＠ ",
+" . [＠u.8+}＠|＠＠.~.'＠1(a)2＠. . {＠3＠8+4＠f.:.J $.L o . 5＠' 6＠. ",
+" 7＠8＠9＠g '＠＠＠....0＠a＠b(a)>+. . . . c＠d＠'＠＠＠＠.;+e(a)K I k _.f＠ & g＠h＠i＠ ",
+" . j＠k＠=+l＠(+m＠n＠9+o＠p＠q＠r＠s＠t＠u＠B ＠＠..＠.v＠w＠x(a)$.J L y＠. . z＠< A＠ ",
+" >+B＠C(a)X.X.4 D＠E＠F＠d.G(a)7 M H＠f ＠.+.6+|＠I＠q.J＠$.4.K(a)L＠ . =.M＠N＠O＠ ",
+" . P＠Q＠R(a)h.I J m ~+B.S＠A.T.T＠U＠＠(a)D 7+a＠I+V＠4 4.A.W＠. X＠Y＠'.Z(a)`＠ #. ",
+" . .#+#＠#n k $.$.k m n ##_.$#%#7.I+g S+&#*#X.A.W(a)=#-#;#>#[.W ,#'# ",
+" . )#|.L(a)!#~+4.J I I $.h.k x＠~#&#u.T+{#]#^#Y./#(#_#:#<#[#/ }#. ",
+" . |#N＠1#. 2#S.n 4.k J $.I J＠0+3#0+4#5#6#7#. . . . . . . ",
+" ] 8#9#0#. . a#b#A.n L c#X.X.X.d#]+%＠. ",
+" . e#[.f#g#] h#i#% j#k#l#~ ~ >+. . ",
+" m#n#o#p#P q#r#s#t#u#. ",
+" . v#w#x x#y#m#. ",
+" . ",
+" ",
+" ",
+" ",
+" "};
1.2.40.1 +490 -41 XEmacs/xemacs/etc/toolbar/mail-cap-up.xpm
Index: mail-cap-up.xpm
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/toolbar/mail-cap-up.xpm,v
retrieving revision 1.2
retrieving revision 1.2.40.1
diff -u -r1.2 -r1.2.40.1
--- mail-cap-up.xpm 1997/12/21 06:28:49 1.2
+++ mail-cap-up.xpm 2005/02/25 16:29:48 1.2.40.1
＠＠ -1,42 +1,491 ＠＠
/* XPM */
-static char * mail[] = {
-"33 33 6 1",
-"X c Gray75 s backgroundToolBarColor",
-"u c #000000000000 s foregroundToolBarColor",
-"o c black",
-"O c Gray90",
-"+ c Gray60",
-"＠ c white",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXoooooooooooXXXXXXXXXXXX",
-"XXXXXXXXXXoOOOOOOOOOooXXXXXXXXXXX",
-"XXXXXXXXXXoOOOOOOOOOo+oXXXXXXXXXX",
-"XXXXXXXXXXoOOOOOOOOOooooXXXXXXXXX",
-"XXXXXXXXXXoOOOOOOOOOOOOoXXXXXXXXX",
-"XXXXXooooooooooooooooooooooooXXXX",
-"XXXXXo＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠oXXXX",
-"XXXXXo＠oo＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠ooo＠oXXXX",
-"XXXXXo＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠o+o＠oXXXX",
-"XXXXXo＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠o+o＠oXXXX",
-"XXXXXo＠＠＠＠＠ooooooooo＠＠＠＠ooo＠oXXXX",
-"XXXXXo＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠oXXXX",
-"XXXXXo＠＠＠＠＠ooooooo＠＠＠＠＠＠＠＠＠＠oXXXX",
-"XXXXXo＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠oXXXX",
-"XXXXXo＠＠＠＠＠ooooo＠＠＠＠＠＠＠＠＠＠＠＠oXXXX",
-"XXXXXo＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠oXXXX",
-"XXXXXo＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠oXXXX",
-"XXXXXo＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠oXXXX",
-"XXXXXooooooooooooooooooooooooXXXX",
-"XXXXXXXXXXoOOOOOOOOOOOOoXXXXXXXXX",
-"XXXXXXXXXXooooooooooooooXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXuXuXXXXXXXXX",
-"XXXXXXXXXXXuXXXuXXXXXXXuXXXXXXXXX",
-"XXXXXXXXXXXuuXuuXuuXXuXuXXXXXXXXX",
-"XXXXXXXXXXXuXuXuXXXuXuXuXXXXXXXXX",
-"XXXXXXXXXXXuXuXuXuuuXuXuXXXXXXXXX",
-"XXXXXXXXXXXuXuXuXuXuXuXuXXXXXXXXX",
-"XXXXXXXXXXXuXuXuXuuXuuXuXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"};
+static char * mail_xpm[] = {
+"48 48 440 2",
+" c None",
+". c #000000",
+"+ c #666666",
+"＠ c #8C8C8C",
+"# c #141414",
+"$ c #252525",
+"% c #6C6C6C",
+"& c #7F7F7F",
+"* c #515151",
+"= c #484848",
+"- c #CCCCCC",
+"; c #BFBFBF",
+"> c #3A3A3A",
+", c #373737",
+"' c #5F5F5F",
+") c #D2D2D2",
+"! c #DFDFDF",
+"~ c #EBEBEB",
+"{ c #FBFBFB",
+"] c #E8E8E8",
+"^ c #5B5B5B",
+"/ c #444444",
+"( c #161616",
+"_ c #3D3D3D",
+": c #121212",
+"< c #999999",
+"[ c #F8F8F8",
+"} c #FFFFFF",
+"| c #CFCFCF",
+"1 c #9F9F9F",
+"2 c #F5F5F5",
+"3 c #A5A5A5",
+"4 c #282828",
+"5 c #333333",
+"6 c #0E0E0E",
+"7 c #8F8F8F",
+"8 c #575C65",
+"9 c #22314E",
+"0 c #173163",
+"a c #112E67",
+"b c #606368",
+"c c #757575",
+"d c #1F1F1F",
+"e c #B5B5B5",
+"f c #C2C2C2",
+"g c #5D6269",
+"h c #34435B",
+"i c #354F78",
+"j c #4064A1",
+"k c #3E67B0",
+"l c #294A88",
+"m c #466995",
+"n c #6D8FAB",
+"o c #81A0AD",
+"p c #6B6E6F",
+"q c #828282",
+"r c #727272",
+"s c #191919",
+"t c #777777",
+"u c #686B6E",
+"v c #3B4857",
+"w c #516A8B",
+"x c #688CBC",
+"y c #6C95D0",
+"z c #6089C8",
+"A c #557EBF",
+"B c #4064A0",
+"C c #3D628A",
+"D c #88BCDD",
+"E c #B7E7FD",
+"F c #C0E9FA",
+"G c #B7E3E2",
+"H c #9DBBBA",
+"I c #656B67",
+"J c #D5D5D5",
+"K c #EFEFEF",
+"L c #4B525B",
+"M c #81A7D6",
+"N c #7FA8DD",
+"O c #749DD5",
+"P c #6992CE",
+"Q c #5E87C6",
+"R c #486CA6",
+"S c #39719A",
+"T c #77C1E2",
+"U c #A7DEEB",
+"V c #B5E2D3",
+"W c #A7DAAD",
+"X c #B7E1BA",
+"Y c #9FD6A2",
+"Z c #7BAB7D",
+"` c #6A6D6A",
+" . c #AFAFAF",
+".. c #485059",
+"+. c #739ACD",
+"＠. c #719AD3",
+"#. c #668FCB",
+"$. c #5A83C4",
+"%. c #3F6665",
+"&. c #B0DCBC",
+"*. c #C0E4C1",
+"=. c #D0EBD2",
+"-. c #D2EDD4",
+";. c #BAE2BC",
+">. c #78C57B",
+",. c #C0E5C1",
+"'. c #B0DEB9",
+"). c #7DAD87",
+"!. c #696C69",
+"~. c #63543D",
+"{. c #AA8F69",
+"]. c #C6A779",
+"^. c #A98E66",
+"/. c #7F6A4D",
+"(. c #463B2A",
+"_. c #0E0B08",
+":. c #898989",
+"<. c #454D58",
+"[. c #658CC3",
+"}. c #618AC8",
+"|. c #567FC1",
+"1. c #377164",
+"2. c #95CDB7",
+"3. c #C7E8C9",
+"4. c #CDEACF",
+"5. c #CFEBD1",
+"6. c #BEE4BF",
+"7. c #B2DEB3",
+"8. c #A3D8A4",
+"9. c #73A87E",
+"0. c #696C6F",
+"a. c #2B2B2B",
+"b. c #564A38",
+"c. c #E5C494",
+"d. c #E2C08C",
+"e. c #E2BE8A",
+"f. c #E2BE89",
+"g. c #D3B280",
+"h. c #433D33",
+"i. c #424A55",
+"j. c #577DB9",
+"k. c #527BBD",
+"l. c #2766AC",
+"m. c #74B8CF",
+"n. c #C1E5C3",
+"o. c #C9E8CB",
+"p. c #C7E7C9",
+"q. c #B9E1BA",
+"r. c #ADDCAD",
+"s. c #87C787",
+"t. c #6FBCA9",
+"u. c #679FCB",
+"v. c #656A6F",
+"w. c #626262",
+"x. c #CAB08B",
+"y. c #E4C291",
+"z. c #50493F",
+"A. c #857C6E",
+"B. c #3F4753",
+"C. c #476EAE",
+"D. c #1E4678",
+"E. c #519EB8",
+"F. c #B8E1B9",
+"G. c #BDE3BF",
+"H. c #BFE4C1",
+"I. c #B0DEB1",
+"J. c #A4D8A5",
+"K. c #69B171",
+"L. c #8ECDFC",
+"M. c #67B4F9",
+"N. c #367DC6",
+"O. c #62676D",
+"P. c #3A3329",
+"Q. c #EAD0AA",
+"R. c #E2BF8A",
+"S. c #34322E",
+"T. c #3C4451",
+"U. c #29477B",
+"V. c #2E7CC9",
+"W. c #7EBCAE",
+"X. c #B1DEB2",
+"Y. c #B3DFB4",
+"Z. c #A3D5A4",
+"`. c #77B48C",
+" + c #88C6B0",
+".+ c #67AE6F",
+"++ c #67B2C5",
+"＠+ c #3D81BB",
+"#+ c #1F5085",
+"$+ c #283748",
+"%+ c #4F4F4F",
+"&+ c #938570",
+"*+ c #E8CDA5",
+"=+ c #39414F",
+"-+ c #193766",
+";+ c #3282DA",
+">+ c #5CA4AE",
+",+ c #77B07B",
+"'+ c #99D09A",
+")+ c #94CE95",
+"!+ c #59908E",
+"~+ c #446A6A",
+"{+ c #485E4F",
+"]+ c #676C67",
+"^+ c #0F0C09",
+"/+ c #E1D0B6",
+"(+ c #E5C596",
+"_+ c #715F44",
+":+ c #6F5F48",
+"<+ c #161E2D",
+"[+ c #143570",
+"}+ c #2561A7",
+"|+ c #235589",
+"1+ c #3D5353",
+"2+ c #686C68",
+"3+ c #DBDBDB",
+"4+ c #1D1D1D",
+"5+ c #595959",
+"6+ c #575757",
+"7+ c #5B554D",
+"8+ c #F0DFC5",
+"9+ c #DEBA83",
+"0+ c #CFAC6D",
+"a+ c #2D2511",
+"b+ c #C5B8A6",
+"c+ c #EAD1AB",
+"d+ c #D6B378",
+"e+ c #C4A25D",
+"f+ c #BD9B52",
+"g+ c #B8964B",
+"h+ c #C2A059",
+"i+ c #C1A065",
+"j+ c #4C4639",
+"k+ c #74716E",
+"l+ c #6B6255",
+"m+ c #1F1E1C",
+"n+ c #F8F0E4",
+"o+ c #E4C494",
+"p+ c #DAB77E",
+"q+ c #C8A562",
+"r+ c #BE9C53",
+"s+ c #B9974C",
+"t+ c #BF9D55",
+"u+ c #CBA866",
+"v+ c #CCA969",
+"w+ c #CBA867",
+"x+ c #CAA765",
+"y+ c #C9A664",
+"z+ c #BB9B5C",
+"A+ c #957B48",
+"B+ c #251E12",
+"C+ c #B8B8B8",
+"D+ c #635E55",
+"E+ c #6E6A5F",
+"F+ c #35312A",
+"G+ c #C5A677",
+"H+ c #8D7655",
+"I+ c #8B8780",
+"J+ c #F3E4CF",
+"K+ c #CBA968",
+"L+ c #BA984D",
+"M+ c #BC9A50",
+"N+ c #C7A562",
+"O+ c #CAA866",
+"P+ c #C8A563",
+"Q+ c #C7A461",
+"R+ c #C6A35F",
+"S+ c #C5A25E",
+"T+ c #C4A15C",
+"U+ c #C3A05B",
+"V+ c #B59553",
+"W+ c #4A4336",
+"X+ c #34290F",
+"Y+ c #BA9959",
+"Z+ c #D4C7AA",
+"`+ c #CBB179",
+" ＠ c #BB994F",
+".＠ c #C8A663",
+"+＠ c #C6A460",
+"＠＠ c #C5A35E",
+"#＠ c #C3A15B",
+"$＠ c #C29F59",
+"%＠ c #C19E58",
+"&＠ c #C09D56",
+"*＠ c #BF9C55",
+"=＠ c #BE9B53",
+"-＠ c #BD9A51",
+";＠ c #B0904B",
+">＠ c #745E30",
+",＠ c #A18341",
+"'＠ c #A88732",
+")＠ c #B0A180",
+"!＠ c #D9C9A2",
+"~＠ c #B7984E",
+"{＠ c #B8964A",
+"]＠ c #C3A15C",
+"^＠ c #C2A05A",
+"/＠ c #C19F58",
+"(＠ c #C09E57",
+"_＠ c #B18F40",
+":＠ c #AF8E3D",
+"<＠ c #B7954A",
+"[＠ c #A98835",
+"}＠ c #B29041",
+"|＠ c #C9C3B9",
+"1＠ c #F9F2E8",
+"2＠ c #E0BE8A",
+"3＠ c #D3B073",
+"4＠ c #BB994E",
+"5＠ c #B29142",
+"6＠ c #B69447",
+"7＠ c #B79548",
+"8＠ c #B39143",
+"9＠ c #BD9B53",
+"0＠ c #E3C08D",
+"a＠ c #E1BE89",
+"b＠ c #E1BD88",
+"c＠ c #DDB982",
+"d＠ c #E3C290",
+"e＠ c #AC8B39",
+"f＠ c #AE8D3C",
+"g＠ c #AB8937",
+"h＠ c #E1C190",
+"i＠ c #E2C08D",
+"j＠ c #DFBC86",
+"k＠ c #DFBB85",
+"l＠ c #DEBB84",
+"m＠ c #C8A664",
+"n＠ c #BD9C54",
+"o＠ c #E7CA9F",
+"p＠ c #DDBA83",
+"q＠ c #DCB982",
+"r＠ c #DCB981",
+"s＠ c #DBB981",
+"t＠ c #DBB880",
+"u＠ c #DBB87F",
+"v＠ c #DAB87F",
+"w＠ c #D3B175",
+"x＠ c #CBAD70",
+"y＠ c #E5C99D",
+"z＠ c #DAB77F",
+"A＠ c #D9B77E",
+"B＠ c #D9B67D",
+"C＠ c #D8B67D",
+"D＠ c #D8B67C",
+"E＠ c #D7B57C",
+"F＠ c #D7B57B",
+"G＠ c #CDAC6C",
+"H＠ c #BF9D56",
+"I＠ c #E1C89D",
+"J＠ c #E0C292",
+"K＠ c #D6B47A",
+"L＠ c #D6B479",
+"M＠ c #D5B479",
+"N＠ c #D5B378",
+"O＠ c #D4B378",
+"P＠ c #D4B277",
+"Q＠ c #D3B276",
+"R＠ c #CAA969",
+"S＠ c #C2A05B",
+"T＠ c #897350",
+"U＠ c #C4A25E",
+"V＠ c #EFDBBF",
+"W＠ c #D8B77E",
+"X＠ c #D2B175",
+"Y＠ c #D2B174",
+"Z＠ c #D1B074",
+"`＠ c #D1B073",
+" # c #D0AF72",
+".# c #CCAC6E",
+"+# c #C9AA6A",
+"＠# c #C1A05B",
+"## c #7B663B",
+"$# c #C6AB6E",
+"%# c #ECD8B9",
+"&# c #D0B073",
+"*# c #CFAF72",
+"=# c #CEB075",
+"-# c #CDB076",
+";# c #CBB075",
+"># c #C9AF74",
+",# c #BCA26A",
+"'# c #89764C",
+")# c #594B30",
+"!# c #262015",
+"~# c #DFCAA3",
+"{# c #E3CBA3",
+"]# c #CFAF71",
+"^# c #CFAE71",
+"/# c #CFAF73",
+"(# c #D1B47C",
+"_# c #D2B883",
+":# c #D3BB89",
+"<# c #D3BD8D",
+"[# c #C4AE7E",
+"}# c #8F7E5A",
+"|# c #5A4F37",
+"1# c #262116",
+"2# c #F4E8D5",
+"3# c #D7BA85",
+"4# c #CEAE70",
+"5# c #CEAD6F",
+"6# c #D3B883",
+"7# c #D7C091",
+"8# c #DAC79D",
+"9# c #DCCCA6",
+"0# c #CBBA92",
+"a# c #948668",
+"b# c #5D533F",
+"c# c #272117",
+"d# c #CBB076",
+"e# c #F3E8D6",
+"f# c #CDAD6E",
+"g# c #CDAC6E",
+"h# c #CEAF73",
+"i# c #D5BC8A",
+"j# c #DCC89E",
+"k# c #E2D2B2",
+"l# c #E6DABF",
+"m# c #D3C5A7",
+"n# c #998E76",
+"o# c #605846",
+"p# c #272218",
+"q# c #D8C7A0",
+"r# c #EDE1CA",
+"s# c #DFCCA5",
+"t# c #E7DBC0",
+"u# c #F0E9D8",
+"v# c #DBD1BB",
+"w# c #9F9684",
+"x# c #635C4E",
+"y# c #28231A",
+"z# c #BBB099",
+"A# c #EBE2CC",
+"B# c #E6E2D9",
+"C# c #A49E92",
+"D# c #666156",
+"E# c #28241B",
+"F# c #0B0803",
+"G# c #251F13",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" . + ＠ # ",
+" $ % & * = - ; > ",
+" , ' * . + - ) ! ~ { ] ^ / ( ",
+" _ + : . < - ) ! ~ [ } } | 1 } 2 | 3 . ",
+" 4 5 6 - - | ! ~ [ } } | 7 8 9 0 a b } 2 c . ",
+" d ; - e f ] 2 } } | 7 g h i j k l m n o p } 2 q r # ",
+" . s t { } ; u v w x y z A B C D E F G H I } 2 | r . ",
+" . r J { K L M N O P Q R S T U V W X Y Z ` } 2 _ ",
+" . . . . 4 < .{ K ..+.＠.#.$.%.&.*.=.-.;.>.,.'.).!.} 2 | 3 # ",
+" . ~.{.].^./.(._.. :.{ K <.[.}.|.1.2.3.4.5.4.3.6.7.8.9.0.} 2 e a. ",
+" b.c.d.e.f.f.f.g.h.; J { K i.j.k.l.m.n.3.o.p.n.q.r.s.t.u.v.} ] w./ ( ",
+" . x.y.f.f.f.f.f.f.g.z.A.:.{ K B.C.D.E.F.G.H.G.F.I.J.K.L.M.N.O.} 2 | 3 . ",
+" P.Q.R.f.f.f.f.f.f.f.f.^.S.J { K T.U.V.W.X.Y.X.Z.`. +.+++＠+#+$+ .} 2 %+ ",
+" . &+*+f.f.f.f.f.f.f.f.f.g.z.; J { K =+-+;+>+,+'+)+!+~+{+]+1 ! } } 2 ] J < ＠ # ",
+" ^+/+(+f.f.f.f.f.f.f.f.f.f.g._+:+:.{ | <+[+}+|+1+2+1 ! } } 2 ] 3+| - 4+( 5+6+# ",
+" 7+8+f.f.f.f.f.f.f.f.f.f.f.9+0+a+3 J { | ' 1 ! } } 2 ] 3+| ＠ , = & 6+. ",
+" . b+c+f.f.f.f.f.f.f.f.d+e+f+g+h+i+j+＠ .{ } 2 ] 3+| k+l+& & = ",
+" m+n+o+f.f.f.f.p+q+r+s+t+u+v+w+x+y+z+A+B+C+f D+E+< & F+G+H+. ",
+" I+J+f.9+K+t+L+M+N+K+O+y+P+Q+R+S+T+U+V+W+3 r X+Y+H+G+f.f.f.H+. ",
+" . Z+`+ ＠s+h+u+x+.＠N++＠＠＠e+#＠$＠%＠&＠*＠=＠-＠;＠>＠,＠'(a)p+f.f.f.f.f.f.H+. ",
+" . )＠!＠~＠{＠t+T+e+]＠^＠/＠(＠t+r+f+M+ ＠_＠:＠s+f+<＠[＠}＠f.f.f.f.f.f.f.f.H+. ",
+" ^+|＠1＠2＠3＠e+4＠g+5＠6＠s+L+s+{＠7＠8＠9＠0＠d.a＠b＠c＠O+&＠((a)p+f.f.f.f.f.f.H+. ",
+" ^+|＠1＠d＠f.f.f.f.3＠q+(＠s+e＠f＠g＠h＠i＠j＠k＠k＠l＠l＠9+p+m(a)M+K+9+f.f.f.f.H+. ",
+" ^+|＠1＠d＠f.f.f.f.f.f.f.f.d+n＠o＠p＠p＠q＠q＠r＠s＠t＠t＠u＠v＠w＠]＠+(a)0+f.f.f.H+. ",
+" ^+|＠1＠d＠f.f.f.f.f.f.f.d+x＠y＠t＠v＠v＠z＠A＠A＠B＠C＠D＠D＠E＠F＠F＠G＠H＠+(a)d+f.H+. ",
+" ^+|＠1＠d＠f.f.f.f.f.f.q+I＠J＠C＠D＠D＠E＠F＠F＠K＠K＠L＠M＠N＠N＠O＠P＠P＠Q＠R＠S(a)O+T＠. ",
+" ^+|＠1＠d＠f.f.f.f.f.U＠V＠W＠K＠L＠M＠N＠N＠O＠P＠P＠Q＠Q＠w＠X＠Y＠Z＠Z(a)`＠ #.#+#＠###. ",
+" ^+|＠1＠d＠f.f.f.f.$#%#P＠P＠Q＠Q＠w＠X＠Y＠Z＠Z＠`(a)&# # #*#=#-#;#>#,#'#)#!#. ",
+" ^+|＠1＠d＠f.f.3＠~#{#Z＠Z＠`(a)&# # #]#^#^#/#(#_#:#<#[#}#|#1#. . ",
+" ^+|＠1＠d＠f.#(a)2#3#^#^#4#4#5#/#6#7#8#9#0#a#b#c#. . ",
+" ^+|＠1＠d＠d#e#f#g#h#i#j#k#l#m#n#o#p#. . ",
+" ^+|＠1＠q#r#s#t#u#v#w#x#y#. . ",
+" ^+z#A#B#C#D#E#. . ",
+" F#G#. . ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "};
1.2.40.1 +836 -40 XEmacs/xemacs/etc/toolbar/news-cap-up.xpm
Index: news-cap-up.xpm
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/toolbar/news-cap-up.xpm,v
retrieving revision 1.2
retrieving revision 1.2.40.1
diff -u -r1.2 -r1.2.40.1
--- news-cap-up.xpm 1997/12/21 06:28:49 1.2
+++ news-cap-up.xpm 2005/02/25 16:29:48 1.2.40.1
＠＠ -1,42 +1,838 ＠＠
/* XPM */
static char * news_xpm[] = {
-"33 33 6 1",
-"X c Gray75 s backgroundToolBarColor",
-"u c #000000000000 s foregroundToolBarColor",
-"o c black",
-"O c white",
-"+ c gray60",
-"＠ c gray",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXooooooooooXXXXXXXX",
-"XXXXXooooooooooOOOoOOOoOOoXXXXXXX",
-"XXXXoooOOOoOoooOoOoOoOOoOo++XXXXX",
-"XXXXo＠oOOooOOooOooOooOooOOo++XXXX",
-"XXoo＠o＠oOOOOOOOOOOOOOOOOOOOo+XXXX",
-"XXo＠＠o＠oOooooooooooooooOooOo++XXX",
-"XXoo＠o＠oOOOOOOOOOOOOOOOOOOOOo++XX",
-"XXoo＠＠o＠oOoOoOoOoooOoOoooooOo++XX",
-"XXo＠o＠o＠oOOoOooOOOOOOoOooOooOo+XX",
-"XXooo＠＠o＠oOoooooOoOOooOoooooOo+XX",
-"XXXo＠o＠o＠oOOooooOOOOOOOOoOooOo++X",
-"XXXXoo＠＠o＠oOoooooOOooooOoooooo++X",
-"XXXXo＠o＠o＠oOOooOooOooOoOoooOOo++X",
-"XXXXXoo＠＠o＠oOoOoooOooooOooOooo+XX",
-"XXXXXoXo＠o＠oOoooOoOooooOoooo+++XX",
-"XXXXXXoXoo＠oOoOooooooooo++++++XXX",
-"XXXXXXXooooooooo++++++++++++++XXX",
-"XXXXXXXXX++++++++++++++++++XXXXXX",
-"XXXXXXXXXX+++++++++XXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXuXXXuXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXuuXXuXXuXXuXuXuXXuuXXXXXXX",
-"XXXXXXXuXuXuXuXuXuXuXuXuXXXXXXXXX",
-"XXXXXXXuXuXuXuuuXuXuXuXXuuXXXXXXX",
-"XXXXXXXuXXuuXuXXXXuXuXXXXuXXXXXXX",
-"XXXXXXXuXXXuXXuuXXuXuXXuuXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"};
+"48 48 787 2",
+" c None",
+". c #1D1D31",
+"+ c #2B2B46",
+"＠ c #333350",
+"# c #373754",
+"$ c #2E2E4C",
+"% c #2F2F46",
+"& c #50506B",
+"* c #6C6C86",
+"= c #84849C",
+"- c #9A9AB0",
+"; c #B0B0C3",
+"> c #C9C9D8",
+", c #DADAE5",
+"' c #E8E8EF",
+") c #F2F2F7",
+"! c #8A8AA6",
+"~ c #2B2B3D",
+"{ c #494961",
+"] c #737389",
+"^ c #9192A7",
+"/ c #B6B6C7",
+"( c #DEDEE7",
+"_ c #F8F8FB",
+": c #FFFFFF",
+"< c #C0C0D1",
+"[ c #131326",
+"} c #333346",
+"| c #55556B",
+"1 c #8C8C9E",
+"2 c #B8B8C5",
+"3 c #DCDCE4",
+"4 c #F4F4F7",
+"5 c #FEFEFF",
+"6 c #F1F1F2",
+"7 c #E9E9EB",
+"8 c #DFE0E2",
+"9 c #F2F3F4",
+"0 c #FDFDFE",
+"a c #3F3F5F",
+"b c #262634",
+"c c #434356",
+"d c #787889",
+"e c #B1B1BE",
+"f c #D7D7DF",
+"g c #F4F5F8",
+"h c #F9FAFC",
+"i c #F5F5F7",
+"j c #EEEFF2",
+"k c #D8D8DB",
+"l c #E6E7E9",
+"m c #DEDEE0",
+"n c #E0E0E4",
+"o c #CDCED1",
+"p c #CBCCCE",
+"q c #FCFCFD",
+"r c #747492",
+"s c #2E2E3C",
+"t c #535365",
+"u c #9494A3",
+"v c #C4C3CE",
+"w c #E9EAEF",
+"x c #FDFDFF",
+"y c #FCFDFF",
+"z c #F8F8FC",
+"A c #F7F8FB",
+"B c #EEEEF3",
+"C c #E1E2E6",
+"D c #E1E1E5",
+"E c #E4E4E8",
+"F c #C9C9CE",
+"G c #D4D5D8",
+"H c #B3B3B6",
+"I c #D3D4D5",
+"J c #DADBDD",
+"K c #D4D5D7",
+"L c #F1F1F3",
+"M c #E9EAEB",
+"N c #CDCECF",
+"O c #D3D4D6",
+"P c #AAAABF",
+"Q c #0C0C1C",
+"R c #353542",
+"S c #6A6A77",
+"T c #A0A0AC",
+"U c #CCCCD5",
+"V c #EEEFF3",
+"W c #FEFFFF",
+"X c #F9FAFF",
+"Y c #F3F4F9",
+"Z c #EDEEF2",
+"` c #F9F9FD",
+" . c #F2F3F6",
+".. c #DCDDE0",
+"+. c #DCDDE2",
+"＠. c #BDBEC4",
+"#. c #EDEDF1",
+"$. c #EEEEF1",
+"%. c #C6C7CB",
+"&. c #DFE0E4",
+"*. c #DCDDDF",
+"=. c #EBECEE",
+"-. c #CBCBCE",
+";. c #CFCFD1",
+">. c #D5D5D7",
+",. c #DFE0E1",
+"'. c #F2F3F5",
+"). c #EAEAF2",
+"!. c #303049",
+"~. c #545466",
+"{. c #92929F",
+"]. c #DFDFE4",
+"^. c #FAFBFE",
+"/. c #FDFFFF",
+"(. c #F9FAFE",
+"_. c #F4F5FB",
+":. c #E7E8ED",
+"<. c #CBCBCF",
+"[. c #EEEFF5",
+"}. c #F0F1F5",
+"|. c #C1C2C9",
+"1. c #C4C5CB",
+"2. c #D6D7DB",
+"3. c #CBCCD0",
+"4. c #C2C3C8",
+"5. c #DDDEE2",
+"6. c #F9F9FC",
+"7. c #E9EAED",
+"8. c #D7D8DB",
+"9. c #CDCDD1",
+"0. c #C1C1C5",
+"a. c #D8D9DC",
+"b. c #EEEEF0",
+"c. c #E6E7EA",
+"d. c #D9DADC",
+"e. c #FBFCFE",
+"f. c #F5F5F8",
+"g. c #71718E",
+"h. c #90909C",
+"i. c #F6F8FE",
+"j. c #F3F5FB",
+"k. c #F5F6FA",
+"l. c #C9CACD",
+"m. c #A7A7AA",
+"n. c #CFD0D5",
+"o. c #E8E9EF",
+"p. c #D9DBE1",
+"q. c #D5D7DB",
+"r. c #AFB0B5",
+"s. c #D7D9DD",
+"t. c #E3E4EA",
+"u. c #D1D2D7",
+"v. c #DADADE",
+"w. c #CECED3",
+"x. c #C4C5C9",
+"y. c #D8D9DD",
+"z. c #F2F4F7",
+"A. c #E5E6E9",
+"B. c #CACBCE",
+"C. c #BABABD",
+"D. c #C5C6C9",
+"E. c #E4E6E7",
+"F. c #D7DADB",
+"G. c #E7E8EB",
+"H. c #AFAFC4",
+"I. c #0E0E23",
+"J. c #3F3F4C",
+"K. c #5B5B6C",
+"L. c #CBCBD5",
+"M. c #F2F4FB",
+"N. c #F3F4FB",
+"O. c #E5E6EA",
+"P. c #CACACE",
+"Q. c #ABACAF",
+"R. c #A2A2A6",
+"S. c #EDEEF4",
+"T. c #F2F4F9",
+"U. c #D1D3D8",
+"V. c #F5F7FC",
+"W. c #F2F3F8",
+"X. c #D9DBE0",
+"Y. c #CDCED4",
+"Z. c #D6D7DD",
+"`. c #E1E3E8",
+" + c #EEF0F4",
+".+ c #FBFCFF",
+"++ c #F7F8FC",
+"＠+ c #D5D6DA",
+"#+ c #D0D1D4",
+"$+ c #DFE0E3",
+"%+ c #E9EBEB",
+"&+ c #E1E4E3",
+"*+ c #E0E4E4",
+"=+ c #D9DCDD",
+"-+ c #F9F9FB",
+";+ c #EAEAF1",
+">+ c #373758",
+",+ c #2B2B37",
+"'+ c #B0B0BA",
+")+ c #F3F3F4",
+"!+ c #EDEDED",
+"~+ c #F1F2F8",
+"{+ c #F2F3FB",
+"]+ c #F1F4FA",
+"^+ c #F3F5FC",
+"/+ c #E8E9EE",
+"(+ c #C9C9CC",
+"_+ c #A9ABAE",
+":+ c #8E8E92",
+"<+ c #CFD0D6",
+"[+ c #F8F9FD",
+"}+ c #E3E5EB",
+"|+ c #D1D2D9",
+"1+ c #D5D7DD",
+"2+ c #DFE0E6",
+"3+ c #F6F8FD",
+"4+ c #F8F9FF",
+"5+ c #EDEEF3",
+"6+ c #F7F8FD",
+"7+ c #F6F7FD",
+"8+ c #EBECF0",
+"9+ c #F4F5F6",
+"0+ c #F7F7F7",
+"a+ c #EAEBEB",
+"b+ c #E0E2E2",
+"c+ c #D0D3D3",
+"d+ c #C0C3C3",
+"e+ c #C8CDCC",
+"f+ c #8989A5",
+"g+ c #5E5E6F",
+"h+ c #ADADB6",
+"i+ c #E3E3E5",
+"j+ c #FCFCFB",
+"k+ c #EAEAEA",
+"l+ c #E7E8EA",
+"m+ c #F1F3FB",
+"n+ c #ECEEF4",
+"o+ c #C6C7CC",
+"p+ c #CECFD5",
+"q+ c #D4D6DD",
+"r+ c #D5D6DD",
+"s+ c #DEDFE6",
+"t+ c #E7E8EF",
+"u+ c #EEF0F7",
+"v+ c #E5E7ED",
+"w+ c #D7D8DF",
+"x+ c #E0E2E9",
+"y+ c #D7D8DE",
+"z+ c #E0E2E8",
+"A+ c #EDEFF4",
+"B+ c #F6F7FC",
+"C+ c #F8F9F9",
+"D+ c #F0F1F1",
+"E+ c #C4C5C5",
+"F+ c #B5B7B7",
+"G+ c #979999",
+"H+ c #B4B7B7",
+"I+ c #B2B6B6",
+"J+ c #B5B7B9",
+"K+ c #FEFEFE",
+"L+ c #D7D7E3",
+"M+ c #1D1D38",
+"N+ c #B5B5BB",
+"O+ c #DFDFE0",
+"P+ c #EEEEEE",
+"Q+ c #D9D9D9",
+"R+ c #D2D2D1",
+"S+ c #F0F2FA",
+"T+ c #DEE0E8",
+"U+ c #DBDCE5",
+"V+ c #E0E1EA",
+"W+ c #E2E4EC",
+"X+ c #E7E9F0",
+"Y+ c #E4E6ED",
+"Z+ c #DBDDE3",
+"`+ c #D4D6DE",
+" ＠ c #D4D5DC",
+".＠ c #D7D9DF",
+"+＠ c #D6D7DE",
+"＠＠ c #EEF0F6",
+"#＠ c #F5F6FC",
+"$＠ c #EFF1F7",
+"%＠ c #E7E7EA",
+"&＠ c #D0D1D1",
+"*＠ c #C8CACA",
+"=＠ c #C2C4C4",
+"-＠ c #AEB1B1",
+";＠ c #979A9A",
+">＠ c #B0B3B3",
+",＠ c #9EA1A2",
+"'＠ c #C9CACE",
+")＠ c #626285",
+"!＠ c #868692",
+"~＠ c #D3D3D4",
+"{＠ c #DEDEDE",
+"]＠ c #C8C8C8",
+"^＠ c #D1D2D3",
+"/＠ c #EEF0F8",
+"(＠ c #EFF0F9",
+"_＠ c #E2E4EE",
+":＠ c #E4E6EE",
+"<＠ c #E8E9F2",
+"[＠ c #DADCE4",
+"}＠ c #CED0D8",
+"|＠ c #D8DAE2",
+"1＠ c #C8C9D0",
+"2＠ c #CFD1D8",
+"3＠ c #D9DBE2",
+"4＠ c #D2D3DB",
+"5＠ c #D6D8DF",
+"6＠ c #CDCFD6",
+"7＠ c #DCDDE4",
+"8＠ c #F4F6FD",
+"9＠ c #E7E9EE",
+"0＠ c #BBBBBB",
+"a＠ c #B8B9B9",
+"b＠ c #C0C2C2",
+"c＠ c #848686",
+"d＠ c #6E7070",
+"e＠ c #707272",
+"f＠ c #B8BDBD",
+"g＠ c #C1C4C7",
+"h＠ c #FBFBFC",
+"i＠ c #C4C4D5",
+"j＠ c #191936",
+"k＠ c #666674",
+"l＠ c #D8D8D9",
+"m＠ c #ECECEB",
+"n＠ c #CACACA",
+"o＠ c #C2C2C3",
+"p＠ c #E1E2E8",
+"q＠ c #F0F3FC",
+"r＠ c #EDEFF8",
+"s＠ c #E2E5ED",
+"t＠ c #CED0D9",
+"u＠ c #CFD1DA",
+"v＠ c #D0D2DB",
+"w＠ c #CFD1D9",
+"x＠ c #D2D3DC",
+"y＠ c #D1D3DB",
+"z＠ c #D7D9E1",
+"A＠ c #D4D5DD",
+"B＠ c #DCDEE5",
+"C＠ c #CCCDD5",
+"D＠ c #EFF1F8",
+"E＠ c #F5F6FD",
+"F＠ c #E5E6ED",
+"G＠ c #8E8F90",
+"H＠ c #868686",
+"I＠ c #B2B4B4",
+"J＠ c #BCBFBF",
+"K＠ c #A3A6A6",
+"L＠ c #BEC3C3",
+"M＠ c #CBD1D2",
+"N＠ c #D8DADE",
+"O＠ c #676789",
+"P＠ c #525263",
+"Q＠ c #B6B6BC",
+"R＠ c #B5B5B6",
+"S＠ c #E3E3E4",
+"T＠ c #DCDCDC",
+"U＠ c #BDBDBE",
+"V＠ c #ECEEF7",
+"W＠ c #EEF1FB",
+"X＠ c #DEE0EA",
+"Y＠ c #CBCDD7",
+"Z＠ c #D8DAE3",
+"`＠ c #CDCFD7",
+" # c #D9DBE3",
+".# c #D5D7DF",
+"+# c #DCDDE6",
+"＠# c #D0D1D9",
+"## c #D7D8E1",
+"$# c #E1E3EA",
+"%# c #88898C",
+"&# c #AAABAB",
+"*# c #B6B8B8",
+"=# c #9EA0A0",
+"-# c #6B6E6E",
+";# c #929595",
+"># c #C7CECD",
+",# c #CCD0D3",
+"'# c #CCCCDC",
+")# c #1F1F3C",
+"!# c #9696A0",
+"~# c #BCBCBD",
+"{# c #CCCCCD",
+"]# c #E7E7E7",
+"^# c #CAC9CA",
+"/# c #B5B4B6",
+"(# c #F1F3FD",
+"_# c #E4E6F0",
+":# c #D1D3DD",
+"<# c #CCCED7",
+"[# c #D8DBE4",
+"}# c #D4D6E0",
+"|# c #C8CBD4",
+"1# c #D2D4DC",
+"2# c #D6D8E1",
+"3# c #CFD2DA",
+"4# c #D2D4DD",
+"5# c #D4D7DF",
+"6# c #CECFD8",
+"7# c #E6E7F0",
+"8# c #F5F7FF",
+"9# c #D3D5DD",
+"0# c #CCCED4",
+"a# c #E5E6E7",
+"b# c #9FA1A1",
+"c# c #C6C8C8",
+"d# c #A4A7A7",
+"e# c #656868",
+"f# c #7D8080",
+"g# c #C8CECE",
+"h# c #C8CECF",
+"i# c #E8EAF0",
+"j# c #8484A2",
+"k# c #050514",
+"l# c #666675",
+"m# c #BEBEC1",
+"n# c #E5E5E5",
+"o# c #D7D7D8",
+"p# c #B4B4B6",
+"q# c #C1C1C6",
+"r# c #EDEFF9",
+"s# c #EBEEF8",
+"t# c #D7DAE3",
+"u# c #CACCD6",
+"v# c #D5D8E1",
+"w# c #D6D8E2",
+"x# c #CFD1DB",
+"y# c #D2D5DE",
+"z# c #DADCE6",
+"A# c #DADCE5",
+"B# c #C9CBD3",
+"C# c #E8EBF3",
+"D# c #F3F5FE",
+"E# c #E1E3EB",
+"F# c #EAECEF",
+"G# c #D9DBDA",
+"H# c #B6B9B9",
+"I# c #777979",
+"J# c #646767",
+"K# c #8A8E8E",
+"L# c #CDD3D2",
+"M# c #C4CACB",
+"N# c #DCDFE5",
+"O# c #FDFEFF",
+"P# c #E5E5ED",
+"Q# c #3A3A61",
+"R# c #4F4F60",
+"S# c #AEAEB5",
+"T# c #B9B9BB",
+"U# c #D6D6D6",
+"V# c #DDDDDF",
+"W# c #C3C3C6",
+"X# c #ACACAF",
+"Y# c #EEF1FC",
+"Z# c #D9DBE6",
+"`# c #CECFDA",
+" $ c #CED0DA",
+".$ c #D3D5E0",
+"+$ c #D2D4DE",
+"＠$ c #D6D9E2",
+"#$ c #CBCDD6",
+"$$ c #D0D1DC",
+"%$ c #D0D2DC",
+"&$ c #DBDDE6",
+"*$ c #E6E8F1",
+"=$ c #EDF0F9",
+"-$ c #D5D7E0",
+";$ c #DDE0E5",
+">$ c #EFF1F1",
+",$ c #D6D9D8",
+"'$ c #989B9A",
+")$ c #616363",
+"!$ c #A0A4A5",
+"~$ c #DEE2E6",
+"{$ c #DFE1E8",
+"]$ c #BFBFD1",
+"^$ c #1F1F41",
+"/$ c #878794",
+"($ c #C1C1C2",
+"_$ c #C0C0C1",
+":$ c #DEDEDF",
+"<$ c #D0D0D4",
+"[$ c #ACACB0",
+"}$ c #BBBBC1",
+"|$ c #ECEFFA",
+"1$ c #E5E8F3",
+"2$ c #CED1DC",
+"3$ c #CACCD7",
+"4$ c #D5D8E3",
+"5$ c #CCCED9",
+"6$ c #CFD1DC",
+"7$ c #CBCCD7",
+"8$ c #D4D7E1",
+"9$ c #CCCFD8",
+"0$ c #CDCFD9",
+"a$ c #ECEFF8",
+"b$ c #E8EAF4",
+"c$ c #E2E4E6",
+"d$ c #E6E9E9",
+"e$ c #DADEE0",
+"f$ c #A9ABB0",
+"g$ c #C3C5CC",
+"h$ c #D2D3DD",
+"i$ c #E7E9F1",
+"j$ c #A8A8C1",
+"k$ c #14142C",
+"l$ c #5A5A6B",
+"m$ c #B8B8BD",
+"n$ c #B6B6B8",
+"o$ c #D9D9DB",
+"p$ c #D3D3D7",
+"q$ c #BBBBC0",
+"r$ c #A4A4A9",
+"s$ c #EBEEFA",
+"t$ c #D5D7E2",
+"u$ c #DADDE8",
+"v$ c #CED0DC",
+"w$ c #C7C9D4",
+"x$ c #D1D4DF",
+"y$ c #D8DAE5",
+"z$ c #CACBD6",
+"A$ c #CED0DB",
+"B$ c #CECFD9",
+"C$ c #D9DCE6",
+"D$ c #DFE2EB",
+"E$ c #E7E9F3",
+"F$ c #ECEEF8",
+"G$ c #DCDFE4",
+"H$ c #DDDFE6",
+"I$ c #E0E2EC",
+"J$ c #DBDCE6",
+"K$ c #D4D6DF",
+"L$ c #C6C9D2",
+"M$ c #DBDDE5",
+"N$ c #F0F2F9",
+"O$ c #BDBDD3",
+"P$ c #252547",
+"Q$ c #9C9CA6",
+"R$ c #B9B9BC",
+"S$ c #C6C6C8",
+"T$ c #D5D5D9",
+"U$ c #C6C6CD",
+"V$ c #A1A0A5",
+"W$ c #C1C2CA",
+"X$ c #EDF1FD",
+"Y$ c #DBDDE9",
+"Z$ c #C9CBD7",
+"`$ c #D4D6E1",
+" % c #CDD0DB",
+".% c #CDCFDA",
+"+% c #D3D6E1",
+"＠% c #C8CAD5",
+"#% c #D7DAE5",
+"$% c #D1D2DD",
+"%% c #E9ECF6",
+"&% c #EDF0FA",
+"*% c #E3E5EF",
+"=% c #D3D6E0",
+"-% c #C9CBD5",
+";% c #CACCD5",
+">% c #C7C9D3",
+",% c #CDCFD8",
+"'% c #E2E3EE",
+")% c #7F7F9F",
+"!% c #1C1C3B",
+"~% c #767686",
+"{% c #BEBEC2",
+"]% c #C9C9D0",
+"^% c #B0B0B8",
+"/% c #A4A5AA",
+"(% c #E7EAF5",
+"_% c #E6E9F4",
+":% c #CCCEDA",
+"<% c #D3D6E2",
+"[% c #CED1DD",
+"}% c #CBCDD9",
+"|% c #CBCED9",
+"1% c #D0D3DE",
+"2% c #C9CCD7",
+"3% c #D0D3DD",
+"4% c #CDCFDB",
+"5% c #C6C8D3",
+"6% c #DDE0EB",
+"7% c #EDF0FB",
+"8% c #DFE2ED",
+"9% c #C6C8D2",
+"0% c #D0D3DC",
+"a% c #CCCDD7",
+"b% c #E8EAF1",
+"c% c #AEAFC6",
+"d% c #3F3F62",
+"e% c #040410",
+"f% c #545467",
+"g% c #B0B0B7",
+"h% c #B3B3B7",
+"i% c #CECED1",
+"j% c #CBCBD2",
+"k% c #BDBDC6",
+"l% c #9B9BA2",
+"m% c #D7D9E4",
+"n% c #D0D2DD",
+"o% c #D2D5E0",
+"p% c #D4D6E2",
+"q% c #CACDD9",
+"r% c #EAEDF8",
+"s% c #E3E5F1",
+"t% c #CBCDD8",
+"u% c #D4D7DE",
+"v% c #747596",
+"w% c #191934",
+"x% c #858592",
+"y% c #B5B5BA",
+"z% c #BFBFC2",
+"A% c #CECED4",
+"B% c #C0C0CA",
+"C% c #A2A2AB",
+"D% c #C0C1C9",
+"E% c #F1F4FE",
+"F% c #E0E2ED",
+"G% c #CCCFDA",
+"H% c #C8CBD6",
+"I% c #D6D8E3",
+"J% c #D2D4DF",
+"K% c #D2D4E0",
+"L% c #D1D4E0",
+"M% c #E4E7F2",
+"N% c #E8EBF7",
+"O% c #D7DAE1",
+"P% c #A4A5BC",
+"Q% c #424265",
+"R% c #070713",
+"S% c #5D5D6F",
+"T% c #AFAFB3",
+"U% c #C1C1CB",
+"V% c #ADADB8",
+"W% c #A4A5AC",
+"X% c #EBEDF8",
+"Y% c #E9EBF6",
+"Z% c #CBCED8",
+"`% c #CFD2DD",
+" & c #D4D7E2",
+".& c #E9ECF8",
+"+& c #E1E3EE",
+"＠& c #B7B9C9",
+"#& c #70708F",
+"$& c #1B1B33",
+"%& c #888896",
+"&& c #ABABB0",
+"*& c #C0C0C4",
+"=& c #C6C6CE",
+"-& c #B5B5C1",
+";& c #94949D",
+">& c #DADDE6",
+",& c #F0F2FD",
+"'& c #D9DBE5",
+")& c #D3D4DF",
+"!& c #D6D9E3",
+"~& c #C9CBD6",
+"{& c #D9DBE7",
+"]& c #C6C9D3",
+"^& c #F0F2FC",
+"/& c #D7D8E4",
+"(& c #8F90AA",
+"_& c #2E2E4D",
+":& c #04040E",
+"<& c #5F5F72",
+"[& c #A7A7AE",
+"}& c #AEAEB3",
+"|& c #CDCDD3",
+"1& c #9797A1",
+"2& c #C6C7D0",
+"3& c #F3F5FF",
+"4& c #E2E5EF",
+"5& c #D3D5DF",
+"6& c #CFD2DB",
+"7& c #CDD0DA",
+"8& c #CCCFD9",
+"9& c #CDCED9",
+"0& c #D1D4DE",
+"a& c #CACDD7",
+"b& c #EFF2FD",
+"c& c #E4E6EF",
+"d& c #ADADC0",
+"e& c #4F4F6F",
+"f& c #121225",
+"g& c #91919E",
+"h& c #A4A4AB",
+"i& c #BEBEC4",
+"j& c #BDBDC8",
+"k& c #A1A1AE",
+"l& c #B2B3BB",
+"m& c #F2F5FE",
+"n& c #D5D7E1",
+"o& c #D2D5DF",
+"p& c #D7DAE4",
+"q& c #EAECF6",
+"r& c #EAEDF5",
+"s& c #BDBFCD",
+"t& c #676785",
+"u& c #1D1C33",
+"v& c #5E5E73",
+"w& c #9E9EA8",
+"x& c #A7A7AD",
+"y& c #C7C7D0",
+"z& c #A8A8B6",
+"A& c #9E9FA7",
+"B& c #EBEEF7",
+"C& c #EEF0FA",
+"D& c #DBDCE7",
+"E& c #D1D3DC",
+"F& c #F0F3FB",
+"G& c #80819B",
+"H& c #353451",
+"I& c #07070F",
+"J& c #858594",
+"K& c #9B9BA1",
+"L& c #BABAC1",
+"M& c #B2B2C1",
+"N& c #91919C",
+"O& c #F1F4FD",
+"P& c #E5E8F1",
+"Q& c #9899AC",
+"R& c #484865",
+"S& c #0F0F1D",
+"T& c #5B5B6F",
+"U& c #9F9FA7",
+"V& c #BBBBC7",
+"W& c #8F8F9C",
+"X& c #D3D5DC",
+"Y& c #ECEFF7",
+"Z& c #D6D7E1",
+"`& c #DEE0E9",
+" * c #F0F1F9",
+".* c #A0A1B3",
+"+* c #55556E",
+"＠* c #19182B",
+"#* c #717183",
+"$* c #96969E",
+"%* c #B6B6BF",
+"&* c #9A99A7",
+"** c #C8C9D1",
+"=* c #F4F7FF",
+"-* c #DFE1E9",
+";* c #F2F4FC",
+">* c #DEE0E6",
+",* c #A5A5B4",
+"'* c #5B5B74",
+")* c #202033",
+"!* c #49495F",
+"~* c #80808F",
+"{* c #A0A0A7",
+"]* c #A3A3AF",
+"^* c #BEBFC8",
+"/* c #F6F9FF",
+"(* c #F1F3FC",
+"_* c #ADAEBB",
+":* c #696980",
+"<* c #28283E",
+"[* c #06060B",
+"}* c #53536A",
+"|* c #A1A1AB",
+"1* c #BDBEC7",
+"2* c #FCFEFF",
+"3* c #F2F4FA",
+"4* c #DDDFE5",
+"5* c #ADADB9",
+"6* c #6D6D81",
+"7* c #313147",
+"8* c #090911",
+"9* c #5E5E77",
+"0* c #888894",
+"a* c #BEBFC4",
+"b* c #D7D8DD",
+"c* c #9B9CA9",
+"d* c #64647A",
+"e* c #2C2C3D",
+"f* c #07070D",
+"g* c #4C4C60",
+"h* c #818191",
+"i* c #626377",
+"j* c #282837",
+"k* c #08080E",
+"l* c #1C1C28",
+" ",
+" ",
+" ",
+" ",
+" ",
+" . + ＠ # $ ",
+" % & * = - ; > , ' ) ! ",
+" ~ { ] ^ / ( _ : : : : : : : : < [ ",
+" } | 1 2 3 4 5 : : : : 6 7 8 9 : 0 5 : 4 a ",
+" b c d e f g : : : : h i j k l m n o p q : : : : r ",
+" s t u v w x : : y z A B C D E F G H I A J K L M N O : P Q ",
+" R S T U V : : W X Y Z ` ...+.＠.n #.$.%.&.*.=.-.p ;.>.,.'.: ).!. ",
+" ~.{.].^.: /.(._.:.<.[.}.|.1.2.3.}.4.5...6.7.8.9.0.a.b.c.d.e.f.6.: g. ",
+" h.^.i.j.j.k.c.l.m.n.W o.p.q.r.s.t.u.v.w.x.y.V z.A.B.C.D.E.F.G.: H.I. ",
+" J.K.L.X M.N.j.O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +X .+++＠+#+$+M %+&+*+=+-+;+>+ ",
+" ,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+o.3+4+5+o.6+7+8+9+0+a+b+c+d+e+7.: f+ ",
+" g+h+i+j+k+l+m+m+M.n+o o+p+q+r+s+t+u+v+w+x+y+z+A+V.B+8+C+D+E+F+G+H+I+J+K+L+M+ ",
+" N+O+P+Q+R+:.m+S+S+T+U+V+W+X+Y+Z+`+ ＠.＠+＠|+w+x+＠＠#＠$＠%＠&＠*＠=＠-＠;＠>＠,＠'＠: )＠ ",
+" !＠~＠k+{＠]＠^＠/＠S+(＠_＠:＠<＠[＠}＠|＠1＠2＠3＠4＠|+5＠r+6＠7＠8＠8＠9＠0＠a＠b＠c＠d＠e＠f＠g＠h＠i＠j＠ ",
+" k＠-.l＠m＠n＠o＠p＠q＠r＠s＠t＠u＠v＠w＠[＠x＠y＠[＠z＠A＠}＠B＠C＠3＠D＠E＠F＠G＠H＠I＠J＠K＠d＠L＠M(a)N＠: O＠ ",
+" P＠Q＠R＠S＠T＠U＠(+V＠W＠X＠Y＠Z＠y＠`＠ #`＠.#`＠v＠+#}＠4＠＠###B＠8＠$#%#&#F+*#=#-#;#>#,#5 '#)# ",
+" !#~#{#]#^#/#p.(#_#:#<#[#}#|#u＠1#2#3#4#5#6#x＠`＠7#8#9#0#a#b#c#d#e#f#g#h#i#: j#k# ",
+" l#m#~#n#o#p#q#r#s#t#u#v#w#x#w#y#z#x#u#v＠u＠A#B#C#D#E#0#F#G#H#I#J#K#L#M#N#O#P#Q# ",
+" R#S#T#U#V#W#X#[＠Y#Z#`# $.$ $v＠4#+$＠$y#v＠#$$$%$&$*$=$-$;$>$,$'$)$!$~${$[＠*$: ]$^$ ",
+" /$($_$:$<$[$}$|$1$2$3$4$5$}#6$7$8$9$t# $ $0$u#z#a$b$s＠c$d$e$f$g$E#h$}＠i$j.: j$k$ ",
+" l$m$n$o$p$q$r$X＠s$t$3$u$v$w$x$5$y$z$A$}#%$ $B$C$D$E$F$G$H$I$J$K$L$<##$M$N$W O$P$ ",
+" Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%＠%+%v$5$v$#%$%%$u#%$%%&%*%=%Y＠-%0$;%>%,%$＠'%)%!% ",
+" ~%{%T#p$]%^%/%(%_%x$A$:%<%[%}%|%1%6$2%3%1%4%5%6%7%|$8%9%.%0%u#a%&$b%c%d%e% ",
+" f%g%h%i%j%k%l%Z(a)7%m%5%3$n%o%p%q%.%4%}% %x$t$3$8$r%|$s%5%t%6$-%u%Z#v%w% ",
+" x%y%z%A%B%C%D%E%F%G%3$A$H%x$I%J% %K%6$2$L%Z$|%4$M%N%.$-%＠$O%P%Q%R% ",
+" S%g%T%<.U%V%W%X%Y%.%Z%t%`%t%o% &`%v$6$x$ %`%5$H% &.&+&4#＠&#&$& ",
+" %&&&*&=&-&;&>&,&'&5$Y＠)&1%!&Z%~&K%{& %]&.% $M%Y#^&/&(&_&:& ",
+" <&[&}&|&2 1&2&3&4&5&6&x#7&:#8&9&0$7&0&a&=%y$b&c&d&e&f& ",
+" g&h&i&j&k&l&m&r#v＠-$4#v＠n&%$}#x#5&o&p&q&r&s&t&u& ",
+" v&w&x&y&z&A&B&C&D&%$0$E&＠$#$u＠ $J%E$F&,%G&H&I& ",
+" J&K&L&M&N&E#O&*$5&:#B$:#>%y#P&m+3＠Q&R&S& ",
+" T&!#U&V&W&X&D#Y&&$Z&u＠`&E$ *Z＠.*+*＠* ",
+" #*$*%*&***=*m+s＠`＠-*;*>*,*'*)* ",
+" !*~*{*]*^*/*(*(*N$`._*:*<*[* ",
+" }*!＠|*1*2*3*4*5*6*7*8* ",
+" 9*0*a*b*c*d*e*f* ",
+" g*h*i*j*k* ",
+" l* ",
+" ",
+" ",
+" ",
+" ",
+" "};
1.2.40.1 +443 -41 XEmacs/xemacs/etc/toolbar/paste-cap-up.xpm
Index: paste-cap-up.xpm
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/toolbar/paste-cap-up.xpm,v
retrieving revision 1.2
retrieving revision 1.2.40.1
diff -u -r1.2 -r1.2.40.1
--- paste-cap-up.xpm 1997/12/21 06:28:49 1.2
+++ paste-cap-up.xpm 2005/02/25 16:29:48 1.2.40.1
＠＠ -1,42 +1,444 ＠＠
/* XPM */
-static char * paste[] = {
-"33 33 6 1",
-"X c Gray75 s backgroundToolBarColor",
-"u c #000000000000 s foregroundToolBarColor",
-"o c black",
-"O c Gray90",
-"+ c Gray60",
-"＠ c white",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXooXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXoOOoXXXXXXXXXXXXXXX",
-"XXXXXXXXooooooOooOooooooXXXXXXXXX",
-"XXXXXXXo++++oOOOOOOo++++oXXXXXXXX",
-"XXXXXXXo+++oooooooooo+++oXXXXXXXX",
-"XXXXXXXo++++++++++++++++oXXXXXXXX",
-"XXXXXXXo++++++++++++++++oXXXXXXXX",
-"XXXXXXXo++++++++++++++++oXXXXXXXX",
-"XXXXXXXo++++++++++++++++oXXXXXXXX",
-"XXXXXXXo++++++oooooooooooXXXXXXXX",
-"XXXXXXXo++++++o＠＠＠＠＠＠＠＠ooXXXXXXXX",
-"XXXXXXXo++++++o＠＠＠＠＠＠＠＠o+oXXXXXXX",
-"XXXXXXXo++++++o＠oooooo＠ooooXXXXXX",
-"XXXXXXXo++++++o＠＠＠＠＠＠＠＠＠＠＠oXXXXXX",
-"XXXXXXXo++++++o＠oooo＠＠＠＠＠＠oXXXXXX",
-"XXXXXXXo++++++o＠＠＠＠＠＠＠＠＠＠＠oXXXXXX",
-"XXXXXXXo++++++o＠＠＠＠＠＠＠＠＠＠＠oXXXXXX",
-"XXXXXXXo++++++o＠oooooooo＠＠oXXXXXX",
-"XXXXXXXoooooooo＠＠＠＠＠＠＠＠＠＠＠oXXXXXX",
-"XXXXXXXXXXXXXXo＠＠＠＠＠＠＠＠＠＠＠oXXXXXX",
-"XXXXXXXXXXXXXXo＠＠＠＠＠＠＠＠＠＠＠oXXXXXX",
-"XXXXXXXXXXXXXXoooooooooooooXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXuXXXXXXXXXXX",
-"XXXXXXXuuuXXXXXXXXXXXuXXXXXXXXXXX",
-"XXXXXXXuXXuXuuXXXuuXuuuXuXXXXXXXX",
-"XXXXXXXuXXuXXXuXuXXXXuXuXuXXXXXXX",
-"XXXXXXXuuuXXuuuXXuuXXuXuuuXXXXXXX",
-"XXXXXXXuXXXXuXuXXXuXXuXuXXXXXXXXX",
-"XXXXXXXuXXXXuuXuuuXXXuXXuuXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"};
+static char * paste_xpm[] = {
+"48 48 393 2",
+" c None",
+". c #000000",
+"+ c #727272",
+"＠ c #C9C9C9",
+"# c #919191",
+"$ c #272727",
+"% c #6E6E6E",
+"& c #DADADA",
+"* c #9B9B9B",
+"= c #838383",
+"- c #8F8F8F",
+"; c #292929",
+"> c #0E0E0E",
+", c #C8C8C8",
+"' c #9F9F9F",
+") c #444444",
+"! c #646464",
+"~ c #C4C4C4",
+"{ c #7A7A7A",
+"] c #666666",
+"^ c #D1D1D1",
+"/ c #5C5C5C",
+"( c #ADADAD",
+"_ c #7F7F7F",
+": c #373737",
+"< c #281800",
+"[ c #352000",
+"} c #341F00",
+"| c #331F00",
+"1 c #32230C",
+"2 c #BABABA",
+"3 c #D0D0D0",
+"4 c #898989",
+"5 c #382408",
+"6 c #2F1B00",
+"7 c #2C1E09",
+"8 c #B9B9B9",
+"9 c #737373",
+"0 c #787878",
+"a c #291700",
+"b c #281600",
+"c c #271500",
+"d c #261500",
+"e c #AC6700",
+"f c #D58000",
+"g c #D68100",
+"h c #D47F00",
+"i c #D37F00",
+"j c #D17D00",
+"k c #D07C00",
+"l c #C2A881",
+"m c #C1C1C1",
+"n c #CFCFCF",
+"o c #AAAAAA",
+"p c #AB9C87",
+"q c #A28E72",
+"r c #C6BCAF",
+"s c #A7A7A7",
+"t c #707070",
+"u c #797979",
+"v c #7A6D5B",
+"w c #4F3D26",
+"x c #543E23",
+"y c #9A5500",
+"z c #7D4500",
+"A c #0A0500",
+"B c #271700",
+"C c #D27E00",
+"D c #D58100",
+"E c #D0820B",
+"F c #BF9F70",
+"G c #B6B6B6",
+"H c #C2C2C2",
+"I c #C7C7C7",
+"J c #A4A4A4",
+"K c #8D8D8D",
+"L c #6D6D6D",
+"M c #A3A3A3",
+"N c #333333",
+"O c #7B4B0F",
+"P c #693A00",
+"Q c #331E00",
+"R c #CB9139",
+"S c #C39E66",
+"T c #B6B1A9",
+"U c #B3B3B3",
+"V c #B8B8B8",
+"W c #BEBEBE",
+"X c #AEAEAE",
+"Y c #909090",
+"Z c #828282",
+"` c #7B7B7B",
+" . c #757575",
+".. c #818181",
+"+. c #B4B4B4",
+"＠. c #7C7C7C",
+"#. c #7B6140",
+"$. c #794A0F",
+"%. c #733F00",
+"&. c #CD7B00",
+"*. c #D07D00",
+"=. c #B6823B",
+"-. c #BDB8B0",
+";. c #BCBCBC",
+">. c #CDCDCD",
+",. c #DCDCDC",
+"'. c #E1E1E1",
+"). c #CBCBCB",
+"!. c #A5A5A5",
+"~. c #979797",
+"{. c #888888",
+"]. c #7D7D7D",
+"^. c #777777",
+"/. c #6C6C6C",
+"(. c #717171",
+"_. c #ABABAB",
+":. c #4D4D4D",
+"<. c #593E1F",
+"[. c #663A06",
+"}. c #321D00",
+"|. c #CB7900",
+"1. c #CE7B00",
+"2. c #B16400",
+"3. c #A09082",
+"4. c #B2B2B2",
+"5. c #C0C0C0",
+"6. c #BBBBBB",
+"7. c #AFAFAF",
+"8. c #ACACAC",
+"9. c #A9A9A9",
+"0. c #A2A2A2",
+"a. c #A0A0A0",
+"b. c #9E9E9E",
+"c. c #9C9C9C",
+"d. c #999999",
+"e. c #40362C",
+"f. c #311D00",
+"g. c #C87700",
+"h. c #CC7900",
+"i. c #A65C00",
+"j. c #7F4E20",
+"k. c #804F20",
+"l. c #815020",
+"m. c #825020",
+"n. c #835120",
+"o. c #855220",
+"p. c #865220",
+"q. c #875320",
+"r. c #885420",
+"s. c #895420",
+"t. c #8A5520",
+"u. c #8B5520",
+"v. c #8C5620",
+"w. c #8D5720",
+"x. c #8E5720",
+"y. c #8F5820",
+"z. c #905920",
+"A. c #915920",
+"B. c #925A20",
+"C. c #935A20",
+"D. c #945B20",
+"E. c #955C20",
+"F. c #9B5308",
+"G. c #9E5100",
+"H. c #A05200",
+"I. c #301C00",
+"J. c #C57400",
+"K. c #C97700",
+"L. c #813F00",
+"M. c #834000",
+"N. c #844100",
+"O. c #864200",
+"P. c #874300",
+"Q. c #894400",
+"R. c #8A4500",
+"S. c #8B4500",
+"T. c #8D4600",
+"U. c #8E4700",
+"V. c #904800",
+"W. c #914900",
+"X. c #924A00",
+"Y. c #944A00",
+"Z. c #954B00",
+"`. c #964C00",
+" + c #984D00",
+".+ c #994E00",
+"++ c #9A4F00",
+"＠+ c #9C4F00",
+"#+ c #9D5000",
+"$+ c #A15200",
+"%+ c #A25300",
+"&+ c #2F1C00",
+"*+ c #C27200",
+"=+ c #C67500",
+"-+ c #884400",
+";+ c #3D1E00",
+">+ c #231100",
+",+ c #241200",
+"'+ c #251200",
+")+ c #251300",
+"!+ c #261300",
+"~+ c #271400",
+"{+ c #281400",
+"]+ c #281500",
+"^+ c #291500",
+"/+ c #2E1B00",
+"(+ c #BE6F00",
+"_+ c #C37300",
+":+ c #8A4400",
+"<+ c #8C4600",
+"[+ c #393939",
+"}+ c #E6E6E6",
+"|+ c #E7E7E7",
+"1+ c #E8E8E8",
+"2+ c #E9E9E9",
+"3+ c #EAEAEA",
+"4+ c #EBEBEB",
+"5+ c #ECECEC",
+"6+ c #EDEDED",
+"7+ c #EEEEEE",
+"8+ c #EFEFEF",
+"9+ c #F0F0F0",
+"0+ c #F1F1F1",
+"a+ c #F2F2F2",
+"b+ c #F3F3F3",
+"c+ c #2D1A00",
+"d+ c #BB6D00",
+"e+ c #C07000",
+"f+ c #A65B00",
+"g+ c #8F4800",
+"h+ c #2C1900",
+"i+ c #B76A00",
+"j+ c #BC6E00",
+"k+ c #A55B00",
+"l+ c #924900",
+"m+ c #934A00",
+"n+ c #3A3A3A",
+"o+ c #F4F4F4",
+"p+ c #2B1900",
+"q+ c #B36700",
+"r+ c #B86B00",
+"s+ c #A55A00",
+"t+ c #944B00",
+"u+ c #F5F5F5",
+"v+ c #2A1800",
+"w+ c #AE6300",
+"x+ c #B46800",
+"y+ c #A45A00",
+"z+ c #974C00",
+"A+ c #D7D7D7",
+"B+ c #D8D8D8",
+"C+ c #D9D9D9",
+"D+ c #E0E0E0",
+"E+ c #DDDDDD",
+"F+ c #E3E3E3",
+"G+ c #F6F6F6",
+"H+ c #AA6000",
+"I+ c #B06500",
+"J+ c #A45900",
+"K+ c #954C00",
+"L+ c #9B4F00",
+"M+ c #C3C3C3",
+"N+ c #C5C5C5",
+"O+ c #C6C6C6",
+"P+ c #F7F7F7",
+"Q+ c #A55D00",
+"R+ c #AB6100",
+"S+ c #A35800",
+"T+ c #3B3B3B",
+"U+ c #F8F8F8",
+"V+ c #A05900",
+"W+ c #A75E00",
+"X+ c #A25700",
+"Y+ c #F9F9F9",
+"Z+ c #251400",
+"`+ c #9B5500",
+" ＠ c #A25A00",
+".＠ c #A15600",
+"+＠ c #DFDFDF",
+"＠＠ c #DBDBDB",
+"#＠ c #DEDEDE",
+"$＠ c #FAFAFA",
+"%＠ c #241300",
+"&＠ c #955100",
+"*＠ c #9D5600",
+"=＠ c #9F5500",
+"-＠ c #9F5200",
+";＠ c #A35400",
+">＠ c #A45500",
+",＠ c #D2D2D2",
+"'＠ c #FBFBFB",
+")＠ c #221200",
+"!＠ c #904D00",
+"~＠ c #975300",
+"{＠ c #9E5400",
+"]＠ c #A65500",
+"^＠ c #A75600",
+"/＠ c #3C3C3C",
+"(＠ c #FCFCFC",
+"_＠ c #211100",
+":＠ c #8A4900",
+"<＠ c #924E00",
+"[＠ c #9D5300",
+"}＠ c #A45400",
+"|＠ c #A55500",
+"1＠ c #A85700",
+"2＠ c #A95700",
+"3＠ c #FDFDFD",
+"4＠ c #1F1000",
+"5＠ c #844500",
+"6＠ c #8C4A00",
+"7＠ c #9B5200",
+"8＠ c #AA5800",
+"9＠ c #AB5900",
+"0＠ c #E2E2E2",
+"a＠ c #FEFEFE",
+"b＠ c #1E0F00",
+"c＠ c #7E4000",
+"d＠ c #864600",
+"e＠ c #995000",
+"f＠ c #AC5900",
+"g＠ c #AE5A00",
+"h＠ c #CACACA",
+"i＠ c #1C0E00",
+"j＠ c #783B00",
+"k＠ c #804200",
+"l＠ c #984F00",
+"m＠ c #AD5A00",
+"n＠ c #AF5B00",
+"o＠ c #B05C00",
+"p＠ c #3D3D3D",
+"q＠ c #FFFFFF",
+"r＠ c #1B0C00",
+"s＠ c #723700",
+"t＠ c #7A3D00",
+"u＠ c #964D00",
+"v＠ c #AE5B00",
+"w＠ c #B05B00",
+"x＠ c #B15C00",
+"y＠ c #B25D00",
+"z＠ c #1A0C00",
+"A＠ c #6C3300",
+"B＠ c #743900",
+"C＠ c #944C00",
+"D＠ c #B35D00",
+"E＠ c #B45E00",
+"F＠ c #E4E4E4",
+"G＠ c #E5E5E5",
+"H＠ c #6B3200",
+"I＠ c #6E3400",
+"J＠ c #B55F00",
+"K＠ c #B65F00",
+"L＠ c #D4D4D4",
+"M＠ c #CCCCCC",
+"N＠ c #B76000",
+"O＠ c #B86000",
+"P＠ c #3E3E3E",
+"Q＠ c #B55E00",
+"R＠ c #B96100",
+"S＠ c #BA6200",
+"T＠ c #BB6200",
+"U＠ c #BC6300",
+"V＠ c #140900",
+"W＠ c #BA6100",
+"X＠ c #BD6300",
+"Y＠ c #BE6400",
+"Z＠ c #562800",
+"`＠ c #BD6400",
+" # c #BF6500",
+".# c #949494",
+"+# c #502500",
+"＠# c #5A2B00",
+"## c #B15D00",
+"$# c #C06500",
+"%# c #C16600",
+"&# c #3F3F3F",
+"*# c #CECECE",
+"=# c #0B0600",
+"-# c #2F1900",
+";# c #301900",
+"># c #B1B1B1",
+",# c #8A8A8A",
+"'# c #0A0A0A",
+")# c #D3D3D3",
+"!# c #B5B5B5",
+"~# c #A6A6A6",
+"{# c #1C1C1C",
+"]# c #A8A8A8",
+"^# c #6B6B6B",
+"/# c #D5D5D5",
+"(# c #A1A1A1",
+"_# c #626262",
+":# c #262626",
+" ",
+" ",
+" . . . ",
+" . . . . . . ",
+" . + ＠ ＠ # $ . ",
+" . % & * = - = ; . ",
+" > , ' ) ! ~ { . ",
+" . ] ^ / . . . ( _ : . ",
+" . < [ [ [ } } } | 1 2 3 4 5 6 7 8 9 0 a b c d d d d . ",
+" . e f g g f h i j k l m n o p q r s t u v w x y y y y z A ",
+" B C h f g D f h E F G H I s ' J K 0 9 L M t N O y y y y P . ",
+" Q k C h f g R S T U V n W X ' Y Z ` .t ..+.J ＠.#.$.y y %.. ",
+" Q &.*.i =.-.;.>.,.'.& ).H +.!.~.{.].^.+ /.(.= ~.;._.:.<.[.. ",
+" }.|.1.2.3.4.G 5.W 6.V +.4.7.8.9.!.0.a.' b.c.* d.!.4.+ N e.. ",
+" f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.. ",
+" I.J.K.i.L.M.N.O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+++(a)+#+G.H.$+%+. ",
+" &+*+=+i.N.O.P.-+R.S.;+>+>+,+,+,+'+)+)+!+!+!+~+~+~+{+{+]+^+. . . . . . . . . ",
+" /+(+_+i.P.-+:+S.<+U.[+}+}+|+|+1+1+2+3+3+4+4+5+5+6+6+7+7+8+8+9+9+0+0+a+a+b+. ",
+" c+d+e+f+:+S.<+U.g+W.[+|+|+1+1+2+3+3+4+4+5+5+6+6+7+7+8+8+9+9+0+0+a+a+b+b+b+. ",
+" h+i+j+k+<+U.g+V.l+m+n+1+2+2+3+3+4+4+5+5+6+6+7+7+8+8+9+9+0+0+a+a+b+b+o+o+o+. ",
+" p+q+r+s+g+V.l+m+t+`.n+2+3+3+4+4+5+5+6+6+7+7+8+8+9+9+0+0+a+a+b+b+o+o+o+u+u+. ",
+" v+w+x+y+W.m+t+`.z+ +n+3+4+4+,.A+B+B+B+C+C+& & D+0+0+a+6+,.,.E+E+E+F+u+G+G+. ",
+" a H+I+J+t+K+z+ +.+L+n+4+5+5+>.M+M+~ ~ ~ ~ N+N+N+a+a+b+E+O+O+I I I I G+P+P+. ",
+" b Q+R+S+z+ +.+L+＠+#+T+5+6+6+7+7+8+8+9+9+0+0+a+a+b+b+o+o+o+u+u+G+G+P+P+U+U+. ",
+" c V+W+X+.+++(a)+#+G.H.T+6+7+7+8+8+9+9+0+0+a+a+b+b+o+o+o+u+u+G+G+P+P+U+U+U+Y+. ",
+" Z+`+ ＠.＠＠+#+G.H.$+%+T+7+8+8++(a)& ＠＠＠＠＠＠,.|+b+o+2+#＠#＠#＠#＠+＠+(a)D+D+D+|+Y+Y+$＠. ",
+" %＠&＠*＠=＠G.-＠$+%+;＠>(a)T+8+9+9+3 N+N+O+O+O+A+o+u+,＠I I , , , , ＠ ＠ ＠ ＠ $＠$＠'＠. ",
+" )＠!＠~＠{＠$+%+;＠>＠]＠^＠/＠9+0+0+a+a+b+b+o+o+u+u+u+G+G+P+P+U+U+Y+Y+Y+$＠$＠'＠'＠(＠. ",
+" _＠:＠<＠[＠;＠}＠|＠^＠1＠2＠/＠0+a+a+b+b+o+o+u+u+u+G+G+P+P+U+U+Y+Y+Y+$＠$＠'＠'＠(＠(＠3＠. ",
+" 4＠5＠6＠7＠|＠^＠1＠2＠8＠9＠/＠a+b+b+F+E+#＠#＠#＠3+G+0+D+D+D+'.|+$＠1+0＠0＠F+F+2+3＠3(a)a＠. ",
+" b＠c＠d＠e＠1＠2＠8＠9＠f＠g＠/＠b+o+o+,＠I I I , +＠P+}+＠ ＠ ＠ ＠ ＠ $＠3 h＠h＠).).).a＠a(a)a＠. ",
+" i＠j＠k＠l＠8＠9＠f＠m＠n＠o＠p＠o+u+u+G+G+G+P+P+U+U+Y+Y+$＠$＠$＠'＠'＠(＠(＠3＠3＠a＠a＠a＠q＠q＠. ",
+" r＠s＠t＠u＠f＠m＠v＠w＠x＠y＠p＠u+G+G+G+P+P+U+U+Y+Y+$＠$＠$＠'＠'＠(＠(＠3＠3＠a＠a＠a＠q＠q＠q＠q＠. ",
+" z＠A＠B＠C＠v＠w＠x＠y＠D＠E＠p＠G+G+P+}+D+D+'.'.'.0＠0＠u+'＠F+F+F＠F＠F＠G＠G＠G＠G＠G＠U+q(a)q＠. ",
+" z＠H＠I＠X.x＠y＠D＠E＠J＠K＠p＠P+P+U+L(a)＠ ＠ ＠ h＠h＠h＠h＠F+(＠).).).M＠M＠M＠M＠M＠M＠M＠4+q(a)q＠. ",
+" z＠H＠H＠V.D＠E＠J＠K＠N＠O＠P＠U+U+Y+Y+$＠$＠'＠'＠'＠(＠(＠3＠3＠a＠a＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q(a)q＠. ",
+" z＠H＠H＠g+Q＠K＠N＠O＠R＠S＠P＠Y+Y+$＠$＠'＠'＠'＠(＠(＠3＠3＠a＠a＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠. ",
+" z＠H＠H＠V.N＠O＠R＠S＠T＠U＠P＠$＠$＠'＠0＠F+F+F+F＠F＠F＠G＠G＠G＠G＠G＠G＠G＠4+q＠q＠q＠q＠q＠q＠q(a)5+. ",
+" V＠H＠H＠W.R＠W＠T＠U＠X＠Y＠P＠'＠'＠'＠h＠).).).).M＠M＠M＠M＠M＠M＠M＠M＠M＠M＠q＠q＠q＠q＠q＠q＠+(a)!.. ",
+" . Z＠H＠X.T＠U＠U＠`(a)Y＠ #P＠'＠(＠(＠3＠3＠a＠a＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠o+7++＠W 9..#. ",
+" V＠+#＠###`＠Y＠ #$#%#&#(＠3＠3＠a＠a＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠(＠*#~ 2 7.J :.. ",
+" . . =#-#-#;#;#;#＠a＠a＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠6+H 2 >#s ,#'# ",
+" &#a＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠)#!#X ~#.#{# ",
+" &#q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠D+( ]#0.^#'# ",
+" &#q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠U+/#(#.#_#:#. ",
+" . . . . . . . . . . . . . . . . . . . . . . ",
+" ",
+" "};
1.2.40.1 +429 -42 XEmacs/xemacs/etc/toolbar/printer-cap-up.xpm
Index: printer-cap-up.xpm
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/toolbar/printer-cap-up.xpm,v
retrieving revision 1.2
retrieving revision 1.2.40.1
diff -u -r1.2 -r1.2.40.1
--- printer-cap-up.xpm 1997/12/21 06:28:49 1.2
+++ printer-cap-up.xpm 2005/02/25 16:29:48 1.2.40.1
＠＠ -1,43 +1,430 ＠＠
/* XPM */
-static char * printer[] = {
-"33 33 7 1",
-"X c Gray75 s backgroundToolBarColor",
-"u c #000000000000 s foregroundToolBarColor",
-"o c black",
-"O c white",
-"+ c Gray60",
-"＠ c Gray90",
-"# c Gray40",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXoooooooooXXXXXXXXXXXXXXX",
-"XXXXXXXXXoOOOOOOOooXXXXXXXXXXXXXX",
-"XXXXXXXXXoOooooOOoXoXXXXXXXXXXXXX",
-"XXXXXXXXXoOOOOOOOoooooooXXXXXXXXX",
-"XXXXXXXXXoOoooOOOOOOoXo+ooXXXXXXX",
-"XXXXXXXXXoOOOOOOOOOOoo++++oXXXXXX",
-"XXXXXXXXXoooooooooooo++++ooXXXXXX",
-"XXXXXXXXo＠＠＠＠＠＠＠＠＠＠＠o+++o+oXXXXXX",
-"XXXXXXXo＠＠＠＠＠＠＠＠＠＠＠＠＠o+o++oXXXXXX",
-"XXXXXXooooooooooooooooo+++oXXXXXX",
-"XXXXXXo＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠o+++oXXXXXX",
-"XXXXXXo＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠o++ooXXXXXX",
-"XXXXXXo＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠o+ooXXXXXXX",
-"XXXXXXo＠＠＠＠＠＠＠＠＠＠＠＠＠＠＠oo#oXXXXXXX",
-"XXXXXXooooooooooooooooo#oXXXXXXXX",
-"XXXXXXXo+++++++++++++o#oXXXXXXXXX",
-"XXXXXXXXo+++++++++++o#oXXXXXXXXXX",
-"XXXXXXXXo+++++++++++ooXXXXXXXXXXX",
-"XXXXXXXXXooooooooooooXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXuXXXXXXXuXXXXXXXX",
-"XXXXXXXXuuuXXXXXXXXXXXXXuXXXXXXXX",
-"XXXXXXXXuXXuXuXuuXuuuXXuuuXXXXXXX",
-"XXXXXXXXuXXuXuuXuXuXXuXXuXXXXXXXX",
-"XXXXXXXXuuuXXuXXuXuXXuXXuXXXXXXXX",
-"XXXXXXXXuXXXXuXXuXuXXuXXuXXXXXXXX",
-"XXXXXXXXuXXXXuXXuXuXXuXXuXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"};
+static char * print_xpm[] = {
+"48 48 379 2",
+" c None",
+". c #000000",
+"+ c #7C7C7C",
+"＠ c #F9F9F9",
+"# c #BABABA",
+"$ c #7B7B7B",
+"% c #F7F7F7",
+"& c #B9B9B9",
+"* c #B8B8B8",
+"= c #F5F5F5",
+"- c #A9A9A9",
+"; c #B7B7B7",
+"> c #F4F4F4",
+", c #7A7A7A",
+"' c #F2F2F2",
+") c #797979",
+"! c #F0F0F0",
+"~ c #AFAFAF",
+"{ c #CFCFCF",
+"] c #787878",
+"^ c #414141",
+"/ c #EFEFEF",
+"( c #777777",
+"_ c #4F4F4F",
+": c #EDEDED",
+"< c #767676",
+"[ c #757575",
+"} c #EBEBEB",
+"| c #494949",
+"1 c #9C9C9C",
+"2 c #EAEAEA",
+"3 c #3A3A3A",
+"4 c #A6A6A6",
+"5 c #E8E8E8",
+"6 c #B1B1B1",
+"7 c #A7A7A7",
+"8 c #ADADAD",
+"9 c #D9D9D9",
+"0 c #E6E6E6",
+"a c #393939",
+"b c #555555",
+"c c #ABABAB",
+"d c #ACACAC",
+"e c #8C9DAF",
+"f c #3977B7",
+"g c #3A77B7",
+"h c #BDBDBD",
+"i c #DEDEDE",
+"j c #DDDDDD",
+"k c #626262",
+"l c #313A4B",
+"m c #093CA2",
+"n c #1D479D",
+"o c #8C8C8C",
+"p c #8A8A8A",
+"q c #444444",
+"r c #1C1C1C",
+"s c #D5D5D5",
+"t c #E5E5E5",
+"u c #E7E7E7",
+"v c #BCD3EB",
+"w c #5AAAF7",
+"x c #5CAAF7",
+"y c #CECECE",
+"z c #6D6D6D",
+"A c #4D4D4D",
+"B c #0F54DA",
+"C c #0D51D9",
+"D c #778FC4",
+"E c #0C0C0C",
+"F c #8D8D8D",
+"G c #E3E3E3",
+"H c #92C0EF",
+"I c #6DB7F9",
+"J c #5EADF8",
+"K c #B8BDC3",
+"L c #C0C0C0",
+"M c #BFBFBF",
+"N c #454D5E",
+"O c #1157DB",
+"P c #1259DC",
+"Q c #1D56D2",
+"R c #B6B6B6",
+"S c #5A5A5A",
+"T c #E2E2E2",
+"U c #E4E4E4",
+"V c #88BBF0",
+"W c #6EB8F9",
+"X c #69A2DD",
+"Y c #77A5D5",
+"Z c #77A3D4",
+"` c #6EA0D8",
+" . c #5597E3",
+".. c #5495E2",
+"+. c #5998E2",
+"＠. c #6DA5E4",
+"#. c #5C98E1",
+"$. c #4D8BDE",
+"%. c #4B88DC",
+"&. c #4A86DB",
+"*. c #4883DA",
+"=. c #4680D9",
+"-. c #447ED8",
+";. c #427BD7",
+">. c #4178D6",
+",. c #3F75D5",
+"'. c #6489C9",
+"). c #6387C8",
+"!. c #3A4F79",
+"~. c #294F9C",
+"{. c #165EDE",
+"]. c #165FDF",
+"^. c #0B4ED8",
+"/. c #97A3BD",
+"(. c #9E9E9E",
+"_. c #808080",
+":. c #67ABF3",
+"<. c #6DB8F9",
+"[. c #80C4FA",
+"}. c #78BFFA",
+"|. c #7DC2FA",
+"1. c #99D5FD",
+"2. c #9ED9FD",
+"3. c #A2DBFD",
+"4. c #A0D9FD",
+"5. c #9BD6FD",
+"6. c #95D2FC",
+"7. c #88C8FA",
+"8. c #63AAF4",
+"9. c #3180EA",
+"0. c #2372E7",
+"a. c #216FE5",
+"b. c #1F6BE4",
+"c. c #1C68E2",
+"d. c #1A64E1",
+"e. c #1760DF",
+"f. c #1660DF",
+"g. c #1F6CE4",
+"h. c #1D69E3",
+"i. c #1A65E1",
+"j. c #5377C7",
+"k. c #B4B4B4",
+"l. c #212121",
+"m. c #C8C8C8",
+"n. c #51A1F4",
+"o. c #6CB7F9",
+"p. c #82C6FB",
+"q. c #89CAFB",
+"r. c #8FCEFC",
+"s. c #94D1FC",
+"t. c #98D4FC",
+"u. c #9AD5FD",
+"v. c #97D4FC",
+"w. c #93D1FC",
+"x. c #8ECDFC",
+"y. c #87C9FB",
+"z. c #81C5FB",
+"A. c #7AC0FA",
+"B. c #418EEE",
+"C. c #155DDE",
+"D. c #1055DB",
+"E. c #175FDF",
+"F. c #1E6BE3",
+"G. c #3160CC",
+"H. c #B0B0B0",
+"I. c #595959",
+"J. c #2A2A2A",
+"K. c #DCE2E8",
+"L. c #3C97F6",
+"M. c #6AB5F9",
+"N. c #7FC3FB",
+"O. c #84C7FB",
+"P. c #8DCDFC",
+"Q. c #90CFFC",
+"R. c #91D0FC",
+"S. c #8ECEFC",
+"T. c #8ACBFB",
+"U. c #86C8FB",
+"V. c #80C4FB",
+"W. c #73BCFA",
+"X. c #3E8CED",
+"Y. c #1E6BE4",
+"Z. c #1C67E2",
+"`. c #1964E1",
+" + c #145CDD",
+".+ c #0F55DA",
+"++ c #0C50D8",
+"＠+ c #1D68E3",
+"#+ c #0342D3",
+"$+ c #858585",
+"%+ c #656565",
+"&+ c #BBD1E9",
+"*+ c #67B3F9",
+"=+ c #83C6FB",
+"-+ c #88C9FB",
+";+ c #88CAFB",
+">+ c #85C8FB",
+",+ c #82C5FB",
+"'+ c #72BBFA",
+")+ c #66B3F9",
+"!+ c #5FAEF8",
+"~+ c #499AF2",
+"{+ c #2976E7",
+"]+ c #1963E0",
+"^+ c #1258DC",
+"/+ c #0D50D9",
+"(+ c #0A4DD7",
+"_+ c #094CD7",
+":+ c #1D6AE3",
+"<+ c #AEAEAE",
+"[+ c #9F9F9F",
+"}+ c #E1E1E1",
+"|+ c #8FBDEC",
+"1+ c #63B1F9",
+"2+ c #74BCFA",
+"3+ c #79BFFA",
+"4+ c #7CC1FA",
+"5+ c #7EC3FB",
+"6+ c #7CC2FA",
+"7+ c #79C0FA",
+"8+ c #75BDFA",
+"9+ c #70BAF9",
+"0+ c #6BB6F9",
+"a+ c #65B2F9",
+"b+ c #58AAF8",
+"c+ c #52A5F7",
+"d+ c #4BA1F7",
+"e+ c #3E95F3",
+"f+ c #2B7EEB",
+"g+ c #135ADD",
+"h+ c #0E53DA",
+"i+ c #0A4CD7",
+"j+ c #0748D5",
+"k+ c #0E49D1",
+"l+ c #B5B5B5",
+"m+ c #161616",
+"n+ c #6FAEEF",
+"o+ c #429BF6",
+"p+ c #4CA2F7",
+"q+ c #57A9F8",
+"r+ c #63B1F8",
+"s+ c #68B4F9",
+"t+ c #77BEFA",
+"u+ c #70BAFA",
+"v+ c #5DADF8",
+"w+ c #51A5F7",
+"x+ c #449CF6",
+"y+ c #3D97F5",
+"z+ c #368EF2",
+"A+ c #2F83EE",
+"B+ c #2778E9",
+"C+ c #0D52D9",
+"D+ c #0443D3",
+"E+ c #3B66CA",
+"F+ c #A4A4A4",
+"G+ c #2C2C2C",
+"H+ c #ECECEC",
+"I+ c #DFDFDF",
+"J+ c #B7CEE5",
+"K+ c #469BF4",
+"L+ c #3B96F6",
+"M+ c #3A94F5",
+"N+ c #3790F3",
+"O+ c #358DF1",
+"P+ c #3E92F2",
+"Q+ c #3F92F1",
+"R+ c #3D8FF0",
+"S+ c #3A8BEF",
+"T+ c #3A8BEE",
+"U+ c #4191F0",
+"V+ c #3D8EEF",
+"W+ c #398AEE",
+"X+ c #3586ED",
+"Y+ c #2978E8",
+"Z+ c #2371E6",
+"`+ c #1F6DE4",
+" ＠ c #1862E0",
+".＠ c #0B4ED7",
+"+＠ c #084AD6",
+"＠＠ c #0646D4",
+"#＠ c #0E4AD1",
+"$＠ c #7E92BF",
+"%＠ c #A1A1A1",
+"&＠ c #E0E0E0",
+"*＠ c #C1D2E4",
+"=＠ c #ADC9E7",
+"-＠ c #8DBBEB",
+";＠ c #77AFEC",
+">＠ c #60A3ED",
+",＠ c #5EA0EC",
+"'＠ c #4792ED",
+")＠ c #2F84EE",
+"!＠ c #2C80EC",
+"~＠ c #2A7CEB",
+"{＠ c #2779E9",
+"]＠ c #2575E8",
+"^＠ c #206EE5",
+"/＠ c #1E6AE3",
+"(＠ c #1B66E2",
+"_＠ c #1962E0",
+":＠ c #145BDD",
+"<＠ c #336CD7",
+"[＠ c #3C70D4",
+"}＠ c #396CD3",
+"|＠ c #6486CB",
+"1＠ c #6D8AC7",
+"2＠ c #8D9DC1",
+"3＠ c #272727",
+"4＠ c #B8CEB7",
+"5＠ c #59AD57",
+"6＠ c #469A44",
+"7＠ c #B6CAB6",
+"8＠ c #E0B4B4",
+"9＠ c #EC4545",
+"0＠ c #DC4545",
+"a＠ c #D9B4B4",
+"b＠ c #DCDCDC",
+"c＠ c #DBDBDB",
+"d＠ c #DADADA",
+"e＠ c #D8D8D8",
+"f＠ c #D7D7D7",
+"g＠ c #D4D4D4",
+"h＠ c #D2D2D2",
+"i＠ c #D0D0D0",
+"j＠ c #CCCCCC",
+"k＠ c #CACACA",
+"l＠ c #C6C6C6",
+"m＠ c #C4C4C4",
+"n＠ c #C2C2C2",
+"o＠ c #BEBEBE",
+"p＠ c #BCBCBC",
+"q＠ c #B2B2B2",
+"r＠ c #57A855",
+"s＠ c #1B9118",
+"t＠ c #107E0F",
+"u＠ c #488D48",
+"v＠ c #E24444",
+"w＠ c #EC0000",
+"x＠ c #D30000",
+"y＠ c #C24343",
+"z＠ c #D3D3D3",
+"A＠ c #CDCDCD",
+"B＠ c #CBCBCB",
+"C＠ c #C9C9C9",
+"D＠ c #C7C7C7",
+"E＠ c #C5C5C5",
+"F＠ c #A3A3A3",
+"G＠ c #262626",
+"H＠ c #5EA35D",
+"I＠ c #107D0E",
+"J＠ c #086F07",
+"K＠ c #95B394",
+"L＠ c #D55050",
+"M＠ c #D10000",
+"N＠ c #BF0000",
+"O＠ c #BD6767",
+"P＠ c #C3C3C3",
+"Q＠ c #C1C1C1",
+"R＠ c #BBBBBB",
+"S＠ c #B3B3B3",
+"T＠ c #A5A5A5",
+"U＠ c #A2A2A2",
+"V＠ c #A0A0A0",
+"W＠ c #9A9A9A",
+"X＠ c #AAAAAA",
+"Y＠ c #A5BFA5",
+"Z＠ c #B0C2B0",
+"`＠ c #CD9D9D",
+" # c #CAA8A8",
+".# c #9D9D9D",
+"+# c #9B9B9B",
+"＠# c #999999",
+"## c #D6D6D6",
+"$# c #919191",
+"%# c #F3F3F3",
+"&# c #939393",
+"*# c #171717",
+"=# c #373737",
+"-# c #080808",
+" ",
+" ",
+" ",
+" ",
+" ",
+" . . . . . . . . . . . . . . . . . . . . . ",
+" + ＠ ＠ ＠ ＠ ＠ ＠ ＠ ＠ ＠ ＠ ＠ ＠ ＠ ＠ ＠ ＠ ＠ ＠ # . ",
+" $ % % % % % % % % % % % % % % % % % % & . ",
+" . * = = = = = = = = = = = = = = = = = = - . ",
+" . ; > > > > > > > > > > > > > > > > > > , . ",
+" . ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ) . ",
+" . ! ! ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ { ! ! ] ",
+" ^ / / / / / / / / / / / / / / / / / / / ( ",
+" _ : : : : : : : : : : : : : : : : : : : < ",
+" [ } } } } } } } } } } } } } } } } } } } | ",
+" 1 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 3 ",
+" 4 5 5 6 7 8 8 8 8 8 8 8 8 8 8 8 9 5 5 5 3 ",
+" . . . . . . . 8 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 a . . . . . . ",
+" . b c d e f g h i i i i i i i i i i i i i j j j j j j k l m n o p q . ",
+" . r s t u v w x { { { { { y y y y y y y y y y y y y y y z A B C D * c E ",
+" . F G 0 5 H I J K L L L L L L L L L L L L L L L L M M M A N O P Q & R S ",
+" . r T U 0 5 V W W X Y Z ` ...+.＠.#.$.%.&.*.=.-.;.>.,.'.).!.~.{.].^./.; (.. ",
+" . _.T U 0 5 :.<.[.}.|.1.2.3.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.a.h.c.i.B j.; k.l. ",
+" . m.G G 0 5 n.o.p.q.r.s.t.u.1.v.w.x.y.z.A.B.a.b.c.d.e.C.P D.E.a.F.C.G.R H.I. ",
+" J.t G G t K.L.M.N.O.q.P.Q.R.Q.S.T.U.V.A.W.o.X.Y.Z.`.e. +P .+C ++(a)+h.#+R d $+. ",
+" . %+t U T U &+L.*+A.N.=+U.-+;+y.>+,+|.}.'+o.)+!+~+{+]+]. +^+B /+(+_+:+#+R <+<+. ",
+" . [+t t }+T |+L.1+2+3+4+5+V.V.5+6+7+8+9+0+a+!+b+c+d+e+f+:+g+h+++i+j+(+k+l+8 - m+ ",
+" . H.t t T }+n+L.o+p+q+r+s+t+t+8+W.u+o.s+1+v+q+w+d+x+y+z+A+B+Y. +C+j+D+E+l+d F+G+ ",
+" . H+t t G I+J+n+K+L.L.L+M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z+`+Z. ＠g+C .＠+＠＠＠#＠$(a)k.c %＠J. ",
+" . 2 0 t U j i I+&＠*＠=＠-＠;＠>＠,＠'＠)＠!＠~＠{＠]＠Z+^＠/＠(＠_＠].:＠<＠[＠}＠|＠1＠2＠* R k.4 [+3＠ ",
+" . 5 0 t t 4＠5＠6＠7＠8＠9＠0＠a＠j b＠c＠d＠e＠f＠s g＠h＠i＠y j＠k＠m.l＠m＠n(a)L o＠p＠# * l+q＠%(a)(.3＠ ",
+" . u t G T r＠s＠t＠u＠v＠w＠x＠y＠s z＠h＠i＠{ A＠B＠C＠D＠E＠m＠n＠L o＠p＠# * R k.q＠~ 8 c F(a)(.1 G＠ ",
+" . m.G }+I+H＠I＠J＠K＠L＠M＠N＠O＠A＠B＠C＠D＠E＠P＠Q＠M h R＠& ; l+S＠6 ~ 8 c - 7 T＠U＠V(a)(.1 W＠G＠ ",
+" . X＠T &＠i b＠Y＠Z＠s z＠`＠ #A＠B＠C＠D＠E＠P＠Q＠M h R＠& ; l+S＠6 ~ 8 c - 7 T＠F＠%＠[+.#+#(a)#. ",
+" . F }+t ' G T &＠I+j b＠d＠e＠##g＠h＠i＠y j＠B＠C＠D＠E＠P＠Q＠M o＠p＠# * R k.q(a)H.~ 8 c - $#. ",
+" J.t ' e＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠I.. ",
+" . [ %#q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠$+. ",
+" . &#q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠4 *# ",
+" *#4 q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠q＠=# ",
+" . p _._._._._._._._._._._._._._._._._._._._._._._._._._._.] -#. . ",
+" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "};
1.2.40.1 +170 -37 XEmacs/xemacs/etc/toolbar/replace-cap-up.xpm
Index: replace-cap-up.xpm
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/toolbar/replace-cap-up.xpm,v
retrieving revision 1.2
retrieving revision 1.2.40.1
diff -u -r1.2 -r1.2.40.1
--- replace-cap-up.xpm 1997/12/21 06:28:49 1.2
+++ replace-cap-up.xpm 2005/02/25 16:29:48 1.2.40.1
＠＠ -1,38 +1,171 ＠＠
/* XPM */
-static char * replace[] = {
-"33 33 2 1",
-"X c Gray75 s backgroundToolBarColor",
-"o c black s foregroundToolBarColor",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXooXXXXooooXXXXXXXXXXXXXX",
-"XXXXXXXXXooXXXXooXXoXXXXXXXXXXXXX",
-"XXXXXXXXoXooXXXooXXoXXXXXXXXXXXXX",
-"XXXXXXXXoXooXXXoooooXXXoooXXXXXXX",
-"XXXXXXXoXXXooXXooXXXoXXooXXXXXXXX",
-"XXXXXXXooooooXXooXXXoXXoXoXXXXXXX",
-"XXXXXXoXXXXXooXooXXXoXXXXXoXXXXXX",
-"XXXXXXoXXXXXooXoooooXXXXXXoXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXoXXXXXX",
-"XXXXXXXXXXXXXXXoXXXXXXXXXXoXXXXXX",
-"XXXXXXXXXXXXXXoXXXXXXXXXXoXXXXXXX",
-"XXXXXXXXXXXXXXoXXXXXXXXXoXXXXXXXX",
-"XXXXXXXXXXXXXoXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXoXXXXXXooooXXXXXXXXXX",
-"XXXXXXXXXXXXoXXXXXooXXXoXXXXXXXXX",
-"XXXXXXXXXXXoXXXXXXooXXXXXXXXXXXXX",
-"XXXXXXXXoXoXXXXXXXooXXXXXXXXXXXXX",
-"XXXXXXXXooXXXXXXXXooXXXXXXXXXXXXX",
-"XXXXXXXXooooXXXXXXooXXXXXXXXXXXXX",
-"XXXXXXXXooXXXXXXXXooXXXoXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXooooXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXoXXXXXXXXXXXXXXX",
-"XXXoooXXXXXXXXXXXoXXXXXXXXXXXXXXX",
-"XXXoXXoXXoXXoooXXoXooXXXooXXoXXXX",
-"XXXoXXoXoXoXoXXoXoXXXoXoXXXoXoXXX",
-"XXXoooXXoooXoXXoXoXoooXoXXXoooXXX",
-"XXXoXXoXoXXXoXXoXoXoXoXoXXXoXXXXX",
-"XXXoXXoXXooXoooXXoXooXoXooXXooXXX",
-"XXXXXXXXXXXXoXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"};
+static char * replace_xpm[] = {
+"48 48 120 2",
+" c None",
+". c #000000",
+"+ c #262626",
+"＠ c #696969",
+"# c #999999",
+"$ c #7C7C7C",
+"% c #393939",
+"& c #565656",
+"* c #727272",
+"= c #0A0A0A",
+"- c #424242",
+"; c #858585",
+"> c #2F2F2F",
+", c #090909",
+"' c #8F8F8F",
+") c #5F5F5F",
+"! c #131313",
+"~ c #2D2D2D",
+"{ c #1E1E1E",
+"] c #4C4C4C",
+"^ c #797979",
+"/ c #D5D5D5",
+"( c #F4F4F4",
+"_ c #0F0F0F",
+": c #5A5A5A",
+"< c #C5C5C5",
+"[ c #F3F3F3",
+"} c #F5F5F5",
+"| c #E6E6E6",
+"1 c #3C3C3C",
+"2 c #F2F2F2",
+"3 c #F6F6F6",
+"4 c #4D4D4D",
+"5 c #2C2C2C",
+"6 c #3B3B3B",
+"7 c #F7F7F7",
+"8 c #AAAAAA",
+"9 c #5B5B5B",
+"0 c #1D1D1D",
+"a c #777777",
+"b c #D0D0D0",
+"c c #EFEFEF",
+"d c #F8F8F8",
+"e c #C0C0C0",
+"f c #EDEDED",
+"g c #EEEEEE",
+"h c #F0F0F0",
+"i c #787878",
+"j c #3D3D3D",
+"k c #F9F9F9",
+"l c #5D5D5D",
+"m c #FAFAFA",
+"n c #CBCBCB",
+"o c #101010",
+"p c #2B2B2B",
+"q c #929292",
+"r c #666666",
+"s c #F1F1F1",
+"t c #FBFBFB",
+"u c #1F1F1F",
+"v c #E7E7E7",
+"w c #1C1C1C",
+"x c #747474",
+"y c #E9E9E9",
+"z c #EAEAEA",
+"A c #757575",
+"B c #FCFCFC",
+"C c #7E7E7E",
+"D c #8B8B8B",
+"E c #BBBBBB",
+"F c #E8E8E8",
+"G c #FDFDFD",
+"H c #DEDEDE",
+"I c #2E2E2E",
+"J c #EBEBEB",
+"K c #767676",
+"L c #7A7A7A",
+"M c #FEFEFE",
+"N c #DADADA",
+"O c #CACACA",
+"P c #ECECEC",
+"Q c #3E3E3E",
+"R c #FFFFFF",
+"S c #9F9F9F",
+"T c #6D6D6D",
+"U c #7B7B7B",
+"V c #4F4F4F",
+"W c #BDBDBD",
+"X c #BEBEBE",
+"Y c #AFAFAF",
+"Z c #585858",
+"` c #6C6C6C",
+" . c #969696",
+".. c #C7C7C7",
+"+. c #5E5E5E",
+"＠. c #A3A3A3",
+"#. c #D3D3D3",
+"$. c #9D9D9D",
+"%. c #CFCFCF",
+"&. c #111111",
+"*. c #4A4A4A",
+"=. c #E1E1E1",
+"-. c #E4E4E4",
+";. c #7F7F7F",
+">. c #ADADAD",
+",. c #DFDFDF",
+"'. c #DDDDDD",
+"). c #BCBCBC",
+"!. c #DBDBDB",
+"~. c #3F3F3F",
+"{. c #6F6F6F",
+"]. c #C8C8C8",
+"^. c #5C5C5C",
+"/. c #8E8E8E",
+"(. c #ABABAB",
+"_. c #BFBFBF",
+":. c #6E6E6E",
+"<. c #CDCDCD",
+"[. c #4E4E4E",
+"}. c #9C9C9C",
+" ",
+" ",
+" ",
+" ",
+" . . . . . . ",
+" . + ＠ # # # $ % . ",
+" . & # # # # # # # * = ",
+" . - # # ; % + > * # # ＠ . ",
+" , ' # $ = . ) # # + ",
+" > # # ! . ; # & . . ~ { ",
+" . ] # $ . . & # * . . { ^ / ( # . ",
+" . ] # * . . ] # * _ : < [ [ ( } | . . ~ { ",
+" . ] # * . . ] # * 1 2 [ [ ( } 3 3 4 { ^ / ( # . ",
+" . ] # * . . 5 6 ] # * 1 [ [ ( } 3 3 7 8 9 [ ( } | . ",
+" . ] # * . . 0 a b c a ] # * 1 [ ( } 3 3 7 d d { ( } 3 3 4 ",
+" . ] # * 0 e f g c h i ] # * j ( } } 3 7 d d k l # 3 3 7 8 . ",
+" . . ] # * 6 f g c h h i ] # * j } } 3 7 d d k m n ] 3 7 d d o ",
+" . p q r ] # * 6 g c h h s ^ ] # * j } 3 7 d d k m m t u v d d k l ",
+" . w x n y z A ] # * 6 c h h s 2 ^ ] # * j 3 7 d d k m m t B C D d k m n . ",
+" _ & E v F y z z A ] # * 6 c h s 2 [ ^ ] # * j 7 d d k m m t B G H I k m m t u ",
+" p | v F y z z J K ] # * 1 h s 2 [ [ L ] # * j d d k m m t B G G M > N m t B C ",
+" . O F y z z J P K ] # * 1 s 2 2 [ ( L ] # * Q d k m m t B G G M R S T t B G H . ",
+" x y z z J P f a ] # * 1 2 2 [ ( } L ] # * Q k m m t B B G M R R c u B G G M > ",
+" 0 z z J P f g a ] # * 1 2 [ ( } } U ] # * Q m m t B B G M R R R R V W G M R S . ",
+" . X J P f g c a ] # * 1 [ ( } } 3 U ] # * Q m t B B G M R R R R R Y ) M R R c . ",
+" Z P f g g c i ] # * ~ ( } } 3 7 ` & # * Q t B B G M M R R R R R R u R R R R V ",
+" _ f g g c h .% # # ! ..} 3 7 F _ ; # & +.B B G M M R R R R R R R ) S R R R Y . ",
+" . ＠.g c h s #., ' # ＠ _ # v 8 I - # # + $.B G M M R R R R R R R R %.V R R R R &. ",
+" *.c h s 2 2 9 ] # # * > , + ＠ # # * u B G M M R R R R R R R R R R u c R R R ) ",
+" . =.s 2 2 [ -._ ) # # # # # # # $ , W G M M R R R R R R R R R R R ;.' R R R %.. ",
+" . .2 2 [ ( ( ..{ % $ # # # ; ] _ >.G M M R R R R R R R R R R R R ,.> R R R R u ",
+" ~ 2 [ ( ( } 3 v U u , + ! _ +.'.G M M R R R R R R R R R R R R R %._ R R R R ;. ",
+" . / ( ( } 3 7 7 d k z ).!.B B G M M R R R R R R R R R R R ,.' > ~.Y R R R R ,.. ",
+" L ( } 3 7 7 d k k m t t B G M M R R R R R R R R R c S V u ' ,.R R R R R R %._ ",
+" { } 3 3 7 d k k m t t B G M M R R R R R R R R Y ) u {.%.R R R R R R ,.' > . ",
+" . ].3 7 d k k m t t B G M M R R R R R R %.{.u ) Y R R R R R R c S V . ",
+" ^.7 d k k m t t B G M M R R R R ,.' > ~.S c R R R R R R Y ) &.. ",
+" o d k k m t t B G M M R R c S V u /.,.R R R R R R %.{.u . ",
+" . (.k m t t B G M M R _.) u :.<.M M R R R R ,.' > . ",
+" [.m t t B G G H {.u +.>.B G M M R R c S V . ",
+" . J t B f /.> I }.J t B G M M R _.) &.. ",
+" . $.$.V . . [.m t t B G G H {.u . ",
+" . . . J t B f /.> . ",
+" . $.$.V . . ",
+" . . ",
+" ",
+" ",
+" "};
1.2.40.1 +273 -42 XEmacs/xemacs/etc/toolbar/spell-cap-up.xpm
Index: spell-cap-up.xpm
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/toolbar/spell-cap-up.xpm,v
retrieving revision 1.2
retrieving revision 1.2.40.1
diff -u -r1.2 -r1.2.40.1
--- spell-cap-up.xpm 1997/12/21 06:28:50 1.2
+++ spell-cap-up.xpm 2005/02/25 16:29:48 1.2.40.1
＠＠ -1,43 +1,274 ＠＠
/* XPM */
-static char * dict[] = {
-"33 33 7 1",
-"X c Gray75 s backgroundToolBarColor",
-"u c #000000000000 s foregroundToolBarColor",
-"o c black",
-"O c Gray90",
-"+ c Gray40",
-"＠ c Gray60",
-"# c white",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXoooooooooooooooooXXXXXXXX",
-"XXXXXXXoXoOOOOOOOOOOOOO+oXXXXXXXX",
-"XXXXXXXooooooooooooooooOoXXXXXXXX",
-"XXXXXXoXo++o＠＠＠＠＠＠o+++oOoXXXXXXXX",
-"XXXXXXXoo++o＠＠＠＠＠＠＠o++oOoXXXXXXXX",
-"XXXXXXXoo++o＠＠＠＠＠＠＠＠o+oOoXXXXXXXX",
-"XXXXXXoXo++o＠ooooooo＠ooOoXXXXXXXX",
-"XXXXXXXoo++o＠o#####o＠＠oOoXXXXXXXX",
-"XXXXXXXoo++o＠ooooooo＠＠oOoXXXXXXXX",
-"XXXXXXoXo++o＠＠＠＠＠＠＠＠＠＠oO###XXXXXX",
-"XXXXXXXoo++o＠ooooooo＠＠###++XXXXXX",
-"XXXXXXXoo++o＠＠＠＠＠＠＠＠####+XXXXXXXX",
-"XXXXXX#Xo++o＠＠＠＠＠＠####++oXXXXXXXX",
-"XXXXX###o++o＠＠＠＠####++oOoXXXXXXXX",
-"XXXX####o++o＠＠＠####+＠＠oOoXXXXXXXX",
-"XXXX+####++o＠####++＠＠ooOoXXXXXXXX",
-"XXXXX+####+o####+＠＠＠o+oOoXXXXXXXX",
-"XXXXXX+########+＠＠＠o++oooXXXXXXXX",
-"XXXXXXo+######+＠＠＠o+++oXXXXXXXXXX",
-"XXXXXXXo+####+oooooooooXXXXXXXXXX",
-"XXXXXXXXX+##+XXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXX++XXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXuXuXXXXXXXX",
-"XXXXXXXXXuuuXXXXXXXXXXuXuXXXXXXXX",
-"XXXXXXXXuXXXXuuuXXXuXXuXuXXXXXXXX",
-"XXXXXXXXuuuXXuXXuXuXuXuXuXXXXXXXX",
-"XXXXXXXXXXXuXuXXuXuuuXuXuXXXXXXXX",
-"XXXXXXXXXXXuXuXXuXuXXXuXuXXXXXXXX",
-"XXXXXXXXuuuXXuuuXXXuuXuXuXXXXXXXX",
-"XXXXXXXXXXXXXuXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"};
+static char * spell_xpm[] = {
+"48 48 223 2",
+" c None",
+". c #000000",
+"+ c #7D9F7D",
+"＠ c #323F32",
+"# c #C9FFC9",
+"$ c #3E4F3E",
+"% c #A3CFA3",
+"& c #BDFABD",
+"* c #2DAC2B",
+"= c #010B01",
+"- c #576F57",
+"; c #6FD86E",
+"> c #17AF14",
+", c #128210",
+"' c #0D110D",
+") c #BCEFBC",
+"! c #B2F5B1",
+"~ c #14B311",
+"{ c #15B113",
+"] c #17B014",
+"^ c #0A4C09",
+"/ c #3EC93D",
+"( c #12B610",
+"_ c #13B411",
+": c #15B212",
+"< c #15A512",
+"[ c #042103",
+"} c #82E682",
+"| c #0EBA0C",
+"1 c #10B80E",
+"2 c #11B70F",
+"3 c #13B510",
+"4 c #14B312",
+"5 c #11900F",
+"6 c #BDFBBC",
+"7 c #16C315",
+"8 c #0CBD0B",
+"9 c #0EBB0C",
+"0 c #0FB90D",
+"a c #12B510",
+"b c #094E08",
+"c c #5CDD5B",
+"d c #09C108",
+"e c #0ABF09",
+"f c #0BBE0A",
+"g c #0DBC0B",
+"h c #0EBA0D",
+"i c #10AB0E",
+"j c #032103",
+"k c #A4F4A3",
+"l c #05C604",
+"m c #07C406",
+"n c #08C207",
+"o c #0AC008",
+"p c #0CBC0B",
+"q c #064505",
+"r c #8AAF8A",
+"s c #33D733",
+"t c #03C803",
+"u c #04C604",
+"v c #06C405",
+"w c #07C307",
+"x c #055204",
+"y c #7FEC7F",
+"z c #01CD01",
+"A c #01CB01",
+"B c #02C902",
+"C c #04C703",
+"D c #05C505",
+"E c #07C306",
+"F c #057905",
+"G c #191F19",
+"H c #AFDFAF",
+"I c #BDFCBD",
+"J c #1CD31C",
+"K c #09CF09",
+"L c #03CD03",
+"M c #01CB00",
+"N c #02CA02",
+"O c #038803",
+"P c #647F64",
+"Q c #6AE76A",
+"R c #19D319",
+"S c #12D112",
+"T c #0CD00C",
+"U c #05CE05",
+"V c #01CC01",
+"W c #01A401",
+"X c #000D00",
+"Y c #2C3E2C",
+"Z c #1A211A",
+"` c #BAEEBA",
+" . c #C6FEC6",
+".. c #AAF7AA",
+"+. c #29D729",
+"＠. c #23D523",
+"#. c #15D215",
+"$. c #0ED00E",
+"%. c #06B406",
+"&. c #7C9E7C",
+"*. c #BCFCBC",
+"=. c #70DC70",
+"-. c #070F07",
+";. c #80AC80",
+">. c #BAFBBA",
+",. c #B9FBB9",
+"'. c #59E359",
+"). c #33D933",
+"!. c #2CD82C",
+"~. c #25D625",
+"{. c #1ED41E",
+"]. c #16C516",
+"^. c #032703",
+"/. c #0C100C",
+"(. c #AEEBAE",
+"_. c #A0F4A0",
+":. c #80ED80",
+"<. c #5CB05C",
+"[. c #2B3D2B",
+"}. c #AEF8AE",
+"|. c #ACF8AC",
+"1. c #87EE87",
+"2. c #43DD43",
+"3. c #3CDC3C",
+"4. c #35DA35",
+"5. c #2ED82E",
+"6. c #27D627",
+"7. c #083508",
+"8. c #405D40",
+"9. c #ABF7AB",
+"0. c #94F294",
+"a. c #8AEF8A",
+"b. c #83ED83",
+"c. c #3F763F",
+"d. c #8DD68D",
+"e. c #9BF39B",
+"f. c #58E358",
+"g. c #4CE04C",
+"h. c #45DE45",
+"i. c #3EDC3E",
+"j. c #38DA38",
+"k. c #125112",
+"l. c #82C682",
+"m. c #9FF49F",
+"n. c #9EF49E",
+"o. c #9AF39A",
+"p. c #93F193",
+"q. c #8CEF8C",
+"r. c #85EE85",
+"s. c #203B20",
+"t. c #4A784A",
+"u. c #94F194",
+"v. c #92F192",
+"w. c #78EA78",
+"x. c #5CE45C",
+"y. c #55E255",
+"z. c #4FE04F",
+"A. c #48DE48",
+"B. c #216E21",
+"C. c #89E289",
+"D. c #91F191",
+"E. c #A2F5A2",
+"F. c #A3F5A3",
+"G. c #9CF39C",
+"H. c #95F295",
+"I. c #8FF08F",
+"J. c #80E080",
+"K. c #7EDF7E",
+"L. c #86EE86",
+"M. c #82ED82",
+"N. c #6CE86C",
+"O. c #66E666",
+"P. c #5FE45F",
+"Q. c #58E258",
+"R. c #328C32",
+"S. c #121F12",
+"T. c #72C372",
+"U. c #B3F9B3",
+"V. c #A5F6A5",
+"W. c #98F298",
+"X. c #7CEC7C",
+"Y. c #7CEB7C",
+"Z. c #76EA76",
+"`. c #6FE86F",
+" + c #68E768",
+".+ c #49AC49",
+"++ c #98CC98",
+"＠+ c #B6FAB6",
+"#+ c #AFF8AF",
+"$+ c #A8F6A8",
+"%+ c #A1F5A1",
+"&+ c #8DF08D",
+"*+ c #78EB78",
+"=+ c #5CBD5C",
+"-+ c #9ACD9A",
+";+ c #B8FAB8",
+">+ c #B1F9B1",
+",+ c #A4F5A4",
+"'+ c #9DF49D",
+")+ c #96F296",
+"!+ c #88EE88",
+"~+ c #79DE79",
+"{+ c #101F10",
+"]+ c #0D120D",
+"^+ c #779D77",
+"/+ c #BBFBBB",
+"(+ c #B4F9B4",
+"_+ c #ADF8AD",
+":+ c #A6F6A6",
+"<+ c #98F398",
+"[+ c #88E288",
+"}+ c #192C19",
+"|+ c #799E79",
+"1+ c #A9F7A9",
+"2+ c #304C30",
+"3+ c #7B9E7B",
+"4+ c #C0FCC0",
+"5+ c #B2F9B2",
+"6+ c #405C40",
+"7+ c #637F63",
+"8+ c #C2FDC2",
+"9+ c #698D69",
+"0+ c #252F25",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" . . ",
+" . . . . . . . . . . . . . . . . . . ",
+" . . . . . . . . . . . . . . . . . . . . . ",
+" . . . . . . . . . . . . . . . ",
+" . . . . . . . . . . . . . ",
+" . . . . . . . . . . . . . ",
+" . . . . . . . . . . . . . . . . . ",
+" . . . . . . . . . . . . . . . . . . + + . ",
+" . . . . . . . . . . . . . . . . . ＠ # # $ ",
+" . . . . . . . . . . . . . . . . . . . % # & * = ",
+" . . . . . . . . . . . . . . . . - # # ; > , . ",
+" . . . . . . . . . . . . . . . . . . . . . ' ) # ! ~ { ] ^ . ",
+" . . . . . . . . . . . . . . . . . . . . + # # / ( _ : < [ ",
+" ＠ # # } | 1 2 3 4 5 . ",
+" . % # 6 7 8 9 0 2 a ~ b ",
+" . - # # c d e f g h 1 i j ",
+" ' ) # k l m n o f p | q ",
+" . r # # s t u v w d e x . ",
+" ＠ # # y z A B C D E F . ",
+" G . . H # I J K L M N t O . ",
+" . H - . . P # # Q R S T U V W X ",
+" ＠ # # Y Z ` ...+.＠.J #.$.%.X ",
+" . &. .*.=.-. . ;.>.,.'.).!.~.{.].^. ",
+" /.(.,._.:.<.. [.}.|.1.2.3.4.5.6.7. ",
+" 8.|.9.0.a.b.c.. . d._.e.f.g.h.i.j.k.. ",
+" . l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.A.B.. ",
+" . C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.. ",
+" S.T.U.|.V.m.W.D.a.X.Y.Z.`. +.+. ",
+" /.++(a)+#+$+%+o.p.&+L.y *+=+-. ",
+" /.-+;+>+..,+'+)+I.!+~+{+ ",
+" ]+^+/+(+_+:+m.<+[+}+ ",
+" . |+I ＠+#+1+E.2+ ",
+" . 3+4+,.5+6+. ",
+" . 7+8+9+. ",
+" . 0+. ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "};
1.2.40.1 +245 -41 XEmacs/xemacs/etc/toolbar/undo-cap-up.xpm
Index: undo-cap-up.xpm
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/toolbar/undo-cap-up.xpm,v
retrieving revision 1.2
retrieving revision 1.2.40.1
diff -u -r1.2 -r1.2.40.1
--- undo-cap-up.xpm 1997/12/21 06:28:50 1.2
+++ undo-cap-up.xpm 2005/02/25 16:29:49 1.2.40.1
＠＠ -1,42 +1,246 ＠＠
/* XPM */
-static char * undo[] = {
-"33 33 6 1",
-"X c Gray75 s backgroundToolBarColor",
-"u c #000000000000 s foregroundToolBarColor",
-"o c black",
-"O c Gray60",
-"+ c Gray90",
-"＠ c white",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXooXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXooOOooooXXXXXX",
-"XXXXXXXXXXXXXXXXXooOOOOOOOOooXXXX",
-"XXXXXXXXXXXXXXXooOOOOOOOOOooXXXXX",
-"XXXXXXXXXXXXXoo++ooooOOOooOoXXXXX",
-"XXXXXXXXXXXoo++++++++oooOOoXXXXXX",
-"XXXXXXXXXoo+++++++++oooOOOoXXXXXX",
-"XXXXXXXoo+++++++++oo++oOOoXXXXXXX",
-"XXXXXXoo++++++++oo+++oOooXXXXXXXX",
-"XXXXXo++oooo++oo+++++ooXXXXXXXXXX",
-"XXXXXo++++++oo+++++ooXXXXXXXXXXXX",
-"XXXXo+++++++o++++ooXXXXXXXXXXXXXX",
-"XXXXo+++++++o++ooXXXXXXXXXXXXXXXX",
-"XXXoo++++++o+ooXXXXXXXXXXXXXXXXXX",
-"XXX＠＠oooo++ooXXXXXXXXXXXXXXXXXXXX",
-"XXX＠＠＠＠＠＠ooXXXXXXXXXXXXXXXXXXXXXX",
-"XXX＠＠＠＠＠＠XXXXXXXXXXXXXXXXXXXXXXXX",
-"XXX＠＠＠＠XXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXX＠＠＠XXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXX＠XXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXuXXXXXXXXXXXX",
-"XXXXXXuXXXuXXXXXXXXXuXXXXXXXXXXXX",
-"XXXXXXuXXXuXuuuXXXuuuXXuuXXXXXXXX",
-"XXXXXXuXXXuXuXXuXuXXuXuXXuXXXXXXX",
-"XXXXXXuXXXuXuXXuXuXXuXuXXuXXXXXXX",
-"XXXXXXuXXXuXuXXuXuXXuXuXXuXXXXXXX",
-"XXXXXXXuuuXXuXXuXXuuuXXuuXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
-"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"};
+static char * undo_xpm[] = {
+"48 48 195 2",
+" c None",
+". c #000000",
+"+ c #8F8C34",
+"＠ c #7F7C2F",
+"# c #9F9B3A",
+"$ c #FFF95E",
+"% c #111006",
+"& c #CFCA4C",
+"* c #7F6C2B",
+"= c #2F2E11",
+"- c #EFE958",
+"; c #FFF05C",
+"> c #FF9049",
+", c #7F3C22",
+"' c #3F3C16",
+") c #EEE657",
+"! c #FEF85D",
+"~ c #FFE059",
+"{ c #FF8848",
+"] c #FF7845",
+"^ c #5C5520",
+"/ c #F9E957",
+"( c #FAED59",
+"_ c #FCF15B",
+": c #FEC653",
+"< c #FF8046",
+"[ c #FFB851",
+"} c #5F5D23",
+"| c #6A5D23",
+"1 c #F4DB52",
+"2 c #F5DF54",
+"3 c #F7E355",
+"4 c #FCA94D",
+"5 c #957E2F",
+"6 c #EFCE4D",
+"7 c #F1D14F",
+"8 c #F3CF4F",
+"9 c #FC9148",
+"0 c #FF984B",
+"a c #FFA04C",
+"b c #FFC053",
+"c c #EFD955",
+"d c #3F3E17",
+"e c #0F0C04",
+"f c #A08231",
+"g c #EBC148",
+"h c #ECC44A",
+"i c #F0B94A",
+"j c #FD8246",
+"k c #5F3D1D",
+"l c #0F0B04",
+"m c #BA9036",
+"n c #E6B444",
+"o c #E7B645",
+"p c #F0A646",
+"q c #FD7C45",
+"r c #EF7040",
+"s c #2F160C",
+"t c #9F6124",
+"u c #D58432",
+"v c #D68733",
+"w c #E38238",
+"x c #CF6138",
+"y c #0B0100",
+"z c #8E1307",
+"A c #B01B0A",
+"B c #B21F0C",
+"C c #CB3D1E",
+"D c #FA7241",
+"E c #5F2D19",
+"F c #6E1106",
+"G c #B2200C",
+"H c #B3240D",
+"I c #BE3215",
+"J c #EC6437",
+"K c #DB5B2D",
+"L c #D05526",
+"M c #D15827",
+"N c #D25B28",
+"O c #D35E29",
+"P c #DF6731",
+"Q c #EA6E38",
+"R c #FB7643",
+"S c #AF522F",
+"T c #430C04",
+"U c #B5280F",
+"V c #B62C10",
+"W c #D75028",
+"X c #FA7341",
+"Y c #CF5225",
+"Z c #C1491B",
+"` c #C24E1D",
+" . c #C4521F",
+".. c #C55620",
+"+. c #C75A22",
+"＠. c #C85E23",
+"#. c #C96225",
+"$. c #DE6D32",
+"%. c #FB7743",
+"&. c #110804",
+"*. c #210702",
+"=. c #AA260E",
+"-. c #B62D11",
+";. c #B83112",
+">. c #C6411D",
+",. c #F26C3C",
+"'. c #CF5325",
+"). c #9D3C16",
+"!. c #923A16",
+"~. c #933D17",
+"{. c #B9511E",
+"]. c #C85F23",
+"^. c #CA6325",
+"/. c #CB6727",
+"(. c #D66D2D",
+"_. c #4F2515",
+":. c #0C0201",
+"<. c #94250E",
+"[. c #BA3514",
+"}. c #BB3915",
+"|. c #DD5B2E",
+"1. c #301207",
+"2. c #251206",
+"3. c #582B10",
+"4. c #B25A22",
+"5. c #CD6B28",
+"6. c #DA7130",
+"7. c #0D0301",
+"8. c #731F0B",
+"9. c #BA3614",
+"0. c #BB3A16",
+"a. c #BD3E17",
+"b. c #CE4F24",
+"c. c #CB5022",
+"d. c #804419",
+"e. c #CE702A",
+"f. c #F67740",
+"g. c #511809",
+"h. c #BE4219",
+"i. c #C0471A",
+"j. c #481B0A",
+"k. c #9B5420",
+"l. c #E77538",
+"m. c #2F0E05",
+"n. c #B13B16",
+"o. c #BE4319",
+"p. c #60250E",
+"q. c #5A3112",
+"r. c #E79E40",
+"s. c #190803",
+"t. c #9B3714",
+"u. c #C0471B",
+"v. c #341C0A",
+"w. c #F0CF4E",
+"x. c #3F1E11",
+"y. c #0D0401",
+"z. c #782D11",
+"A. c #432C10",
+"B. c #FCF05A",
+"C. c #180903",
+"D. c #9C9337",
+"E. c #9F4B2B",
+"F. c #101006",
+"G. c #1F0F08",
+"H. c #ADA73F",
+"I. c #FFF85E",
+"J. c #FFE85A",
+"K. c #6D6526",
+"L. c #5C521F",
+"M. c #F8E556",
+"N. c #FBF05A",
+"O. c #FEC854",
+"P. c #130905",
+"Q. c #786827",
+"R. c #FCC252",
+"S. c #8F4326",
+"T. c #A38833",
+"U. c #F0D04E",
+"V. c #FABB4F",
+"W. c #DF693C",
+"X. c #483815",
+"Y. c #DBB143",
+"Z. c #EDC74B",
+"`. c #DA9442",
+" + c #120804",
+".+ c #2A1E0B",
+"++ c #AA7F30",
+"＠+ c #E6B443",
+"#+ c #DBB243",
+"$+ c #947C2F",
+"%+ c #4C3517",
+"&+ c #0D0903",
+"*+ c #61461A",
+"=+ c #382A10",
+"-+ c #1C1608",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" . . ",
+" . + ＠ ",
+" . # $ ＠ ",
+" % & $ $ ＠ ",
+" % & $ $ $ * ",
+" = - $ $ ; > , . ",
+" . ' ) ! $ ~ { ] , . . . . . . ",
+" . ^ / ( _ : < ] ] [ $ $ $ $ & # } % . ",
+" . | 1 2 3 4 ] ] ] ] [ $ $ $ $ $ $ $ $ # % ",
+" . 5 6 7 8 9 ] ] ] ] ] { 0 > ] ] ] ] > a b c d . ",
+" e f g h i j ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] 0 k ",
+" l m n o p q ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] r s ",
+" . t u v w ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] x . ",
+" y z A B C D ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] ] E ",
+" . F G H I J ] ] ] ] ] K L M N O P Q R ] ] ] ] ] ] ] S . ",
+" . T H U V W X ] ] ] Y Z ` ...+.＠.#.$.%.] ] ] ] ] ] &. ",
+" . *.=.-.;.>.,.] ] '.).!.~.{.+.].^./.(.%.] ] ] ] ] _. ",
+" :.<.;.[.}.|.] '.1.. . . . 2.3.4.5.6.] ] ] ] ] , ",
+" 7.8.9.0.a.b.c.1. . d.e.f.] ] ] ] , . ",
+" . g.0.a.h.i.j. . k.l.] ] ] ] , . ",
+" . m.n.o.i.p. q.r.] ] ] ] , ",
+" s.t.u.p. v.w.a ] ] ] x. ",
+" y.z.p. A.B.[ ] ] r . ",
+" . C. . D.$ [ ] ] E.. ",
+" F.$ $ 0 ] ] G. ",
+" . H.I.J.] ] , . ",
+" . K.B.! a ] E.. ",
+" . L.M.N.O.] S P. ",
+" . Q.1 M.R.] S.. ",
+" e T.U.1 V.W._.. ",
+" . X.Y.Z.7 `., + ",
+" . .+++＠+#+$+%+. ",
+" &+*+=+-+. . ",
+" ",
+" ",
+" ",
+" ",
+" ",
+" "};
No revision
No revision
1.8.8.1 +4 -0 XEmacs/xemacs/lisp/device.el
Index: device.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/device.el,v
retrieving revision 1.8
retrieving revision 1.8.8.1
diff -u -r1.8 -r1.8.8.1
--- device.el 2004/03/08 15:22:49 1.8
+++ device.el 2005/02/25 16:29:53 1.8.8.1
＠＠ -130,6 +130,10 ＠＠
"Create a new mswindows device."
(make-device 'mswindows nil))
+(defun make-carbon-device ()
+ "Create a new carbon device."
+ (make-device 'carbon nil))
+
(defun device-on-window-system-p (&optional device)
"Return non-nil if DEVICE is on a window system.
This generally means that there is support for the mouse, the menubar,
1.48.2.1 +6 -0 XEmacs/xemacs/lisp/dumped-lisp.el
Index: dumped-lisp.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/dumped-lisp.el,v
retrieving revision 1.48
retrieving revision 1.48.2.1
diff -u -r1.48 -r1.48.2.1
--- dumped-lisp.el 2003/03/02 09:38:39 1.48
+++ dumped-lisp.el 2005/02/25 16:29:53 1.48.2.1
＠＠ -45,6 +45,7 ＠＠
(when (featurep 'x) "x-faces") ; needed by faces
(when (featurep 'gtk) "gtk-faces")
(when (valid-console-type-p 'mswindows) "msw-faces")
+ (when (featurep 'carbon) "carbon-faces")
"faces" ; must be loaded before any make-face call
;;(pureload "facemenu") #### not yet ported
"glyphs"
＠＠ -264,6 +265,10 ＠＠
"msw-select"))
;; preload the TTY init code.
(when (featurep 'tty) "tty-init")
+;; preload the Carbon code.
+ (when (featurep 'carbon)
+ '("carbon-glyphs"
+ "carbon-init"))
;;; Formerly in tooltalk/tooltalk-load.el
;; Moved to tooltalk package
;; (when (featurep 'tooltalk)
＠＠ -298,6 +303,7 ＠＠
;; "sun-eos-menubar"))
"loadhist" ; Must be dumped before loaddefs is loaded
"loaddefs" ; <=== autoloads get loaded here
+
))
(setq preloaded-file-list
1.34.10.1 +19 -7 XEmacs/xemacs/lisp/faces.el
Index: faces.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/faces.el,v
retrieving revision 1.34
retrieving revision 1.34.10.1
diff -u -r1.34 -r1.34.10.1
--- faces.el 2002/12/03 14:02:50 1.34
+++ faces.el 2005/02/25 16:29:53 1.34.10.1
＠＠ -1230,7 +1230,8 ＠＠
x x-make-font-bold
gtk gtk-make-font-bold
mswindows mswindows-make-font-bold
- msprinter mswindows-make-font-bold)
+ msprinter mswindows-make-font-bold
+ carbon carbon-make-font-bold)
'(([default] . [bold])
([bold] . t)
([italic] . [bold-italic])
＠＠ -1249,7 +1250,8 ＠＠
x x-make-font-italic
gtk gtk-make-font-italic
mswindows mswindows-make-font-italic
- msprinter mswindows-make-font-italic)
+ msprinter mswindows-make-font-italic
+ carbon carbon-make-font-italic)
'(([default] . [italic])
([bold] . [bold-italic])
([italic] . t)
＠＠ -1268,7 +1270,8 ＠＠
x x-make-font-bold-italic
gtk gtk-make-font-bold-italic
mswindows mswindows-make-font-bold-italic
- msprinter mswindows-make-font-bold-italic)
+ msprinter mswindows-make-font-bold-italic
+ carbon carbon-make-font-bold-italic)
'(([default] . [italic])
([bold] . [bold-italic])
([italic] . [bold-italic])
＠＠ -1288,7 +1291,8 ＠＠
x x-make-font-unbold
gtk gtk-make-font-unbold
mswindows mswindows-make-font-unbold
- msprinter mswindows-make-font-unbold)
+ msprinter mswindows-make-font-unbold
+ carbon carbon-make-font-unbold)
'(([default] . t)
([bold] . [default])
([italic] . t)
＠＠ -1307,7 +1311,8 ＠＠
x x-make-font-unitalic
gtk gtk-make-font-unitalic
mswindows mswindows-make-font-unitalic
- msprinter mswindows-make-font-unitalic)
+ msprinter mswindows-make-font-unitalic
+ carbon carbon-make-font-unitalic)
'(([default] . t)
([bold] . t)
([italic] . [default])
＠＠ -1344,7 +1349,8 ＠＠
'(x x-find-smaller-font
gtk gtk-find-smaller-font
mswindows mswindows-find-smaller-font
- msprinter mswindows-find-smaller-font)
+ msprinter mswindows-find-smaller-font
+ carbon carbon-find-smaller-font)
nil))
(defun make-face-larger (face &optional locale tags exact-p)
＠＠ -1356,7 +1362,8 ＠＠
'(x x-find-larger-font
gtk gtk-find-larger-font
mswindows mswindows-find-larger-font
- msprinter mswindows-find-larger-font)
+ msprinter mswindows-find-larger-font
+ carbon carbon-find-larger-font)
nil))
(defun invert-face (face &optional locale)
＠＠ -1673,6 +1680,8 ＠＠
(declare-fboundp (gtk-init-device-faces device)))
((eq 'mswindows (device-type device))
(declare-fboundp (mswindows-init-device-faces device)))
+ ((eq 'carbon (device-type device))
+ (declare-fboundp (carbon-init-device-faces device)))
;; Nothing to do for TTYs?
)
(or (eq 'stream (device-type device))
＠＠ -1690,6 +1699,8 ＠＠
(declare-fboundp (gtk-init-frame-faces frame)))
((eq 'mswindows (frame-type frame))
(declare-fboundp (mswindows-init-frame-faces frame)))
+ ((eq 'carbon (frame-type frame))
+ (declare-fboundp (carbon-init-frame-faces frame)))
;; Is there anything which should be done for TTY's?
)))
＠＠ -1704,6 +1715,7 ＠＠
(and (featurep 'x) (declare-fboundp (x-init-global-faces)))
(and (featurep 'gtk) (declare-fboundp (gtk-init-global-faces)))
(and (featurep 'mswindows) (declare-fboundp (mswindows-init-global-faces)))
+ (and (featurep 'carbon) (declare-fboundp (carbon-init-global-faces)))
;; for bold and the like, make the global specification be bold etc.
;; if the user didn't already specify a value. These will also be
1.20.4.1 +7 -2 XEmacs/xemacs/lisp/setup-paths.el
Index: setup-paths.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/setup-paths.el,v
retrieving revision 1.20
retrieving revision 1.20.4.1
diff -u -r1.20 -r1.20.4.1
--- setup-paths.el 2003/06/13 00:11:16 1.20
+++ setup-paths.el 2005/02/25 16:29:54 1.20.4.1
＠＠ -153,11 +153,16 ＠＠
(maybe-root-1 (file-name-as-directory
(paths-construct-path '("..") executable-directory)))
(maybe-root-2 (file-name-as-directory
- (paths-construct-path '(".." "..") executable-directory))))
+ (paths-construct-path '(".." "..") executable-directory)))
+ (maybe-root-3 (file-name-as-directory
+ (paths-construct-path '(".." "Resources") executable-directory))))
(or (and (paths-emacs-root-p maybe-root-1)
maybe-root-1)
(and (paths-emacs-root-p maybe-root-2)
- maybe-root-2))))
+ maybe-root-2)
+ (and (featurep 'carbon)
+ (paths-emacs-root-p maybe-root-3)
+ maybe-root-3))))
(defun paths-find-emacs-roots (root-p)
"Find all plausible installation roots for XEmacs.
No revision
No revision
1.1.2.1 +157 -0 XEmacs/xemacs/lisp/Attic/carbon-faces.el
Index: carbon-faces.el
===================================================================
RCS file: carbon-faces.el
diff -N carbon-faces.el
--- /dev/null Fri Feb 25 17:29:40 2005
+++ /tmp/cvsAAAsbayZg Fri Feb 25 17:29:55 2005
＠＠ -0,0 +1,157 ＠＠
+(defconst carbon-fontspec-regexp nil)
+
+(let ((name-regexp "\\(\\([^\\:]\\|\\\\\\\\\\|\\\\:\\)+\\)")
+ (size-regexp ":\\([0-9]+\\)")
+ (style-regexp ":\\(b\\|i\\|bi\\|bold\\|italic\\|bolditalic\\)"))
+ (setq
+ carbon-fontspec-regexp
+ (concat
+ "^" name-regexp "\\(" size-regexp "\\(" style-regexp "\\)?" "\\)?" "$")))
+
+(defun carbon-init-global-faces ()
+ (or (face-foreground 'default 'global)
+ (set-face-foreground 'default "wheat" 'global '(carbon default)))
+ (or (face-background 'default 'global)
+ (set-face-background 'default "darkslategrey" 'global '(carbon default))))
+
+(defun carbon-init-device-faces (device)
+ )
+
+(defun carbon-init-frame-faces (frame)
+ )
+
+(defun carbon-parse-fontspec (fontspec)
+ (cond ((string-match carbon-fontspec-regexp fontspec)
+ (list (match-string 1 fontspec)
+ (let ((size (match-string 4 fontspec)))
+ (cond (size size)
+ (t "10")))
+ (let ((style (match-string 6 fontspec)))
+ (cond (style style)
+ (t "")))))
+ (t nil)))
+
+(defun carbon-font-name (parsed-fontspec)
+ (car parsed-fontspec))
+
+(defun carbon-font-size (parsed-fontspec)
+ (cadr parsed-fontspec))
+
+(defun carbon-font-style (parsed-fontspec)
+ (caddr parsed-fontspec))
+
+(defun carbon-make-font-bold (font &optional device)
+ "Given a Carbon font specification, this attempts to make a bold font.
+If it fails, it returns nil."
+ (let ((parsed-fontspec (carbon-parse-fontspec font)))
+ (cond (parsed-fontspec
+ (cond ((or
+ (string-equal (carbon-font-style parsed-fontspec) "i")
+ (string-equal (carbon-font-style parsed-fontspec) "bi"))
+ (concat (carbon-font-name parsed-fontspec)
+ ":"
+ (carbon-font-size parsed-fontspec)
+ ":bi"))
+ (t
+ (concat (carbon-font-name parsed-fontspec)
+ ":"
+ (carbon-font-size parsed-fontspec)
+ ":b"))))
+ (t nil))))
+
+(defun carbon-make-font-italic (font &optional device)
+ "Given a Carbon font specification, this attempts to make an `italic'
+font. If it fails, it returns nil."
+ (let ((parsed-fontspec (carbon-parse-fontspec font)))
+ (cond (parsed-fontspec
+ (cond ((or
+ (string-equal (carbon-font-style parsed-fontspec) "b")
+ (string-equal (carbon-font-style parsed-fontspec) "bi"))
+ (concat (carbon-font-name parsed-fontspec)
+ ":"
+ (carbon-font-size parsed-fontspec)
+ ":bi"))
+ (t
+ (concat (carbon-font-name parsed-fontspec)
+ ":"
+ (carbon-font-size parsed-fontspec)
+ ":i"))))
+ (t nil))))
+
+(defun carbon-make-font-bold-italic (font &optional device)
+ "Given a Carbon font specification, this attempts to make a `bold-italic'
+font. If it fails, it returns nil."
+ (let ((parsed-fontspec (carbon-parse-fontspec font)))
+ (cond (parsed-fontspec
+ (concat (carbon-font-name parsed-fontspec)
+ ":"
+ (carbon-font-size parsed-fontspec)
+ ":bi"))
+ (t nil))))
+
+(defun carbon-make-font-unbold (font &optional device)
+ "Given a Carbon font specification, this attempts to make a non-bold font.
+If it fails, it returns nil."
+ (let ((parsed-fontspec (carbon-parse-fontspec font)))
+ (cond (parsed-fontspec
+ (cond ((string-equal (carbon-font-style parsed-fontspec) "b")
+ (concat (carbon-font-name parsed-fontspec)
+ ":"
+ (carbon-font-size parsed-fontspec)))
+ ((string-equal (carbon-font-style parsed-fontspec) "bi")
+ (concat (carbon-font-name parsed-fontspec)
+ ":"
+ (carbon-font-size parsed-fontspec)
+ ":i"))
+ (t font)))
+ (t nil))))
+
+(defun carbon-make-font-unitalic (font &optional device)
+ "Given a Carbon font specification, this attempts to make a non-italic
+font. If it fails, it returns nil."
+ (let ((parsed-fontspec (carbon-parse-fontspec font)))
+ (cond (parsed-fontspec
+ (cond ((string-equal (carbon-font-style parsed-fontspec) "i")
+ (concat (carbon-font-name parsed-fontspec)
+ ":"
+ (carbon-font-size parsed-fontspec)))
+ ((string-equal (carbon-font-style parsed-fontspec) "bi")
+ (concat (carbon-font-name parsed-fontspec)
+ ":"
+ (carbon-font-size parsed-fontspec)
+ ":b"))
+ (t font)))
+ (t nil))))
+
+(defun carbon-find-smaller-font (font &optional device)
+ "Loads a new version of the given font (or font name) 1 point smaller.
+Returns the font if it succeeds, nil otherwise."
+ (let ((parsed-fontspec (carbon-parse-fontspec font)))
+ (cond (parsed-fontspec
+ (concat (carbon-font-name parsed-fontspec)
+ ":"
+ (number-to-string
+ (1- (string-to-number
+ (carbon-font-size parsed-fontspec))))
+ (cond ((string-equal (carbon-font-style parsed-fontspec) "")
+ "")
+ (t
+ (concat ":" (carbon-font-style parsed-fontspec))))))
+ (t nil))))
+
+(defun carbon-find-larger-font (font &optional device)
+ "Loads a new version of the given font (or font name) 1 point larger.
+Returns the font if it succeeds, nil otherwise."
+ (let ((parsed-fontspec (carbon-parse-fontspec font)))
+ (cond (parsed-fontspec
+ (concat (carbon-font-name parsed-fontspec)
+ ":"
+ (number-to-string
+ (1+ (string-to-number
+ (carbon-font-size parsed-fontspec))))
+ (cond ((string-equal (carbon-font-style parsed-fontspec) "")
+ "")
+ (t
+ (concat ":" (carbon-font-style parsed-fontspec))))))
+ (t nil))))
+
1.1.2.1 +18 -0 XEmacs/xemacs/lisp/Attic/carbon-glyphs.el
Index: carbon-glyphs.el
===================================================================
RCS file: carbon-glyphs.el
diff -N carbon-glyphs.el
--- /dev/null Fri Feb 25 17:29:40 2005
+++ /tmp/cvsAAAycaWZg Fri Feb 25 17:29:55 2005
＠＠ -0,0 +1,18 ＠＠
+(progn
+ (if (featurep 'carbon)
+ (set-console-type-image-conversion-list
+ 'carbon
+ `(,＠(if (featurep 'xpm) '(("\\.xpm\\'" [xpm :file nil] 2)))
+ ,＠(if (featurep 'xpm) '(("\\`/\\* XPM \\*/" [xpm :data nil] 2))))))
+
+ (cond ((featurep 'xpm)
+ (set-glyph-image xemacs-logo
+ (concat "../etc/"
+ (if emacs-beta-version
+ "xemacs-beta.xpm"
+ "xemacs.xpm"))
+ 'global 'carbon))
+ (t
+ (set-glyph-image xemacs-logo
+ "XEmacs <insert spiffy graphic logo here>"
+ 'global 'carbon))))
1.1.2.1 +27 -0 XEmacs/xemacs/lisp/Attic/carbon-init.el
Index: carbon-init.el
===================================================================
RCS file: carbon-init.el
diff -N carbon-init.el
--- /dev/null Fri Feb 25 17:29:40 2005
+++ /tmp/cvsAAAHdai0g Fri Feb 25 17:29:55 2005
＠＠ -0,0 +1,27 ＠＠
+(defvar carbon-win-initted nil)
+(defvar carbon-pre-win-initted nil)
+(defvar carbon-post-win-initted nil)
+
+(defun init-pre-carbon-win ()
+ "Initialize Carbon GUI at startup (pre). Don't call this."
+ (unless carbon-pre-win-initted
+ (setq carbon-pre-win-initted t)))
+
+(defun init-carbon-win ()
+ "Initialize carbon GUI at startup. Don't call this."
+ (unless carbon-win-initted
+ (init-pre-carbon-win)
+ (make-carbon-device)
+ (init-post-carbon-win (selected-console))
+
+ ;; If Emacs is started from the Finder, change the default directory
+ ;; to the user's home directory.
+ (if (string= default-directory "/")
+ (cd "~"))
+
+ (setq carbon-win-initted t)))
+
+(defun init-post-carbon-win (console)
+ "Initialize carbon GUI at startup (post). Don't call this."
+ (unless carbon-post-win-initted
+ (setq carbon-post-win-initted t)))
No revision
No revision
1.111.2.1 +14 -2 XEmacs/xemacs/src/Makefile.in.in
Index: Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Makefile.in.in,v
retrieving revision 1.111
retrieving revision 1.111.2.1
diff -u -r1.111 -r1.111.2.1
--- Makefile.in.in 2004/09/10 11:58:33 1.111
+++ Makefile.in.in 2005/02/25 16:29:56 1.111.2.1
＠＠ -160,6 +160,13 ＠＠
#endif
#endif
+#ifdef HAVE_CARBON
+carbon_objs=console-carbon.o device-carbon.o event-carbon.o frame-carbon.o \
+ glyphs-carbon.o intl-carbon.o objects-carbon.o redisplay-carbon.o \
+ select-carbon.o
+carbon_gui_objs += menubar-carbon.o scrollbar-carbon.o toolbar-carbon.o
+#endif
+
#ifdef HAVE_BALLOON_HELP
balloon_help_objs=balloon_help.o balloon-x.o
#endif
＠＠ -259,8 +266,8 ＠＠
objs=\
abbrev.o alloc.o alloca.o \
- $(balloon_help_objs) blocktype.o buffer.o bytecode.o \
- callint.o casefiddle.o casetab.o chartab.o \
+ $(balloon_help_objs) blocktype.o buffer.o bytecode.o callint.o \
+ $(carbon_objs) $(carbon_gui_objs) casefiddle.o casetab.o chartab.o \
$(clash_detection_objs) cmdloop.o cmds.o $(coding_system_objs) console.o \
console-stream.o\
data.o $(database_objs) $(debug_objs) device.o dired.o doc.o doprnt.o\
＠＠ -384,6 +391,11 ＠＠
# endif
#else
ldflags = $(LDFLAGS) $(ld_switch_all) $(ld_dynamic_link_flags)
+#endif
+
+#if HAVE_CARBON
+cflags+=-std=c99
+ldflags+=-framework Carbon -framework ApplicationServices -prebind
#endif
#ifdef SOLARIS2
1.94.2.1 +5 -2 XEmacs/xemacs/src/config.h.in
Index: config.h.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/config.h.in,v
retrieving revision 1.94
retrieving revision 1.94.2.1
diff -u -r1.94 -r1.94.2.1
--- config.h.in 2004/09/11 05:28:41 1.94
+++ config.h.in 2005/02/25 16:29:56 1.94.2.1
＠＠ -205,8 +205,11 ＠＠
#undef HAVE_GLADE_H
#undef LIBGLADE_XML_TXTDOMAIN
+/* Compile in support for Mac OS X Carbon? */
+#undef HAVE_CARBON
+
/* Define HAVE_WINDOW_SYSTEM if any windowing system is available. */
-#if defined (HAVE_GTK) || defined (HAVE_X_WINDOWS) || defined (HAVE_MS_WINDOWS) /* || defined (HAVE_NEXTSTEP) */
+#if defined (HAVE_GTK) || defined (HAVE_X_WINDOWS) || defined (HAVE_MS_WINDOWS) || defined (HAVE_CARBON) /* || defined (HAVE_NEXTSTEP) */
#define HAVE_WINDOW_SYSTEM
#endif
＠＠ -215,7 +218,7 ＠＠
#endif
/* Define HAVE_UNIXOID_EVENT_LOOP if we use select() to wait for events. */
-#if defined (HAVE_X_WINDOWS) || defined (HAVE_TTY) || defined (HAVE_MSG_SELECT)
+#if defined (HAVE_X_WINDOWS) || defined (HAVE_TTY) || defined (HAVE_MSG_SELECT) || defined (HAVE_CARBON)
#define HAVE_UNIXOID_EVENT_LOOP
#endif
1.6.2.1 +10 -1 XEmacs/xemacs/src/console-impl.h
Index: console-impl.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-impl.h,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- console-impl.h 2003/09/20 01:14:29 1.6
+++ console-impl.h 2005/02/25 16:29:57 1.6.2.1
＠＠ -513,10 +513,15 ＠＠
#else
#define CONSOLE_TYPESYM_MSWINDOWS_P(typesym) 0
#endif
+#ifdef HAVE_CARBON
+#define CONSOLE_TYPESYM_CARBON_P(typesym) EQ (typesym, Qcarbon)
+#else
+#define CONSOLE_TYPESYM_CARBON_P(typesym) 0
+#endif
#define CONSOLE_TYPESYM_STREAM_P(typesym) EQ (typesym, Qstream)
#define CONSOLE_TYPESYM_WIN_P(typesym) \
- (CONSOLE_TYPESYM_GTK_P (typesym) || CONSOLE_TYPESYM_X_P (typesym) || CONSOLE_TYPESYM_MSWINDOWS_P (typesym))
+ (CONSOLE_TYPESYM_GTK_P (typesym) || CONSOLE_TYPESYM_X_P (typesym) || CONSOLE_TYPESYM_MSWINDOWS_P (typesym) || CONSOLE_TYPESYM_CARBON_P(typesym))
#define CONSOLE_X_P(con) CONSOLE_TYPESYM_X_P (CONSOLE_TYPE (con))
#define CHECK_X_CONSOLE(z) CHECK_CONSOLE_TYPE (z, x)
＠＠ -533,6 +538,10 ＠＠
#define CONSOLE_MSWINDOWS_P(con) CONSOLE_TYPESYM_MSWINDOWS_P (CONSOLE_TYPE (con))
#define CHECK_MSWINDOWS_CONSOLE(z) CHECK_CONSOLE_TYPE (z, mswindows)
#define CONCHECK_MSWINDOWS_CONSOLE(z) CONCHECK_CONSOLE_TYPE (z, mswindows)
+
+#define CONSOLE_CARBON_P(con) CONSOLE_TYPESYM_CARBON_P (CONSOLE_TYPE (con))
+#define CHECK_CARBON_CONSOLE(z) CHECK_CONSOLE_TYPE (z, carbon)
+#define CONCHECK_CARBON_CONSOLE(z) CONCHECK_CONSOLE_TYPE (z, carbon)
#define CONSOLE_STREAM_P(con) CONSOLE_TYPESYM_STREAM_P (CONSOLE_TYPE (con))
#define CHECK_STREAM_CONSOLE(z) CHECK_CONSOLE_TYPE (z, stream)
1.37.2.1 +12 -3 XEmacs/xemacs/src/console.c
Index: console.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console.c,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -u -r1.37 -r1.37.2.1
--- console.c 2004/10/19 17:19:07 1.37
+++ console.c 2005/02/25 16:29:57 1.37.2.1
＠＠ -257,6 +257,9 ＠＠
if (EQ (type, Qmsprinter))
return msprinter_console;
+ if (EQ (type, Qcarbon))
+ return carbon_console;
+
if (EQ (type, Qstream))
return stream_console;
＠＠ -272,7 +275,7 ＠＠
DEFUN ("valid-console-type-p", Fvalid_console_type_p, 1, 1, 0, /*
Return t if CONSOLE-TYPE is a valid console type.
-Valid types are 'x, 'tty, 'mswindows, 'msprinter, 'gtk, and 'stream.
+Valid types are 'x, 'tty, 'mswindows, 'msprinter, 'gtk, 'carbon, and 'stream.
*/
(console_type))
{
＠＠ -337,10 +340,15 ＠＠
else
#endif
#ifdef HAVE_MS_WINDOWS
- if (CONSOLE_MSWINDOWS_P (XCONSOLE (console)))
- Vwindow_system = Qmswindows;
+ if (CONSOLE_MSWINDOWS_P (XCONSOLE (console)))
+ Vwindow_system = Qmswindows;
else
#endif
+#ifdef HAVE_CARBON
+ if (CONSOLE_CARBON_P (XCONSOLE (console)))
+ Vwindow_system = Qcarbon;
+ else
+#endif
Vwindow_system = Qnil;
}
＠＠ -406,6 +414,7 ＠＠
`mswindows' for a console that is an MS Windows connection,
`msprinter' for a console that is an MS Windows printer connection,
`gtk' for a console that is a GTK connection,
+`carbon' for a console that is a Carbon connection,
`stream' for a stream console (which acts like a stdio stream), and
`dead' for a deleted console.
*/
1.42.8.1 +1 -0 XEmacs/xemacs/src/console.h
Index: console.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console.h,v
retrieving revision 1.42
retrieving revision 1.42.8.1
diff -u -r1.42 -r1.42.8.1
--- console.h 2004/03/08 15:23:02 1.42
+++ console.h 2005/02/25 16:29:57 1.42.8.1
＠＠ -54,6 +54,7 ＠＠
x_console,
mswindows_console,
msprinter_console,
+ carbon_console,
stream_console
};
1.50.2.1 +12 -0 XEmacs/xemacs/src/depend
Index: depend
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/depend,v
retrieving revision 1.50
retrieving revision 1.50.2.1
diff -u -r1.50 -r1.50.2.1
--- depend 2004/09/22 21:54:47 1.50
+++ depend 2005/02/25 16:29:58 1.50.2.1
＠＠ -117,10 +117,12 ＠＠
cm.o: $(LISP_H) conslots.h console-impl.h console-tty-impl.h console-tty.h console.h device.h frame.h lstream.h redisplay.h systty.h
cmdloop.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h commands.h conslots.h console-impl.h console-msw.h console.h device.h events.h frame.h intl-auto-encap-win32.h redisplay.h scrollbar.h systime.h syswindows.h window.h
cmds.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h commands.h extents.h insdel.h syntax.h
+console-carbon.o: $(LISP_H) conslots.h console-impl.h console.h
console-stream.o: $(LISP_H) conslots.h console-impl.h console-stream-impl.h console-stream.h console-tty.h console.h device-impl.h device.h devslots.h events.h frame-impl.h frame.h frameslots.h redisplay.h scrollbar.h sysdep.h sysfile.h systime.h systty.h window.h
console.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console-stream-impl.h console-stream.h console-tty-impl.h console-tty.h console.h device-impl.h device.h devslots.h events.h frame-impl.h frame.h frameslots.h redisplay.h scrollbar.h sysdep.h systime.h systty.h window.h
data.o: $(LISP_H) buffer.h bufslots.h bytecode.h casetab.h charset.h chartab.h sysfloat.h syssignal.h
debug.o: $(LISP_H) bytecode.h debug.h
+device-carbon.o: $(LISP_H) conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h frame-impl.h frame.h frameslots.h redisplay.h sysdep.h
device.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h elhash.h events.h faces.h frame-impl.h frame.h frameslots.h keymap.h objects.h redisplay.h scrollbar.h specifier.h sysdep.h syssignal.h systime.h toolbar.h window.h
dgif_lib.o: $(LISP_H) gifrlib.h sysfile.h
dialog.o: $(LISP_H) conslots.h console-impl.h console.h frame-impl.h frame.h frameslots.h redisplay.h
＠＠ -139,6 +141,7 ＠＠
esd.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h miscplay.h sound.h sysfile.h
eval.o: $(LISP_H) backtrace.h buffer.h bufslots.h bytecode.h casetab.h charset.h chartab.h commands.h conslots.h console-impl.h console.h device.h frame.h lstream.h opaque.h profile.h redisplay.h scrollbar.h window.h
event-Xt.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h Emacs.ad.h EmacsFrame.h blocktype.h charset.h coding-system-slots.h conslots.h console-impl.h console-tty.h console-x-impl.h console-x.h console.h device-impl.h device.h devslots.h dragdrop.h elhash.h event-xlike-inc.c events.h file-coding.h frame-impl.h frame.h frameslots.h glyphs.h lstream.h objects-x.h objects.h offix-types.h offix.h process.h redisplay.h scrollbar.h specifier.h sysproc.h syssignal.h systime.h systty.h window-impl.h window.h winslots.h xintrinsic.h xintrinsicp.h xmotif.h
+event-carbon.o: $(LISP_H) conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h events.h frame-impl.h frame.h frameslots.h process.h redisplay.h sysproc.h syssignal.h systime.h
event-stream.o: $(LISP_H) backtrace.h blocktype.h buffer.h bufslots.h casetab.h charset.h chartab.h coding-system-slots.h commands.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h elhash.h events.h file-coding.h frame-impl.h frame.h frameslots.h gui.h insdel.h keymap.h lstream.h macros.h menubar.h process.h profile.h redisplay.h scrollbar.h sysdep.h sysfile.h syssignal.h systime.h window-impl.h window.h winslots.h
event-unixoid.o: $(LISP_H) conslots.h console-impl.h console-stream-impl.h console-stream.h console-tty-impl.h console-tty.h console.h device-impl.h device.h devslots.h events.h lstream.h process.h sysdep.h sysfile.h sysproc.h syssignal.h systime.h systty.h
events.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console-tty-impl.h console-tty.h console.h device.h events.h extents.h frame-impl.h frame.h frameslots.h glyphs.h keymap.h lstream.h redisplay.h scrollbar.h specifier.h systime.h systty.h toolbar.h window-impl.h window.h winslots.h
＠＠ -151,11 +154,13 ＠＠
floatfns.o: $(LISP_H) sysfloat.h syssignal.h
fns.o: $(LISP_H) buffer.h bufslots.h bytecode.h casetab.h charset.h chartab.h console.h device.h events.h extents.h frame.h insdel.h lstream.h opaque.h process.h redisplay.h sysfile.h sysproc.h syssignal.h systime.h
font-lock.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h insdel.h syntax.h
+frame-carbon.o: $(LISP_H) charset.h conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h events.h faces.h frame-impl.h frame.h frameslots.h gutter.h objects-carbon-impl.h objects-impl.h objects.h redisplay.h scrollbar.h specifier.h systime.h window-impl.h window.h winslots.h
frame.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h events.h extents.h faces.h frame-impl.h frame.h frameslots.h glyphs.h gui.h gutter.h menubar.h redisplay.h scrollbar.h specifier.h systime.h toolbar.h window-impl.h window.h winslots.h
free-hook.o: $(LISP_H) hash.h
general.o: $(LISP_H) general-slots.h
getloadavg.o: $(LISP_H) sysfile.h syssignal.h
gif_io.o: $(LISP_H) gifrlib.h sysfile.h
+glyphs-carbon.o: $(LISP_H) conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h frame-impl.h frame.h frameslots.h glyphs-carbon.h glyphs.h objects-carbon-impl.h objects-impl.h objects.h redisplay.h scrollbar.h specifier.h sysfile.h window-impl.h window.h winslots.h
glyphs-eimage.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h coding-system-slots.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h faces.h file-coding.h frame.h gifrlib.h glyphs.h lstream.h objects-impl.h objects.h opaque.h redisplay.h scrollbar.h specifier.h sysfile.h window-impl.h window.h winslots.h
glyphs-shared.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h console.h elhash.h faces.h frame.h glyphs.h imgproc.h insdel.h lstream.h opaque.h redisplay.h scrollbar.h specifier.h sysdep.h sysfile.h window-impl.h window.h winslots.h
glyphs-widget.o: $(LISP_H) bytecode.h charset.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h faces.h frame.h glyphs.h gui.h insdel.h lstream.h objects.h opaque.h redisplay.h scrollbar.h specifier.h window-impl.h window.h winslots.h
＠＠ -174,6 +179,7 ＠＠
input-method-xlib.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h EmacsFrame.h buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console-x-impl.h console-x.h console.h device-impl.h device.h devslots.h events.h frame-impl.h frame.h frameslots.h redisplay.h scrollbar.h systime.h window-impl.h window.h winslots.h xintrinsic.h
insdel.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h console.h device.h extents.h frame.h insdel.h line-number.h lstream.h redisplay.h
intl-auto-encap-win32.o: $(LISP_H) intl-auto-encap-win32.h syswindows.h
+intl-carbon.o: $(LISP_H)
intl-encap-win32.o: $(LISP_H) console-msw.h console.h intl-auto-encap-win32.h syswindows.h
intl-win32.o: $(LISP_H) charset.h coding-system-slots.h conslots.h console-impl.h console-msw-impl.h console-msw.h console.h elhash.h faces.h file-coding.h frame-impl.h frame.h frameslots.h intl-auto-encap-win32.h objects-impl.h objects-msw-impl.h objects-msw.h objects.h redisplay.h scrollbar.h specifier.h syswindows.h window-impl.h window.h winslots.h
intl.o: $(LISP_H)
＠＠ -189,6 +195,7 ＠＠
malloc.o: $(CONFIG_H) getpagesize.h syssignal.h
marker.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h
md5.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h coding-system-slots.h file-coding.h lstream.h
+menubar-carbon.o: $(LISP_H) conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h events.h frame-impl.h frame.h frameslots.h gui.h menubar.h redisplay.h scrollbar.h systime.h window-impl.h window.h winslots.h
menubar.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h frame-impl.h frame.h frameslots.h gui.h keymap.h menubar.h redisplay.h scrollbar.h specifier.h window-impl.h window.h winslots.h
minibuf.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h commands.h conslots.h console-impl.h console-stream.h console.h events.h frame-impl.h frame.h frameslots.h insdel.h redisplay.h scrollbar.h systime.h window-impl.h window.h winslots.h
miscplay.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h miscplay.h sound.h sysfile.h syssignal.h
＠＠ -199,6 +206,7 ＠＠
number-gmp.o: $(LISP_H) sysproc.h syssignal.h systime.h
number-mp.o: $(LISP_H)
number.o: $(LISP_H)
+objects-carbon.o: $(LISP_H) conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h frame-impl.h frame.h frameslots.h objects-carbon-impl.h objects-impl.h objects.h redisplay.h specifier.h
objects.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console-tty.h console.h device-impl.h device.h devslots.h elhash.h faces.h frame.h glyphs.h objects-impl.h objects.h redisplay.h scrollbar.h specifier.h systty.h window-impl.h window.h winslots.h
offix.o: offix-cursors.h offix-types.h offix.h xintrinsic.h
opaque.o: $(LISP_H) opaque.h
＠＠ -210,11 +218,14 ＠＠
ralloc.o: $(LISP_H) getpagesize.h
rangetab.o: $(LISP_H) rangetab.h
realpath.o: $(LISP_H) intl-auto-encap-win32.h ndir.h sysdir.h sysfile.h syswindows.h
+redisplay-carbon.o: $(LISP_H) charset.h conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h faces.h frame-impl.h frame.h frameslots.h glyphs-carbon.h glyphs.h objects-carbon-impl.h objects-impl.h objects.h redisplay.h scrollbar.h specifier.h window-impl.h window.h winslots.h
redisplay-output.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h faces.h frame-impl.h frame.h frameslots.h glyphs.h gutter.h redisplay.h scrollbar.h specifier.h window-impl.h window.h winslots.h
redisplay.o: $(LISP_H) backtrace.h buffer.h bufslots.h casetab.h charset.h chartab.h coding-system-slots.h commands.h conslots.h console-impl.h console-tty.h console.h debug.h device-impl.h device.h devslots.h elhash.h events.h extents-impl.h extents.h faces.h file-coding.h frame-impl.h frame.h frameslots.h glyphs.h gui.h gutter.h insdel.h line-number.h menubar.h objects-impl.h objects.h opaque.h process.h profile.h redisplay.h scrollbar.h specifier.h sysfile.h systime.h systty.h toolbar.h window-impl.h window.h winslots.h
regex.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h regex.h syntax.h
+scrollbar-carbon.o: $(LISP_H) charset.h conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h faces.h frame-impl.h frame.h frameslots.h objects-carbon-impl.h objects-impl.h objects.h redisplay.h scrollbar.h specifier.h window-impl.h window.h winslots.h
scrollbar.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h commands.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h frame-impl.h frame.h frameslots.h glyphs.h gutter.h redisplay.h scrollbar.h specifier.h window-impl.h window.h winslots.h
search.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h insdel.h opaque.h regex.h syntax.h
+select-carbon.o: $(LISP_H) conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h frame-impl.h frame.h frameslots.h objects-carbon-impl.h objects-impl.h objects.h redisplay.h select.h specifier.h
select.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h extents.h frame.h objects.h opaque.h redisplay.h select.h
sgiplay.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h libst.h sound.h sysfile.h sysproc.h syssignal.h systime.h
sheap.o: $(LISP_H) sheap-adjust.h sysfile.h
＠＠ -235,6 +246,7 ＠＠
terminfo.o: $(CONFIG_H)
tests.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h elhash.h lstream.h opaque.h
text.o: $(LISP_H) backtrace.h buffer.h bufslots.h casetab.h charset.h chartab.h coding-system-slots.h file-coding.h lstream.h profile.h
+toolbar-carbon.o: $(LISP_H) conslots.h console-carbon-impl.h console-impl.h console.h device-impl.h device.h devslots.h frame-impl.h frame.h frameslots.h glyphs-carbon.h glyphs.h gui.h objects-carbon-impl.h objects-impl.h objects.h redisplay.h scrollbar.h specifier.h toolbar.h window-impl.h window.h winslots.h
toolbar-common.o: $(LISP_H) $(LWLIB_SRCDIR)/lwlib.h charset.h conslots.h console-gtk-impl.h console-gtk.h console-impl.h console-x-impl.h console-x.h console.h device-impl.h device.h devslots.h faces.h frame-impl.h frame.h frameslots.h glyphs.h redisplay.h scrollbar.h specifier.h toolbar-common.h toolbar.h window-impl.h window.h winslots.h xintrinsic.h
toolbar.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h conslots.h console-impl.h console.h device-impl.h device.h devslots.h frame-impl.h frame.h frameslots.h glyphs.h redisplay.h scrollbar.h specifier.h toolbar.h window-impl.h window.h winslots.h
tooltalk.o: $(LISP_H) buffer.h bufslots.h casetab.h charset.h chartab.h elhash.h process.h syssignal.h tooltalk.h
1.4.8.1 +4 -0 XEmacs/xemacs/src/device-impl.h
Index: device-impl.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-impl.h,v
retrieving revision 1.4
retrieving revision 1.4.8.1
diff -u -r1.4 -r1.4.8.1
--- device-impl.h 2003/01/12 11:08:11 1.4
+++ device-impl.h 2005/02/25 16:29:58 1.4.8.1
＠＠ -249,6 +249,10 ＠＠
#define CHECK_TTY_DEVICE(z) CHECK_DEVICE_TYPE (z, tty)
#define CONCHECK_TTY_DEVICE(z) CONCHECK_DEVICE_TYPE (z, tty)
+#define DEVICE_CARBON_P(dev) CONSOLE_TYPESYM_CARBON_P (DEVICE_TYPE (dev))
+#define CHECK_CARBON_DEVICE(z) CHECK_DEVICE_TYPE (z, carbon)
+#define CONCHECK_CARBON_DEVICE(z) CONCHECK_DEVICE_TYPE (z, carbon)
+
#define DEVICE_STREAM_P(dev) CONSOLE_TYPESYM_STREAM_P (DEVICE_TYPE (dev))
#define CHECK_STREAM_DEVICE(z) CHECK_DEVICE_TYPE (z, stream)
#define CONCHECK_STREAM_DEVICE(z) CONCHECK_DEVICE_TYPE (z, stream)
1.33.2.1 +4 -0 XEmacs/xemacs/src/doc.c
Index: doc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/doc.c,v
retrieving revision 1.33
retrieving revision 1.33.2.1
diff -u -r1.33 -r1.33.2.1
--- doc.c 2004/01/03 21:54:42 1.33
+++ doc.c 2005/02/25 16:29:58 1.33.2.1
＠＠ -461,7 +461,11 ＠＠
{
name = alloca_ibytes (XSTRING_LENGTH (filename) + 14);
+#ifndef RUN_TEMACS_UNDER_XCODE
qxestrcpy (name, (Ibyte *) "../lib-src/");
+#else
+ qxestrcpy (name, (Ibyte *) "../../lib-src/");
+#endif
}
qxestrcat (name, XSTRING_DATA (filename));
1.149.2.1 +86 -5 XEmacs/xemacs/src/emacs.c
Index: emacs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v
retrieving revision 1.149
retrieving revision 1.149.2.1
diff -u -r1.149 -r1.149.2.1
--- emacs.c 2004/09/20 19:19:39 1.149
+++ emacs.c 2005/02/25 16:29:59 1.149.2.1
＠＠ -978,6 +978,21 ＠＠
#endif
}
+ if (argmatch (argv, argc, "-carbon", "--use-carbon", 0, NULL, &skip_args))
+ {
+ check_compatible_window_system ("carbon");
+#ifndef HAVE_CARBON
+ fatal ("Sorry, this XEmacs was not compiled with Carbon support");
+#endif
+ }
+
+#ifdef HAVE_CARBON
+ /* Skip process serial number passed in the form -psn_x_y as command-line
+ argument when application is started from the Finder. */
+ if (argc > skip_args+1 && strncmp (argv[skip_args+1], "-psn_", 5) == 0)
+ skip_args++;
+#endif
+
/* Handle other switches implying particular window systems: */
/* Handle the -t switch, which specifies filename to use as terminal */
＠＠ -1072,11 +1087,16 ＠＠
if (!display_use)
display_use = "mswindows";
#endif /* HAVE_MS_WINDOWS */
-
+
+#ifdef HAVE_CARBON
+ if (!display_use)
+ display_use = "carbon";
+#endif /* HAVE_CARBON */
+
#ifdef HAVE_TTY
if (!display_use)
display_use = "tty";
-#endif /* HAVE_MS_WINDOWS */
+#endif /* HAVE_TTY */
if (!display_use)
fatal ("No window systems and no TTY's in this XEmacs: Must specify "
＠＠ -1440,6 +1460,17 ＠＠
syms_of_win32 ();
#endif
+#ifdef HAVE_CARBON
+ syms_of_console_carbon ();
+ syms_of_device_carbon ();
+ syms_of_event_carbon ();
+ syms_of_frame_carbon ();
+ syms_of_objects_carbon ();
+ syms_of_intl_carbon ();
+ syms_of_redisplay_carbon ();
+ syms_of_select_carbon ();
+#endif /* HAVE_CARBON */
+
syms_of_file_coding ();
syms_of_unicode ();
#ifdef MULE
＠＠ -1588,6 +1619,25 ＠＠
#endif
#endif
+#ifdef HAVE_CARBON
+ console_type_create_carbon ();
+ console_type_create_device_carbon ();
+ console_type_create_frame_carbon ();
+ console_type_create_objects_carbon ();
+ console_type_create_redisplay_carbon ();
+ console_type_create_glyphs_carbon ();
+ console_type_create_select_carbon ();
+# ifdef HAVE_SCROLLBARS
+ console_type_create_scrollbar_carbon ();
+# endif
+#ifdef HAVE_MENUBARS
+ console_type_create_menubar_carbon ();
+#endif
+#ifdef HAVE_TOOLBARS
+ console_type_create_toolbar_carbon ();
+#endif
+#endif /* HAVE_CARBON */
+
/* Now initialize the specifier types and associated symbols.
Other than the first function below, the functions may
make exactly the following function/macro calls:
＠＠ -1668,7 +1718,10 ＠＠
#ifdef HAVE_GTK
image_instantiator_format_create_glyphs_gtk ();
#endif
-
+#ifdef HAVE_CARBON
+ image_instantiator_format_create_glyphs_carbon ();
+#endif /* HAVE_CARBON */
+
/* Now initialize the lstream types and associated symbols.
Other than the first function below, the functions may
make exactly the following function/macro calls:
＠＠ -1951,6 +2004,15 ＠＠
#endif
#endif /* HAVE_MS_WINDOWS */
+#ifdef HAVE_CARBON
+ vars_of_console_carbon ();
+ vars_of_device_carbon ();
+ vars_of_event_carbon ();
+ vars_of_frame_carbon ();
+ vars_of_objects_carbon ();
+ vars_of_select_carbon ();
+#endif /* HAVE_CARBON */
+
#ifdef MULE
vars_of_mule_ccl ();
vars_of_mule_charset ();
＠＠ -2034,7 +2096,10 ＠＠
#ifdef WIN32_ANY
complex_vars_of_intl_win32 ();
#endif
-
+#ifdef HAVE_CARBON
+ complex_vars_of_intl_carbon ();
+#endif
+
/* Depends on specifiers. */
complex_vars_of_faces ();
＠＠ -2140,7 +2205,10 ＠＠
#ifdef HAVE_GTK
reinit_console_type_create_gtk ();
#endif
-
+#ifdef HAVE_CARBON
+ reinit_console_type_create_carbon ();
+#endif
+
reinit_specifier_type_create ();
reinit_specifier_type_create_image ();
reinit_specifier_type_create_gutter ();
＠＠ -2238,6 +2306,14 ＠＠
#endif
#endif /* HAVE_X_WINDOWS */
+#ifdef HAVE_CARBON
+ reinit_vars_of_event_carbon ();
+ reinit_vars_of_glyphs_carbon ();
+ reinit_vars_of_objects_carbon ();
+ reinit_vars_of_scrollbar_carbon ();
+ reinit_vars_of_select_carbon ();
+#endif
+
#ifdef MULE
reinit_vars_of_mule_coding ();
#endif
＠＠ -2375,6 +2451,10 ＠＠
Vinvocation_name = Ffile_name_nondirectory (Vinvocation_directory);
Vinvocation_directory = Ffile_name_directory (Vinvocation_directory);
+
+#ifdef RUN_TEMACS_UNDER_XCODE
+ Vinvocation_directory = concat2(Vinvocation_directory, build_string("../../../../../src/"));
+#endif
}
#if defined (LOCALTIME_CACHE) && defined (HAVE_TZSET)
＠＠ -2448,6 +2528,7 ＠＠
{ "-gtk", "--use-gtk", 63, 0 },
{ "-gnome", "--use-gnome", 62, 0 },
{ "-msw", "--use-ms-windows", 61, 0 },
+ { "-carbon", "--use-carbon", 60, 0 },
{ "-t", "--terminal", 58, 1 },
{ "-d", "--display", 57, 1 },
{ "-display", 0, 56, 1 },
1.85.2.1 +7 -2 XEmacs/xemacs/src/event-stream.c
Index: event-stream.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-stream.c,v
retrieving revision 1.85
retrieving revision 1.85.2.1
diff -u -r1.85 -r1.85.2.1
--- event-stream.c 2004/09/20 19:19:41 1.85
+++ event-stream.c 2005/02/25 16:29:59 1.85.2.1
＠＠ -5228,8 +5228,13 ＠＠
else
#endif
#ifdef HAVE_MS_WINDOWS
- if (!strcmp (display_use, "mswindows"))
- init_event_mswindows_late ();
+ if (!strcmp (display_use, "mswindows"))
+ init_event_mswindows_late ();
+ else
+#endif
+#ifdef HAVE_CARBON
+ if (!strcmp (display_use, "carbon"))
+ init_event_carbon_late ();
else
#endif
{
1.38.2.1 +14 -2 XEmacs/xemacs/src/events.h
Index: events.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/events.h,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -u -r1.38 -r1.38.2.1
--- events.h 2003/02/07 11:50:53 1.38
+++ events.h 2005/02/25 16:30:00 1.38.2.1
＠＠ -740,6 +740,9 ＠＠
#ifdef HAVE_MS_WINDOWS
int mswindows_event;
#endif
+#ifdef HAVE_CARBON
+ unsigned long carbon_event;
+#endif
} underlying;
};
＠＠ -783,9 +786,18 ＠＠
#define EVENT_MAGIC_MSWINDOWS_EVENT(e) EVENT_FOO_BAR (e, MAGIC, magic, underlying.mswindows_event)
#define XEVENT_MAGIC_MSWINDOWS_EVENT(e) EVENT_MAGIC_MSWINDOWS_EVENT (XEVENT (e))
#define SET_EVENT_MAGIC_MSWINDOWS_EVENT(e, val) \
- SET_EVENT_FOO_BAR (e, MAGIC, magic, underlying.mswindows_event, val)
+SET_EVENT_FOO_BAR (e, MAGIC, magic, underlying.mswindows_event, val)
#define XSET_EVENT_MAGIC_MSWINDOWS_EVENT(e, val) \
- SET_EVENT_MAGIC_MSWINDOWS_EVENT (XEVENT (e), val)
+SET_EVENT_MAGIC_MSWINDOWS_EVENT (XEVENT (e), val)
+#endif
+
+#ifdef HAVE_CARBON
+#define EVENT_MAGIC_CARBON_EVENT(e) EVENT_FOO_BAR (e, MAGIC, magic, underlying.carbon_event)
+#define XEVENT_MAGIC_CARBON_EVENT(e) EVENT_MAGIC_CARBON_EVENT (XEVENT (e))
+#define SET_EVENT_MAGIC_CARBON_EVENT(e, val) \
+SET_EVENT_FOO_BAR (e, MAGIC, magic, underlying.carbon_event, val)
+#define XSET_EVENT_MAGIC_CARBON_EVENT(e, val) \
+SET_EVENT_MAGIC_CARBON_EVENT (XEVENT (e), val)
#endif
struct Lisp_Timeout
1.42.2.1 +28 -0 XEmacs/xemacs/src/faces.c
Index: faces.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/faces.c,v
retrieving revision 1.42
retrieving revision 1.42.2.1
diff -u -r1.42 -r1.42.2.1
--- faces.c 2004/09/20 19:19:42 1.42
+++ faces.c 2005/02/25 16:30:00 1.42.2.1
＠＠ -1963,6 +1963,10 ＠＠
fg_fb = acons (list1 (Qmswindows), build_string ("black"), fg_fb);
bg_fb = acons (list1 (Qmswindows), build_string ("white"), bg_fb);
#endif
+#ifdef HAVE_CARBON
+ fg_fb = acons (list1 (Qcarbon), build_string ("black"), fg_fb);
+ bg_fb = acons (list1 (Qcarbon), build_string ("white"), bg_fb);
+#endif
set_specifier_fallback (Fget (Vdefault_face, Qforeground, Qnil), fg_fb);
set_specifier_fallback (Fget (Vdefault_face, Qbackground, Qnil), bg_fb);
}
＠＠ -2155,6 +2159,26 ＠＠
}
#endif /* HAVE_MS_WINDOWS */
+#ifdef HAVE_CARBON
+ {
+ const Char_ASCII *carbonfonts[] =
+ {
+ "Andale Mono:13",
+ "Monaco:10"
+ };
+ const Char_ASCII **carbonfontptr;
+
+ for (carbonfontptr = carbonfonts + countof (carbonfonts) - 1;
+ carbonfontptr >= carbonfonts; carbonfontptr--)
+ {
+ /* display device */
+ inst_list = Fcons (Fcons (list1 (Qcarbon),
+ build_string (*carbonfontptr)),
+ inst_list);
+ }
+ }
+#endif /* HAVE_CARBON */
+
set_specifier_fallback (Fget (Vdefault_face, Qfont, Qnil), inst_list);
}
＠＠ -2202,6 +2226,10 ＠＠
bg_fb = acons (list1 (Qmsprinter), build_string ("white"), bg_fb);
fg_fb = acons (list1 (Qmswindows), build_string ("black"), fg_fb);
bg_fb = acons (list1 (Qmswindows), build_string ("Gray75"), bg_fb);
+#endif
+#ifdef HAVE_CARBON
+ fg_fb = acons (list1 (Qcarbon), build_string ("black"), fg_fb);
+ bg_fb = acons (list1 (Qcarbon), build_string ("Gray80"), bg_fb);
#endif
set_specifier_fallback (Fget (Vgui_element_face, Qforeground, Qnil), fg_fb);
set_specifier_fallback (Fget (Vgui_element_face, Qbackground, Qnil), bg_fb);
1.4.8.1 +11 -0 XEmacs/xemacs/src/frame-impl.h
Index: frame-impl.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame-impl.h,v
retrieving revision 1.4
retrieving revision 1.4.8.1
diff -u -r1.4 -r1.4.8.1
--- frame-impl.h 2003/01/12 11:08:16 1.4
+++ frame-impl.h 2005/02/25 16:30:01 1.4.8.1
＠＠ -291,6 +291,10 ＠＠
#define CHECK_TTY_FRAME(z) CHECK_FRAME_TYPE (z, tty)
#define CONCHECK_TTY_FRAME(z) CONCHECK_FRAME_TYPE (z, tty)
+#define FRAME_CARBON_P(frm) CONSOLE_TYPESYM_CARBON_P (FRAME_TYPE (frm))
+#define CHECK_CARBON_FRAME(z) CHECK_FRAME_TYPE (z, carbon)
+#define CONCHECK_CARBON_FRAME(z) CONCHECK_FRAME_TYPE (z, carbon)
+
#define FRAME_STREAM_P(frm) CONSOLE_TYPESYM_STREAM_P (FRAME_TYPE (frm))
#define CHECK_STREAM_FRAME(z) CHECK_FRAME_TYPE (z, stream)
#define CONCHECK_STREAM_FRAME(z) CONCHECK_FRAME_TYPE (z, stream)
＠＠ -641,11 +645,18 ＠＠
if you encounter some odd toolbar behavior, you might want
to look into this. --ben */
+#ifndef HAVE_CARBON
#define FRAME_REAL_TOOLBAR_VISIBLE(f, pos) \
((!NILP (FRAME_REAL_TOOLBAR (f, pos)) \
&& FRAME_RAW_REAL_TOOLBAR_SIZE (f, pos) > 0) \
? FRAME_RAW_REAL_TOOLBAR_VISIBLE (f, pos) \
: 0)
+#else
+#define FRAME_REAL_TOOLBAR_VISIBLE(f, pos) \
+ (!NILP (FRAME_REAL_TOOLBAR (f, pos)) \
+ ? FRAME_RAW_REAL_TOOLBAR_VISIBLE (f, pos) \
+ : 0)
+#endif
#define FRAME_REAL_TOOLBAR_SIZE(f, pos) \
((!NILP (FRAME_REAL_TOOLBAR (f, pos)) \
&& FRAME_RAW_REAL_TOOLBAR_VISIBLE (f, pos)) \
1.64.2.1 +4 -0 XEmacs/xemacs/src/frame.c
Index: frame.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame.c,v
retrieving revision 1.64
retrieving revision 1.64.2.1
diff -u -r1.64 -r1.64.2.1
--- frame.c 2004/09/20 19:19:45 1.64
+++ frame.c 2005/02/25 16:30:01 1.64.2.1
＠＠ -141,6 +141,7 ＠＠
extern const struct sized_memory_description gtk_frame_data_description;
extern const struct sized_memory_description mswindows_frame_data_description;
extern const struct sized_memory_description x_frame_data_description;
+extern const struct sized_memory_description carbon_frame_data_description;
static const struct memory_description frame_data_description_1 []= {
#ifdef HAVE_GTK
＠＠ -151,6 +152,9 ＠＠
#endif
#ifdef HAVE_X_WINDOWS
{ XD_STRUCT_PTR, x_console, 1, &x_frame_data_description},
+#endif
+#ifdef HAVE_CARBON
+ { XD_STRUCT_PTR, carbon_console, 1, &carbon_frame_data_description},
#endif
{ XD_END }
};
1.15.8.1 +1 -0 XEmacs/xemacs/src/general-slots.h
Index: general-slots.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/general-slots.h,v
retrieving revision 1.15
retrieving revision 1.15.8.1
diff -u -r1.15 -r1.15.8.1
--- general-slots.h 2004/04/05 22:49:54 1.15
+++ general-slots.h 2005/02/25 16:30:02 1.15.8.1
＠＠ -72,6 +72,7 ＠＠
SYMBOL_KEYWORD (Q_callback);
SYMBOL_KEYWORD (Q_callback_ex);
SYMBOL (Qcancel);
+SYMBOL (Qcarbon);
SYMBOL (Qcategory);
SYMBOL (Qcenter);
SYMBOL (Qchain);
1.91.2.1 +17 -7 XEmacs/xemacs/src/redisplay.c
Index: redisplay.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay.c,v
retrieving revision 1.91
retrieving revision 1.91.2.1
diff -u -r1.91 -r1.91.2.1
--- redisplay.c 2004/09/20 19:19:57 1.91
+++ redisplay.c 2005/02/25 16:30:06 1.91.2.1
＠＠ -9924,14 +9924,24 ＠＠
#ifdef HAVE_MS_WINDOWS
if (!strcmp (display_use, "mswindows"))
- {
- /* Some stuff checks this way early. */
- Vwindow_system = Qmswindows;
- Vinitial_window_system = Qmswindows;
- return;
- }
+ {
+ /* Some stuff checks this way early. */
+ Vwindow_system = Qmswindows;
+ Vinitial_window_system = Qmswindows;
+ return;
+ }
#endif /* HAVE_MS_WINDOWS */
-
+
+#ifdef HAVE_CARBON
+ if (!strcmp (display_use, "carbon"))
+ {
+ /* Some stuff checks this way early. */
+ Vwindow_system = Qcarbon;
+ Vinitial_window_system = Qcarbon;
+ return;
+ }
+#endif /* HAVE_MS_WINDOWS */
+
#ifdef HAVE_TTY
/* If no window system has been specified, try to use the terminal. */
if (!isatty (0))
1.49.2.1 +34 -0 XEmacs/xemacs/src/symsinit.h
Index: symsinit.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symsinit.h,v
retrieving revision 1.49
retrieving revision 1.49.2.1
diff -u -r1.49 -r1.49.2.1
--- symsinit.h 2004/04/05 22:49:56 1.49
+++ symsinit.h 2005/02/25 16:30:08 1.49.2.1
＠＠ -266,6 +266,7 ＠＠
void image_instantiator_format_create_glyphs_x (void);
void image_instantiator_format_create_glyphs_mswindows (void);
void image_instantiator_format_create_glyphs_tty (void);
+void image_instantiator_format_create_glyphs_carbon (void);
/* Initialize the lstream types (dump-time only). */
＠＠ -549,6 +550,39 ＠＠
void complex_vars_of_glyphs_gtk (void);
void init_event_gtk_late (void);
void console_type_create_select_gtk (void);
+
+void syms_of_console_carbon (void);
+void syms_of_device_carbon (void);
+void syms_of_event_carbon (void);
+void syms_of_frame_carbon (void);
+void syms_of_intl_carbon (void);
+void syms_of_objects_carbon (void);
+void syms_of_redisplay_carbon (void);
+void syms_of_select_carbon (void);
+void console_type_create_carbon (void);
+void console_type_create_device_carbon (void);
+void console_type_create_frame_carbon (void);
+void console_type_create_glyphs_carbon (void);
+void console_type_create_menubar_carbon (void);
+void console_type_create_objects_carbon (void);
+void console_type_create_redisplay_carbon (void);
+void console_type_create_scrollbar_carbon (void);
+void console_type_create_select_carbon (void);
+void console_type_create_toolbar_carbon (void);
+void vars_of_device_carbon (void);
+void vars_of_console_carbon (void);
+void vars_of_frame_carbon (void);
+void vars_of_objects_carbon (void);
+void vars_of_select_carbon (void);
+void complex_vars_of_intl_carbon (void);
+void reinit_console_type_create_carbon (void);
+void reinit_vars_of_event_carbon (void);
+void reinit_vars_of_glyphs_carbon (void);
+void reinit_vars_of_objects_carbon (void);
+void reinit_vars_of_scrollbar_carbon (void);
+void reinit_vars_of_select_carbon (void);
+void vars_of_event_carbon (void);
+void init_event_carbon_late (void);
/* Enhanced number initialization: must be done only at runtime due to complex
interactions with the supporting libraries. */
1.32.2.1 +13 -1 XEmacs/xemacs/src/toolbar.c
Index: toolbar.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/toolbar.c,v
retrieving revision 1.32
retrieving revision 1.32.2.1
diff -u -r1.32 -r1.32.2.1
--- toolbar.c 2004/09/20 19:20:03 1.32
+++ toolbar.c 2005/02/25 16:30:09 1.32.2.1
＠＠ -1713,7 +1713,10 ＠＠
#ifdef HAVE_MS_WINDOWS
fb = Fcons (Fcons (list1 (Qmswindows), make_int (2)), fb);
#endif
-
+#ifdef HAVE_CARBON
+ fb = Fcons (Fcons (list1 (Qcarbon), Qzero), fb);
+#endif
+
if (!NILP (fb))
set_specifier_fallback (Vtoolbar_shadow_thickness, fb);
＠＠ -1731,6 +1734,9 ＠＠
fb = Fcons (Fcons (list1 (Qmswindows),
make_int (MSWINDOWS_DEFAULT_TOOLBAR_HEIGHT)), fb);
#endif
+#ifdef HAVE_CARBON
+ fb = Fcons (Fcons (list1 (Qcarbon), Qzero), fb);
+#endif
if (!NILP (fb))
set_specifier_fallback (Vdefault_toolbar_height, fb);
＠＠ -1748,6 +1754,9 ＠＠
fb = Fcons (Fcons (list1 (Qmswindows),
make_int (MSWINDOWS_DEFAULT_TOOLBAR_WIDTH)), fb);
#endif
+#ifdef HAVE_CARBON
+ fb = Fcons (Fcons (list1 (Qcarbon), Qzero), fb);
+#endif
if (!NILP (fb))
set_specifier_fallback (Vdefault_toolbar_width, fb);
＠＠ -1862,6 +1871,9 ＠＠
#endif
#ifdef HAVE_MS_WINDOWS
fb = Fcons (Fcons (list1 (Qmswindows), make_int (MSWINDOWS_DEFAULT_TOOLBAR_BORDER_WIDTH)), fb);
+#endif
+#ifdef HAVE_CARBON
+ fb = Fcons (Fcons (list1 (Qcarbon), Qzero), fb);
#endif
if (!NILP (fb))
set_specifier_fallback (Vdefault_toolbar_border_width, fb);
1.80.2.1 +6 -0 XEmacs/xemacs/src/window.c
Index: window.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/window.c,v
retrieving revision 1.80
retrieving revision 1.80.2.1
diff -u -r1.80 -r1.80.2.1
--- window.c 2004/09/21 03:28:15 1.80
+++ window.c 2005/02/25 16:30:10 1.80.2.1
＠＠ -5636,6 +5636,9 ＠＠
/* #### This should be made magic and made to obey system settings */
fb = Fcons (Fcons (list1 (Qmswindows), make_int (3)), fb);
#endif
+#ifdef HAVE_CARBON
+ fb = Fcons (Fcons (list1 (Qcarbon), make_int (3)), fb);
+#endif
set_specifier_fallback (Vvertical_divider_line_width, fb);
}
set_specifier_caching (Vvertical_divider_line_width,
＠＠ -5668,6 +5671,9 ＠＠
#endif
#ifdef HAVE_MS_WINDOWS
fb = Fcons (Fcons (list1 (Qmswindows), Qzero), fb);
+#endif
+#ifdef HAVE_CARBON
+ fb = Fcons (Fcons (list1 (Qcarbon), Qzero), fb);
#endif
set_specifier_fallback (Vvertical_divider_spacing, fb);
}
No revision
No revision
1.1.2.1 +50 -0 XEmacs/xemacs/src/Attic/console-carbon-impl.h
Index: console-carbon-impl.h
===================================================================
RCS file: console-carbon-impl.h
diff -N console-carbon-impl.h
--- /dev/null Fri Feb 25 17:30:12 2005
+++ /tmp/cvsAAAY_aOOi Fri Feb 25 17:30:15 2005
＠＠ -0,0 +1,50 ＠＠
+/*
+ The following code is original work by me, except where noted with
+ the comments "Taken from ..." or "Adapted from ...". I now place
+ it in the public domain.
+
+ Andrew Choi. Calgary, Canada, February 9, 2005. */
+
+#ifndef INCLUDED_console_carbon_impl_h_
+#define INCLUDED_console_carbon_impl_h_
+
+#include "console-impl.h"
+#include "device-impl.h"
+#include "frame-impl.h"
+
+#ifdef HAVE_CARBON
+
+#include <Carbon/Carbon.h>
+#include <ApplicationServices/ApplicationServices.h>
+
+DECLARE_CONSOLE_TYPE (carbon);
+
+struct carbon_device
+{
+ CGColorSpaceRef color_space;
+};
+
+#define DEVICE_CARBON_DATA(d) DEVICE_TYPE_DATA (d, carbon)
+
+#define DEVICE_CARBON_COLOR_SPACE(d) (DEVICE_CARBON_DATA (d)->color_space)
+
+struct carbon_frame
+{
+ WindowRef window;
+ CGContextRef context;
+ int nestedness;
+ MenuRef menubar;
+};
+
+#define FRAME_CARBON_DATA(f) FRAME_TYPE_DATA (f, carbon)
+
+#define FRAME_CARBON_WINDOW(f) (FRAME_CARBON_DATA (f)->window)
+#define FRAME_CARBON_CONTEXT(f) (FRAME_CARBON_DATA (f)->context)
+#define FRAME_CARBON_NESTEDNESS(f) (FRAME_CARBON_DATA (f)->nestedness)
+#define FRAME_CARBON_MENUBAR(f) (FRAME_CARBON_DATA (f)->menubar)
+
+extern struct console_type *carbon_console_type;
+
+#endif /* HAVE_CARBON */
+
+#endif /* INCLUDED_console_carbon_impl_h_ */
1.1.2.1 +98 -0 XEmacs/xemacs/src/Attic/console-carbon.c
Index: console-carbon.c
===================================================================
RCS file: console-carbon.c
diff -N console-carbon.c
--- /dev/null Fri Feb 25 17:30:12 2005
+++ /tmp/cvsAAAubaaPi Fri Feb 25 17:30:15 2005
＠＠ -0,0 +1,98 ＠＠
+/*
+ The following code is original work by me, except where noted with
+ the comments "Taken from ..." or "Adapted from ...". I now place
+ it in the public domain.
+
+ Andrew Choi. Calgary, Canada, February 9, 2005. */
+
+#include <config.h>
+#include "lisp.h"
+
+#include "console-impl.h"
+
+/* All functions in this file are taken from console-qt.cpp*/
+
+DEFINE_CONSOLE_TYPE (carbon);
+
+static int
+carbon_initially_selected_for_input (struct console * UNUSED (con))
+{
+ return 1;
+}
+
+static Lisp_Object
+carbon_device_to_console_connection (Lisp_Object connection, Error_Behavior UNUSED (errb))
+{
+ if (NILP (connection))
+ return Qnil;
+ else
+ connection = build_string ("carbon");
+ return connection;
+}
+
+static Lisp_Object
+carbon_semi_canonicalize_console_connection (Lisp_Object connection, Error_Behavior UNUSED (errb))
+{
+ struct gcpro gcpro1;
+ GCPRO1 (connection);
+ connection = build_string ("carbon");
+ RETURN_UNGCPRO (connection);
+}
+
+static Lisp_Object
+carbon_canonicalize_console_connection (Lisp_Object connection, Error_Behavior UNUSED (errb))
+{
+ Lisp_Object hostname = Qnil;
+ struct gcpro gcpro1, gcpro2;
+ GCPRO2 (connection, hostname);
+ connection = build_string ("carbon");
+ RETURN_UNGCPRO (connection);
+}
+
+static Lisp_Object
+carbon_semi_canonicalize_device_connection (Lisp_Object connection, Error_Behavior UNUSED (errb))
+{
+ struct gcpro gcpro1;
+ GCPRO1 (connection);
+ connection = build_string("carbon");
+ RETURN_UNGCPRO (connection);
+}
+
+static Lisp_Object
+carbon_canonicalize_device_connection (Lisp_Object connection, Error_Behavior UNUSED (errb))
+{
+ struct gcpro gcpro1;
+ GCPRO1 (connection);
+ connection = build_string("carbon");
+ RETURN_UNGCPRO (connection);
+}
+
+void
+syms_of_console_carbon (void)
+{
+}
+
+void
+console_type_create_carbon (void)
+{
+ INITIALIZE_CONSOLE_TYPE (carbon, "carbon", "console-carbon-p");
+
+ CONSOLE_HAS_METHOD (carbon, semi_canonicalize_console_connection);
+ CONSOLE_HAS_METHOD (carbon, canonicalize_console_connection);
+ CONSOLE_HAS_METHOD (carbon, semi_canonicalize_device_connection);
+ CONSOLE_HAS_METHOD (carbon, canonicalize_device_connection);
+ CONSOLE_HAS_METHOD (carbon, device_to_console_connection);
+ CONSOLE_HAS_METHOD (carbon, initially_selected_for_input);
+}
+
+void
+reinit_console_type_create_carbon (void)
+{
+ REINITIALIZE_CONSOLE_TYPE (carbon);
+}
+
+void
+vars_of_console_carbon (void)
+{
+ Fprovide (Qcarbon);
+}
1.1.2.1 +103 -0 XEmacs/xemacs/src/Attic/device-carbon.c
Index: device-carbon.c
===================================================================
RCS file: device-carbon.c
diff -N device-carbon.c
--- /dev/null Fri Feb 25 17:30:12 2005
+++ /tmp/cvsAAAKcayPi Fri Feb 25 17:30:15 2005
＠＠ -0,0 +1,103 ＠＠
+/*
+ The following code is original work by me, except where noted with
+ the comments "Taken from ..." or "Adapted from ...". I now place
+ it in the public domain.
+
+ Andrew Choi. Calgary, Canada, February 9, 2005. */
+
+#include <config.h>
+#include "lisp.h"
+
+#include "sysdep.h"
+
+#include "console-carbon-impl.h"
+
+static void
+check_app_is_bundled (void)
+{
+ /* From http://developer.apple.com/carbon/tipsandtricks.html */
+ FSRef processRef;
+ ProcessSerialNumber psn = { 0, kCurrentProcess };
+ FSCatalogInfo processInfo;
+
+ GetProcessBundleLocation (&psn, &processRef);
+ FSGetCatalogInfo (&processRef, kFSCatInfoNodeFlags, &processInfo, NULL, NULL, NULL);
+ if (!(processInfo.nodeFlags & kFSNodeIsDirectoryMask))
+ fatal ("XEmacs is run on a Carbon console but the executable\n\
+used is not contained in a proper application bundle. Either fix that\n\
+(start it from the Finder, e.g.) or run it with -nw option instead.\n");
+}
+
+static void
+carbon_init_device (struct device *d, Lisp_Object UNUSED (props))
+{
+ DEVICE_CLASS (d) = Qcolor;
+
+ DEVICE_CARBON_DATA (d) = xnew_and_zero (struct carbon_device);
+
+ DEVICE_CARBON_COLOR_SPACE (d) = CGColorSpaceCreateDeviceRGB ();
+
+ /* Without this, isearch, for instance, will think it's running on
+ a slow terminal and splits off a small window when the incremental
+ search moves off the screen. */
+ init_baud_rate (d);
+
+ DisableMenuCommand (NULL, kHICommandQuit);
+
+ check_app_is_bundled ();
+}
+
+static void
+carbon_finish_init_device(struct device * UNUSED (d), Lisp_Object UNUSED (props))
+{
+}
+
+static void
+carbon_mark_device (struct device * UNUSED (d))
+{
+}
+
+static void
+carbon_delete_device (struct device *d)
+{
+ CGColorSpaceRelease (DEVICE_CARBON_COLOR_SPACE (d));
+
+ xfree (DEVICE_CARBON_DATA (d), void *);
+}
+
+static Lisp_Object
+carbon_device_system_metrics(struct device * UNUSED (d), enum device_metrics m)
+{
+ switch (m)
+ {
+ case DM_size_device:
+ return Fcons (make_int (CGDisplayPixelsWide (CGMainDisplayID ())),
+ make_int (CGDisplayPixelsHigh (CGMainDisplayID ())));
+ case DM_num_bit_planes:
+ return make_int (CGDisplayBitsPerPixel (CGMainDisplayID ()));
+ default: /* No such device metric property for Carbon devices */
+ return Qunbound;
+ }
+}
+
+void
+syms_of_device_carbon (void)
+{
+}
+
+void
+console_type_create_device_carbon (void)
+{
+ CONSOLE_HAS_METHOD (carbon, init_device);
+ CONSOLE_HAS_METHOD (carbon, finish_init_device);
+ CONSOLE_HAS_METHOD (carbon, mark_device);
+ CONSOLE_HAS_METHOD (carbon, delete_device);
+ CONSOLE_HAS_METHOD (carbon, device_system_metrics);
+
+ CONSOLE_IMPLEMENTATION_FLAGS (carbon, XDEVIMPF_PIXEL_GEOMETRY);
+}
+
+void
+vars_of_device_carbon (void)
+{
+}
1.1.2.1 +764 -0 XEmacs/xemacs/src/Attic/event-carbon.c
Index: event-carbon.c
===================================================================
RCS file: event-carbon.c
diff -N event-carbon.c
--- /dev/null Fri Feb 25 17:30:12 2005
+++ /tmp/cvsAAAbea4Pi Fri Feb 25 17:30:15 2005
＠＠ -0,0 +1,764 ＠＠
+/*
+ The following code is original work by me, except where noted with
+ the comments "Taken from ..." or "Adapted from ...". I now place
+ it in the public domain.
+
+ Andrew Choi. Calgary, Canada, February 9, 2005. */
+
+#include <config.h>
+#include "lisp.h"
+
+#include "events.h"
+#include "process.h"
+#include "dragdrop.h"
+
+#include "sysproc.h"
+#include "systime.h"
+
+#include "console-carbon-impl.h"
+
+extern Lisp_Object Qcarbon_unicode; /* From intl-carbon.c. */
+
+extern SELECT_TYPE process_only_mask; /* From event-unixoid.c. */
+extern int track_mouse_down_on_scrollbar (void); /* from scrollbar-carbon.c. */
+
+static struct event_stream *carbon_event_stream;
+
+static Lisp_Object carbon_user_event_queue;
+static Lisp_Object carbon_user_event_queue_tail;
+
+static Lisp_Object carbon_timer_event_queue;
+static Lisp_Object carbon_timer_event_queue_tail;
+
+static Lisp_Object carbon_process_event_queue;
+static Lisp_Object carbon_process_event_queue_tail;
+
+static EventLoopTimerUPP timer_proc_UPP;
+
+static debug_carbon_events = 0;
+
+/* Used in frame-carbon.c. */
+void carbon_enqueue_user_event (Lisp_Object);
+
+void
+carbon_enqueue_user_event (Lisp_Object event)
+{
+ enqueue_event (event, &carbon_user_event_queue, &carbon_user_event_queue_tail);
+}
+
+static Lisp_Object
+carbon_dequeue_user_event (void)
+{
+ return dequeue_event (&carbon_user_event_queue, &carbon_user_event_queue_tail);
+}
+
+static void
+carbon_enqueue_timer_event (Lisp_Object event)
+{
+ enqueue_event (event, &carbon_timer_event_queue, &carbon_timer_event_queue_tail);
+}
+
+static Lisp_Object
+carbon_dequeue_timer_event (void)
+{
+ return dequeue_event (&carbon_timer_event_queue, &carbon_timer_event_queue_tail);
+}
+
+static void
+carbon_enqueue_process_event (Lisp_Object event)
+{
+ enqueue_event (event, &carbon_process_event_queue, &carbon_process_event_queue_tail);
+}
+
+static Lisp_Object
+carbon_dequeue_process_event (void)
+{
+ return dequeue_event (&carbon_process_event_queue, &carbon_process_event_queue_tail);
+}
+
+static int
+carbon_queue_event_count (Lisp_Object queue)
+{
+ Lisp_Object event;
+ int count = 0;
+
+ EVENT_CHAIN_LOOP (event, queue)
+ count++;
+
+ return count;
+}
+
+/* Used in frame-carbon.c and scrollbar-carbon.c. */
+unsigned long current_time_milliseconds (void);
+
+unsigned long
+current_time_milliseconds (void)
+{
+ UnsignedWide micro_tick_count;
+ long remainder;
+
+ Microseconds (µ_tick_count);
+
+ return WideDivide ((wide *) µ_tick_count, 1000L, &remainder);
+}
+
+/* Used in menubar-carbon.c, redisplay-carbon.c, and toolbar-carbon.c. */
+void carbon_enqueue_misc_user_event (Lisp_Object, Lisp_Object, Lisp_Object);
+
+void
+carbon_enqueue_misc_user_event (Lisp_Object channel, Lisp_Object function, Lisp_Object object)
+{
+ Lisp_Object event = Fmake_event (Qnil, Qnil);
+
+ XSET_EVENT_TYPE (event, misc_user_event);
+ XSET_EVENT_CHANNEL (event, channel);
+ XSET_EVENT_TIMESTAMP (event, current_time_milliseconds ());
+ XSET_EVENT_MISC_USER_FUNCTION (event, function);
+ XSET_EVENT_MISC_USER_OBJECT (event, object);
+
+ carbon_enqueue_user_event (event);
+}
+
+/* Used in select-carbon.c. */
+void carbon_enqueue_dragdrop_event (Lisp_Object, Lisp_Object);
+
+void
+carbon_enqueue_dragdrop_event (Lisp_Object dnd_type, Lisp_Object dnd_list)
+{
+ Lisp_Object event = Fmake_event (Qnil, Qnil);
+
+ XSET_EVENT_TYPE (event, misc_user_event);
+ XSET_EVENT_CHANNEL (event, wrap_frame (selected_frame ()));
+ XSET_EVENT_MISC_USER_FUNCTION (event, Qdragdrop_drop_dispatch);
+ XSET_EVENT_MISC_USER_OBJECT (event, Fcons (dnd_type, dnd_list));
+ XSET_EVENT_MISC_USER_BUTTON (event, 0);
+ XSET_EVENT_MISC_USER_MODIFIERS (event, 0);
+ XSET_EVENT_MISC_USER_X (event, -1);
+ XSET_EVENT_MISC_USER_Y (event, -1);
+
+ carbon_enqueue_user_event (event);
+}
+
+/* Adapted from macterm.c (do_ae_open_documents) in Emacs. */
+static OSErr
+open_documents_ae_handler (const AppleEvent * apple_event, AppleEvent * UNUSED (reply), SInt32 UNUSED (ref_con))
+{
+ AEDesc the_desc;
+ OSErr s = AEGetParamDesc (apple_event, keyDirectObject, typeAEList, &the_desc);
+ if (s != noErr)
+ return s;
+
+ /* The parameter for a open documents event should just be the file list. */
+ AEKeyword keyword;
+ s = AEGetAttributePtr (apple_event, keyMissedKeywordAttr, typeWildCard, NULL, &keyword, sizeof (keyword), NULL);
+ /* No error means that we found superfluous parameters and errAEDescNotFound means parameters are missing. */
+ if ((s == noErr) || (s != errAEDescNotFound))
+ goto dispose_desc_and_return_error;
+
+ /* Get the file list. */
+ long num_files_to_open;
+ s = AECountItems (&the_desc, &num_files_to_open);
+ if (s != noErr)
+ goto dispose_desc_and_return_error;
+
+ Lisp_Object file_list = Qnil;
+
+ /* AE file list is one based. */
+ for (int i = 1; i <= num_files_to_open; i++)
+ {
+ FSSpec fsspec;
+ if (AEGetNthPtr (&the_desc, i, typeFSS, NULL, NULL, &fsspec, sizeof (fsspec), NULL) != noErr)
+ goto dispose_desc_and_return_error;
+
+ FSRef fsref;
+ if (FSpMakeFSRef (&fsspec, &fsref) != noErr)
+ goto dispose_desc_and_return_error;
+
+ CFURLRef urlref = CFURLCreateFromFSRef (NULL, &fsref);
+ CFStringRef pathname = CFURLCopyFileSystemPath(urlref, kCFURLPOSIXPathStyle);
+ CFStringRef file_url = CFStringCreateWithFormat (NULL, NULL, CFSTR ("file:%＠"), pathname);
+
+ int buf_size = (CFStringGetLength (file_url) + 1) * 2;
+ Extbyte *buf = alloca_extbytes (buf_size);
+ if (!CFStringGetCString (file_url, (char *) buf, buf_size, kCFStringEncodingUnicode))
+ goto dispose_desc_and_return_error;
+
+ /* Don't include NULL terminator bytes. */
+ file_list = Fcons (make_ext_string (buf, buf_size - 2, Qcarbon_unicode), file_list);
+
+ CFRelease (urlref);
+ CFRelease (pathname);
+ CFRelease (file_url);
+ }
+
+ /*printf("file list\n");
+ debug_print(file_list);*/
+ carbon_enqueue_dragdrop_event (Qdragdrop_URL, file_list);
+
+ return noErr;
+
+dispose_desc_and_return_error:
+ AEDisposeDesc (&the_desc);
+ return errAEEventNotHandled;
+}
+
+static void
+install_apple_event_handlers (void)
+{
+ AEEventHandlerUPP od_handler = NewAEEventHandlerUPP (open_documents_ae_handler);
+
+ if (AEInstallEventHandler (kCoreEventClass, kAEOpenDocuments, od_handler, NULL, false) != noErr)
+ invalid_operation ("Cannot install open documents Apple event handler", Qnil);
+
+ DisposeAEEventHandlerUPP (od_handler);
+}
+
+/* Table for translating Mac keycode to keysym strings. Adapted from macterm.c in Emacs. */
+static char *keycode_to_keysymstr_table[] = {
+ /*0x00*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ /*0x10*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ /*0x20*/ 0, 0, 0, 0, "return", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+
+ /*0x30*/ "tab", "space", 0, "backspace",
+ /*0x34*/ 0, "escape", 0, 0,
+ /*0x38*/ 0, 0, 0, 0,
+ /*0x3C*/ 0, 0, 0, 0,
+
+ /*0x40*/ 0, "kp-decimal", 0, "kp-multiply",
+ /*0x44*/ 0, "kp-add", 0, "clear",
+ /*0x48*/ 0, 0, 0, "kp-divide",
+ /*0x4C*/ "kp-enter", 0, "kp-subtract", 0,
+
+ /*0x50*/ 0, "kp-equal", "kp-0", "kp-1",
+ /*0x54*/ "kp-2", "kp-3", "kp-4", "kp-5",
+ /*0x58*/ "kp-6", "kp-7", 0, "kp-8",
+ /*0x5C*/ "kp-9", 0, 0, 0,
+
+ /*0x60*/ "f5", "f6", "f6", "f3",
+ /*0x64*/ "f8", "f9", 0, "f11",
+ /*0x68*/ 0, "f13", 0, "f14",
+ /*0x6C*/ 0, "f10", 0, "f12",
+
+ /*0x70*/ 0, "f15", "insert", "home",
+ /*0x74*/ "prior", "delete", "f4", "end",
+ /*0x78*/ "f2", "next", "f1", "left",
+ /*0x7C*/ "right", "down", "up", 0
+};
+
+/* Used in frame-carbon.c. */
+int carbon_modifiers_to_emacs_modifiers (UInt32);
+int
+carbon_modifiers_to_emacs_modifiers (UInt32 modifiers)
+{
+ int emacs_modifiers = 0;
+
+ if (modifiers & cmdKey)
+ emacs_modifiers |= XEMACS_MOD_META;
+ if (modifiers & controlKey)
+ emacs_modifiers |= XEMACS_MOD_CONTROL;
+ if (modifiers & shiftKey)
+ emacs_modifiers |= XEMACS_MOD_SHIFT;
+
+ return emacs_modifiers;
+}
+
+static void
+handle_keyboard_event (EventRef event)
+{
+ UInt32 event_kind = GetEventKind (event);
+
+ if (event_kind == kEventRawKeyDown || event_kind == kEventRawKeyRepeat)
+ {
+ UInt32 modifiers;
+ GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(typeUInt32), NULL, &modifiers);
+ int emacs_modifiers = carbon_modifiers_to_emacs_modifiers (modifiers);
+
+ UInt32 keycode;
+ GetEventParameter(event, kEventParamKeyCode, typeUInt32, NULL, sizeof(typeUInt32), NULL, &keycode);
+
+ Lisp_Object keysym;
+ char *keysymstr = keycode_to_keysymstr_table[keycode & 0x7f];
+ if (keysymstr)
+ keysym = KEYSYM (keysymstr);
+ else
+ {
+ char charcode;
+ if (modifiers & (controlKey | optionKey | cmdKey))
+ {
+ UInt32 new_keycode = keycode | (modifiers & ~controlKey & ~optionKey & ~cmdKey);
+ Ptr kchr_ptr = (Ptr) GetScriptManagerVariable (smKCHRCache);
+ unsigned long some_state = 0;
+ charcode = KeyTranslate (kchr_ptr, new_keycode, &some_state) & 0xff;
+ }
+ else
+ GetEventParameter(event, kEventParamKeyMacCharCodes, typeChar, NULL, sizeof(typeChar), NULL, &charcode);
+
+ keysym = make_char ((unsigned char)charcode);
+ }
+
+ Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
+
+ XSET_EVENT_TYPE (emacs_event, key_press_event);
+ XSET_EVENT_CHANNEL (emacs_event, Vselected_console);
+ XSET_EVENT_KEY_KEYSYM (emacs_event, keysym);
+ XSET_EVENT_KEY_MODIFIERS (emacs_event, emacs_modifiers);
+
+ carbon_enqueue_user_event (emacs_event);
+ }
+}
+
+static int
+handle_menubar_event (EventRef event)
+{
+ HIPoint location;
+ GetEventParameter (event, kEventParamMouseLocation, typeHIPoint, NULL, sizeof (HIPoint), NULL, &location);
+
+ Point qd_location;
+ qd_location.h = location.x;
+ qd_location.v = location.y;
+
+ WindowRef window;
+ WindowPartCode part_code = FindWindow (qd_location, &window);
+ if (part_code == inMenuBar && window == NULL)
+ {
+ (void) MenuSelect (qd_location);
+ return 1;
+ }
+ else
+ return 0; /* Not handled. */
+}
+
+static void
+debug_print_event (EventClass class, UInt32 kind)
+{
+ stderr_out ("Class = %c%c%c%c; ", (char)(class >> 24), (char)(class >> 16 & 0xff), (char)(class >> 8 & 0xff), (char)(class & 0xff));
+ stderr_out ("kind = %lu", kind);
+}
+
+static void
+handle_apple_event (EventRef event)
+{
+ /* Comments for kEventClassAppleEvent/kEventAppleEvent in CarbonEvents.h describes how we can handle an Apple event ourselves. */
+ EventRecord event_record;
+ if (!ConvertEventRefToEventRecord (event, &event_record))
+ stderr_out ("Can't convert to event record.\n");
+
+ OSErr s = AEProcessAppleEvent (&event_record);
+ if (s != noErr && debug_carbon_events)
+ stderr_out ("Apple event not processed (error = %d).\n", s);
+}
+
+static void
+generic_send_event_to_target (EventRef event)
+{
+ OSErr s = SendEventToEventTarget (event, GetEventDispatcherTarget ());
+
+ if (s != noErr && debug_carbon_events)
+ {
+ EventClass event_class = GetEventClass (event);
+ UInt32 event_kind = GetEventKind (event);
+
+ stderr_out ("Event not sent to or ignored by target: ");
+ debug_print_event (event_class, event_kind);
+ stderr_out ("\n");
+ }
+}
+
+static void
+get_carbon_events (int can_block_p)
+{
+ /* Process events for the scrollbar after it is clicked and while mouse is down. */
+ if (track_mouse_down_on_scrollbar ())
+ return;
+
+ EventRef event;
+
+ double time_to_block = 0.0;
+ if (can_block_p)
+ time_to_block = 0.02;
+
+ while (ReceiveNextEvent (0, NULL, time_to_block, true, &event) == noErr)
+ {
+ EventClass event_class = GetEventClass (event);
+ UInt32 event_kind = GetEventKind (event);
+
+ if (event_class == kEventClassKeyboard)
+ handle_keyboard_event (event);
+ else if (event_class == kEventClassMouse && event_kind == kEventMouseMoved)
+ ; /* Too many, just ignore it. */
+ else if (event_class == kEventClassMouse && event_kind == kEventMouseDown)
+ {
+ if (!handle_menubar_event (event))
+ generic_send_event_to_target (event);
+ }
+ else if (event_class == kEventClassAppleEvent && event_kind == kEventAppleEvent)
+ {
+ handle_apple_event (event);
+ }
+ else if (event_class == kEventClassMouse || event_class == kEventClassWindow || event_class == kEventClassControl || event_class == kEventClassToolbar || event_class == kEventClassApplication || event_class == kEventClassService)
+ {
+ generic_send_event_to_target (event);
+ }
+ else if (debug_carbon_events)
+ {
+ stderr_out ("Event ignored: ");
+ debug_print_event (event_class, event_kind);
+ stderr_out ("\n");
+ }
+
+ ReleaseEvent(event);
+ }
+}
+
+static void
+get_process_events (void)
+{
+ int ndesc;
+ int i;
+ SELECT_TYPE temp_mask = process_only_mask;
+
+ EMACS_TIME polling_block_time;
+ EMACS_SELECT_TIME polling_block_select_time;
+
+ /* Don't block because of process events. */
+ EMACS_SET_SECS_USECS (polling_block_time, 0, 0);
+
+ EMACS_TIME_TO_SELECT_TIME (polling_block_time, polling_block_select_time);
+
+ ndesc = select (MAXDESC, &temp_mask, 0, 0, &polling_block_select_time);
+
+ for (i = 0; i < MAXDESC; i++)
+ {
+ if (FD_ISSET (i, &temp_mask))
+ {
+ Lisp_Object process;
+ Lisp_Process *p = get_process_from_usid (FD_TO_USID (i));
+ Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
+
+ assert (p);
+ process = wrap_process (p);
+ XSET_EVENT_TYPE (emacs_event, process_event);
+ XSET_EVENT_TIMESTAMP (emacs_event, current_time_milliseconds ());
+ XSET_EVENT_PROCESS_PROCESS (emacs_event, process);
+
+ carbon_enqueue_process_event (emacs_event);
+ }
+ }
+}
+
+static void
+get_events (int can_block_p)
+{
+ get_carbon_events (can_block_p);
+ get_process_events ();
+}
+
+static void emacs_carbon_drain_queue (void);
+
+static int
+emacs_carbon_event_pending_p (int how_many)
+{
+ get_events (0);
+
+ if (!how_many)
+ {
+ return !NILP (carbon_user_event_queue) || !NILP (carbon_timer_event_queue) || !NILP (carbon_process_event_queue);
+ }
+ else
+ {
+ return carbon_queue_event_count (carbon_user_event_queue) >= how_many;
+ }
+}
+
+static void
+emacs_carbon_next_event (struct Lisp_Event *emacs_event)
+{
+ Lisp_Object event = Qnil;
+ Lisp_Object event2;
+
+ while (1)
+ {
+ if (!NILP (carbon_user_event_queue))
+ event = carbon_dequeue_user_event ();
+ else if (!NILP (carbon_timer_event_queue))
+ event = carbon_dequeue_timer_event ();
+ else if (!NILP (carbon_process_event_queue))
+ event = carbon_dequeue_process_event ();
+
+ if (!NILP (event))
+ break;
+
+ get_events (1);
+ }
+
+ event2 = wrap_event (emacs_event);
+ Fcopy_event (event, event2);
+ Fdeallocate_event (event);
+}
+
+static void
+emacs_carbon_handle_magic_event (struct Lisp_Event *emacs_event)
+{
+ UInt32 carbon_event = EVENT_MAGIC_CARBON_EVENT (emacs_event);
+ switch (carbon_event)
+ {
+ case kEventWindowActivated:
+ case kEventWindowDeactivated:
+ {
+ Lisp_Object frame = EVENT_CHANNEL (emacs_event);
+ struct frame *f = XFRAME (frame);
+
+ Lisp_Object conser;
+ struct gcpro gcpro1;
+
+ conser = Fcons (frame, Fcons (FRAME_DEVICE (f), carbon_event == kEventWindowActivated ? Qt : Qnil));
+ GCPRO1 (conser);
+ emacs_handle_focus_change_preliminary (conser);
+ emacs_handle_focus_change_final (conser);
+ UNGCPRO;
+ }
+ break;
+ default:
+ assert (0);
+ }
+}
+
+static void
+emacs_carbon_format_magic_event (Lisp_Event *emacs_event,
+ Lisp_Object pstream)
+{
+#define FROB(msg) case msg: write_c_string (pstream, "type=" #msg); break
+
+ switch (EVENT_MAGIC_CARBON_EVENT (emacs_event))
+ {
+ FROB (kEventWindowActivated);
+ FROB (kEventWindowDeactivated);
+
+ default: assert (0);
+ }
+
+#undef FROB
+
+ if (!NILP (EVENT_CHANNEL (emacs_event)))
+ {
+ write_c_string (pstream, " ");
+ print_internal (EVENT_CHANNEL (emacs_event), pstream, 1);
+ }
+}
+
+static int
+emacs_carbon_compare_magic_event (Lisp_Event *e1, Lisp_Event *e2)
+{
+ return EVENT_MAGIC_CARBON_EVENT (e1) == EVENT_MAGIC_CARBON_EVENT (e2);
+}
+
+static Hashcode
+emacs_carbon_hash_magic_event (Lisp_Event *e)
+{
+ return EVENT_MAGIC_CARBON_EVENT (e);
+}
+
+static void
+timer_proc (EventLoopTimerRef inTimer, void * UNUSED (inUserData))
+{
+ /* Mutex with dequeue operations doesn't seem necessary because the
+ callback seems to be made with the call to ReceiveNextEvent (not
+ on a second thread). */
+
+ Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
+
+ XSET_EVENT_CHANNEL (emacs_event, Qnil);
+ XSET_EVENT_TIMESTAMP (emacs_event, current_time_milliseconds ());
+ XSET_EVENT_TYPE (emacs_event, timeout_event);
+ XSET_EVENT_TIMEOUT_INTERVAL_ID (emacs_event, (int) inTimer);
+ XSET_EVENT_TIMEOUT_FUNCTION (emacs_event, Qnil);
+ XSET_EVENT_TIMEOUT_OBJECT (emacs_event, Qnil);
+
+ carbon_enqueue_timer_event (emacs_event);
+}
+
+static int
+emacs_carbon_add_timeout (EMACS_TIME thyme)
+{
+ EventLoopTimerRef timer_ref;
+
+ EventTimerInterval delay;
+ EMACS_TIME current_time;
+ EMACS_GET_TIME (current_time);
+ EMACS_SUB_TIME (thyme, thyme, current_time);
+ delay = EMACS_SECS (thyme) + EMACS_USECS (thyme) / 1000000.0;
+
+ if (InstallEventLoopTimer (GetCurrentEventLoop (), delay, 0.0,
+ timer_proc_UPP, NULL, &timer_ref) != noErr)
+ stderr_out ("Can't install event loop timer.");
+
+ /* ### TO DO: use a hash table. Currently this depends on a pointer
+ fitting into an int. */
+ return (int) timer_ref;
+}
+
+static int
+remove_timeout_mapper (Lisp_Object event, void *data)
+{
+ return XEVENT_TYPE (event) == timeout_event &&
+ (int) data == XEVENT_TIMEOUT_INTERVAL_ID (event);
+}
+
+static void
+emacs_carbon_remove_timeout (int id)
+{
+ if (RemoveEventLoopTimer ((EventLoopTimerRef) id) != noErr)
+ stderr_out ("Can't remove event loop timer.");
+
+ map_event_chain_remove (remove_timeout_mapper,
+ &carbon_timer_event_queue,
+ &carbon_timer_event_queue_tail,
+ (void *) id, MECR_DEALLOCATE_EVENT);
+}
+
+static void
+emacs_carbon_select_console (struct console *con)
+{
+ if (CONSOLE_CARBON_P (con))
+ return;
+
+ event_stream_unixoid_select_console (con);
+}
+
+static void
+emacs_carbon_unselect_console (struct console *con)
+{
+ if (CONSOLE_CARBON_P (con))
+ return;
+
+ event_stream_unixoid_unselect_console (con);
+}
+
+static void
+emacs_carbon_select_process (Lisp_Process *process, int doin, int doerr)
+{
+ int infd, errfd;
+
+ event_stream_unixoid_select_process (process, doin, doerr, &infd, &errfd);
+}
+
+static void
+emacs_carbon_unselect_process (Lisp_Process *process, int doin, int doerr)
+{
+ int infd, errfd;
+
+ event_stream_unixoid_unselect_process (process, doin, doerr, &infd, &errfd);
+}
+
+static void
+emacs_carbon_drain_queue (void)
+{
+ get_events (0);
+
+ while (!NILP (carbon_user_event_queue))
+ enqueue_dispatch_event (carbon_dequeue_user_event ());
+
+ while (!NILP (carbon_timer_event_queue))
+ enqueue_dispatch_event (carbon_dequeue_timer_event ());
+
+ while (!NILP (carbon_process_event_queue))
+ enqueue_dispatch_event (carbon_dequeue_process_event ());
+}
+
+static void
+emacs_carbon_create_io_streams (void *inhandle, void *outhandle, void *errhandle, Lisp_Object *instream, Lisp_Object *outstream, Lisp_Object *errstream, USID *in_usid, USID *err_usid, int flags)
+{
+ event_stream_unixoid_create_io_streams (inhandle, outhandle, errhandle, instream, outstream, errstream, in_usid, err_usid, flags);
+}
+
+static void
+emacs_carbon_delete_io_streams (Lisp_Object instream, Lisp_Object outstream, Lisp_Object errstream, USID *in_usid, USID *err_usid)
+{
+ event_stream_unixoid_delete_io_streams (instream, outstream, errstream, in_usid, err_usid);
+}
+
+static int
+emacs_carbon_current_event_timestamp (struct console * UNUSED (c))
+{
+ UnsignedWide micro_tick_count;
+ long remainder;
+
+ Microseconds (µ_tick_count);
+
+ WideDivide ((wide *) µ_tick_count, 1000L, &remainder);
+
+ return micro_tick_count.lo;
+}
+
+/* Taken from event-msw.c. */
+/* Don't know what this does exactly but its definition is empty in
+ both event-Xt.c and event-msw.c. Anyway we need it if we define
+ HAVE_WINDOW_SYSTEM. */
+void debug_process_finalization (Lisp_Process *p);
+
+void
+debug_process_finalization (Lisp_Process *UNUSED (p))
+{
+}
+
+
+/************************************************************************/
+/* initialization */
+/************************************************************************/
+
+void
+syms_of_event_carbon (void)
+{
+}
+
+void
+reinit_vars_of_event_carbon (void)
+{
+ carbon_event_stream = xnew_and_zero (struct event_stream);
+
+ carbon_event_stream->event_pending_p = emacs_carbon_event_pending_p;
+ carbon_event_stream->next_event_cb = emacs_carbon_next_event;
+ carbon_event_stream->handle_magic_event_cb = emacs_carbon_handle_magic_event;
+ carbon_event_stream->format_magic_event_cb = emacs_carbon_format_magic_event;
+ carbon_event_stream->compare_magic_event_cb = emacs_carbon_compare_magic_event;
+ carbon_event_stream->hash_magic_event_cb = emacs_carbon_hash_magic_event;
+ carbon_event_stream->add_timeout_cb = emacs_carbon_add_timeout;
+ carbon_event_stream->remove_timeout_cb = emacs_carbon_remove_timeout;
+ carbon_event_stream->select_console_cb = emacs_carbon_select_console;
+ carbon_event_stream->unselect_console_cb = emacs_carbon_unselect_console;
+ carbon_event_stream->select_process_cb = emacs_carbon_select_process;
+ carbon_event_stream->unselect_process_cb = emacs_carbon_unselect_process;
+ carbon_event_stream->drain_queue_cb = emacs_carbon_drain_queue;
+ carbon_event_stream->create_io_streams_cb = emacs_carbon_create_io_streams;
+ carbon_event_stream->delete_io_streams_cb = emacs_carbon_delete_io_streams;
+ carbon_event_stream->current_event_timestamp_cb =
+ emacs_carbon_current_event_timestamp;
+
+ timer_proc_UPP = NewEventLoopTimerUPP (timer_proc);
+
+ carbon_user_event_queue = Qnil;
+ staticpro (&carbon_user_event_queue);
+ carbon_user_event_queue_tail = Qnil;
+
+ carbon_timer_event_queue = Qnil;
+ staticpro (&carbon_timer_event_queue);
+ carbon_timer_event_queue_tail = Qnil;
+
+ carbon_process_event_queue = Qnil;
+ staticpro (&carbon_process_event_queue);
+ carbon_process_event_queue_tail = Qnil;
+
+ install_apple_event_handlers ();
+}
+
+void
+vars_of_event_carbon (void)
+{
+ reinit_vars_of_event_carbon ();
+}
+
+void
+init_event_carbon_late (void)
+{
+ event_stream = carbon_event_stream;
+}
1.1.2.1 +789 -0 XEmacs/xemacs/src/Attic/frame-carbon.c
Index: frame-carbon.c
===================================================================
RCS file: frame-carbon.c
diff -N frame-carbon.c
--- /dev/null Fri Feb 25 17:30:12 2005
+++ /tmp/cvsAAARfaqQi Fri Feb 25 17:30:15 2005
＠＠ -0,0 +1,789 ＠＠
+/*
+ The following code is original work by me, except where noted with
+ the comments "Taken from ..." or "Adapted from ...". I now place
+ it in the public domain.
+
+ Andrew Choi. Calgary, Canada, February 9, 2005. */
+
+#include <config.h>
+#include "lisp.h"
+
+#include "window-impl.h"
+#include "faces.h"
+#include "frame.h"
+#include "gutter.h"
+#include "events.h"
+
+#include "console-carbon-impl.h"
+#include "objects-carbon-impl.h"
+
+extern Lisp_Object Qcarbon_unicode; /* From intl-carbon.c. */
+
+extern void carbon_enqueue_user_event (Lisp_Object); /* In event-carbon.c */
+extern void carbon_enqueue_misc_user_event (Lisp_Object, Lisp_Object, Lisp_Object); /* In event-carbon.c */
+extern int carbon_modifiers_to_emacs_modifiers (UInt32); /* In event-carbon.c */
+extern unsigned long current_time_milliseconds (void); /* In event-carbon.c */
+
+/* Buttons that are currently down. Set in handle_mouse_down_or_up_event and used in handle_mouse_dragged_event. */
+static int down_buttons = 0;
+static const int button_mod [] =
+{
+ XEMACS_MOD_BUTTON1,
+ XEMACS_MOD_BUTTON2,
+ XEMACS_MOD_BUTTON3
+};
+static const int button_mod_len = sizeof (button_mod) / sizeof (button_mod [0]);
+
+static const struct memory_description carbon_frame_data_description_1 [] = {
+ { XD_END }
+};
+
+extern const struct sized_memory_description carbon_frame_data_description;
+
+const struct sized_memory_description carbon_frame_data_description = {
+ sizeof (struct carbon_frame), carbon_frame_data_description_1
+};
+
+/* Used in scrollbar-carbon.c. */
+Point window_to_content_coord_adj (WindowRef);
+
+Point
+window_to_content_coord_adj (WindowRef window)
+{
+ Rect structure_rect;
+ if (GetWindowBounds (window, kWindowStructureRgn, &structure_rect) != noErr)
+ invalid_operation ("Can't get structure bounds", Qnil);
+
+ Rect content_rect;
+ if (GetWindowBounds (window, kWindowContentRgn, &content_rect) != noErr)
+ invalid_operation ("Can't get content bounds", Qnil);
+
+ Point adjustment;
+ adjustment.v = structure_rect.top - content_rect.top;
+ adjustment.h = structure_rect.left - content_rect.left;
+
+ return adjustment;
+}
+
+static void
+carbon_set_initial_frame_size (struct frame *f, int x, int y, unsigned int w, unsigned int h)
+{
+ int dw, dh;
+ Rect r;
+ WindowRef win = FRAME_CARBON_WINDOW (f);
+
+ if (GetWindowBounds (win, kWindowStructureRgn, &r) != noErr)
+ invalid_operation ("Cannot get window bounds", wrap_frame (f));
+
+ if (x > 0 || y > 0)
+ {
+ if (x < 0)
+ x = (int)r.left;
+ if (y < 0)
+ y = (int)r.top;
+
+ SInt16 menubar_height;
+ if (GetThemeMenuBarHeight (&menubar_height) != noErr)
+ menubar_height = 22;
+ y += menubar_height;
+
+ Point adjustment = window_to_content_coord_adj (win);
+ x -= adjustment.h;
+ y -= adjustment.v;
+
+ MoveWindow (win, x, y, 0);
+ }
+
+ if (w > 0 || h > 0)
+ {
+ default_face_height_and_width (wrap_frame (f), &dh, &dw);
+
+ FRAME_HEIGHT (f) = h;
+ FRAME_WIDTH (f) = w;
+
+ /* change_frame_size (f, h, w, 0); */
+
+ FRAME_PIXWIDTH (f) = w * dw;
+ FRAME_PIXHEIGHT (f) = h * dh;
+
+ SizeWindow (win, w * dw, h * dh, 0);
+ }
+}
+
+static void
+carbon_initialize_frame_size (struct frame *f)
+{
+ int x = 8, y = 8, w = 82, h = 40;
+
+ /* Set the position of the frame's root window now. When the
+ frame was created, the position was initialized to (0,0). */
+ {
+ struct window *win = XWINDOW (f->root_window);
+
+ WINDOW_LEFT (win) = FRAME_LEFT_BORDER_END (f)
+ + FRAME_LEFT_GUTTER_BOUNDS (f);
+ WINDOW_TOP (win) = FRAME_TOP_BORDER_END (f)
+ + FRAME_TOP_GUTTER_BOUNDS (f);
+
+ if (!NILP (f->minibuffer_window))
+ {
+ win = XWINDOW (f->minibuffer_window);
+ WINDOW_LEFT (win) = FRAME_LEFT_BORDER_END (f)
+ + FRAME_LEFT_GUTTER_BOUNDS (f);
+ }
+ }
+
+ carbon_set_initial_frame_size (f, x, y, w, h);
+}
+
+static void
+carbon_set_frame_size (struct frame *f, int cols, int rows);
+
+static void
+handle_window_bounds_changed_event (EventRef event, void *data)
+{
+ Rect bounds;
+ struct frame *f = (struct frame *) data;
+
+ GetEventParameter(event, kEventParamCurrentBounds, typeQDRectangle, NULL, sizeof (bounds), NULL, &bounds);
+
+ int w = bounds.right - bounds.left;
+ int h = bounds.bottom - bounds.top;
+
+ carbon_set_frame_size (f, w, h);
+
+ /* This works. But a little drastic? */
+ if (f->init_finished)
+ redisplay ();
+}
+
+static pascal OSStatus
+window_event_handler (EventHandlerCallRef UNUSED (next_handler), EventRef event, void *data)
+{
+ if (GetEventClass (event) == kEventClassWindow)
+ {
+ UInt32 event_kind = GetEventKind (event);
+ switch (event_kind)
+ {
+ case kEventWindowBoundsChanged:
+ handle_window_bounds_changed_event (event, data);
+ break;
+ case kEventWindowActivated:
+ case kEventWindowDeactivated:
+ {
+ Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
+
+ XSET_EVENT_TYPE (emacs_event, magic_event);
+ XSET_EVENT_CHANNEL (emacs_event, wrap_frame ((struct frame *) data));
+ XSET_EVENT_MAGIC_CARBON_EVENT (emacs_event, event_kind);
+ XSET_EVENT_TIMESTAMP (emacs_event, current_time_milliseconds ());
+
+ carbon_enqueue_user_event (emacs_event);
+ }
+ break;
+ case kEventWindowClose:
+ {
+ Lisp_Object frame = wrap_frame ((struct frame *) data);
+ carbon_enqueue_misc_user_event (frame, Qeval, list3 (Qdelete_frame, frame, Qt));
+ }
+ break;
+ default:
+ stderr_out ("Unknown window event kind: %ld\n", GetEventKind (event));
+ }
+ }
+
+ return noErr;
+}
+
+static WindowPartCode
+get_part_code_from_event (EventRef event)
+{
+ WindowPartCode part_code;
+
+ GetEventParameter (event, kEventParamWindowPartCode, typeWindowPartCode, NULL, sizeof (WindowPartCode), NULL, &part_code);
+
+ return part_code;
+}
+
+static WindowRef
+get_window_ref_from_event (EventRef event)
+{
+ WindowRef window;
+
+ GetEventParameter (event, kEventParamWindowRef, typeWindowRef, NULL, sizeof (WindowRef), NULL, &window);
+
+ return window;
+}
+
+static HIPoint
+get_location_from_event (EventRef event)
+{
+ HIPoint location;
+
+ GetEventParameter (event, kEventParamWindowMouseLocation, typeHIPoint, NULL, sizeof (HIPoint), NULL, &location);
+
+ return location;
+}
+
+static UInt32
+get_modifiers_from_event (EventRef event)
+{
+ UInt32 modifiers;
+
+ GetEventParameter (event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof (UInt32), NULL, &modifiers);
+
+ return modifiers;
+}
+
+static OSStatus
+handle_mouse_down_or_up_event (EventHandlerCallRef next_handler, EventRef event, void *data)
+{
+ if (get_part_code_from_event (event) != inContent)
+ return CallNextEventHandler (next_handler, event);
+
+ WindowRef window = get_window_ref_from_event (event);
+ if (!IsWindowActive (window))
+ return CallNextEventHandler (next_handler, event);
+
+ HIPoint location = get_location_from_event (event);
+ Point qd_location;
+ qd_location.h = location.x;
+ qd_location.v = location.y;
+ AddPt (window_to_content_coord_adj (window), &qd_location);
+
+ ControlRef control_ref;
+ (void) FindControl (qd_location, window, &control_ref);
+
+ /* Don't handle if a control has been hit. */
+ if (control_ref)
+ return CallNextEventHandler (next_handler, event);
+
+ UInt32 modifiers = get_modifiers_from_event (event);
+
+ UInt32 event_kind = GetEventKind (event);
+
+ EventMouseButton button;
+ SInt32 mouse_wheel_delta;
+ if (event_kind == kEventMouseDown || event_kind == kEventMouseUp)
+ GetEventParameter(event, kEventParamMouseButton, typeMouseButton, NULL, sizeof (EventMouseButton), NULL, &button);
+ else /* kEventMouseWheelMoved */
+ GetEventParameter(event, kEventParamMouseWheelDelta, typeSInt32, NULL, sizeof (SInt32), NULL, &mouse_wheel_delta);
+
+ Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
+
+ switch (event_kind)
+ {
+ case kEventMouseDown:
+ XSET_EVENT_TYPE (emacs_event, button_press_event);
+ down_buttons |= button_mod [min (max (button, 1), button_mod_len) - 1];
+ break;
+ case kEventMouseUp:
+ XSET_EVENT_TYPE (emacs_event, button_release_event);
+ down_buttons &= ~button_mod [min (max (button, 1), button_mod_len) - 1];
+ break;
+ case kEventMouseWheelMoved:
+ /* Mouse wheel moves are sent as /release/ events presumably because although tracking begins at "mouse down" time, actions are finalized at "mouse up" time. */
+ XSET_EVENT_TYPE (emacs_event, button_release_event);
+ break;
+ default:
+ stderr_out ("Unknown mouse event kind in handler: %ld", event_kind);
+ }
+
+ XSET_EVENT_CHANNEL (emacs_event, wrap_frame ((struct frame *) data));
+
+ if (event_kind == kEventMouseDown || event_kind == kEventMouseUp)
+ XSET_EVENT_BUTTON_BUTTON (emacs_event, button);
+ else /* kEventMouseWheelMoved */
+ XSET_EVENT_BUTTON_BUTTON (emacs_event, mouse_wheel_delta > 0 ? 4 : 5);
+
+ XSET_EVENT_BUTTON_X (emacs_event, (int) qd_location.h);
+ XSET_EVENT_BUTTON_Y (emacs_event, (int) qd_location.v);
+ XSET_EVENT_BUTTON_MODIFIERS (emacs_event, carbon_modifiers_to_emacs_modifiers (modifiers));
+ XSET_EVENT_TIMESTAMP (emacs_event, current_time_milliseconds ());
+
+ carbon_enqueue_user_event (emacs_event);
+
+ return CallNextEventHandler (next_handler, event);
+}
+
+static OSStatus
+handle_mouse_dragged_event (EventHandlerCallRef next_handler, EventRef event, void *data)
+{
+ if (get_part_code_from_event (event) != inContent)
+ return CallNextEventHandler (next_handler, event);
+
+ WindowRef window = get_window_ref_from_event (event);
+
+ HIPoint location = get_location_from_event (event);
+ Point qd_location;
+ qd_location.h = location.x;
+ qd_location.v = location.y;
+ AddPt (window_to_content_coord_adj (window), &qd_location);
+
+ UInt32 modifiers = get_modifiers_from_event (event);
+
+ Lisp_Object emacs_event = Fmake_event (Qnil, Qnil);
+
+ XSET_EVENT_TYPE (emacs_event, pointer_motion_event);
+
+ XSET_EVENT_CHANNEL (emacs_event, wrap_frame ((struct frame *) data));
+
+ XSET_EVENT_MOTION_X (emacs_event, (int) qd_location.h);
+ XSET_EVENT_MOTION_Y (emacs_event, (int) qd_location.v);
+ XSET_EVENT_MOTION_MODIFIERS (emacs_event, down_buttons | carbon_modifiers_to_emacs_modifiers (modifiers));
+ XSET_EVENT_TIMESTAMP (emacs_event, current_time_milliseconds ());
+
+ carbon_enqueue_user_event (emacs_event);
+
+ return noErr;
+}
+
+static pascal OSStatus
+mouse_event_handler (EventHandlerCallRef next_handler, EventRef event, void *data)
+{
+ if (GetEventClass (event) == kEventClassMouse)
+ switch (GetEventKind (event))
+ {
+ case kEventMouseDown:
+ case kEventMouseUp:
+ case kEventMouseWheelMoved:
+ return handle_mouse_down_or_up_event (next_handler, event, data);
+ case kEventMouseDragged:
+ return handle_mouse_dragged_event (next_handler, event, data);
+ default:
+ stderr_out ("Unknown mouse event kind: %ld", GetEventKind (event));
+ }
+
+ return eventNotHandledErr;
+}
+
+static void
+install_event_handler (struct frame *f)
+{
+ EventHandlerUPP we_handler;
+ we_handler = NewEventHandlerUPP (window_event_handler);
+
+ EventTypeSpec we_types[] =
+ {
+ { kEventClassWindow, kEventWindowBoundsChanged },
+ { kEventClassWindow, kEventWindowActivated },
+ { kEventClassWindow, kEventWindowDeactivated },
+ { kEventClassWindow, kEventWindowClose }
+ };
+
+ if (InstallWindowEventHandler (FRAME_CARBON_WINDOW (f), we_handler, sizeof (we_types) / sizeof (we_types[0]), we_types, f, NULL) != noErr)
+ invalid_operation ("Cannot install window event handler", wrap_frame (f));
+
+ DisposeEventHandlerUPP (we_handler);
+
+ EventHandlerUPP me_handler;
+ me_handler = NewEventHandlerUPP (mouse_event_handler);
+
+ EventTypeSpec me_types[] =
+ {
+ { kEventClassMouse, kEventMouseDown },
+ { kEventClassMouse, kEventMouseUp },
+ { kEventClassMouse, kEventMouseWheelMoved },
+ { kEventClassMouse, kEventMouseDragged }
+ };
+
+ if (InstallWindowEventHandler (FRAME_CARBON_WINDOW (f), me_handler, sizeof (me_types) / sizeof (me_types[0]), me_types, f, NULL) != noErr)
+ invalid_operation ("Cannot install window event handler", wrap_frame (f));
+
+ DisposeEventHandlerUPP (me_handler);
+
+ if (InstallStandardEventHandler (GetWindowEventTarget (FRAME_CARBON_WINDOW (f))))
+ invalid_operation ("Cannot install standard window event handler", wrap_frame (f));
+}
+
+static void
+carbon_init_frame_1 (struct frame *f, Lisp_Object props, int UNUSED (frame_name_is_defaulted))
+{
+ Lisp_Object height, width, popup, top, left;
+ Rect rect;
+
+ left = Fplist_get (props, Qleft, Qnil);
+ if (!NILP (left))
+ CHECK_INT (left);
+
+ top = Fplist_get (props, Qtop, Qnil);
+ if (!NILP (top))
+ CHECK_INT (top);
+
+ width = Fplist_get (props, Qwidth, Qnil);
+ if (!NILP (width))
+ CHECK_INT (width);
+
+ height = Fplist_get (props, Qheight, Qnil);
+ if (!NILP (height))
+ CHECK_INT (height);
+
+ f->frame_data = xnew_and_zero (struct carbon_frame);
+
+ rect.left = NILP (left) ? -1 : abs (XINT (left));
+ rect.top = NILP (top) ? -1 : abs (XINT (top));
+ rect.right = rect.left + (NILP (width) ? -1 : abs (XINT (width)));
+ rect.bottom = rect.top + (NILP (height) ? -1 : abs (XINT (height)));
+
+ f->visible = 1;
+
+ popup = Fplist_get (props, Qpopup, Qnil);
+ if (EQ (popup, Qt))
+ popup = Fselected_frame (Qnil);
+
+ if (NILP (popup))
+ {
+ /* Don't turn on kWindowCompositingAttribute unless you're ready to make changes throughout. Many things work differently in compositing windows. */
+ if (CreateNewWindow (kDocumentWindowClass, kWindowStandardDocumentAttributes | kWindowLiveResizeAttribute | kWindowStandardHandlerAttribute, &rect, &FRAME_CARBON_WINDOW (f)) != noErr)
+ invalid_operation ("Cannot create window", wrap_frame (f));
+ }
+ else
+ {
+ invalid_operation ("Creating a popup", wrap_frame (f));
+ }
+}
+
+static void
+carbon_init_frame_2 (struct frame *f, Lisp_Object UNUSED (props))
+{
+ update_frame_face_values (f);
+ carbon_initialize_frame_size (f);
+
+ update_frame_title (f);
+}
+
+static void
+carbon_init_frame_3 (struct frame *f)
+{
+ ShowWindow (FRAME_CARBON_WINDOW (f));
+
+ install_event_handler (f);
+
+ Lisp_Object conser;
+ struct gcpro gcpro1;
+
+ conser = Fcons (wrap_frame (f), Fcons (FRAME_DEVICE (f), Qt));
+ GCPRO1 (conser);
+ emacs_handle_focus_change_preliminary (conser);
+ emacs_handle_focus_change_final (conser);
+ UNGCPRO;
+}
+
+static void
+carbon_mark_frame (struct frame * UNUSED (f))
+{
+}
+
+static void
+carbon_focus_on_frame (struct frame *f)
+{
+ SelectWindow (FRAME_CARBON_WINDOW (f));
+}
+
+static void
+carbon_delete_frame (struct frame *f)
+{
+ DisposeWindow (FRAME_CARBON_WINDOW (f));
+}
+
+static void
+carbon_raise_frame (struct frame *f)
+{
+ SelectWindow (FRAME_CARBON_WINDOW (f));
+}
+
+static void
+carbon_lower_frame (struct frame *f)
+{
+ SendBehind (FRAME_CARBON_WINDOW (f), NULL);
+}
+
+static void
+carbon_make_frame_visible (struct frame *f)
+{
+ SelectWindow (FRAME_CARBON_WINDOW (f));
+}
+
+static void
+carbon_make_frame_invisible (struct frame *f)
+{
+ HideWindow (FRAME_CARBON_WINDOW (f));
+}
+
+static void
+carbon_iconify_frame (struct frame *f)
+{
+ if (CollapseWindow (FRAME_CARBON_WINDOW (f), 1) != noErr)
+ invalid_operation ("Cannot collapse window\n", wrap_frame (f));
+}
+
+static void
+carbon_set_frame_size (struct frame *f, int width, int height)
+{
+ int cols, rows;
+
+ if (width > 0 && height > 0)
+ {
+ SizeWindow (FRAME_CARBON_WINDOW (f), width, height, 0);
+
+ pixel_to_char_size (f, width, height, &cols, &rows);
+
+ change_frame_size (f, rows, cols, 0);
+
+ /* Redisplay still thinks the window has the old height if these
+ are not changed. */
+ FRAME_PIXWIDTH (f) = width;
+ FRAME_PIXHEIGHT (f) = height;
+ }
+}
+
+static void
+carbon_set_frame_position (struct frame *f, int xoff, int yoff)
+{
+ MoveWindow (FRAME_CARBON_WINDOW (f), xoff, yoff, 0);
+}
+
+static Lisp_Object
+carbon_frame_property (struct frame *f, Lisp_Object property)
+{
+ Rect r;
+
+ if (GetWindowBounds (FRAME_CARBON_WINDOW (f), kWindowStructureRgn, &r) != noErr)
+ invalid_operation ("Cannot get window bounds", wrap_frame (f));
+
+ if (EQ (Qleft, property))
+ return make_int ((int)r.left);
+ else if (EQ (Qtop, property))
+ return make_int ((int)r.top);
+ else
+ return Qunbound;
+}
+
+static int
+carbon_internal_frame_property_p (struct frame * UNUSED (f), Lisp_Object property)
+{
+ return EQ (property, Qleft) || EQ (property, Qtop);
+}
+
+static Lisp_Object
+carbon_frame_properties (struct frame *f)
+{
+ Lisp_Object props = Qnil;
+ Rect rc;
+
+ if (GetWindowBounds (FRAME_CARBON_WINDOW (f), kWindowStructureRgn, &rc) != noErr)
+ invalid_operation ("Cannot get window bounds", wrap_frame (f));
+
+ props = cons3 (Qtop, make_int (rc.top), props);
+ props = cons3 (Qleft, make_int (rc.left), props);
+
+ return props;
+}
+
+/* Adapted from frame-msw.c and frame-x.c. */
+static void
+carbon_set_frame_properties (struct frame *f, Lisp_Object plist)
+{
+ int x = -1, y = -1;
+ int width = -1, height = -1;
+ int width_specified_p = 0;
+ int height_specified_p = 0;
+ int x_position_specified_p = 0;
+ int y_position_specified_p = 0;
+ Lisp_Object tail;
+
+ /* Extract the properties from plist */
+ for (tail = plist; !NILP (tail); tail = Fcdr (Fcdr (tail)))
+ {
+ Lisp_Object prop = Fcar (tail);
+ Lisp_Object val = Fcar (Fcdr (tail));
+
+ if (SYMBOLP (prop))
+ {
+ /* Kludge to handle the font property. */
+ if (EQ (prop, Qfont))
+ {
+ /* If the value is not a string we silently ignore it. */
+ if (STRINGP (val))
+ {
+ Lisp_Object frm, font_spec;
+
+ frm = wrap_frame (f);
+ font_spec = Fget (Fget_face (Qdefault), Qfont, Qnil);
+
+ Fadd_spec_to_specifier (font_spec, val, frm, Qnil, Qnil);
+ update_frame_face_values (f);
+ }
+ }
+ else if (EQ (prop, Qwidth))
+ {
+ CHECK_INT (val);
+ width = XINT (val);
+ width_specified_p = 1;
+ }
+ else if (EQ (prop, Qheight))
+ {
+ CHECK_INT (val);
+ height = XINT (val);
+ height_specified_p = 1;
+ }
+ else if (EQ (prop, Qleft))
+ {
+ CHECK_INT (val);
+ x = XINT (val);
+ x_position_specified_p = 1;
+ }
+ else if (EQ (prop, Qtop))
+ {
+ CHECK_INT (val);
+ y = XINT (val);
+ y_position_specified_p = 1;
+ }
+ }
+ }
+
+ /* Kludge kludge kludge. We need to deal with the size and position
+ specially. */
+ {
+ int size_specified_p = width_specified_p || height_specified_p;
+ int position_specified_p = x_position_specified_p || y_position_specified_p;
+
+ if (!width_specified_p)
+ width = FRAME_WIDTH (f);
+ if (!height_specified_p)
+ height = FRAME_HEIGHT (f);
+
+ /* Kludge kludge kludge kludge. */
+ if (position_specified_p &&
+ (!x_position_specified_p || !y_position_specified_p))
+ {
+ Rect r;
+
+ if (GetWindowBounds (FRAME_CARBON_WINDOW (f), kWindowStructureRgn, &r) != noErr)
+ invalid_operation ("Cannot get window bounds", wrap_frame (f));
+
+ if (!x_position_specified_p)
+ x = (int)r.left;
+ if (!y_position_specified_p)
+ y = (int)r.top;
+ }
+
+ if (!f->init_finished)
+ {
+ if (size_specified_p || position_specified_p)
+ carbon_set_initial_frame_size (f, x, y, width, height);
+ }
+ else
+ {
+ if (size_specified_p)
+ {
+ Lisp_Object frame = wrap_frame (f);
+
+ Fset_frame_size (frame, make_int (width), make_int (height), Qnil);
+ }
+ if (position_specified_p)
+ {
+ Lisp_Object frame = wrap_frame (f);
+
+ Fset_frame_position (frame, make_int (x), make_int (y));
+ }
+ }
+ }
+}
+
+static void
+carbon_set_title_from_ibyte (struct frame *f, Ibyte *name)
+{
+ Extbyte *ext_name;
+ int ext_name_len;
+
+ TO_EXTERNAL_FORMAT (DATA, (name, qxestrlen (name)), ALLOCA, (ext_name, ext_name_len), Qcarbon_unicode);
+
+ CFStringRef cfname = CFStringCreateWithCharacters (NULL, (UniChar *)ext_name, ext_name_len / 2);
+
+ if (SetWindowTitleWithCFString (FRAME_CARBON_WINDOW (f), cfname) != noErr)
+ invalid_operation ("Cannot set window title", wrap_frame (f));
+
+ CFRelease (cfname);
+}
+
+static int
+carbon_frame_visible_p (struct frame *f)
+{
+ return IsWindowVisible (FRAME_CARBON_WINDOW (f));
+}
+
+static int
+carbon_frame_totally_visible_p (struct frame *f)
+{
+ invalid_operation ("carbon_frame_totally_visible_p not implemented", wrap_frame (f));
+
+ return carbon_frame_visible_p(f);
+}
+
+static int
+carbon_frame_iconified_p (struct frame *f)
+{
+ return IsWindowCollapsed (FRAME_CARBON_WINDOW (f));
+}
+
+static void
+carbon_set_frame_pointer (struct frame * UNUSED (f))
+{
+ /* Cursors will be difficult unless we use the old QuickDraw API. */
+}
+
+static Lisp_Object
+carbon_get_frame_parent (struct frame * UNUSED (f))
+{
+ /* Carbon windows really don't have parents. */
+ return Qnil;
+}
+
+static void
+carbon_update_frame_external_traits (struct frame *UNUSED (frm), Lisp_Object UNUSED (name))
+{
+}
+
+void
+syms_of_frame_carbon (void)
+{
+}
+
+void
+console_type_create_frame_carbon (void)
+{
+ /* frame methods */
+ CONSOLE_HAS_METHOD (carbon, init_frame_1);
+ CONSOLE_HAS_METHOD (carbon, init_frame_2);
+ CONSOLE_HAS_METHOD (carbon, init_frame_3);
+ CONSOLE_HAS_METHOD (carbon, mark_frame);
+ CONSOLE_HAS_METHOD (carbon, focus_on_frame);
+ CONSOLE_HAS_METHOD (carbon, delete_frame);
+ /* CONSOLE_HAS_METHOD (carbon, get_mouse_position); */
+ /* CONSOLE_HAS_METHOD (carbon, set_mouse_position); */
+ CONSOLE_HAS_METHOD (carbon, raise_frame);
+ CONSOLE_HAS_METHOD (carbon, lower_frame);
+ CONSOLE_HAS_METHOD (carbon, make_frame_visible);
+ CONSOLE_HAS_METHOD (carbon, make_frame_invisible);
+ CONSOLE_HAS_METHOD (carbon, iconify_frame);
+ CONSOLE_HAS_METHOD (carbon, set_frame_size);
+ CONSOLE_HAS_METHOD (carbon, set_frame_position);
+ CONSOLE_HAS_METHOD (carbon, frame_property);
+ CONSOLE_HAS_METHOD (carbon, internal_frame_property_p);
+ CONSOLE_HAS_METHOD (carbon, frame_properties);
+ CONSOLE_HAS_METHOD (carbon, set_frame_properties);
+ CONSOLE_HAS_METHOD (carbon, set_title_from_ibyte);
+ /* CONSOLE_HAS_METHOD (carbon, set_icon_name_from_ibyte); */
+ CONSOLE_HAS_METHOD (carbon, frame_visible_p);
+ CONSOLE_HAS_METHOD (carbon, frame_totally_visible_p);
+ CONSOLE_HAS_METHOD (carbon, frame_iconified_p);
+ CONSOLE_HAS_METHOD (carbon, set_frame_pointer);
+ CONSOLE_HAS_METHOD (carbon, get_frame_parent);
+ CONSOLE_HAS_METHOD (carbon, update_frame_external_traits);
+}
+
+void
+vars_of_frame_carbon (void)
+{
+}
1.1.2.1 +606 -0 XEmacs/xemacs/src/Attic/glyphs-carbon.c
Index: glyphs-carbon.c
===================================================================
RCS file: glyphs-carbon.c
diff -N glyphs-carbon.c
--- /dev/null Fri Feb 25 17:30:12 2005
+++ /tmp/cvsAAAAhaOQi Fri Feb 25 17:30:16 2005
＠＠ -0,0 +1,606 ＠＠
+/*
+ The following code is original work by me, except where noted with
+ the comments "Taken from ..." or "Adapted from ...". I now place
+ it in the public domain.
+
+ Andrew Choi. Calgary, Canada, February 9, 2005. */
+
+#include <config.h>
+#include "lisp.h"
+
+#include "sysfile.h"
+#include "glyphs-carbon.h"
+
+#include "console-carbon-impl.h"
+#include "objects-carbon-impl.h"
+
+#include "../carbon/xpm/xpm.h"
+
+extern unsigned long carbon_string_to_color (const Ibyte *);
+
+static CGColorRef transparent_color;
+
+#ifdef HAVE_XPM
+DEFINE_DEVICE_IIFORMAT (carbon, xpm);
+#endif
+
+/* Taken from glyphs-msw.c. */
+static void
+carbon_print_image_instance (Lisp_Image_Instance *p,
+ Lisp_Object printcharfun,
+ int UNUSED (escapeflag))
+{
+ switch (IMAGE_INSTANCE_TYPE (p))
+ {
+ case IMAGE_MONO_PIXMAP:
+ case IMAGE_COLOR_PIXMAP:
+ case IMAGE_POINTER:
+ write_fmt_string (printcharfun, " (0x%lx", (unsigned long) IMAGE_INSTANCE_CARBON_IMAGE_REF (p));
+ write_c_string (printcharfun, ")");
+ break;
+
+ default:
+ break;
+ }
+}
+
+/* Taken from glyphs-msw.c. */
+static void
+carbon_finalize_image_instance (Lisp_Image_Instance *p)
+{
+ if (!p->data)
+ return;
+
+ if (DEVICE_LIVE_P (XDEVICE (IMAGE_INSTANCE_DEVICE (p))))
+ {
+ int i;
+ if (IMAGE_INSTANCE_PIXMAP_TIMEOUT (p))
+ disable_glyph_animated_timeout (IMAGE_INSTANCE_PIXMAP_TIMEOUT (p));
+
+ if (IMAGE_INSTANCE_CARBON_IMAGE_REF_SLICES (p))
+ {
+ for (i = 0; i < IMAGE_INSTANCE_PIXMAP_MAXSLICE (p); i++)
+ {
+ if (IMAGE_INSTANCE_CARBON_IMAGE_REF_SLICE (p, i))
+ CGImageRelease (IMAGE_INSTANCE_CARBON_IMAGE_REF_SLICE (p, i));
+ IMAGE_INSTANCE_CARBON_IMAGE_REF_SLICE (p, i) = 0;
+ }
+ xfree (IMAGE_INSTANCE_CARBON_IMAGE_REF_SLICES (p), CGImageRef *);
+ IMAGE_INSTANCE_CARBON_IMAGE_REF_SLICES (p) = 0;
+ }
+ }
+
+ if (p->data)
+ {
+ xfree (p->data, void *);
+ p->data = 0;
+ }
+}
+
+/* Taken from glyphs-msw.c. */
+static int
+carbon_image_instance_equal (Lisp_Image_Instance *p1, Lisp_Image_Instance *p2, int UNUSED (depth))
+{
+ switch (IMAGE_INSTANCE_TYPE (p1))
+ {
+ case IMAGE_MONO_PIXMAP:
+ case IMAGE_COLOR_PIXMAP:
+ case IMAGE_POINTER:
+ if (IMAGE_INSTANCE_CARBON_IMAGE_REF (p1) != IMAGE_INSTANCE_CARBON_IMAGE_REF (p2))
+ return 0;
+ break;
+
+ default:
+ break;
+ }
+
+ return 1;
+}
+
+/* Taken from glyphs-msw.c. */
+static Hashcode
+carbon_image_instance_hash (Lisp_Image_Instance *p, int UNUSED (depth))
+{
+ switch (IMAGE_INSTANCE_TYPE (p))
+ {
+ case IMAGE_MONO_PIXMAP:
+ case IMAGE_COLOR_PIXMAP:
+ case IMAGE_POINTER:
+ return (Hashcode) IMAGE_INSTANCE_CARBON_IMAGE_REF (p);
+
+ default:
+ return 0;
+ }
+}
+
+static void
+data_provider_release_data (void *info, const void * UNUSED (data), size_t UNUSED (size))
+{
+ xfree (info, UChar_Binary *);
+}
+
+static CGImageRef
+convert_EImage_to_image_ref (int width, int height, UChar_Binary *pic)
+{
+ /* Need to make a copy because data providers don't really /hold/ any data within them, and contents of "pic" aren't guaranteed to hang around. */
+ unsigned int data_len = width * height * 4;
+ UChar_Binary *data = (UChar_Binary *) xmalloc (data_len);
+ memcpy (data, pic, data_len);
+
+ CGDataProviderRef provider = CGDataProviderCreateWithData (data, data, data_len, data_provider_release_data);
+ CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB ();
+
+ CGImageRef image = CGImageCreate (width, height, 8, 32, width * 4, cs, kCGImageAlphaFirst, provider, NULL, TRUE, kCGRenderingIntentDefault);
+
+ CGDataProviderRelease (provider);
+ CGColorSpaceRelease (cs);
+
+ /* Image retains provider, data should freed when image is freed. */
+ return image;
+}
+
+/* Adapted from glyphs-msw.c. */
+/* Set all the slots in an image instance structure to reasonable
+ default values. This is used somewhere within an instantiate
+ method. It is assumed that the device slot within the image
+ instance is already set -- this is the case when instantiate
+ methods are called. */
+static void
+carbon_initialize_image_ref_image_instance (Lisp_Image_Instance *ii,
+ int slices,
+ enum image_instance_type type)
+{
+ ii->data = xnew_and_zero (struct carbon_image_instance_data);
+ IMAGE_INSTANCE_TYPE (ii) = type;
+ IMAGE_INSTANCE_PIXMAP_FILENAME (ii) = Qnil;
+ IMAGE_INSTANCE_PIXMAP_MASK_FILENAME (ii) = Qnil;
+ IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii) = Qnil;
+ IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii) = Qnil;
+ IMAGE_INSTANCE_PIXMAP_FG (ii) = Qnil;
+ IMAGE_INSTANCE_PIXMAP_BG (ii) = Qnil;
+ IMAGE_INSTANCE_PIXMAP_MAXSLICE (ii) = slices;
+ IMAGE_INSTANCE_CARBON_IMAGE_REF_SLICES (ii) =
+ xnew_array_and_zero (CGImageRef, slices);
+}
+
+/* Adapted from glyphs-msw.c. */
+/* Initialize an image instance from a bitmap
+
+ DEST_MASK specifies the mask of allowed image types.
+
+ If this fails, signal an error. INSTANTIATOR is only used
+ in the error message. */
+static void
+init_image_instance_from_image_ref (Lisp_Image_Instance *ii, CGImageRef image_ref, int dest_mask, int slices, Lisp_Object instantiator, int x_hot, int y_hot, int UNUSED (create_mask))
+{
+ enum image_instance_type type;
+
+ if (dest_mask & IMAGE_COLOR_PIXMAP_MASK)
+ type = IMAGE_COLOR_PIXMAP;
+ else if (dest_mask & IMAGE_POINTER_MASK)
+ type = IMAGE_POINTER;
+ else
+ incompatible_image_types (instantiator, dest_mask, IMAGE_COLOR_PIXMAP_MASK | IMAGE_POINTER_MASK);
+
+ carbon_initialize_image_ref_image_instance (ii, slices, type);
+
+ IMAGE_INSTANCE_PIXMAP_FILENAME (ii) = find_keyword_in_vector (instantiator, Q_file);
+
+ IMAGE_INSTANCE_CARBON_IMAGE_REF (ii) = CGImageRetain (image_ref);
+
+ IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = 32;
+ IMAGE_INSTANCE_PIXMAP_HOTSPOT_X (ii) = make_int (x_hot);
+ IMAGE_INSTANCE_PIXMAP_HOTSPOT_Y (ii) = make_int (y_hot);
+ IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = CGImageGetWidth (image_ref);
+ IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = CGImageGetHeight (image_ref);
+}
+
+/* Adapted from glyphs-msw.c. */
+static void
+image_instance_add_image_ref (Lisp_Image_Instance *ii, CGImageRef image_ref, int slice, Lisp_Object UNUSED (instantiator))
+{
+ IMAGE_INSTANCE_CARBON_IMAGE_REF_SLICE (ii, slice) = CGImageRetain (image_ref);
+}
+
+/* Adapted from glyphs-msw.c. */
+static void
+carbon_init_image_instance_from_eimage (Lisp_Image_Instance *ii, int width, int height, int slices, UChar_Binary *eimage, int dest_mask, Lisp_Object instantiator, Lisp_Object UNUSED (domain))
+{
+ CGImageRef image_ref;
+ int slice;
+
+ for (slice = 0; slice < slices; slice++)
+ {
+ /* build a Quartz 2D image from the eimage */
+ if (!(image_ref = convert_EImage_to_image_ref (width, height, eimage + (width * height * 4 * slice))))
+ {
+ signal_image_error ("EImage to Quartz 2D image conversion failed", instantiator);
+ }
+
+ /* Now create the pixmap and set up the image instance */
+ if (slice == 0)
+ init_image_instance_from_image_ref (ii, image_ref, dest_mask, slices, instantiator, 0, 0, 0);
+ else
+ image_instance_add_image_ref (ii, image_ref, slice, instantiator);
+
+ CGImageRelease (image_ref);
+ }
+}
+
+/* Taken from glyphs-msw.c. */
+/* Given a pixmap filename, look through all of the "standard" places
+ where the file might be located. Return a full pathname if found;
+ otherwise, return Qnil. */
+static Lisp_Object
+carbon_locate_pixmap_file (Lisp_Object name)
+{
+ /* Check non-absolute pathnames with a directory component relative to
+ the search path; that's the way Xt does it. */
+ if (IS_DIRECTORY_SEP(string_byte (name, 0)) ||
+ (string_byte (name, 0) == '.' &&
+ (IS_DIRECTORY_SEP(string_byte (name, 1)) ||
+ (string_byte (name, 1) == '.' &&
+ (IS_DIRECTORY_SEP(string_byte (name, 2)))))))
+ {
+ if (!NILP (Ffile_readable_p (name)))
+ return Fexpand_file_name (name, Qnil);
+ else
+ return Qnil;
+ }
+
+ Lisp_Object found;
+ Lisp_Object temp = list1 (Vdata_directory);
+ struct gcpro gcpro1;
+
+ GCPRO1 (temp);
+ locate_file (temp, name, Qnil, &found, R_OK);
+ UNGCPRO;
+
+ return found;
+}
+
+/**********************************************************************
+ * XPM *
+ **********************************************************************/
+
+#ifdef HAVE_XPM
+
+#define BPLINE(width) ((int)(~3UL & (unsigned long)((width) +3)))
+
+struct color_symbol
+{
+ Ibyte * name;
+ CGColorRef color;
+};
+
+/* Taken from glyphs-msw.c. */
+static struct color_symbol *
+extract_xpm_color_names (Lisp_Object device,
+ Lisp_Object domain,
+ Lisp_Object color_symbol_alist,
+ int *nsymbols)
+{
+ /* This function can GC */
+ Lisp_Object rest;
+ Lisp_Object results = Qnil;
+ int i, j;
+ struct color_symbol *colortbl;
+ struct gcpro gcpro1, gcpro2;
+
+ GCPRO2 (results, device);
+
+ /* We built up results to be (("name" . #<color>) ...) so that if an
+ error happens we don't lose any malloc()ed data, or more importantly,
+ leave any pixels allocated in the server. */
+ i = 0;
+ LIST_LOOP (rest, color_symbol_alist)
+ {
+ Lisp_Object cons = XCAR (rest);
+ Lisp_Object name = XCAR (cons);
+ Lisp_Object value = XCDR (cons);
+ if (NILP (value))
+ continue;
+ if (STRINGP (value))
+ value =
+ Fmake_color_instance
+ (value, device, encode_error_behavior_flag (ERROR_ME_DEBUG_WARN));
+ else
+ {
+ assert (COLOR_SPECIFIERP (value));
+ value = Fspecifier_instance (value, domain, Qnil, Qnil);
+ }
+ if (NILP (value))
+ continue;
+ results = noseeum_cons (noseeum_cons (name, value), results);
+ i++;
+ }
+ UNGCPRO; /* no more evaluation */
+
+ *nsymbols = i;
+ if (i == 0) return 0;
+
+ colortbl = xnew_array_and_zero (struct color_symbol, i);
+
+ for (j = 0; j < i; j++)
+ {
+ Lisp_Object cons = XCAR (results);
+ colortbl[j].color =
+ COLOR_INSTANCE_CARBON_COLOR (XCOLOR_INSTANCE (XCDR (cons)));
+
+ /* mustn't lose this when we return */
+ colortbl[j].name = qxestrdup (XSTRING_DATA (XCAR (cons)));
+ free_cons (cons);
+ cons = results;
+ results = XCDR (results);
+ free_cons (cons);
+ }
+ return colortbl;
+}
+
+static CGColorRef
+carbon_string_to_color_ref (Ibyte * color_name)
+{
+ unsigned long color = carbon_string_to_color (color_name);
+ if (color != UNRECOGNIZED_COLOR)
+ {
+ float color_components[4] = {
+ RED_FROM_ULONG (color) / 255.0,
+ GREEN_FROM_ULONG (color) / 255.0,
+ BLUE_FROM_ULONG (color) / 255.0,
+ 1.0
+ };
+
+ CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB ();
+ CGColorRef color_ref = CGColorCreate (cs, color_components);
+ CGColorSpaceRelease (cs);
+
+ return color_ref;
+ }
+ else
+ return transparent_color;
+}
+
+/* Taken from glyphs-msw.c. */
+static int xpm_to_eimage (Lisp_Object image, const Extbyte *buffer,
+ UChar_Binary **data,
+ int *width, int *height,
+ int *x_hot, int *y_hot,
+ int *transp,
+ struct color_symbol *color_symbols,
+ int nsymbols)
+{
+ XpmImage xpmimage;
+ XpmInfo xpminfo;
+ int result, i, j, transp_idx, maskbpline;
+ UChar_Binary *dptr;
+ unsigned int *sptr;
+ CGColorRef color; /* the american spelling virus hits again .. */
+ CGColorRef *colortbl;
+
+ xzero (xpmimage);
+ xzero (xpminfo);
+ xpminfo.valuemask = XpmHotspot;
+ *transp = FALSE;
+
+ result = XpmCreateXpmImageFromBuffer ((char *)buffer,
+ &xpmimage,
+ &xpminfo);
+ switch (result)
+ {
+ case XpmSuccess:
+ break;
+ case XpmFileInvalid:
+ {
+ signal_image_error ("Invalid XPM data", image);
+ }
+ case XpmNoMemory:
+ {
+ signal_double_image_error ("Parsing pixmap data",
+ "out of memory", image);
+ }
+ default:
+ {
+ signal_double_image_error_2 ("Parsing pixmap data",
+ "unknown error",
+ make_int (result), image);
+ }
+ }
+
+ *width = xpmimage.width;
+ *height = xpmimage.height;
+ maskbpline = BPLINE ((~7UL & (unsigned long)(*width + 7)) / 8);
+
+ *data = xnew_array_and_zero (UChar_Binary, *width * *height * 4);
+
+ if (!*data)
+ {
+ XpmFreeXpmImage (&xpmimage);
+ XpmFreeXpmInfo (&xpminfo);
+ return 0;
+ }
+
+ /* build a color table to speed things up */
+ colortbl = xnew_array_and_zero (CGColorRef, xpmimage.ncolors);
+ if (!colortbl)
+ {
+ xfree (*data, UChar_Binary *);
+ XpmFreeXpmImage (&xpmimage);
+ XpmFreeXpmInfo (&xpminfo);
+ return 0;
+ }
+
+ for (i = 0; i < (int) xpmimage.ncolors; i++)
+ {
+ /* goto alert!!!! */
+ /* pick up symbolic colors in preference */
+ if (xpmimage.colorTable[i].symbolic)
+ {
+ if (!strcasecmp (xpmimage.colorTable[i].symbolic, "BgColor")
+ ||
+ !strcasecmp (xpmimage.colorTable[i].symbolic, "None"))
+ {
+ *transp = TRUE;
+ colortbl[i] = transparent_color;
+ transp_idx = i;
+ goto label_found_color;
+ }
+ else if (color_symbols)
+ {
+ for (j = 0; j < nsymbols; j++)
+ {
+ if (!qxestrcmp_c (color_symbols[j].name,
+ xpmimage.colorTable[i].symbolic))
+ {
+ colortbl[i] = color_symbols[j].color;
+ goto label_found_color;
+ }
+ }
+ }
+ else if (xpmimage.colorTable[i].c_color == 0)
+ {
+ goto label_no_color;
+ }
+ }
+ /* pick up transparencies */
+ if (!strcasecmp (xpmimage.colorTable[i].c_color, "None"))
+ {
+ *transp = TRUE;
+ colortbl[i] = transparent_color;
+ transp_idx = i;
+ goto label_found_color;
+ }
+ /* finally pick up a normal color spec */
+ if (xpmimage.colorTable[i].c_color)
+ {
+ colortbl[i]= carbon_string_to_color_ref ((Ibyte *) xpmimage.colorTable[i].c_color);
+ goto label_found_color;
+ }
+
+ label_no_color:
+ xfree (*data, UChar_Binary *);
+ xfree (colortbl, CGColorRef *);
+ XpmFreeXpmImage (&xpmimage);
+ XpmFreeXpmInfo (&xpminfo);
+ return 0;
+
+ label_found_color:;
+ }
+
+ /* convert the image */
+ sptr = xpmimage.data;
+ dptr = *data;
+ for (i = 0; i< *width * *height; i++)
+ {
+ color = colortbl[*sptr++];
+
+ /* split out the CGColorRef into an rgb triple */
+ *dptr++ = (int)(CGColorGetComponents (color)[3] * 255); /* alpha */
+ *dptr++ = (int)(CGColorGetComponents (color)[0] * 255); /* red */
+ *dptr++ = (int)(CGColorGetComponents (color)[1] * 255); /* green */
+ *dptr++ = (int)(CGColorGetComponents (color)[2] * 255); /* blue */
+ }
+
+ *x_hot = xpminfo.x_hotspot;
+ *y_hot = xpminfo.y_hotspot;
+
+ XpmFreeXpmImage (&xpmimage);
+ XpmFreeXpmInfo (&xpminfo);
+ xfree (colortbl, CGColorRef *);
+ return TRUE;
+}
+
+/* Taken from glyphs-msw.c. */
+static void
+carbon_xpm_instantiate (Lisp_Object image_instance,
+ Lisp_Object instantiator,
+ Lisp_Object UNUSED (pointer_fg),
+ Lisp_Object UNUSED (pointer_bg),
+ int dest_mask, Lisp_Object domain)
+{
+ Lisp_Image_Instance *ii = XIMAGE_INSTANCE (image_instance);
+ Lisp_Object device = IMAGE_INSTANCE_DEVICE (ii);
+ const Extbyte *bytes;
+ Bytecount len;
+ UChar_Binary *eimage;
+ int width, height, x_hot, y_hot;
+ CGImageRef image_ref;
+ int nsymbols = 0, transp;
+ struct color_symbol* color_symbols = NULL;
+
+ Lisp_Object data = find_keyword_in_vector (instantiator, Q_data);
+ Lisp_Object color_symbol_alist = find_keyword_in_vector (instantiator,
+ Q_color_symbols);
+
+ /* CHECK_MSGDI_DEVICE (device); */
+
+ assert (!NILP (data));
+
+ TO_EXTERNAL_FORMAT (LISP_STRING, data,
+ ALLOCA, (bytes, len),
+ Qbinary);
+
+ /* in case we have color symbols */
+ color_symbols = extract_xpm_color_names (device, domain,
+ color_symbol_alist, &nsymbols);
+
+ /* convert to an eimage to make processing easier */
+ if (!xpm_to_eimage (image_instance, bytes, &eimage, &width, &height,
+ &x_hot, &y_hot, &transp, color_symbols, nsymbols))
+ {
+ signal_image_error ("XPM to EImage conversion failed",
+ image_instance);
+ }
+
+ if (color_symbols)
+ {
+ while (nsymbols--)
+ {
+ xfree (color_symbols[nsymbols].name, Ibyte *);
+ }
+ xfree(color_symbols, struct color_symbol *);
+ }
+
+ /* build a bitmap from the eimage */
+ if (!(image_ref = convert_EImage_to_image_ref (width, height, eimage)))
+ {
+ signal_image_error ("XPM to EImage conversion failed",
+ image_instance);
+ }
+ xfree (eimage, UChar_Binary *);
+
+ /* Now create the pixmap and set up the image instance */
+ init_image_instance_from_image_ref (ii, image_ref, dest_mask,
+ 1, instantiator,
+ x_hot, y_hot, transp);
+ CGImageRelease (image_ref);
+}
+#endif /* HAVE_XPM */
+
+void
+console_type_create_glyphs_carbon (void)
+{
+ CONSOLE_HAS_METHOD (carbon, print_image_instance);
+ CONSOLE_HAS_METHOD (carbon, finalize_image_instance);
+ CONSOLE_HAS_METHOD (carbon, image_instance_equal);
+ CONSOLE_HAS_METHOD (carbon, image_instance_hash);
+ CONSOLE_HAS_METHOD (carbon, init_image_instance_from_eimage);
+ CONSOLE_HAS_METHOD (carbon, locate_pixmap_file);
+}
+
+void
+image_instantiator_format_create_glyphs_carbon (void)
+{
+#ifdef HAVE_XPM
+ INITIALIZE_DEVICE_IIFORMAT (carbon, xpm);
+ IIFORMAT_HAS_DEVMETHOD (carbon, xpm, instantiate);
+#endif
+}
+
+void
+reinit_vars_of_glyphs_carbon (void)
+{
+ float color_components[4] = { 0.0, 0.0, 0.0, 0.0 };
+ CGColorSpaceRef cs = CGColorSpaceCreateDeviceRGB ();
+ transparent_color = CGColorCreate (cs, color_components);
+ CGColorSpaceRelease (cs);
+}
1.1.2.1 +45 -0 XEmacs/xemacs/src/Attic/glyphs-carbon.h
Index: glyphs-carbon.h
===================================================================
RCS file: glyphs-carbon.h
diff -N glyphs-carbon.h
--- /dev/null Fri Feb 25 17:30:16 2005
+++ /tmp/cvsAAAbjaaRi Fri Feb 25 17:30:16 2005
＠＠ -0,0 +1,45 ＠＠
+/*
+ The following code is original work by me, except where noted with
+ the comments "Taken from ..." or "Adapted from ...". I now place
+ it in the public domain.
+
+ Andrew Choi. Calgary, Canada, February 9, 2005. */
+
+#ifndef INCLUDED_glyphs_carbon_h_
+#define INCLUDED_glyphs_carbon_h_
+
+#ifdef HAVE_CARBON
+
+#include <Carbon/Carbon.h>
+
+#include "glyphs.h"
+
+/****************************************************************************
+ * Image-Instance Object *
+ ****************************************************************************/
+
+struct carbon_image_instance_data
+{
+ CGImageRef *image_ref;
+};
+
+#define CARBON_IMAGE_INSTANCE_DATA(i) \
+((struct carbon_image_instance_data *) (i)->data)
+
+#define IMAGE_INSTANCE_CARBON_IMAGE_REF(i) \
+(CARBON_IMAGE_INSTANCE_DATA (i)->image_ref[0])
+#define IMAGE_INSTANCE_CARBON_IMAGE_REF_SLICE(i,slice) \
+(CARBON_IMAGE_INSTANCE_DATA (i)->image_ref[slice])
+#define IMAGE_INSTANCE_CARBON_IMAGE_REF_SLICES(i) \
+(CARBON_IMAGE_INSTANCE_DATA (i)->image_ref)
+
+#define XIMAGE_INSTANCE_CARBON_IMAGE_REF(i) \
+IMAGE_INSTANCE_CARBON_IMAGE_REF (XIMAGE_INSTANCE (i))
+#define XIMAGE_INSTANCE_CARBON_IMAGE_REF_SLICE(i, slice) \
+IMAGE_INSTANCE_CARBON_IMAGE_REF_SLICE (XIMAGE_INSTANCE (i, slice))
+#define XIMAGE_INSTANCE_CARBON_IMAGE_REF_SLICES(i) \
+IMAGE_INSTANCE_CARBON_IMAGE_REF_SLICES (XIMAGE_INSTANCE (i))
+
+#endif /* HAVE_CARBON */
+
+#endif /* INCLUDED_glyphs_carbon_h_ */
1.1.2.1 +23 -0 XEmacs/xemacs/src/Attic/intl-carbon.c
Index: intl-carbon.c
===================================================================
RCS file: intl-carbon.c
diff -N intl-carbon.c
--- /dev/null Fri Feb 25 17:30:16 2005
+++ /tmp/cvsAAA3ka4Ri Fri Feb 25 17:30:16 2005
＠＠ -0,0 +1,23 ＠＠
+/*
+ The following code is original work by me, except where noted with
+ the comments "Taken from ..." or "Adapted from ...". I now place
+ it in the public domain.
+
+ Andrew Choi. Calgary, Canada, February 9, 2005. */
+
+#include <config.h>
+#include "lisp.h"
+
+Lisp_Object Qcarbon_unicode;
+
+void
+syms_of_intl_carbon (void)
+{
+ DEFSYMBOL (Qcarbon_unicode);
+}
+
+void
+complex_vars_of_intl_carbon (void)
+{
+ Fmake_coding_system (Qcarbon_unicode, Qunicode, build_msg_string ("Carbon Unicode"), nconc2 (list4 (Qdocumentation, build_msg_string ( "Converts to the Unicode encoding for Carbon/Quartz 2D calls.\nThe encoding used is standard UTF-16 big-endian."), Qmnemonic, build_string ("CARBON-U")), list4 (Qtype, Qutf_16, Qlittle_endian, Qnil)));
+}
1.1.2.1 +803 -0 XEmacs/xemacs/src/Attic/menubar-carbon.c
Index: menubar-carbon.c
===================================================================
RCS file: menubar-carbon.c
diff -N menubar-carbon.c
--- /dev/null Fri Feb 25 17:30:16 2005
+++ /tmp/cvsAAAwmaqSi Fri Feb 25 17:30:16 2005
＠＠ -0,0 +1,803 ＠＠
+/*
+ The following code is original work by me, except where noted with
+ the comments "Taken from ..." or "Adapted from ...". I now place
+ it in the public domain.
+
+ Andrew Choi. Calgary, Canada, February 9, 2005. */
+
+#include <config.h>
+#include "lisp.h"
+
+#include "gui.h"
+#include "window-impl.h"
+#include "menubar.h"
+#include "events.h"
+
+#include "console-carbon-impl.h"
+
+extern void carbon_enqueue_misc_user_event (Lisp_Object, Lisp_Object, Lisp_Object);
+ /* In event-carbon.c */
+
+struct menu_callback_data
+{
+ Lisp_Object desc;
+ Lisp_Object filter;
+};
+
+static MenuRef create_menu (Lisp_Object);
+static int parse_menu_item (Lisp_Object, CFStringRef *, int *, int *, Lisp_Object *);
+
+/* Adapted from redisplay.c (called eval_within_redisplay there). */
+static Lisp_Object
+eval_within_menu_callback (Lisp_Object thing_to_eval)
+{
+ return
+ eval_in_buffer_trapping_problems ("Error evaluating Lisp expression in menu callback", current_buffer, thing_to_eval, INHIBIT_ENTERING_DEBUGGER | INHIBIT_WARNING_ISSUE);
+}
+
+/* Need to handle mouse-down events on the menubar ourselves since we are
+ not using RunApplicationEventLoop. */
+static pascal OSStatus
+mouse_down (EventHandlerCallRef UNUSED (nextHandler), EventRef theEvent, void* UNUSED (userData))
+{
+ HIPoint location;
+ GetEventParameter(theEvent, kEventParamMouseLocation, typeHIPoint, NULL, sizeof(location), NULL, &location);
+
+ WindowRef window;
+ Point point;
+ point.h = location.x;
+ point.v = location.y;
+ long selection;
+ if (FindWindow (point, &window) == inMenuBar)
+ /* Note: MenuSelect sends kEventMenuPopulate and kEventCommandProcess events. */
+ selection = MenuSelect (point);
+
+ /* Unhighlight the menu. */
+ HiliteMenu (0);
+
+ return noErr;
+}
+
+static MenuRef
+carbon_create_menubar (void)
+{
+ /* The root menu must not have a name. */
+ MenuRef menu;
+
+ if (CreateNewMenu (0, 0, &menu) != noErr)
+ stderr_out ("Can't create root menu\n");
+
+ return menu;
+}
+
+static MenuRef
+carbon_create_menu (CFStringRef name)
+{
+ MenuRef menu;
+
+ if (CreateNewMenu (0, 0, &menu) != noErr)
+ stderr_out ("Can't create menu\n");
+
+ if (SetMenuTitleWithCFString (menu, name) != noErr)
+ stderr_out ("Can't set menu name\n");
+
+ return menu;
+}
+
+static void
+carbon_append_submenu (MenuRef menu, MenuRef submenu)
+{
+ CFStringRef name;
+
+ if (CopyMenuTitleAsCFString (submenu, &name) != noErr)
+ stderr_out ("Can't get name of submenu\n");
+
+ MenuItemIndex index;
+ if (AppendMenuItemTextWithCFString (menu, name, 0, 'NOOP', &index) != noErr)
+ stderr_out ("Can't add submenu item\n");
+
+ CFRelease(name);
+
+ if (SetMenuItemHierarchicalMenu (menu, index, submenu) != noErr)
+ stderr_out ("Can't attach submenu to menu\n");
+}
+
+static void
+carbon_append_menu_item (MenuRef menu, CFStringRef name, UInt32 command, int active, int selected, Lisp_Object callback)
+{
+ MenuItemIndex index;
+ if (AppendMenuItemTextWithCFString (menu, name, active ? 0 : kMenuItemAttrDisabled, command, &index) != noErr)
+ stderr_out ("Can't append menu item\n");
+
+ if (selected)
+ SetItemMark (menu, index, kCheckCharCode);
+
+ if (SetMenuItemProperty (menu, index, 'EMAx', 'CMCB', sizeof (Lisp_Object), &callback) != noErr)
+ stderr_out ("Can't set menu item property\n");
+}
+
+static void
+carbon_release_menu (MenuRef menu)
+{
+ if (ReleaseMenu (menu) != noErr)
+ stderr_out ("Can't release menu\n");
+}
+
+static pascal OSStatus
+populate_menu (EventHandlerCallRef UNUSED (nextHandler), EventRef theEvent, void* UNUSED (userData))
+{
+ /* Check whether event is actually triggered by display of menu. */
+ UInt32 context;
+ GetEventParameter (theEvent, kEventParamMenuContext, typeUInt32, NULL, sizeof (context), NULL, &context);
+ if (!(context & (kMenuContextMenuBarTracking | kMenuContextPopUpTracking)))
+ return noErr;
+
+ MenuRef menu;
+ GetEventParameter (theEvent, kEventParamDirectObject, typeMenuRef, NULL, sizeof(menu), NULL, &menu);
+
+ struct menu_callback_data callback_data;
+ if (GetMenuItemProperty (menu, 0, 'EMAx', 'CMCB', sizeof (struct menu_callback_data), NULL, &callback_data) != noErr)
+ stderr_out ("Can't get menu property\n");
+
+ if (DeleteMenuItems (menu, 1, CountMenuItems (menu)) != noErr)
+ stderr_out ("Can't clear menu\n");
+
+ Lisp_Object desc = callback_data.desc;
+
+ if (!NILP (Ffunctionp (callback_data.filter)))
+ {
+ struct gcpro gcpro1, gcpro2;
+ GCPRO2 (desc, callback_data.filter);
+
+ /* Perhaps a bit paranoid. INHIBIT_WARNING_ISSUE /is/ recommended in
+ the documentation of call_trapping_problems. */
+ desc = call1_trapping_problems ("Error executing filter function in current-menubar", callback_data.filter, desc, INHIBIT_ENTERING_DEBUGGER | INHIBIT_WARNING_ISSUE);
+
+ UNGCPRO;
+ }
+
+ /* If call1_trapping_problems has found problem, abort. Difficult to do
+ more in a callback function. */
+ if (!CONSP (desc))
+ return noErr;
+
+ Lisp_Object tail;
+
+ EXTERNAL_LIST_LOOP (tail, desc)
+ {
+ Lisp_Object item = XCAR (tail);
+
+ if (LISTP (item))
+ {
+ MenuRef submenu = create_menu (item);
+ if (submenu)
+ {
+ carbon_append_submenu (menu, submenu);
+ carbon_release_menu (submenu);
+ }
+ }
+ else
+ {
+ CFStringRef cf_item_name;
+ int active, selected;
+ Lisp_Object callback;
+ if (parse_menu_item (item, &cf_item_name, &active, &selected, &callback))
+ {
+ carbon_append_menu_item (menu, cf_item_name, 'NOOP', active, selected, callback);
+ CFRelease (cf_item_name);
+ }
+ }
+ }
+
+ return noErr;
+}
+
+static pascal OSStatus
+process_command (EventHandlerCallRef UNUSED (nextHandler), EventRef theEvent, void* UNUSED (userData))
+{
+ HICommand command;
+ GetEventParameter (theEvent, kEventParamDirectObject, typeHICommand, NULL, sizeof(command), NULL, &command);
+
+ Lisp_Object callback;
+ /* I actually registered 'EMAx' with Apple DTS for Emacs for Mac OS 8. */
+ if (GetMenuItemProperty (command.menu.menuRef, command.menu.menuItemIndex, 'EMAx', 'CMCB', sizeof (Lisp_Object), NULL, &callback) != noErr)
+ stderr_out ("Can't get menu item property\n");
+
+ Lisp_Object fn, arg;
+ get_gui_callback (callback, &fn, &arg);
+
+ carbon_enqueue_misc_user_event (wrap_frame (selected_frame ()), fn, arg);
+
+ return noErr;
+}
+
+static void
+carbon_set_menu_callback_data (MenuRef menu, const struct menu_callback_data
+*callback_data)
+{
+ if (SetMenuItemProperty (menu, 0, 'EMAx', 'CMCB', sizeof (struct menu_callback_data), callback_data) != noErr)
+ stderr_out ("Can't set menu property\n");
+}
+
+static void
+carbon_install_menu_callback (MenuRef menu)
+{
+ EventTargetRef target_ref = GetMenuEventTarget (menu);
+
+ EventHandlerUPP pm_handler = NewEventHandlerUPP (populate_menu);
+ EventTypeSpec pm_event_types[] =
+ {
+ { kEventClassMenu, kEventMenuPopulate }
+ };
+
+ if (InstallEventHandler (target_ref, pm_handler, 1, pm_event_types, NULL, NULL) != noErr)
+ stderr_out ("Can't attach event handler for populate menu\n");
+
+ DisposeEventHandlerUPP (pm_handler);
+
+ EventHandlerUPP pc_handler = NewEventHandlerUPP (process_command);
+ EventTypeSpec pc_event_types[] =
+ {
+ { kEventClassCommand, kEventCommandProcess }
+ };
+
+ if (InstallEventHandler (target_ref, pc_handler, 1, pc_event_types, NULL, NULL) != noErr)
+ stderr_out ("Can't attach event handler for process commands\n");
+
+ DisposeEventHandlerUPP (pc_handler);
+}
+
+/* Taken from menubar-gtk.c. */
+/* Remove the XEmacs menu accellerator representation from a string. */
+static char *
+remove_underscores(const Ibyte *name)
+{
+ char *rval = (char*) xmalloc_and_zero (qxestrlen(name) + 1);
+ int i;
+ int j = 0;
+
+ for (i = 0; name[i]; i++)
+ {
+ if (name[i]=='%')
+ {
+ i++;
+ if (!(name[i]))
+ continue;
+
+ if ((name[i] != '_') && (name[i] != '%'))
+ i--;
+ else
+ continue;
+ }
+
+ rval[j++] = name[i];
+ }
+
+ return rval;
+}
+
+/* Adapted from menubar-gtk.c. */
+static int
+parse_menu_item (Lisp_Object desc, CFStringRef *cf_name, int *is_active, int *is_selected, Lisp_Object *callback)
+{
+ const static UniChar UniCharLeftBracket = 0x00ab;
+ const static UniChar UniCharRightBracket = 0x00bb;
+ Lisp_Object name;
+ Lisp_Object suffix;
+ Lisp_Object keys;
+
+ Ibyte *label_buffer = NULL;
+ Ibyte *label_buffer2 = NULL;
+
+ *is_active = 1;
+ *is_selected = 1;
+
+ if (STRINGP (desc))
+ {
+ *cf_name = CFStringCreateWithCString (NULL, XSTRING_DATA (desc), kCFStringEncodingISOLatin1);
+
+ return 1;
+ }
+ else if (VECTORP (desc))
+ {
+ name = Qnil;
+ *callback = Qnil;
+ suffix = Qnil;
+ Lisp_Object active_p = Qt;
+ Lisp_Object include_p = Qt;
+ Lisp_Object selected_p = Qnil;
+ keys = Qnil;
+ Lisp_Object style = Qnil;
+ Lisp_Object config_tag = Qnil;
+ Lisp_Object accel = Qnil;
+
+ int length = XVECTOR_LENGTH (desc);
+ Lisp_Object *contents = XVECTOR_DATA (desc);
+ int plist_p;
+ int selected_spec = 0;
+ int included_spec = 0;
+
+ if (length < 2)
+ sferror ("button descriptors must be at least 2 long", desc);
+
+ /* length 2: [ "name" callback ]
+ length 3: [ "name" callback active-p ]
+ length 4: [ "name" callback active-p suffix ] or
+ [ "name" callback keyword value ]
+ length 5+: [ "name" callback [ keyword value ]+ ] */
+ plist_p = (length >= 5 || (length > 2 && KEYWORDP (contents[2])));
+
+ if (!plist_p && length > 2)
+ /* the old way */
+ {
+ name = contents[0];
+ *callback = contents[1];
+ active_p = contents[2];
+ if (length == 4)
+ suffix = contents[3];
+ }
+ else
+ {
+ /* the new way */
+ int i;
+ if (length & 1)
+ sferror ("button descriptor has an odd number of keywords and values", desc);
+
+ name = contents[0];
+ *callback = contents[1];
+ for (i = 2; i < length;)
+ {
+ Lisp_Object key = contents[i++];
+ Lisp_Object val = contents[i++];
+ if (!KEYWORDP (key))
+ invalid_argument_2 ("not a keyword", key, desc);
+
+ if (EQ (key, Q_active))
+ active_p = val;
+ else if (EQ (key, Q_suffix))
+ suffix = val;
+ else if (EQ (key, Q_keys))
+ keys = val;
+ else if (EQ (key, Q_key_sequence))
+ ; /* ignored for FSF compat */
+ else if (EQ (key, Q_label))
+ ; /* implement for 21.0 */
+ else if (EQ (key, Q_style))
+ style = val;
+ else if (EQ (key, Q_selected))
+ {
+ selected_p = val;
+ selected_spec = 1;
+ }
+ else if (EQ (key, Q_included))
+ {
+ include_p = val;
+ included_spec = 1;
+ }
+ else if (EQ (key, Q_config))
+ config_tag = val;
+ else if (EQ (key, Q_accelerator))
+ {
+ if ( SYMBOLP (val) || CHARP (val))
+ accel = val;
+ else
+ invalid_argument ("bad keyboard accelerator", val);
+ }
+ else if (EQ (key, Q_filter))
+ sferror(":filter keyword not permitted on leaf nodes", desc);
+ else
+ invalid_argument_2 ("unknown menu item keyword", key, desc);
+ }
+ }
+
+ /* Skip the rest now if indicated because active_p may not evaluate, e.g. */
+ if (included_spec)
+ {
+ include_p = eval_within_menu_callback (include_p);
+ if (NILP (include_p) || UNBOUNDP (include_p))
+ return 0;
+ }
+
+ if ((!NILP (config_tag) && NILP (Fmemq (config_tag, Vmenubar_configuration))))
+ {
+ return 0;
+ }
+
+ CHECK_STRING (name);
+
+ if (NILP (accel))
+ /* accel = menu_name_to_accelerator (XSTRING_DATA (name)); */
+ ;
+
+ if (!NILP (suffix))
+ suffix = eval_within_menu_callback (suffix);
+
+ if (!separator_string_p (XSTRING_DATA (name)))
+ {
+ if (STRINGP (suffix) && XSTRING_LENGTH (suffix))
+ {
+ label_buffer = (Ibyte*) ALLOCA (XSTRING_LENGTH (name) + 15 + XSTRING_LENGTH (suffix));
+ sprintf ((char*) label_buffer, "%s %s", XSTRING_DATA (name), XSTRING_DATA (suffix));
+ }
+ else
+ {
+ label_buffer = (Ibyte*) ALLOCA (XSTRING_LENGTH (name) + 1);
+ qxestrcpy (label_buffer, XSTRING_DATA (name));
+ }
+ }
+ else
+ {
+ label_buffer = (Ibyte*) ALLOCA (XSTRING_LENGTH (name) + 1);
+ qxestrcpy (label_buffer, XSTRING_DATA (name));
+ }
+
+ /* Evaluate the selected and active items now */
+ if (selected_spec)
+ {
+ if (NILP (selected_p) || EQ (selected_p, Qt))
+ {
+ /* Do nothing */
+ }
+ else
+ {
+ selected_p = eval_within_menu_callback (selected_p);
+ }
+ }
+
+ *is_selected = !NILP (selected_p) && !UNBOUNDP (selected_p);
+
+ if (NILP (active_p) || EQ (active_p, Qt))
+ {
+ /* Do Nothing */
+ }
+ else
+ {
+ active_p = eval_within_menu_callback (active_p);
+ }
+
+ *is_active = !NILP (active_p) && !UNBOUNDP (active_p);
+
+ if (menubar_show_keybindings)
+ {
+ /* Need to get keybindings */
+ if (!NILP (keys))
+ {
+ /* User-specified string to generate key bindings with */
+ CHECK_STRING (keys);
+
+ keys = Fsubstitute_command_keys (keys);
+ }
+ else if (SYMBOLP (*callback))
+ {
+ DECLARE_EISTRING_MALLOC (buf);
+
+ /* #### Warning, dependency here on current_buffer and point */
+ where_is_to_char (*callback, buf);
+
+ if (eilen (buf) > 0)
+ keys = eimake_string (buf);
+ else
+ {
+ keys = Qnil;
+ }
+
+ eifree (buf);
+ }
+ }
+
+ if (STRINGP (keys) && XSTRING_LENGTH (keys))
+ {
+ label_buffer2 = (Ibyte*) ALLOCA (qxestrlen (label_buffer) + 15 + XSTRING_LENGTH (keys));
+ sprintf ((char*) label_buffer2, "%s (%s)", label_buffer, XSTRING_DATA (keys));
+ }
+ else
+ {
+ label_buffer2 = (Ibyte*) ALLOCA (qxestrlen (label_buffer) + 15);
+ sprintf ((char*) label_buffer2, "%s", label_buffer);
+ }
+
+ /* We really cann't do anything with button styles in Carbon. */
+ if (NILP (style) || EQ (style, Qtext) || EQ (style, Qbutton))
+ {
+ }
+ else if (EQ (style, Qtoggle) || EQ (style, Qradio))
+ {
+ if (EQ (style, Qradio))
+ {
+ }
+ else
+ {
+ }
+ }
+ else
+ {
+ invalid_argument_2 ("unknown style", style, desc);
+ }
+ }
+ else
+ {
+ invalid_argument ("invalid menu item specs\n", desc);
+ }
+
+ CFMutableStringRef cfm_name = CFStringCreateMutable (NULL, 0);
+
+ char *temp = remove_underscores (XSTRING_DATA (name));
+ CFStringAppendCString (cfm_name, temp, kCFStringEncodingISOLatin1);
+ xfree (temp, char *);
+
+ if (STRINGP (suffix) && XSTRING_LENGTH (suffix))
+ {
+ char *temp = remove_underscores (XSTRING_DATA (suffix));
+ CFStringAppendCString (cfm_name, " ", kCFStringEncodingISOLatin1);
+ CFStringAppendCString (cfm_name, temp, kCFStringEncodingISOLatin1);
+ xfree (temp, char *);
+ }
+
+ if (STRINGP (keys) && XSTRING_LENGTH (keys))
+ {
+ CFStringAppendCString (cfm_name, " ", kCFStringEncodingISOLatin1);
+ CFStringAppendCharacters (cfm_name, &UniCharLeftBracket, 1);
+ CFStringAppendCString (cfm_name, XSTRING_DATA (keys), kCFStringEncodingISOLatin1);
+ CFStringAppendCharacters (cfm_name, &UniCharRightBracket, 1);
+ }
+
+ *cf_name = CFStringCreateCopy (NULL, cfm_name);
+ CFRelease (cfm_name);
+
+ return 1;
+}
+
+static MenuRef
+create_single_item_menu (Lisp_Object item)
+{
+ CFStringRef cf_item_name;
+ int active, selected;
+ Lisp_Object callback;
+ if (parse_menu_item (item, &cf_item_name, &active, &selected, &callback))
+ {
+ MenuRef carbon_menu = carbon_create_menu (cf_item_name);
+ carbon_append_menu_item (carbon_menu, cf_item_name, 'NOOP', active, selected, callback);
+ CFRelease (cf_item_name);
+ return carbon_menu;
+ }
+ else
+ return NULL;
+}
+
+static MenuRef
+create_menu (Lisp_Object desc)
+{
+ Lisp_Object name = XCAR (desc);
+ Lisp_Object key, val;
+ Lisp_Object include_p = Qnil, filter = Qnil, config_tag = Qnil;
+ Lisp_Object active_p = Qt;
+ int included_spec = 0;
+ int active_spec = 0;
+
+ if (STRINGP (name))
+ {
+ desc = Fcdr (desc);
+
+ while (key = Fcar (desc), KEYWORDP (key))
+ {
+ Lisp_Object cascade = desc;
+ desc = Fcdr (desc);
+ if (NILP (desc))
+ sferror ("keyword in menu lacks a value", cascade);
+ val = Fcar (desc);
+ desc = Fcdr (desc);
+ if (EQ (key, Q_filter))
+ filter = val;
+ else if (EQ (key, Q_active))
+ {
+ active_p = val;
+ active_spec = 1;
+ }
+ else if (EQ (key, Q_included))
+ {
+ include_p = val;
+ included_spec = 1;
+ }
+ else if (EQ (key, Q_config))
+ config_tag = val;
+ else
+ invalid_argument ("unknown menu cascade keyword", cascade);
+ }
+
+ /* Skip the rest now if indicated because active_p may not evaluate, e.g. */
+ if (included_spec)
+ {
+ include_p = eval_within_menu_callback (include_p);
+ if (NILP (include_p) || UNBOUNDP (include_p))
+ return NULL;
+ }
+
+ if ((!NILP (config_tag) && NILP (Fmemq (config_tag, Vmenubar_configuration))))
+ {
+ return NULL;
+ }
+
+ if (active_spec)
+ {
+ /* ### TODO: Unused currently. */
+ active_p = eval_within_menu_callback (active_p);
+ }
+ }
+ else
+ {
+ invalid_argument ("menu name (first element) must be a string", desc);
+ }
+
+ Ibyte *temp_name = remove_underscores (XSTRING_DATA (name));
+ CFStringRef cf_name = CFStringCreateWithCString (NULL, temp_name, kCFStringEncodingISOLatin1);
+ xfree (temp_name, Ibyte *);
+
+ MenuRef carbon_menu = carbon_create_menu (cf_name);
+
+ CFRelease (cf_name);
+
+ struct menu_callback_data callback_data;
+
+ callback_data.desc = desc;
+ callback_data.filter = filter;
+
+ carbon_set_menu_callback_data (carbon_menu, &callback_data);
+
+ carbon_install_menu_callback (carbon_menu);
+
+ return carbon_menu;
+}
+
+static MenuRef
+create_menubar (Lisp_Object menubar)
+{
+ MenuRef carbon_menubar = carbon_create_menubar ();
+
+ Lisp_Object tail;
+
+ EXTERNAL_LIST_LOOP (tail, menubar)
+ {
+ Lisp_Object item = XCAR (tail);
+
+ if (NILP (item))
+ {
+ /* Intentionally blank: specs say to right-justify subsequent
+ menus. We don't do that in Carbon. */
+ }
+ else if (VECTORP (item))
+ {
+ /* A menu item right on the menubar! Not supported in Carbon.
+ So we simulate one with a menu with a single item. */
+ MenuRef carbon_menu = create_single_item_menu (item);
+ if (carbon_menu)
+ {
+ carbon_append_submenu (carbon_menubar, carbon_menu);
+ carbon_release_menu (carbon_menu);
+ }
+ }
+ else if (LISTP (item))
+ {
+ MenuRef carbon_menu = create_menu (item);
+ if (carbon_menu)
+ {
+ carbon_append_submenu (carbon_menubar, carbon_menu);
+ carbon_release_menu (carbon_menu);
+ }
+ }
+ else if (STRINGP (item))
+ {
+ /* An unselectable text on the menubar. Let's skip this. */
+ }
+ }
+
+ return carbon_menubar;
+}
+
+static void
+carbon_free_frame_menubars (struct frame *f)
+{
+ if (FRAME_CARBON_MENUBAR (f))
+ carbon_release_menu (FRAME_CARBON_MENUBAR (f));
+}
+
+static void
+carbon_update_frame_menubars (struct frame *f)
+{
+ if (f->menubar_changed || !FRAME_CARBON_MENUBAR (f))
+ {
+ struct window *w = XWINDOW (FRAME_LAST_NONMINIBUF_WINDOW (f));
+ Lisp_Object menubar = symbol_value_in_buffer (Qcurrent_menubar, w->buffer);
+
+ /* ### TODO: Verify this is sufficient. */
+ struct gcpro gcpro1;
+ GCPRO1 (menubar);
+
+ carbon_free_frame_menubars (f);
+ FRAME_CARBON_MENUBAR (f) = create_menubar (menubar);
+
+ UNGCPRO;
+ }
+
+ if (SetRootMenu (FRAME_CARBON_MENUBAR (f)) != noErr)
+ stderr_out ("Can't set root menu");
+}
+
+/* Adapted from menubar-msw.c. */
+static void
+carbon_popup_menu (Lisp_Object menu_desc, Lisp_Object event)
+{
+ struct frame *f = selected_frame ();
+ Lisp_Event *eev = NULL;
+ struct gcpro gcpro1;
+
+ GCPRO1 (menu_desc); /* to be safe -- see above */
+
+ if (!NILP (event))
+ {
+ CHECK_LIVE_EVENT (event);
+ eev = XEVENT (event);
+ if (eev->event_type != button_press_event && eev->event_type != button_release_event)
+ wrong_type_argument (Qmouse_event_p, event);
+ }
+ else if (!NILP (Vthis_command_keys))
+ {
+ /* if an event wasn't passed, use the last event of the event sequence currently being executed, if that event is a mouse event */
+ eev = XEVENT (Vthis_command_keys); /* last event first */
+ if (eev->event_type != button_press_event && eev->event_type != button_release_event)
+ eev = NULL;
+ }
+
+ short top;
+ short left;
+ /* Default is to put the menu at the point (10, 10) in frame */
+ if (eev)
+ {
+ left = EVENT_BUTTON_X (eev);
+ top = EVENT_BUTTON_Y (eev);
+ }
+ else
+ top = left = 10;
+
+ Rect content_rect;
+ if (GetWindowBounds (FRAME_CARBON_WINDOW (f), kWindowContentRgn, &content_rect) != noErr)
+ invalid_operation ("Can't get content bounds", wrap_frame (f));
+
+ /* Convert to global coordinates. */
+ top += content_rect.top;
+ left += content_rect.left;
+
+ if (SYMBOLP (menu_desc))
+ menu_desc = Fsymbol_value (menu_desc);
+ CHECK_CONS (menu_desc);
+ CHECK_STRING (XCAR (menu_desc));
+
+ MenuRef menu = create_menu (menu_desc);
+ if (menu)
+ {
+ /* PopUpMenuSelect during its execution will send kEventMenuPopulate and kEventCommandProcess events to menu items causing them to be populated and the selected item's command be processed. */
+ (void) PopUpMenuSelect (menu, top, left, 0);
+
+ carbon_release_menu (menu);
+ }
+ else
+ invalid_operation ("Cannot create popup menu", menu_desc);
+
+ UNGCPRO;
+}
+
+void
+console_type_create_menubar_carbon (void)
+{
+ EventHandlerUPP handlerUPP = NewEventHandlerUPP (mouse_down);
+ EventTypeSpec eventTypes[] =
+ {
+ { kEventClassMouse, kEventMouseDown }
+ };
+ if (InstallApplicationEventHandler (handlerUPP, 1, eventTypes, NULL, NULL) != noErr)
+ stderr_out ("Can't attach mouse down handler for application");
+ DisposeEventHandlerUPP(mouse_down);
+
+ CONSOLE_HAS_METHOD (carbon, update_frame_menubars);
+ CONSOLE_HAS_METHOD (carbon, free_frame_menubars);
+ CONSOLE_HAS_METHOD (carbon, popup_menu);
+}
1.1.2.1 +57 -0 XEmacs/xemacs/src/Attic/objects-carbon-impl.h
Index: objects-carbon-impl.h
===================================================================
RCS file: objects-carbon-impl.h
diff -N objects-carbon-impl.h
--- /dev/null Fri Feb 25 17:30:16 2005
+++ /tmp/cvsAAAaoaOSi Fri Feb 25 17:30:16 2005
＠＠ -0,0 +1,57 ＠＠
+/*
+ The following code is original work by me, except where noted with
+ the comments "Taken from ..." or "Adapted from ...". I now place
+ it in the public domain.
+
+ Andrew Choi. Calgary, Canada, February 9, 2005. */
+
+#ifndef INCLUDED_objects_carbon_impl_h_
+#define INCLUDED_objects_carbon_impl_h_
+
+#include "objects-impl.h"
+
+#ifdef HAVE_CARBON
+
+#include <Carbon/Carbon.h>
+
+/*****************************************************************************
+ Color-Instance
+ ****************************************************************************/
+
+struct carbon_color_instance_data
+{
+ CGColorRef color;
+};
+
+#define CARBON_COLOR_INSTANCE_DATA(c) ((struct carbon_color_instance_data *) ((c)->data))
+#define COLOR_INSTANCE_CARBON_COLOR(c) (CARBON_COLOR_INSTANCE_DATA (c)->color)
+
+#define RGB_TO_ULONG(r, g, b) (((r) << 16) | ((g) << 8) | (b))
+
+#define RED_FROM_ULONG(color) ((color) >> 16)
+#define GREEN_FROM_ULONG(color) (((color) >> 8) & 0xff)
+#define BLUE_FROM_ULONG(color) ((color) & 0xff)
+
+#define UNRECOGNIZED_COLOR 0xffffffff
+
+/*****************************************************************************
+ Font-Instance
+ ****************************************************************************/
+
+struct carbon_font_instance_data
+{
+ ATSUFontID font;
+ Fixed size;
+ Boolean bold;
+ Boolean italic;
+};
+
+#define CARBON_FONT_INSTANCE_DATA(f) ((struct carbon_font_instance_data *) ((f)->data))
+#define FONT_INSTANCE_CARBON_FONT(f) (CARBON_FONT_INSTANCE_DATA (f)->font)
+#define FONT_INSTANCE_CARBON_SIZE(f) (CARBON_FONT_INSTANCE_DATA (f)->size)
+#define FONT_INSTANCE_CARBON_BOLD(f) (CARBON_FONT_INSTANCE_DATA (f)->bold)
+#define FONT_INSTANCE_CARBON_ITALIC(f) (CARBON_FONT_INSTANCE_DATA (f)->italic)
+
+#endif /* HAVE_CARBON */
+
+#endif /* INCLUDED_objects_carbon_impl_h_ */
1.1.2.1 +1375 -0 XEmacs/xemacs/src/Attic/objects-carbon.c
Index: objects-carbon.c
===================================================================
RCS file: objects-carbon.c
diff -N objects-carbon.c
--- /dev/null Fri Feb 25 17:30:16 2005
+++ /tmp/cvsAAACpaaTi Fri Feb 25 17:30:16 2005
＠＠ -0,0 +1,1375 ＠＠
+/*
+ The following code is original work by me, except where noted with
+ the comments "Taken from ..." or "Adapted from ...". I now place
+ it in the public domain.
+
+ Andrew Choi. Calgary, Canada, February 9, 2005. */
+
+#include <config.h>
+#include "lisp.h"
+
+#include <sys/types.h>
+
+/* This #include is strange like this because if we say <regex.h> or "regex.h",
+ we pick up the src/regex.h. This has disastrous result since that file
+ declares the struct regmatch_t differently than the system header, but
+ we end up calling regcomp and regexec in the system library because they
+ are conditioned out in src/regex.c. */
+#include "/usr/include/regex.h"
+
+#include "console-carbon-impl.h"
+#include "objects-carbon-impl.h"
+
+static const char *font_spec_regex_str = "^(([^\\:]|\\\\\\\\|\\\\:)+)(:([0-9]+)(:(b|i|bi|bold|italic|bolditalic))?)?$";
+static regex_t font_spec_regex;
+
+/* The default colors for the Mac color map */
+typedef struct colormap_t
+{
+ unsigned long color;
+ char *name;
+} colormap_t;
+
+/* Taken from src/macterm.c in Emacs, which is based on etc/rgb.txt there. */
+colormap_t mac_color_map[] =
+{
+ { RGB_TO_ULONG(255, 255, 255), "white" },
+ { RGB_TO_ULONG(0 , 0 , 0 ), "black" },
+ { RGB_TO_ULONG(255, 250, 250), "snow" },
+ { RGB_TO_ULONG(248, 248, 255), "ghost white" },
+ { RGB_TO_ULONG(248, 248, 255), "GhostWhite" },
+ { RGB_TO_ULONG(245, 245, 245), "white smoke" },
+ { RGB_TO_ULONG(245, 245, 245), "WhiteSmoke" },
+ { RGB_TO_ULONG(220, 220, 220), "gainsboro" },
+ { RGB_TO_ULONG(255, 250, 240), "floral white" },
+ { RGB_TO_ULONG(255, 250, 240), "FloralWhite" },
+ { RGB_TO_ULONG(253, 245, 230), "old lace" },
+ { RGB_TO_ULONG(253, 245, 230), "OldLace" },
+ { RGB_TO_ULONG(250, 240, 230), "linen" },
+ { RGB_TO_ULONG(250, 235, 215), "antique white" },
+ { RGB_TO_ULONG(250, 235, 215), "AntiqueWhite" },
+ { RGB_TO_ULONG(255, 239, 213), "papaya whip" },
+ { RGB_TO_ULONG(255, 239, 213), "PapayaWhip" },
+ { RGB_TO_ULONG(255, 235, 205), "blanched almond" },
+ { RGB_TO_ULONG(255, 235, 205), "BlanchedAlmond" },
+ { RGB_TO_ULONG(255, 228, 196), "bisque" },
+ { RGB_TO_ULONG(255, 218, 185), "peach puff" },
+ { RGB_TO_ULONG(255, 218, 185), "PeachPuff" },
+ { RGB_TO_ULONG(255, 222, 173), "navajo white" },
+ { RGB_TO_ULONG(255, 222, 173), "NavajoWhite" },
+ { RGB_TO_ULONG(255, 228, 181), "moccasin" },
+ { RGB_TO_ULONG(255, 248, 220), "cornsilk" },
+ { RGB_TO_ULONG(255, 255, 240), "ivory" },
+ { RGB_TO_ULONG(255, 250, 205), "lemon chiffon" },
+ { RGB_TO_ULONG(255, 250, 205), "LemonChiffon" },
+ { RGB_TO_ULONG(255, 245, 238), "seashell" },
+ { RGB_TO_ULONG(240, 255, 240), "honeydew" },
+ { RGB_TO_ULONG(245, 255, 250), "mint cream" },
+ { RGB_TO_ULONG(245, 255, 250), "MintCream" },
+ { RGB_TO_ULONG(240, 255, 255), "azure" },
+ { RGB_TO_ULONG(240, 248, 255), "alice blue" },
+ { RGB_TO_ULONG(240, 248, 255), "AliceBlue" },
+ { RGB_TO_ULONG(230, 230, 250), "lavender" },
+ { RGB_TO_ULONG(255, 240, 245), "lavender blush" },
+ { RGB_TO_ULONG(255, 240, 245), "LavenderBlush" },
+ { RGB_TO_ULONG(255, 228, 225), "misty rose" },
+ { RGB_TO_ULONG(255, 228, 225), "MistyRose" },
+ { RGB_TO_ULONG(255, 255, 255), "white" },
+ { RGB_TO_ULONG(0 , 0 , 0 ), "black" },
+ { RGB_TO_ULONG(47 , 79 , 79 ), "dark slate gray" },
+ { RGB_TO_ULONG(47 , 79 , 79 ), "DarkSlateGray" },
+ { RGB_TO_ULONG(47 , 79 , 79 ), "dark slate grey" },
+ { RGB_TO_ULONG(47 , 79 , 79 ), "DarkSlateGrey" },
+ { RGB_TO_ULONG(105, 105, 105), "dim gray" },
+ { RGB_TO_ULONG(105, 105, 105), "DimGray" },
+ { RGB_TO_ULONG(105, 105, 105), "dim grey" },
+ { RGB_TO_ULONG(105, 105, 105), "DimGrey" },
+ { RGB_TO_ULONG(112, 128, 144), "slate gray" },
+ { RGB_TO_ULONG(112, 128, 144), "SlateGray" },
+ { RGB_TO_ULONG(112, 128, 144), "slate grey" },
+ { RGB_TO_ULONG(112, 128, 144), "SlateGrey" },
+ { RGB_TO_ULONG(119, 136, 153), "light slate gray" },
+ { RGB_TO_ULONG(119, 136, 153), "LightSlateGray" },
+ { RGB_TO_ULONG(119, 136, 153), "light slate grey" },
+ { RGB_TO_ULONG(119, 136, 153), "LightSlateGrey" },
+ { RGB_TO_ULONG(190, 190, 190), "gray" },
+ { RGB_TO_ULONG(190, 190, 190), "grey" },
+ { RGB_TO_ULONG(211, 211, 211), "light grey" },
+ { RGB_TO_ULONG(211, 211, 211), "LightGrey" },
+ { RGB_TO_ULONG(211, 211, 211), "light gray" },
+ { RGB_TO_ULONG(211, 211, 211), "LightGray" },
+ { RGB_TO_ULONG(25 , 25 , 112), "midnight blue" },
+ { RGB_TO_ULONG(25 , 25 , 112), "MidnightBlue" },
+ { RGB_TO_ULONG(0 , 0 , 128), "navy" },
+ { RGB_TO_ULONG(0 , 0 , 128), "navy blue" },
+ { RGB_TO_ULONG(0 , 0 , 128), "NavyBlue" },
+ { RGB_TO_ULONG(100, 149, 237), "cornflower blue" },
+ { RGB_TO_ULONG(100, 149, 237), "CornflowerBlue" },
+ { RGB_TO_ULONG(72 , 61 , 139), "dark slate blue" },
+ { RGB_TO_ULONG(72 , 61 , 139), "DarkSlateBlue" },
+ { RGB_TO_ULONG(106, 90 , 205), "slate blue" },
+ { RGB_TO_ULONG(106, 90 , 205), "SlateBlue" },
+ { RGB_TO_ULONG(123, 104, 238), "medium slate blue" },
+ { RGB_TO_ULONG(123, 104, 238), "MediumSlateBlue" },
+ { RGB_TO_ULONG(132, 112, 255), "light slate blue" },
+ { RGB_TO_ULONG(132, 112, 255), "LightSlateBlue" },
+ { RGB_TO_ULONG(0 , 0 , 205), "medium blue" },
+ { RGB_TO_ULONG(0 , 0 , 205), "MediumBlue" },
+ { RGB_TO_ULONG(65 , 105, 225), "royal blue" },
+ { RGB_TO_ULONG(65 , 105, 225), "RoyalBlue" },
+ { RGB_TO_ULONG(0 , 0 , 255), "blue" },
+ { RGB_TO_ULONG(30 , 144, 255), "dodger blue" },
+ { RGB_TO_ULONG(30 , 144, 255), "DodgerBlue" },
+ { RGB_TO_ULONG(0 , 191, 255), "deep sky blue" },
+ { RGB_TO_ULONG(0 , 191, 255), "DeepSkyBlue" },
+ { RGB_TO_ULONG(135, 206, 235), "sky blue" },
+ { RGB_TO_ULONG(135, 206, 235), "SkyBlue" },
+ { RGB_TO_ULONG(135, 206, 250), "light sky blue" },
+ { RGB_TO_ULONG(135, 206, 250), "LightSkyBlue" },
+ { RGB_TO_ULONG(70 , 130, 180), "steel blue" },
+ { RGB_TO_ULONG(70 , 130, 180), "SteelBlue" },
+ { RGB_TO_ULONG(176, 196, 222), "light steel blue" },
+ { RGB_TO_ULONG(176, 196, 222), "LightSteelBlue" },
+ { RGB_TO_ULONG(173, 216, 230), "light blue" },
+ { RGB_TO_ULONG(173, 216, 230), "LightBlue" },
+ { RGB_TO_ULONG(176, 224, 230), "powder blue" },
+ { RGB_TO_ULONG(176, 224, 230), "PowderBlue" },
+ { RGB_TO_ULONG(175, 238, 238), "pale turquoise" },
+ { RGB_TO_ULONG(175, 238, 238), "PaleTurquoise" },
+ { RGB_TO_ULONG(0 , 206, 209), "dark turquoise" },
+ { RGB_TO_ULONG(0 , 206, 209), "DarkTurquoise" },
+ { RGB_TO_ULONG(72 , 209, 204), "medium turquoise" },
+ { RGB_TO_ULONG(72 , 209, 204), "MediumTurquoise" },
+ { RGB_TO_ULONG(64 , 224, 208), "turquoise" },
+ { RGB_TO_ULONG(0 , 255, 255), "cyan" },
+ { RGB_TO_ULONG(224, 255, 255), "light cyan" },
+ { RGB_TO_ULONG(224, 255, 255), "LightCyan" },
+ { RGB_TO_ULONG(95 , 158, 160), "cadet blue" },
+ { RGB_TO_ULONG(95 , 158, 160), "CadetBlue" },
+ { RGB_TO_ULONG(102, 205, 170), "medium aquamarine" },
+ { RGB_TO_ULONG(102, 205, 170), "MediumAquamarine" },
+ { RGB_TO_ULONG(127, 255, 212), "aquamarine" },
+ { RGB_TO_ULONG(0 , 100, 0 ), "dark green" },
+ { RGB_TO_ULONG(0 , 100, 0 ), "DarkGreen" },
+ { RGB_TO_ULONG(85 , 107, 47 ), "dark olive green" },
+ { RGB_TO_ULONG(85 , 107, 47 ), "DarkOliveGreen" },
+ { RGB_TO_ULONG(143, 188, 143), "dark sea green" },
+ { RGB_TO_ULONG(143, 188, 143), "DarkSeaGreen" },
+ { RGB_TO_ULONG(46 , 139, 87 ), "sea green" },
+ { RGB_TO_ULONG(46 , 139, 87 ), "SeaGreen" },
+ { RGB_TO_ULONG(60 , 179, 113), "medium sea green" },
+ { RGB_TO_ULONG(60 , 179, 113), "MediumSeaGreen" },
+ { RGB_TO_ULONG(32 , 178, 170), "light sea green" },
+ { RGB_TO_ULONG(32 , 178, 170), "LightSeaGreen" },
+ { RGB_TO_ULONG(152, 251, 152), "pale green" },
+ { RGB_TO_ULONG(152, 251, 152), "PaleGreen" },
+ { RGB_TO_ULONG(0 , 255, 127), "spring green" },
+ { RGB_TO_ULONG(0 , 255, 127), "SpringGreen" },
+ { RGB_TO_ULONG(124, 252, 0 ), "lawn green" },
+ { RGB_TO_ULONG(124, 252, 0 ), "LawnGreen" },
+ { RGB_TO_ULONG(0 , 255, 0 ), "green" },
+ { RGB_TO_ULONG(127, 255, 0 ), "chartreuse" },
+ { RGB_TO_ULONG(0 , 250, 154), "medium spring green" },
+ { RGB_TO_ULONG(0 , 250, 154), "MediumSpringGreen" },
+ { RGB_TO_ULONG(173, 255, 47 ), "green yellow" },
+ { RGB_TO_ULONG(173, 255, 47 ), "GreenYellow" },
+ { RGB_TO_ULONG(50 , 205, 50 ), "lime green" },
+ { RGB_TO_ULONG(50 , 205, 50 ), "LimeGreen" },
+ { RGB_TO_ULONG(154, 205, 50 ), "yellow green" },
+ { RGB_TO_ULONG(154, 205, 50 ), "YellowGreen" },
+ { RGB_TO_ULONG(34 , 139, 34 ), "forest green" },
+ { RGB_TO_ULONG(34 , 139, 34 ), "ForestGreen" },
+ { RGB_TO_ULONG(107, 142, 35 ), "olive drab" },
+ { RGB_TO_ULONG(107, 142, 35 ), "OliveDrab" },
+ { RGB_TO_ULONG(189, 183, 107), "dark khaki" },
+ { RGB_TO_ULONG(189, 183, 107), "DarkKhaki" },
+ { RGB_TO_ULONG(240, 230, 140), "khaki" },
+ { RGB_TO_ULONG(238, 232, 170), "pale goldenrod" },
+ { RGB_TO_ULONG(238, 232, 170), "PaleGoldenrod" },
+ { RGB_TO_ULONG(250, 250, 210), "light goldenrod yellow" },
+ { RGB_TO_ULONG(250, 250, 210), "LightGoldenrodYellow" },
+ { RGB_TO_ULONG(255, 255, 224), "light yellow" },
+ { RGB_TO_ULONG(255, 255, 224), "LightYellow" },
+ { RGB_TO_ULONG(255, 255, 0 ), "yellow" },
+ { RGB_TO_ULONG(255, 215, 0 ), "gold" },
+ { RGB_TO_ULONG(238, 221, 130), "light goldenrod" },
+ { RGB_TO_ULONG(238, 221, 130), "LightGoldenrod" },
+ { RGB_TO_ULONG(218, 165, 32 ), "goldenrod" },
+ { RGB_TO_ULONG(184, 134, 11 ), "dark goldenrod" },
+ { RGB_TO_ULONG(184, 134, 11 ), "DarkGoldenrod" },
+ { RGB_TO_ULONG(188, 143, 143), "rosy brown" },
+ { RGB_TO_ULONG(188, 143, 143), "RosyBrown" },
+ { RGB_TO_ULONG(205, 92 , 92 ), "indian red" },
+ { RGB_TO_ULONG(205, 92 , 92 ), "IndianRed" },
+ { RGB_TO_ULONG(139, 69 , 19 ), "saddle brown" },
+ { RGB_TO_ULONG(139, 69 , 19 ), "SaddleBrown" },
+ { RGB_TO_ULONG(160, 82 , 45 ), "sienna" },
+ { RGB_TO_ULONG(205, 133, 63 ), "peru" },
+ { RGB_TO_ULONG(222, 184, 135), "burlywood" },
+ { RGB_TO_ULONG(245, 245, 220), "beige" },
+ { RGB_TO_ULONG(245, 222, 179), "wheat" },
+ { RGB_TO_ULONG(244, 164, 96 ), "sandy brown" },
+ { RGB_TO_ULONG(244, 164, 96 ), "SandyBrown" },
+ { RGB_TO_ULONG(210, 180, 140), "tan" },
+ { RGB_TO_ULONG(210, 105, 30 ), "chocolate" },
+ { RGB_TO_ULONG(178, 34 , 34 ), "firebrick" },
+ { RGB_TO_ULONG(165, 42 , 42 ), "brown" },
+ { RGB_TO_ULONG(233, 150, 122), "dark salmon" },
+ { RGB_TO_ULONG(233, 150, 122), "DarkSalmon" },
+ { RGB_TO_ULONG(250, 128, 114), "salmon" },
+ { RGB_TO_ULONG(255, 160, 122), "light salmon" },
+ { RGB_TO_ULONG(255, 160, 122), "LightSalmon" },
+ { RGB_TO_ULONG(255, 165, 0 ), "orange" },
+ { RGB_TO_ULONG(255, 140, 0 ), "dark orange" },
+ { RGB_TO_ULONG(255, 140, 0 ), "DarkOrange" },
+ { RGB_TO_ULONG(255, 127, 80 ), "coral" },
+ { RGB_TO_ULONG(240, 128, 128), "light coral" },
+ { RGB_TO_ULONG(240, 128, 128), "LightCoral" },
+ { RGB_TO_ULONG(255, 99 , 71 ), "tomato" },
+ { RGB_TO_ULONG(255, 69 , 0 ), "orange red" },
+ { RGB_TO_ULONG(255, 69 , 0 ), "OrangeRed" },
+ { RGB_TO_ULONG(255, 0 , 0 ), "red" },
+ { RGB_TO_ULONG(255, 105, 180), "hot pink" },
+ { RGB_TO_ULONG(255, 105, 180), "HotPink" },
+ { RGB_TO_ULONG(255, 20 , 147), "deep pink" },
+ { RGB_TO_ULONG(255, 20 , 147), "DeepPink" },
+ { RGB_TO_ULONG(255, 192, 203), "pink" },
+ { RGB_TO_ULONG(255, 182, 193), "light pink" },
+ { RGB_TO_ULONG(255, 182, 193), "LightPink" },
+ { RGB_TO_ULONG(219, 112, 147), "pale violet red" },
+ { RGB_TO_ULONG(219, 112, 147), "PaleVioletRed" },
+ { RGB_TO_ULONG(176, 48 , 96 ), "maroon" },
+ { RGB_TO_ULONG(199, 21 , 133), "medium violet red" },
+ { RGB_TO_ULONG(199, 21 , 133), "MediumVioletRed" },
+ { RGB_TO_ULONG(208, 32 , 144), "violet red" },
+ { RGB_TO_ULONG(208, 32 , 144), "VioletRed" },
+ { RGB_TO_ULONG(255, 0 , 255), "magenta" },
+ { RGB_TO_ULONG(238, 130, 238), "violet" },
+ { RGB_TO_ULONG(221, 160, 221), "plum" },
+ { RGB_TO_ULONG(218, 112, 214), "orchid" },
+ { RGB_TO_ULONG(186, 85 , 211), "medium orchid" },
+ { RGB_TO_ULONG(186, 85 , 211), "MediumOrchid" },
+ { RGB_TO_ULONG(153, 50 , 204), "dark orchid" },
+ { RGB_TO_ULONG(153, 50 , 204), "DarkOrchid" },
+ { RGB_TO_ULONG(148, 0 , 211), "dark violet" },
+ { RGB_TO_ULONG(148, 0 , 211), "DarkViolet" },
+ { RGB_TO_ULONG(138, 43 , 226), "blue violet" },
+ { RGB_TO_ULONG(138, 43 , 226), "BlueViolet" },
+ { RGB_TO_ULONG(160, 32 , 240), "purple" },
+ { RGB_TO_ULONG(147, 112, 219), "medium purple" },
+ { RGB_TO_ULONG(147, 112, 219), "MediumPurple" },
+ { RGB_TO_ULONG(216, 191, 216), "thistle" },
+ { RGB_TO_ULONG(255, 250, 250), "snow1" },
+ { RGB_TO_ULONG(238, 233, 233), "snow2" },
+ { RGB_TO_ULONG(205, 201, 201), "snow3" },
+ { RGB_TO_ULONG(139, 137, 137), "snow4" },
+ { RGB_TO_ULONG(255, 245, 238), "seashell1" },
+ { RGB_TO_ULONG(238, 229, 222), "seashell2" },
+ { RGB_TO_ULONG(205, 197, 191), "seashell3" },
+ { RGB_TO_ULONG(139, 134, 130), "seashell4" },
+ { RGB_TO_ULONG(255, 239, 219), "AntiqueWhite1" },
+ { RGB_TO_ULONG(238, 223, 204), "AntiqueWhite2" },
+ { RGB_TO_ULONG(205, 192, 176), "AntiqueWhite3" },
+ { RGB_TO_ULONG(139, 131, 120), "AntiqueWhite4" },
+ { RGB_TO_ULONG(255, 228, 196), "bisque1" },
+ { RGB_TO_ULONG(238, 213, 183), "bisque2" },
+ { RGB_TO_ULONG(205, 183, 158), "bisque3" },
+ { RGB_TO_ULONG(139, 125, 107), "bisque4" },
+ { RGB_TO_ULONG(255, 218, 185), "PeachPuff1" },
+ { RGB_TO_ULONG(238, 203, 173), "PeachPuff2" },
+ { RGB_TO_ULONG(205, 175, 149), "PeachPuff3" },
+ { RGB_TO_ULONG(139, 119, 101), "PeachPuff4" },
+ { RGB_TO_ULONG(255, 222, 173), "NavajoWhite1" },
+ { RGB_TO_ULONG(238, 207, 161), "NavajoWhite2" },
+ { RGB_TO_ULONG(205, 179, 139), "NavajoWhite3" },
+ { RGB_TO_ULONG(139, 121, 94 ), "NavajoWhite4" },
+ { RGB_TO_ULONG(255, 250, 205), "LemonChiffon1" },
+ { RGB_TO_ULONG(238, 233, 191), "LemonChiffon2" },
+ { RGB_TO_ULONG(205, 201, 165), "LemonChiffon3" },
+ { RGB_TO_ULONG(139, 137, 112), "LemonChiffon4" },
+ { RGB_TO_ULONG(255, 248, 220), "cornsilk1" },
+ { RGB_TO_ULONG(238, 232, 205), "cornsilk2" },
+ { RGB_TO_ULONG(205, 200, 177), "cornsilk3" },
+ { RGB_TO_ULONG(139, 136, 120), "cornsilk4" },
+ { RGB_TO_ULONG(255, 255, 240), "ivory1" },
+ { RGB_TO_ULONG(238, 238, 224), "ivory2" },
+ { RGB_TO_ULONG(205, 205, 193), "ivory3" },
+ { RGB_TO_ULONG(139, 139, 131), "ivory4" },
+ { RGB_TO_ULONG(240, 255, 240), "honeydew1" },
+ { RGB_TO_ULONG(224, 238, 224), "honeydew2" },
+ { RGB_TO_ULONG(193, 205, 193), "honeydew3" },
+ { RGB_TO_ULONG(131, 139, 131), "honeydew4" },
+ { RGB_TO_ULONG(255, 240, 245), "LavenderBlush1" },
+ { RGB_TO_ULONG(238, 224, 229), "LavenderBlush2" },
+ { RGB_TO_ULONG(205, 193, 197), "LavenderBlush3" },
+ { RGB_TO_ULONG(139, 131, 134), "LavenderBlush4" },
+ { RGB_TO_ULONG(255, 228, 225), "MistyRose1" },
+ { RGB_TO_ULONG(238, 213, 210), "MistyRose2" },
+ { RGB_TO_ULONG(205, 183, 181), "MistyRose3" },
+ { RGB_TO_ULONG(139, 125, 123), "MistyRose4" },
+ { RGB_TO_ULONG(240, 255, 255), "azure1" },
+ { RGB_TO_ULONG(224, 238, 238), "azure2" },
+ { RGB_TO_ULONG(193, 205, 205), "azure3" },
+ { RGB_TO_ULONG(131, 139, 139), "azure4" },
+ { RGB_TO_ULONG(131, 111, 255), "SlateBlue1" },
+ { RGB_TO_ULONG(122, 103, 238), "SlateBlue2" },
+ { RGB_TO_ULONG(105, 89 , 205), "SlateBlue3" },
+ { RGB_TO_ULONG(71 , 60 , 139), "SlateBlue4" },
+ { RGB_TO_ULONG(72 , 118, 255), "RoyalBlue1" },
+ { RGB_TO_ULONG(67 , 110, 238), "RoyalBlue2" },
+ { RGB_TO_ULONG(58 , 95 , 205), "RoyalBlue3" },
+ { RGB_TO_ULONG(39 , 64 , 139), "RoyalBlue4" },
+ { RGB_TO_ULONG(0 , 0 , 255), "blue1" },
+ { RGB_TO_ULONG(0 , 0 , 238), "blue2" },
+ { RGB_TO_ULONG(0 , 0 , 205), "blue3" },
+ { RGB_TO_ULONG(0 , 0 , 139), "blue4" },
+ { RGB_TO_ULONG(30 , 144, 255), "DodgerBlue1" },
+ { RGB_TO_ULONG(28 , 134, 238), "DodgerBlue2" },
+ { RGB_TO_ULONG(24 , 116, 205), "DodgerBlue3" },
+ { RGB_TO_ULONG(16 , 78 , 139), "DodgerBlue4" },
+ { RGB_TO_ULONG(99 , 184, 255), "SteelBlue1" },
+ { RGB_TO_ULONG(92 , 172, 238), "SteelBlue2" },
+ { RGB_TO_ULONG(79 , 148, 205), "SteelBlue3" },
+ { RGB_TO_ULONG(54 , 100, 139), "SteelBlue4" },
+ { RGB_TO_ULONG(0 , 191, 255), "DeepSkyBlue1" },
+ { RGB_TO_ULONG(0 , 178, 238), "DeepSkyBlue2" },
+ { RGB_TO_ULONG(0 , 154, 205), "DeepSkyBlue3" },
+ { RGB_TO_ULONG(0 , 104, 139), "DeepSkyBlue4" },
+ { RGB_TO_ULONG(135, 206, 255), "SkyBlue1" },
+ { RGB_TO_ULONG(126, 192, 238), "SkyBlue2" },
+ { RGB_TO_ULONG(108, 166, 205), "SkyBlue3" },
+ { RGB_TO_ULONG(74 , 112, 139), "SkyBlue4" },
+ { RGB_TO_ULONG(176, 226, 255), "LightSkyBlue1" },
+ { RGB_TO_ULONG(164, 211, 238), "LightSkyBlue2" },
+ { RGB_TO_ULONG(141, 182, 205), "LightSkyBlue3" },
+ { RGB_TO_ULONG(96 , 123, 139), "LightSkyBlue4" },
+ { RGB_TO_ULONG(198, 226, 255), "SlateGray1" },
+ { RGB_TO_ULONG(185, 211, 238), "SlateGray2" },
+ { RGB_TO_ULONG(159, 182, 205), "SlateGray3" },
+ { RGB_TO_ULONG(108, 123, 139), "SlateGray4" },
+ { RGB_TO_ULONG(202, 225, 255), "LightSteelBlue1" },
+ { RGB_TO_ULONG(188, 210, 238), "LightSteelBlue2" },
+ { RGB_TO_ULONG(162, 181, 205), "LightSteelBlue3" },
+ { RGB_TO_ULONG(110, 123, 139), "LightSteelBlue4" },
+ { RGB_TO_ULONG(191, 239, 255), "LightBlue1" },
+ { RGB_TO_ULONG(178, 223, 238), "LightBlue2" },
+ { RGB_TO_ULONG(154, 192, 205), "LightBlue3" },
+ { RGB_TO_ULONG(104, 131, 139), "LightBlue4" },
+ { RGB_TO_ULONG(224, 255, 255), "LightCyan1" },
+ { RGB_TO_ULONG(209, 238, 238), "LightCyan2" },
+ { RGB_TO_ULONG(180, 205, 205), "LightCyan3" },
+ { RGB_TO_ULONG(122, 139, 139), "LightCyan4" },
+ { RGB_TO_ULONG(187, 255, 255), "PaleTurquoise1" },
+ { RGB_TO_ULONG(174, 238, 238), "PaleTurquoise2" },
+ { RGB_TO_ULONG(150, 205, 205), "PaleTurquoise3" },
+ { RGB_TO_ULONG(102, 139, 139), "PaleTurquoise4" },
+ { RGB_TO_ULONG(152, 245, 255), "CadetBlue1" },
+ { RGB_TO_ULONG(142, 229, 238), "CadetBlue2" },
+ { RGB_TO_ULONG(122, 197, 205), "CadetBlue3" },
+ { RGB_TO_ULONG(83 , 134, 139), "CadetBlue4" },
+ { RGB_TO_ULONG(0 , 245, 255), "turquoise1" },
+ { RGB_TO_ULONG(0 , 229, 238), "turquoise2" },
+ { RGB_TO_ULONG(0 , 197, 205), "turquoise3" },
+ { RGB_TO_ULONG(0 , 134, 139), "turquoise4" },
+ { RGB_TO_ULONG(0 , 255, 255), "cyan1" },
+ { RGB_TO_ULONG(0 , 238, 238), "cyan2" },
+ { RGB_TO_ULONG(0 , 205, 205), "cyan3" },
+ { RGB_TO_ULONG(0 , 139, 139), "cyan4" },
+ { RGB_TO_ULONG(151, 255, 255), "DarkSlateGray1" },
+ { RGB_TO_ULONG(141, 238, 238), "DarkSlateGray2" },
+ { RGB_TO_ULONG(121, 205, 205), "DarkSlateGray3" },
+ { RGB_TO_ULONG(82 , 139, 139), "DarkSlateGray4" },
+ { RGB_TO_ULONG(127, 255, 212), "aquamarine1" },
+ { RGB_TO_ULONG(118, 238, 198), "aquamarine2" },
+ { RGB_TO_ULONG(102, 205, 170), "aquamarine3" },
+ { RGB_TO_ULONG(69 , 139, 116), "aquamarine4" },
+ { RGB_TO_ULONG(193, 255, 193), "DarkSeaGreen1" },
+ { RGB_TO_ULONG(180, 238, 180), "DarkSeaGreen2" },
+ { RGB_TO_ULONG(155, 205, 155), "DarkSeaGreen3" },
+ { RGB_TO_ULONG(105, 139, 105), "DarkSeaGreen4" },
+ { RGB_TO_ULONG(84 , 255, 159), "SeaGreen1" },
+ { RGB_TO_ULONG(78 , 238, 148), "SeaGreen2" },
+ { RGB_TO_ULONG(67 , 205, 128), "SeaGreen3" },
+ { RGB_TO_ULONG(46 , 139, 87 ), "SeaGreen4" },
+ { RGB_TO_ULONG(154, 255, 154), "PaleGreen1" },
+ { RGB_TO_ULONG(144, 238, 144), "PaleGreen2" },
+ { RGB_TO_ULONG(124, 205, 124), "PaleGreen3" },
+ { RGB_TO_ULONG(84 , 139, 84 ), "PaleGreen4" },
+ { RGB_TO_ULONG(0 , 255, 127), "SpringGreen1" },
+ { RGB_TO_ULONG(0 , 238, 118), "SpringGreen2" },
+ { RGB_TO_ULONG(0 , 205, 102), "SpringGreen3" },
+ { RGB_TO_ULONG(0 , 139, 69 ), "SpringGreen4" },
+ { RGB_TO_ULONG(0 , 255, 0 ), "green1" },
+ { RGB_TO_ULONG(0 , 238, 0 ), "green2" },
+ { RGB_TO_ULONG(0 , 205, 0 ), "green3" },
+ { RGB_TO_ULONG(0 , 139, 0 ), "green4" },
+ { RGB_TO_ULONG(127, 255, 0 ), "chartreuse1" },
+ { RGB_TO_ULONG(118, 238, 0 ), "chartreuse2" },
+ { RGB_TO_ULONG(102, 205, 0 ), "chartreuse3" },
+ { RGB_TO_ULONG(69 , 139, 0 ), "chartreuse4" },
+ { RGB_TO_ULONG(192, 255, 62 ), "OliveDrab1" },
+ { RGB_TO_ULONG(179, 238, 58 ), "OliveDrab2" },
+ { RGB_TO_ULONG(154, 205, 50 ), "OliveDrab3" },
+ { RGB_TO_ULONG(105, 139, 34 ), "OliveDrab4" },
+ { RGB_TO_ULONG(202, 255, 112), "DarkOliveGreen1" },
+ { RGB_TO_ULONG(188, 238, 104), "DarkOliveGreen2" },
+ { RGB_TO_ULONG(162, 205, 90 ), "DarkOliveGreen3" },
+ { RGB_TO_ULONG(110, 139, 61 ), "DarkOliveGreen4" },
+ { RGB_TO_ULONG(255, 246, 143), "khaki1" },
+ { RGB_TO_ULONG(238, 230, 133), "khaki2" },
+ { RGB_TO_ULONG(205, 198, 115), "khaki3" },
+ { RGB_TO_ULONG(139, 134, 78 ), "khaki4" },
+ { RGB_TO_ULONG(255, 236, 139), "LightGoldenrod1" },
+ { RGB_TO_ULONG(238, 220, 130), "LightGoldenrod2" },
+ { RGB_TO_ULONG(205, 190, 112), "LightGoldenrod3" },
+ { RGB_TO_ULONG(139, 129, 76 ), "LightGoldenrod4" },
+ { RGB_TO_ULONG(255, 255, 224), "LightYellow1" },
+ { RGB_TO_ULONG(238, 238, 209), "LightYellow2" },
+ { RGB_TO_ULONG(205, 205, 180), "LightYellow3" },
+ { RGB_TO_ULONG(139, 139, 122), "LightYellow4" },
+ { RGB_TO_ULONG(255, 255, 0 ), "yellow1" },
+ { RGB_TO_ULONG(238, 238, 0 ), "yellow2" },
+ { RGB_TO_ULONG(205, 205, 0 ), "yellow3" },
+ { RGB_TO_ULONG(139, 139, 0 ), "yellow4" },
+ { RGB_TO_ULONG(255, 215, 0 ), "gold1" },
+ { RGB_TO_ULONG(238, 201, 0 ), "gold2" },
+ { RGB_TO_ULONG(205, 173, 0 ), "gold3" },
+ { RGB_TO_ULONG(139, 117, 0 ), "gold4" },
+ { RGB_TO_ULONG(255, 193, 37 ), "goldenrod1" },
+ { RGB_TO_ULONG(238, 180, 34 ), "goldenrod2" },
+ { RGB_TO_ULONG(205, 155, 29 ), "goldenrod3" },
+ { RGB_TO_ULONG(139, 105, 20 ), "goldenrod4" },
+ { RGB_TO_ULONG(255, 185, 15 ), "DarkGoldenrod1" },
+ { RGB_TO_ULONG(238, 173, 14 ), "DarkGoldenrod2" },
+ { RGB_TO_ULONG(205, 149, 12 ), "DarkGoldenrod3" },
+ { RGB_TO_ULONG(139, 101, 8 ), "DarkGoldenrod4" },
+ { RGB_TO_ULONG(255, 193, 193), "RosyBrown1" },
+ { RGB_TO_ULONG(238, 180, 180), "RosyBrown2" },
+ { RGB_TO_ULONG(205, 155, 155), "RosyBrown3" },
+ { RGB_TO_ULONG(139, 105, 105), "RosyBrown4" },
+ { RGB_TO_ULONG(255, 106, 106), "IndianRed1" },
+ { RGB_TO_ULONG(238, 99 , 99 ), "IndianRed2" },
+ { RGB_TO_ULONG(205, 85 , 85 ), "IndianRed3" },
+ { RGB_TO_ULONG(139, 58 , 58 ), "IndianRed4" },
+ { RGB_TO_ULONG(255, 130, 71 ), "sienna1" },
+ { RGB_TO_ULONG(238, 121, 66 ), "sienna2" },
+ { RGB_TO_ULONG(205, 104, 57 ), "sienna3" },
+ { RGB_TO_ULONG(139, 71 , 38 ), "sienna4" },
+ { RGB_TO_ULONG(255, 211, 155), "burlywood1" },
+ { RGB_TO_ULONG(238, 197, 145), "burlywood2" },
+ { RGB_TO_ULONG(205, 170, 125), "burlywood3" },
+ { RGB_TO_ULONG(139, 115, 85 ), "burlywood4" },
+ { RGB_TO_ULONG(255, 231, 186), "wheat1" },
+ { RGB_TO_ULONG(238, 216, 174), "wheat2" },
+ { RGB_TO_ULONG(205, 186, 150), "wheat3" },
+ { RGB_TO_ULONG(139, 126, 102), "wheat4" },
+ { RGB_TO_ULONG(255, 165, 79 ), "tan1" },
+ { RGB_TO_ULONG(238, 154, 73 ), "tan2" },
+ { RGB_TO_ULONG(205, 133, 63 ), "tan3" },
+ { RGB_TO_ULONG(139, 90 , 43 ), "tan4" },
+ { RGB_TO_ULONG(255, 127, 36 ), "chocolate1" },
+ { RGB_TO_ULONG(238, 118, 33 ), "chocolate2" },
+ { RGB_TO_ULONG(205, 102, 29 ), "chocolate3" },
+ { RGB_TO_ULONG(139, 69 , 19 ), "chocolate4" },
+ { RGB_TO_ULONG(255, 48 , 48 ), "firebrick1" },
+ { RGB_TO_ULONG(238, 44 , 44 ), "firebrick2" },
+ { RGB_TO_ULONG(205, 38 , 38 ), "firebrick3" },
+ { RGB_TO_ULONG(139, 26 , 26 ), "firebrick4" },
+ { RGB_TO_ULONG(255, 64 , 64 ), "brown1" },
+ { RGB_TO_ULONG(238, 59 , 59 ), "brown2" },
+ { RGB_TO_ULONG(205, 51 , 51 ), "brown3" },
+ { RGB_TO_ULONG(139, 35 , 35 ), "brown4" },
+ { RGB_TO_ULONG(255, 140, 105), "salmon1" },
+ { RGB_TO_ULONG(238, 130, 98 ), "salmon2" },
+ { RGB_TO_ULONG(205, 112, 84 ), "salmon3" },
+ { RGB_TO_ULONG(139, 76 , 57 ), "salmon4" },
+ { RGB_TO_ULONG(255, 160, 122), "LightSalmon1" },
+ { RGB_TO_ULONG(238, 149, 114), "LightSalmon2" },
+ { RGB_TO_ULONG(205, 129, 98 ), "LightSalmon3" },
+ { RGB_TO_ULONG(139, 87 , 66 ), "LightSalmon4" },
+ { RGB_TO_ULONG(255, 165, 0 ), "orange1" },
+ { RGB_TO_ULONG(238, 154, 0 ), "orange2" },
+ { RGB_TO_ULONG(205, 133, 0 ), "orange3" },
+ { RGB_TO_ULONG(139, 90 , 0 ), "orange4" },
+ { RGB_TO_ULONG(255, 127, 0 ), "DarkOrange1" },
+ { RGB_TO_ULONG(238, 118, 0 ), "DarkOrange2" },
+ { RGB_TO_ULONG(205, 102, 0 ), "DarkOrange3" },
+ { RGB_TO_ULONG(139, 69 , 0 ), "DarkOrange4" },
+ { RGB_TO_ULONG(255, 114, 86 ), "coral1" },
+ { RGB_TO_ULONG(238, 106, 80 ), "coral2" },
+ { RGB_TO_ULONG(205, 91 , 69 ), "coral3" },
+ { RGB_TO_ULONG(139, 62 , 47 ), "coral4" },
+ { RGB_TO_ULONG(255, 99 , 71 ), "tomato1" },
+ { RGB_TO_ULONG(238, 92 , 66 ), "tomato2" },
+ { RGB_TO_ULONG(205, 79 , 57 ), "tomato3" },
+ { RGB_TO_ULONG(139, 54 , 38 ), "tomato4" },
+ { RGB_TO_ULONG(255, 69 , 0 ), "OrangeRed1" },
+ { RGB_TO_ULONG(238, 64 , 0 ), "OrangeRed2" },
+ { RGB_TO_ULONG(205, 55 , 0 ), "OrangeRed3" },
+ { RGB_TO_ULONG(139, 37 , 0 ), "OrangeRed4" },
+ { RGB_TO_ULONG(255, 0 , 0 ), "red1" },
+ { RGB_TO_ULONG(238, 0 , 0 ), "red2" },
+ { RGB_TO_ULONG(205, 0 , 0 ), "red3" },
+ { RGB_TO_ULONG(139, 0 , 0 ), "red4" },
+ { RGB_TO_ULONG(255, 20 , 147), "DeepPink1" },
+ { RGB_TO_ULONG(238, 18 , 137), "DeepPink2" },
+ { RGB_TO_ULONG(205, 16 , 118), "DeepPink3" },
+ { RGB_TO_ULONG(139, 10 , 80 ), "DeepPink4" },
+ { RGB_TO_ULONG(255, 110, 180), "HotPink1" },
+ { RGB_TO_ULONG(238, 106, 167), "HotPink2" },
+ { RGB_TO_ULONG(205, 96 , 144), "HotPink3" },
+ { RGB_TO_ULONG(139, 58 , 98 ), "HotPink4" },
+ { RGB_TO_ULONG(255, 181, 197), "pink1" },
+ { RGB_TO_ULONG(238, 169, 184), "pink2" },
+ { RGB_TO_ULONG(205, 145, 158), "pink3" },
+ { RGB_TO_ULONG(139, 99 , 108), "pink4" },
+ { RGB_TO_ULONG(255, 174, 185), "LightPink1" },
+ { RGB_TO_ULONG(238, 162, 173), "LightPink2" },
+ { RGB_TO_ULONG(205, 140, 149), "LightPink3" },
+ { RGB_TO_ULONG(139, 95 , 101), "LightPink4" },
+ { RGB_TO_ULONG(255, 130, 171), "PaleVioletRed1" },
+ { RGB_TO_ULONG(238, 121, 159), "PaleVioletRed2" },
+ { RGB_TO_ULONG(205, 104, 137), "PaleVioletRed3" },
+ { RGB_TO_ULONG(139, 71 , 93 ), "PaleVioletRed4" },
+ { RGB_TO_ULONG(255, 52 , 179), "maroon1" },
+ { RGB_TO_ULONG(238, 48 , 167), "maroon2" },
+ { RGB_TO_ULONG(205, 41 , 144), "maroon3" },
+ { RGB_TO_ULONG(139, 28 , 98 ), "maroon4" },
+ { RGB_TO_ULONG(255, 62 , 150), "VioletRed1" },
+ { RGB_TO_ULONG(238, 58 , 140), "VioletRed2" },
+ { RGB_TO_ULONG(205, 50 , 120), "VioletRed3" },
+ { RGB_TO_ULONG(139, 34 , 82 ), "VioletRed4" },
+ { RGB_TO_ULONG(255, 0 , 255), "magenta1" },
+ { RGB_TO_ULONG(238, 0 , 238), "magenta2" },
+ { RGB_TO_ULONG(205, 0 , 205), "magenta3" },
+ { RGB_TO_ULONG(139, 0 , 139), "magenta4" },
+ { RGB_TO_ULONG(255, 131, 250), "orchid1" },
+ { RGB_TO_ULONG(238, 122, 233), "orchid2" },
+ { RGB_TO_ULONG(205, 105, 201), "orchid3" },
+ { RGB_TO_ULONG(139, 71 , 137), "orchid4" },
+ { RGB_TO_ULONG(255, 187, 255), "plum1" },
+ { RGB_TO_ULONG(238, 174, 238), "plum2" },
+ { RGB_TO_ULONG(205, 150, 205), "plum3" },
+ { RGB_TO_ULONG(139, 102, 139), "plum4" },
+ { RGB_TO_ULONG(224, 102, 255), "MediumOrchid1" },
+ { RGB_TO_ULONG(209, 95 , 238), "MediumOrchid2" },
+ { RGB_TO_ULONG(180, 82 , 205), "MediumOrchid3" },
+ { RGB_TO_ULONG(122, 55 , 139), "MediumOrchid4" },
+ { RGB_TO_ULONG(191, 62 , 255), "DarkOrchid1" },
+ { RGB_TO_ULONG(178, 58 , 238), "DarkOrchid2" },
+ { RGB_TO_ULONG(154, 50 , 205), "DarkOrchid3" },
+ { RGB_TO_ULONG(104, 34 , 139), "DarkOrchid4" },
+ { RGB_TO_ULONG(155, 48 , 255), "purple1" },
+ { RGB_TO_ULONG(145, 44 , 238), "purple2" },
+ { RGB_TO_ULONG(125, 38 , 205), "purple3" },
+ { RGB_TO_ULONG(85 , 26 , 139), "purple4" },
+ { RGB_TO_ULONG(171, 130, 255), "MediumPurple1" },
+ { RGB_TO_ULONG(159, 121, 238), "MediumPurple2" },
+ { RGB_TO_ULONG(137, 104, 205), "MediumPurple3" },
+ { RGB_TO_ULONG(93 , 71 , 139), "MediumPurple4" },
+ { RGB_TO_ULONG(255, 225, 255), "thistle1" },
+ { RGB_TO_ULONG(238, 210, 238), "thistle2" },
+ { RGB_TO_ULONG(205, 181, 205), "thistle3" },
+ { RGB_TO_ULONG(139, 123, 139), "thistle4" },
+ { RGB_TO_ULONG(0 , 0 , 0 ), "gray0" },
+ { RGB_TO_ULONG(0 , 0 , 0 ), "grey0" },
+ { RGB_TO_ULONG(3 , 3 , 3 ), "gray1" },
+ { RGB_TO_ULONG(3 , 3 , 3 ), "grey1" },
+ { RGB_TO_ULONG(5 , 5 , 5 ), "gray2" },
+ { RGB_TO_ULONG(5 , 5 , 5 ), "grey2" },
+ { RGB_TO_ULONG(8 , 8 , 8 ), "gray3" },
+ { RGB_TO_ULONG(8 , 8 , 8 ), "grey3" },
+ { RGB_TO_ULONG(10 , 10 , 10 ), "gray4" },
+ { RGB_TO_ULONG(10 , 10 , 10 ), "grey4" },
+ { RGB_TO_ULONG(13 , 13 , 13 ), "gray5" },
+ { RGB_TO_ULONG(13 , 13 , 13 ), "grey5" },
+ { RGB_TO_ULONG(15 , 15 , 15 ), "gray6" },
+ { RGB_TO_ULONG(15 , 15 , 15 ), "grey6" },
+ { RGB_TO_ULONG(18 , 18 , 18 ), "gray7" },
+ { RGB_TO_ULONG(18 , 18 , 18 ), "grey7" },
+ { RGB_TO_ULONG(20 , 20 , 20 ), "gray8" },
+ { RGB_TO_ULONG(20 , 20 , 20 ), "grey8" },
+ { RGB_TO_ULONG(23 , 23 , 23 ), "gray9" },
+ { RGB_TO_ULONG(23 , 23 , 23 ), "grey9" },
+ { RGB_TO_ULONG(26 , 26 , 26 ), "gray10" },
+ { RGB_TO_ULONG(26 , 26 , 26 ), "grey10" },
+ { RGB_TO_ULONG(28 , 28 , 28 ), "gray11" },
+ { RGB_TO_ULONG(28 , 28 , 28 ), "grey11" },
+ { RGB_TO_ULONG(31 , 31 , 31 ), "gray12" },
+ { RGB_TO_ULONG(31 , 31 , 31 ), "grey12" },
+ { RGB_TO_ULONG(33 , 33 , 33 ), "gray13" },
+ { RGB_TO_ULONG(33 , 33 , 33 ), "grey13" },
+ { RGB_TO_ULONG(36 , 36 , 36 ), "gray14" },
+ { RGB_TO_ULONG(36 , 36 , 36 ), "grey14" },
+ { RGB_TO_ULONG(38 , 38 , 38 ), "gray15" },
+ { RGB_TO_ULONG(38 , 38 , 38 ), "grey15" },
+ { RGB_TO_ULONG(41 , 41 , 41 ), "gray16" },
+ { RGB_TO_ULONG(41 , 41 , 41 ), "grey16" },
+ { RGB_TO_ULONG(43 , 43 , 43 ), "gray17" },
+ { RGB_TO_ULONG(43 , 43 , 43 ), "grey17" },
+ { RGB_TO_ULONG(46 , 46 , 46 ), "gray18" },
+ { RGB_TO_ULONG(46 , 46 , 46 ), "grey18" },
+ { RGB_TO_ULONG(48 , 48 , 48 ), "gray19" },
+ { RGB_TO_ULONG(48 , 48 , 48 ), "grey19" },
+ { RGB_TO_ULONG(51 , 51 , 51 ), "gray20" },
+ { RGB_TO_ULONG(51 , 51 , 51 ), "grey20" },
+ { RGB_TO_ULONG(54 , 54 , 54 ), "gray21" },
+ { RGB_TO_ULONG(54 , 54 , 54 ), "grey21" },
+ { RGB_TO_ULONG(56 , 56 , 56 ), "gray22" },
+ { RGB_TO_ULONG(56 , 56 , 56 ), "grey22" },
+ { RGB_TO_ULONG(59 , 59 , 59 ), "gray23" },
+ { RGB_TO_ULONG(59 , 59 , 59 ), "grey23" },
+ { RGB_TO_ULONG(61 , 61 , 61 ), "gray24" },
+ { RGB_TO_ULONG(61 , 61 , 61 ), "grey24" },
+ { RGB_TO_ULONG(64 , 64 , 64 ), "gray25" },
+ { RGB_TO_ULONG(64 , 64 , 64 ), "grey25" },
+ { RGB_TO_ULONG(66 , 66 , 66 ), "gray26" },
+ { RGB_TO_ULONG(66 , 66 , 66 ), "grey26" },
+ { RGB_TO_ULONG(69 , 69 , 69 ), "gray27" },
+ { RGB_TO_ULONG(69 , 69 , 69 ), "grey27" },
+ { RGB_TO_ULONG(71 , 71 , 71 ), "gray28" },
+ { RGB_TO_ULONG(71 , 71 , 71 ), "grey28" },
+ { RGB_TO_ULONG(74 , 74 , 74 ), "gray29" },
+ { RGB_TO_ULONG(74 , 74 , 74 ), "grey29" },
+ { RGB_TO_ULONG(77 , 77 , 77 ), "gray30" },
+ { RGB_TO_ULONG(77 , 77 , 77 ), "grey30" },
+ { RGB_TO_ULONG(79 , 79 , 79 ), "gray31" },
+ { RGB_TO_ULONG(79 , 79 , 79 ), "grey31" },
+ { RGB_TO_ULONG(82 , 82 , 82 ), "gray32" },
+ { RGB_TO_ULONG(82 , 82 , 82 ), "grey32" },
+ { RGB_TO_ULONG(84 , 84 , 84 ), "gray33" },
+ { RGB_TO_ULONG(84 , 84 , 84 ), "grey33" },
+ { RGB_TO_ULONG(87 , 87 , 87 ), "gray34" },
+ { RGB_TO_ULONG(87 , 87 , 87 ), "grey34" },
+ { RGB_TO_ULONG(89 , 89 , 89 ), "gray35" },
+ { RGB_TO_ULONG(89 , 89 , 89 ), "grey35" },
+ { RGB_TO_ULONG(92 , 92 , 92 ), "gray36" },
+ { RGB_TO_ULONG(92 , 92 , 92 ), "grey36" },
+ { RGB_TO_ULONG(94 , 94 , 94 ), "gray37" },
+ { RGB_TO_ULONG(94 , 94 , 94 ), "grey37" },
+ { RGB_TO_ULONG(97 , 97 , 97 ), "gray38" },
+ { RGB_TO_ULONG(97 , 97 , 97 ), "grey38" },
+ { RGB_TO_ULONG(99 , 99 , 99 ), "gray39" },
+ { RGB_TO_ULONG(99 , 99 , 99 ), "grey39" },
+ { RGB_TO_ULONG(102, 102, 102), "gray40" },
+ { RGB_TO_ULONG(102, 102, 102), "grey40" },
+ { RGB_TO_ULONG(105, 105, 105), "gray41" },
+ { RGB_TO_ULONG(105, 105, 105), "grey41" },
+ { RGB_TO_ULONG(107, 107, 107), "gray42" },
+ { RGB_TO_ULONG(107, 107, 107), "grey42" },
+ { RGB_TO_ULONG(110, 110, 110), "gray43" },
+ { RGB_TO_ULONG(110, 110, 110), "grey43" },
+ { RGB_TO_ULONG(112, 112, 112), "gray44" },
+ { RGB_TO_ULONG(112, 112, 112), "grey44" },
+ { RGB_TO_ULONG(115, 115, 115), "gray45" },
+ { RGB_TO_ULONG(115, 115, 115), "grey45" },
+ { RGB_TO_ULONG(117, 117, 117), "gray46" },
+ { RGB_TO_ULONG(117, 117, 117), "grey46" },
+ { RGB_TO_ULONG(120, 120, 120), "gray47" },
+ { RGB_TO_ULONG(120, 120, 120), "grey47" },
+ { RGB_TO_ULONG(122, 122, 122), "gray48" },
+ { RGB_TO_ULONG(122, 122, 122), "grey48" },
+ { RGB_TO_ULONG(125, 125, 125), "gray49" },
+ { RGB_TO_ULONG(125, 125, 125), "grey49" },
+ { RGB_TO_ULONG(127, 127, 127), "gray50" },
+ { RGB_TO_ULONG(127, 127, 127), "grey50" },
+ { RGB_TO_ULONG(130, 130, 130), "gray51" },
+ { RGB_TO_ULONG(130, 130, 130), "grey51" },
+ { RGB_TO_ULONG(133, 133, 133), "gray52" },
+ { RGB_TO_ULONG(133, 133, 133), "grey52" },
+ { RGB_TO_ULONG(135, 135, 135), "gray53" },
+ { RGB_TO_ULONG(135, 135, 135), "grey53" },
+ { RGB_TO_ULONG(138, 138, 138), "gray54" },
+ { RGB_TO_ULONG(138, 138, 138), "grey54" },
+ { RGB_TO_ULONG(140, 140, 140), "gray55" },
+ { RGB_TO_ULONG(140, 140, 140), "grey55" },
+ { RGB_TO_ULONG(143, 143, 143), "gray56" },
+ { RGB_TO_ULONG(143, 143, 143), "grey56" },
+ { RGB_TO_ULONG(145, 145, 145), "gray57" },
+ { RGB_TO_ULONG(145, 145, 145), "grey57" },
+ { RGB_TO_ULONG(148, 148, 148), "gray58" },
+ { RGB_TO_ULONG(148, 148, 148), "grey58" },
+ { RGB_TO_ULONG(150, 150, 150), "gray59" },
+ { RGB_TO_ULONG(150, 150, 150), "grey59" },
+ { RGB_TO_ULONG(153, 153, 153), "gray60" },
+ { RGB_TO_ULONG(153, 153, 153), "grey60" },
+ { RGB_TO_ULONG(156, 156, 156), "gray61" },
+ { RGB_TO_ULONG(156, 156, 156), "grey61" },
+ { RGB_TO_ULONG(158, 158, 158), "gray62" },
+ { RGB_TO_ULONG(158, 158, 158), "grey62" },
+ { RGB_TO_ULONG(161, 161, 161), "gray63" },
+ { RGB_TO_ULONG(161, 161, 161), "grey63" },
+ { RGB_TO_ULONG(163, 163, 163), "gray64" },
+ { RGB_TO_ULONG(163, 163, 163), "grey64" },
+ { RGB_TO_ULONG(166, 166, 166), "gray65" },
+ { RGB_TO_ULONG(166, 166, 166), "grey65" },
+ { RGB_TO_ULONG(168, 168, 168), "gray66" },
+ { RGB_TO_ULONG(168, 168, 168), "grey66" },
+ { RGB_TO_ULONG(171, 171, 171), "gray67" },
+ { RGB_TO_ULONG(171, 171, 171), "grey67" },
+ { RGB_TO_ULONG(173, 173, 173), "gray68" },
+ { RGB_TO_ULONG(173, 173, 173), "grey68" },
+ { RGB_TO_ULONG(176, 176, 176), "gray69" },
+ { RGB_TO_ULONG(176, 176, 176), "grey69" },
+ { RGB_TO_ULONG(179, 179, 179), "gray70" },
+ { RGB_TO_ULONG(179, 179, 179), "grey70" },
+ { RGB_TO_ULONG(181, 181, 181), "gray71" },
+ { RGB_TO_ULONG(181, 181, 181), "grey71" },
+ { RGB_TO_ULONG(184, 184, 184), "gray72" },
+ { RGB_TO_ULONG(184, 184, 184), "grey72" },
+ { RGB_TO_ULONG(186, 186, 186), "gray73" },
+ { RGB_TO_ULONG(186, 186, 186), "grey73" },
+ { RGB_TO_ULONG(189, 189, 189), "gray74" },
+ { RGB_TO_ULONG(189, 189, 189), "grey74" },
+ { RGB_TO_ULONG(191, 191, 191), "gray75" },
+ { RGB_TO_ULONG(191, 191, 191), "grey75" },
+ { RGB_TO_ULONG(194, 194, 194), "gray76" },
+ { RGB_TO_ULONG(194, 194, 194), "grey76" },
+ { RGB_TO_ULONG(196, 196, 196), "gray77" },
+ { RGB_TO_ULONG(196, 196, 196), "grey77" },
+ { RGB_TO_ULONG(199, 199, 199), "gray78" },
+ { RGB_TO_ULONG(199, 199, 199), "grey78" },
+ { RGB_TO_ULONG(201, 201, 201), "gray79" },
+ { RGB_TO_ULONG(201, 201, 201), "grey79" },
+ { RGB_TO_ULONG(204, 204, 204), "gray80" },
+ { RGB_TO_ULONG(204, 204, 204), "grey80" },
+ { RGB_TO_ULONG(207, 207, 207), "gray81" },
+ { RGB_TO_ULONG(207, 207, 207), "grey81" },
+ { RGB_TO_ULONG(209, 209, 209), "gray82" },
+ { RGB_TO_ULONG(209, 209, 209), "grey82" },
+ { RGB_TO_ULONG(212, 212, 212), "gray83" },
+ { RGB_TO_ULONG(212, 212, 212), "grey83" },
+ { RGB_TO_ULONG(214, 214, 214), "gray84" },
+ { RGB_TO_ULONG(214, 214, 214), "grey84" },
+ { RGB_TO_ULONG(217, 217, 217), "gray85" },
+ { RGB_TO_ULONG(217, 217, 217), "grey85" },
+ { RGB_TO_ULONG(219, 219, 219), "gray86" },
+ { RGB_TO_ULONG(219, 219, 219), "grey86" },
+ { RGB_TO_ULONG(222, 222, 222), "gray87" },
+ { RGB_TO_ULONG(222, 222, 222), "grey87" },
+ { RGB_TO_ULONG(224, 224, 224), "gray88" },
+ { RGB_TO_ULONG(224, 224, 224), "grey88" },
+ { RGB_TO_ULONG(227, 227, 227), "gray89" },
+ { RGB_TO_ULONG(227, 227, 227), "grey89" },
+ { RGB_TO_ULONG(229, 229, 229), "gray90" },
+ { RGB_TO_ULONG(229, 229, 229), "grey90" },
+ { RGB_TO_ULONG(232, 232, 232), "gray91" },
+ { RGB_TO_ULONG(232, 232, 232), "grey91" },
+ { RGB_TO_ULONG(235, 235, 235), "gray92" },
+ { RGB_TO_ULONG(235, 235, 235), "grey92" },
+ { RGB_TO_ULONG(237, 237, 237), "gray93" },
+ { RGB_TO_ULONG(237, 237, 237), "grey93" },
+ { RGB_TO_ULONG(240, 240, 240), "gray94" },
+ { RGB_TO_ULONG(240, 240, 240), "grey94" },
+ { RGB_TO_ULONG(242, 242, 242), "gray95" },
+ { RGB_TO_ULONG(242, 242, 242), "grey95" },
+ { RGB_TO_ULONG(245, 245, 245), "gray96" },
+ { RGB_TO_ULONG(245, 245, 245), "grey96" },
+ { RGB_TO_ULONG(247, 247, 247), "gray97" },
+ { RGB_TO_ULONG(247, 247, 247), "grey97" },
+ { RGB_TO_ULONG(250, 250, 250), "gray98" },
+ { RGB_TO_ULONG(250, 250, 250), "grey98" },
+ { RGB_TO_ULONG(252, 252, 252), "gray99" },
+ { RGB_TO_ULONG(252, 252, 252), "grey99" },
+ { RGB_TO_ULONG(255, 255, 255), "gray100" },
+ { RGB_TO_ULONG(255, 255, 255), "grey100" },
+ { RGB_TO_ULONG(169, 169, 169), "dark grey" },
+ { RGB_TO_ULONG(169, 169, 169), "DarkGrey" },
+ { RGB_TO_ULONG(169, 169, 169), "dark gray" },
+ { RGB_TO_ULONG(169, 169, 169), "DarkGray" },
+ { RGB_TO_ULONG(0 , 0 , 139), "dark blue" },
+ { RGB_TO_ULONG(0 , 0 , 139), "DarkBlue" },
+ { RGB_TO_ULONG(0 , 139, 139), "dark cyan" },
+ { RGB_TO_ULONG(0 , 139, 139), "DarkCyan" },
+ { RGB_TO_ULONG(139, 0 , 139), "dark magenta" },
+ { RGB_TO_ULONG(139, 0 , 139), "DarkMagenta" },
+ { RGB_TO_ULONG(139, 0 , 0 ), "dark red" },
+ { RGB_TO_ULONG(139, 0 , 0 ), "DarkRed" },
+ { RGB_TO_ULONG(144, 238, 144), "light green" },
+ { RGB_TO_ULONG(144, 238, 144), "LightGreen" }
+};
+
+/*****************************************************************************
+ Color-Instance
+ ****************************************************************************/
+
+/* Taken from objects-msw.c. */
+static int
+hexval (Ibyte c)
+{
+ /* assumes ASCII and isxdigit (c) */
+ if (c >= 'a')
+ return c - 'a' + 10;
+ else if (c >= 'A')
+ return c - 'A' + 10;
+ else
+ return c - '0';
+}
+
+/* Taken from objects-msw.c. */
+/* Used in glyphs-carbon.c. */
+unsigned long carbon_string_to_color (const Ibyte *);
+
+unsigned long
+carbon_string_to_color (const Ibyte *name)
+{
+ int i;
+
+ if (*name == '#')
+ {
+ /* numeric names look like "#RRGGBB", "#RRRGGGBBB" or "#RRRRGGGGBBBB"
+ or "rgb:rrrr/gggg/bbbb" */
+ unsigned int r, g, b;
+
+ for (i = 1; i < qxestrlen (name); i++)
+ {
+ if (!byte_ascii_p (name[i]) || !isxdigit ((int) name[i]))
+ return UNRECOGNIZED_COLOR;
+ }
+ if (qxestrlen (name) == 7)
+ {
+ r = hexval (name[1]) * 16 + hexval (name[2]);
+ g = hexval (name[3]) * 16 + hexval (name[4]);
+ b = hexval (name[5]) * 16 + hexval (name[6]);
+ return RGB_TO_ULONG (r, g, b);
+ }
+ else if (qxestrlen (name) == 10)
+ {
+ r = hexval (name[1]) * 16 + hexval (name[2]);
+ g = hexval (name[4]) * 16 + hexval (name[5]);
+ b = hexval (name[7]) * 16 + hexval (name[8]);
+ return RGB_TO_ULONG (r, g, b);
+ }
+ else if (qxestrlen (name) == 13)
+ {
+ r = hexval (name[1]) * 16 + hexval (name[2]);
+ g = hexval (name[5]) * 16 + hexval (name[6]);
+ b = hexval (name[9]) * 16 + hexval (name[10]);
+ return RGB_TO_ULONG (r, g, b);
+ }
+ }
+ else if (!qxestrncmp_c (name, "rgb:", 4))
+ {
+ unsigned int r, g, b;
+
+ if (sscanf ((CIbyte *) name, "rgb:%04x/%04x/%04x", &r, &g, &b) == 3)
+ {
+ int len = qxestrlen (name);
+ if (len == 18)
+ {
+ r /= 257;
+ g /= 257;
+ b /= 257;
+ }
+ else if (len == 15)
+ {
+ r /= 17;
+ g /= 17;
+ b /= 17;
+ }
+ return RGB_TO_ULONG (r, g, b);
+ }
+ else
+ return UNRECOGNIZED_COLOR;
+ }
+ else if (*name) /* Can't be an empty string */
+ {
+ Ibyte *nospaces = (Ibyte *) ALLOCA (qxestrlen (name) + 1);
+ Ibyte *c = nospaces;
+ while (*name)
+ if (*name != ' ')
+ *c++ = *name++;
+ else
+ name++;
+ *c = '\0';
+
+ for (i = 0; i < countof (mac_color_map); i++)
+ if (!qxestrcasecmp_c (nospaces, mac_color_map[i].name))
+ return mac_color_map[i].color;
+ }
+
+ return UNRECOGNIZED_COLOR;
+}
+
+static int
+carbon_initialize_color_instance (Lisp_Color_Instance *c, Lisp_Object name, Lisp_Object device, Error_Behavior errb)
+{
+ unsigned long color;
+
+ color = carbon_string_to_color (XSTRING_DATA (name));
+ if (color != UNRECOGNIZED_COLOR)
+ {
+ float color_components[4] = {
+ RED_FROM_ULONG (color) / 255.0,
+ GREEN_FROM_ULONG (color) / 255.0,
+ BLUE_FROM_ULONG (color) / 255.0,
+ 1.0
+ };
+
+ c->data = xnew (struct carbon_color_instance_data);
+ struct device *d = XDEVICE (device);
+ CGColorSpaceRef cs = DEVICE_CARBON_COLOR_SPACE (d);
+ COLOR_INSTANCE_CARBON_COLOR (c) = CGColorCreate (cs, color_components);
+ return 1;
+ }
+ maybe_signal_error (Qinvalid_constant, "Unrecognized color", name, Qcolor, errb);
+ return 0;
+}
+
+#if 0
+static void
+carbon_mark_color_instance (Lisp_Color_Instance *c)
+{
+}
+#endif
+
+static void
+carbon_print_color_instance (Lisp_Color_Instance *c, Lisp_Object printcharfun, int UNUSED (escapeflag))
+{
+ CGColorRef color = COLOR_INSTANCE_CARBON_COLOR (c);
+ write_fmt_string (printcharfun, " (%X,%X,%X)", (int)(CGColorGetComponents (color)[0] * 255), (int)(CGColorGetComponents (color)[1] * 255), (int)(CGColorGetComponents (color)[2] * 255));
+}
+
+static void
+carbon_finalize_color_instance (Lisp_Color_Instance *c)
+{
+ if (c->data)
+ {
+ CGColorRelease (COLOR_INSTANCE_CARBON_COLOR (c));
+ xfree (c->data, void *);
+ c->data = 0;
+ }
+}
+
+static int
+carbon_color_instance_equal (Lisp_Color_Instance *c1, Lisp_Color_Instance *c2, int UNUSED (depth))
+{
+ return CGColorEqualToColor (COLOR_INSTANCE_CARBON_COLOR (c1), COLOR_INSTANCE_CARBON_COLOR (c2));
+}
+
+static unsigned long
+carbon_color_instance_hash (Lisp_Color_Instance *c, int UNUSED (depth))
+{
+ CGColorRef color = COLOR_INSTANCE_CARBON_COLOR (c);
+ return RGB_TO_ULONG ((int)(CGColorGetComponents (color)[0] * 255), (int)(CGColorGetComponents (color)[1] * 255), (int)(CGColorGetComponents (color)[2] * 255));
+}
+
+static Lisp_Object
+carbon_color_instance_rgb_components (Lisp_Color_Instance *c)
+{
+ CGColorRef color = COLOR_INSTANCE_CARBON_COLOR (c);
+ return list3 (make_int ((int)(CGColorGetComponents (color)[0] * 255)), make_int ((int)(CGColorGetComponents (color)[1] * 255)), make_int ((int)(CGColorGetComponents (color)[2] * 255)));
+}
+
+static int
+carbon_valid_color_name_p (struct device *UNUSED (d), Lisp_Object color)
+{
+ return carbon_string_to_color (XSTRING_DATA (color)) != UNRECOGNIZED_COLOR;
+}
+
+
+/*****************************************************************************
+ Font-Instance
+ ****************************************************************************/
+
+static Ibyte *
+escape_font_name (const Ibyte *name)
+{
+ Ibyte *escaped_name = alloca_ibytes (qxestrlen (name) * 2 + 1);
+
+ Ibyte *t = escaped_name;
+ while (*name != '\0')
+ {
+ if (*name == ':' && *name == '\\')
+ *t++ = '\\';
+ *t++ = *name++;
+ }
+
+ *t = '\0';
+
+ /* Caller should deallocate result. */
+ return qxestrdup (escaped_name);
+}
+
+static Ibyte *
+unescape_font_name (const Ibyte *name)
+{
+ Ibyte *unescaped_name = alloca_ibytes (qxestrlen (name) + 1);
+
+ Ibyte *t = unescaped_name;
+ while (*name != '\0')
+ {
+ if (*name == '\\' && *(name + 1) != '\0')
+ name++;
+ *t++ = *name++;
+ }
+
+ *t = '\0';
+
+ /* Caller should deallocate result. */
+ return qxestrdup (unescaped_name);
+}
+
+#define MATCH_ARRAY_SIZE 7
+#define NAME_MATCH_INDEX 1
+#define SIZE_MATCH_INDEX 4
+#define STYLE_MATCH_INDEX 6
+
+/* A "Carbon font spec" has the simple form "fontname[:fontsize[:fontstyle]]",
+ where fontstyle is b, i, bi, bold, italic, or bolditalic. If fontname
+ contains the character ':', the latter needs to be escaped with '\'.
+ Of course '\' also needs to be escaped with '\'. */
+static int
+parse_font_spec (const Ibyte *specstr, Ibyte **namestr, Ibyte **sizestr, Ibyte **stylestr)
+{
+ *namestr = NULL;
+ *sizestr = NULL;
+ *stylestr = NULL;
+
+ regmatch_t m[MATCH_ARRAY_SIZE];
+ if (regexec (&font_spec_regex, specstr, MATCH_ARRAY_SIZE, m, 0) != 0)
+ return 0;
+
+ int namelen = m[NAME_MATCH_INDEX].rm_eo - m[NAME_MATCH_INDEX].rm_so;
+ *namestr = xmalloc (namelen + 1);
+ strncpy (*namestr, specstr + m[NAME_MATCH_INDEX].rm_so, namelen);
+ (*namestr)[namelen] = '\0';
+
+ int sizelen = m[SIZE_MATCH_INDEX].rm_eo - m[SIZE_MATCH_INDEX].rm_so;
+ if (sizelen)
+ {
+ *sizestr = xmalloc (sizelen + 1);
+ strncpy (*sizestr, specstr + m[SIZE_MATCH_INDEX].rm_so, sizelen);
+ (*sizestr)[sizelen] = '\0';
+ }
+
+ int stylelen = m[STYLE_MATCH_INDEX].rm_eo - m[STYLE_MATCH_INDEX].rm_so;
+ if (stylelen)
+ {
+ *stylestr = xmalloc (stylelen + 1);
+ strncpy (*stylestr, specstr + m[STYLE_MATCH_INDEX].rm_so, stylelen);
+ (*stylestr)[stylelen] = '\0';
+ }
+
+ return 1;
+}
+
+#define DEFAULT_SIZE 10
+
+static int
+create_font_from_font_spec (const Ibyte *specstr, ATSUFontID *font, Fixed *size, Boolean *bold, Boolean *italic)
+{
+ Ibyte *namestr;
+ Ibyte *sizestr;
+ Ibyte *stylestr;
+ int result = 0;
+
+ if (!parse_font_spec (specstr, &namestr, &sizestr, &stylestr))
+ return 0;
+
+ Ibyte *unamestr = unescape_font_name (namestr);
+ if (ATSUFindFontFromName (unamestr, qxestrlen (unamestr), kFontFullName, kFontMacintoshPlatform, kFontNoScriptCode, kFontNoLanguageCode, font) != noErr)
+ goto cleanupandreturn;
+
+ if (sizestr)
+ *size = Long2Fix (atol (sizestr));
+ else
+ *size = Long2Fix (DEFAULT_SIZE);
+
+ *bold = FALSE;
+ *italic = FALSE;
+
+ if (stylestr)
+ {
+ if (qxestrcmp_c (stylestr, "b") == 0 || qxestrcmp_c (stylestr, "bold") == 0)
+ *bold = TRUE;
+ else if (qxestrcmp_c (stylestr, "i") == 0 || qxestrcmp_c (stylestr, "italic") == 0)
+ *italic = TRUE;
+ else if (qxestrcmp_c (stylestr, "bi") == 0 || qxestrcmp_c (stylestr, "bolditalic") == 0)
+ {
+ *bold = TRUE;
+ *italic = TRUE;
+ }
+ }
+
+ result = 1;
+
+cleanupandreturn:
+ if (namestr)
+ xfree (namestr, Ibyte *);
+ if (sizestr)
+ xfree (sizestr, Ibyte *);
+ if (stylestr)
+ xfree (stylestr, Ibyte *);
+ xfree (unamestr, Ibyte *);
+
+ return result;
+}
+
+static int
+get_truename (ATSUFontID font, Fixed size, Boolean bold, Boolean italic, Lisp_Object *truename)
+{
+ ByteCount namelen;
+
+ if (ATSUFindFontName (font, kFontFullName, kFontMacintoshPlatform, kFontNoScriptCode, kFontNoLanguageCode, 0, NULL, &namelen, NULL) != noErr)
+ return 0;
+
+ Ibyte *namestr = alloca_ibytes (namelen + 1);
+
+ if (ATSUFindFontName (font, kFontFullName, kFontMacintoshPlatform, kFontNoScriptCode, kFontNoLanguageCode, namelen, namestr, NULL, NULL) != noErr)
+ return 0;
+
+ namestr[namelen] = '\0';
+
+ Ibyte *enamestr = escape_font_name (namestr);
+
+ Ibyte *truenamestr = alloca_ibytes (qxestrlen (enamestr) + 15);
+
+ Ibyte *bold_italic;
+ if (bold && italic)
+ bold_italic = ":bi";
+ else if (bold)
+ bold_italic = ":b";
+ else if (italic)
+ bold_italic = ":i";
+ else
+ bold_italic = "";
+
+ qxesprintf (truenamestr, "%s:%ld%s", enamestr, Fix2Long (size), bold_italic);
+ xfree (enamestr, Ibyte *);
+
+ *truename = build_intstring (truenamestr);
+ return 1;
+}
+
+static int
+get_font_metrics (ATSUFontID font, Fixed size, unsigned short *width, unsigned short *height, unsigned short *ascent, unsigned short *descent)
+{
+ ATSFontMetrics oMetrics;
+ ATSFontRef iFont = FMGetATSFontRefFromFont (font);
+ if (ATSFontGetHorizontalMetrics (iFont, kATSOptionFlagsDefault, &oMetrics) != noErr)
+ return 0;
+
+ /* Use maxAdvanceWidth because avgAdvanceWidth is 0.0 for most fonts. */
+ float fsize = FixedToFloat (size);
+ *width = (unsigned short) (oMetrics.maxAdvanceWidth * fsize + 0.5);
+ *height = (unsigned short) ((oMetrics.ascent - oMetrics.descent)
+ * fsize + 0.5);
+ *ascent = (unsigned short) (oMetrics.ascent * fsize + 0.5);
+ *descent = (unsigned short) (- oMetrics.descent * fsize + 0.5);
+
+ /* Strange values are reported for some fonts! */
+ if (*width > fsize * 3.0)
+ *width = fsize * 3.0;
+ if (*width < 0.0)
+ *width = fsize;
+
+ return 1;
+}
+
+static int
+font_is_proportional (ATSUFontID font)
+{
+ /* There doesn't seem to be a simple way in the ATS/ATSUI API to determine
+ whether a font is proportional/fixed-pitch. For now we access the font
+ data directly for truetype and opentype fonts. This covers most fonts
+ installed in OS X by default. Don't know how to do this for LWFN fonts
+ yet. Also, for now, return 1 if we can't determine whether the font is
+ proportional. */
+
+ FourCharCode fntType;
+ if (FMGetFontFormat(font, &fntType) != noErr)
+ return 1;
+
+ if (fntType == 'true' || fntType == 'OTTO') {
+ UInt16 iBuffer;
+ ByteCount oActualLength;
+ if (FMGetFontTable(font, 'post', 14, 2, &iBuffer, &oActualLength) == noErr)
+ return !iBuffer;
+ }
+
+ return 1;
+}
+
+static int
+carbon_initialize_font_instance (Lisp_Font_Instance *f, Lisp_Object name, Lisp_Object UNUSED (device), Error_Behavior errb)
+{
+ ATSUFontID font;
+ Fixed size;
+ Boolean bold;
+ Boolean italic;
+
+ if (!create_font_from_font_spec (XSTRING_DATA (name), &font, &size, &bold, &italic))
+ {
+ maybe_signal_error (Qinvalid_argument, "No font with that name", name, Qfont, errb);
+ return 0;
+ }
+
+ if (!get_truename (font, size, bold, italic, &f->truename))
+ {
+ maybe_signal_error (Qinvalid_argument, "Can't get font truename", name, Qfont, errb);
+ return 0;
+ }
+
+ f->data = xnew (struct carbon_font_instance_data);
+ FONT_INSTANCE_CARBON_FONT (f) = font;
+ FONT_INSTANCE_CARBON_SIZE (f) = size;
+ FONT_INSTANCE_CARBON_BOLD (f) = bold;
+ FONT_INSTANCE_CARBON_ITALIC (f) = italic;
+
+ if (!get_font_metrics (font, size, &f->width, &f->height, &f->ascent, &f->descent))
+ {
+ maybe_signal_error (Qgui_error, "Can't get font metrics", name, Qfont, errb);
+ return 0;
+ }
+
+ f->proportional_p = font_is_proportional (font);
+
+ return 1;
+}
+
+static void
+carbon_print_font_instance (Lisp_Font_Instance *f, Lisp_Object printcharfun, int UNUSED (escapeflag))
+{
+ write_fmt_string (printcharfun, " 0x%lx(%ld)", (unsigned long) FONT_INSTANCE_CARBON_FONT (f), Fix2Long (FONT_INSTANCE_CARBON_SIZE (f)));
+}
+
+static void
+carbon_finalize_font_instance (Lisp_Font_Instance *f)
+{
+ if (f->data)
+ {
+ xfree (f->data, void *);
+ f->data = 0;
+ }
+}
+
+static Lisp_Object
+carbon_font_instance_truename (Lisp_Font_Instance *f, Error_Behavior UNUSED (errb))
+{
+ return f->truename;
+}
+
+#define MAX_FONT_COUNT 100
+
+static Lisp_Object
+carbon_list_fonts (Lisp_Object pattern, Lisp_Object UNUSED (device), Lisp_Object maxnumber)
+{
+ Lisp_Object result = Qnil;
+
+ Ibyte *pattern_str = XSTRING_DATA (pattern);
+ Ibyte *regex_str = alloca_ibytes (qxestrlen (pattern_str) + 3);
+ qxestrcpy_c (regex_str, "^");
+ qxestrcat (regex_str, pattern_str);
+ qxestrcat_c (regex_str, "$");
+
+ regex_t r;
+ if (regcomp (&r, regex_str, REG_EXTENDED | REG_ICASE) != 0)
+ return result;
+
+ int count = 0;
+ int max_number = MAX_FONT_COUNT;
+
+ if (!NILP (maxnumber) && INTP (maxnumber))
+ max_number = XINT (maxnumber);
+
+ ItemCount numFonts;
+ if (ATSUFontCount (&numFonts) != noErr)
+ return result;
+
+ ATSUFontID *fontIDList = (ATSUFontID *) ALLOCA (numFonts * sizeof (ATSUFontID));
+ if (!fontIDList)
+ return result;
+
+ if (ATSUGetFontIDs (fontIDList, numFonts, NULL) != noErr)
+ return result;
+
+ ItemCount i;
+ for (i = 0; i < numFonts && count < max_number; i++)
+ {
+ ByteCount namelen;
+
+ if (ATSUFindFontName (fontIDList[i], kFontFullName, kFontMacintoshPlatform, kFontNoScriptCode, kFontNoLanguageCode, 0, NULL, &namelen, NULL) == noErr)
+ {
+ Ibyte *name = (Ibyte *) xmalloc (namelen + 1);
+
+ if (ATSUFindFontName (fontIDList[i], kFontFullName, kFontMacintoshPlatform, kFontNoScriptCode, kFontNoLanguageCode, namelen, name, NULL, NULL) == noErr)
+ {
+ name[namelen] = '\0';
+
+ if (regexec (&r, name, 0, NULL, 0) == 0)
+ {
+ result = Fcons (build_intstring (name), result);
+ count++;
+ }
+ }
+
+ xfree (name, Ibyte *);
+ }
+ }
+
+ return result;
+}
+
+#ifdef MULE
+static Lisp_Object
+carbon_find_charset_font (Lisp_Object UNUSED (device), Lisp_Object font, Lisp_Object UNUSED (charset), int UNUSED (stage))
+{
+ /* As a simplification, any font will display any charset, since automatic font substitution is on. */
+ return font;
+}
+
+static int
+carbon_font_spec_matches_charset (struct device * UNUSED (d), Lisp_Object UNUSED (charset), const Ibyte * UNUSED (nonreloc), Lisp_Object UNUSED (reloc), Bytecount UNUSED (offset), Bytecount UNUSED (length), int UNUSED (stage))
+{
+ /* Always return true as a simplification. */
+ return 1;
+}
+#endif
+
+/*****************************************************************************
+ Initialization
+ ****************************************************************************/
+
+void
+syms_of_objects_carbon (void)
+{
+}
+
+void
+console_type_create_objects_carbon (void)
+{
+ CONSOLE_HAS_METHOD (carbon, initialize_color_instance);
+ /* CONSOLE_HAS_METHOD (carbon, mark_color_instance); */
+ CONSOLE_HAS_METHOD (carbon, print_color_instance);
+ CONSOLE_HAS_METHOD (carbon, finalize_color_instance);
+ CONSOLE_HAS_METHOD (carbon, color_instance_equal);
+ CONSOLE_HAS_METHOD (carbon, color_instance_hash);
+ CONSOLE_HAS_METHOD (carbon, color_instance_rgb_components);
+ CONSOLE_HAS_METHOD (carbon, valid_color_name_p);
+
+ CONSOLE_HAS_METHOD (carbon, initialize_font_instance);
+ /* CONSOLE_HAS_METHOD (carbon, mark_font_instance); */
+ CONSOLE_HAS_METHOD (carbon, print_font_instance);
+ CONSOLE_HAS_METHOD (carbon, finalize_font_instance);
+ CONSOLE_HAS_METHOD (carbon, font_instance_truename);
+ /* CONSOLE_HAS_METHOD (carbon, font_instance_properties); */
+ CONSOLE_HAS_METHOD (carbon, list_fonts);
+
+#ifdef MULE
+ CONSOLE_HAS_METHOD (carbon, find_charset_font);
+ CONSOLE_HAS_METHOD (carbon, font_spec_matches_charset);
+#endif
+}
+
+void
+reinit_vars_of_objects_carbon (void)
+{
+ if (regcomp (&font_spec_regex, font_spec_regex_str, REG_EXTENDED) != 0)
+ fatal ("Can't compile regex for Carbon font spec.");
+}
+
+void
+vars_of_objects_carbon (void)
+{
+}
1.1.2.1 +1029 -0 XEmacs/xemacs/src/Attic/redisplay-carbon.c
Index: redisplay-carbon.c
===================================================================
RCS file: redisplay-carbon.c
diff -N redisplay-carbon.c
--- /dev/null Fri Feb 25 17:30:16 2005
+++ /tmp/cvsAAAtrayTi Fri Feb 25 17:30:16 2005
＠＠ -0,0 +1,1029 ＠＠
+/*
+ The following code is original work by me, except where noted with
+ the comments "Taken from ..." or "Adapted from ...". I now place
+ it in the public domain.
+
+ Andrew Choi. Calgary, Canada, February 9, 2005. */
+
+#include <config.h>
+#include "lisp.h"
+
+#include "faces.h"
+#include "glyphs-carbon.h"
+#include "window-impl.h"
+
+#include "console-carbon-impl.h"
+#include "objects-carbon-impl.h"
+
+extern Lisp_Object Qcarbon_unicode; /* From intl-carbon.c. */
+extern int scrollbars_need_redraw; /* In scrollbar-carbon.c. */
+extern int inhibit_warning_display; /* In redisplay.c. */
+
+extern void carbon_enqueue_misc_user_event (Lisp_Object, Lisp_Object, Lisp_Object); /* In event-carbon.c */
+
+static Lisp_Object Qredraw_frame;
+
+/* Taken from src/redisplay-msw.c. */
+typedef struct textual_run
+{
+ Lisp_Object charset; /* charset of this run */
+ UniChar *ptr; /* pointer to Unicode chars in this run */
+ int nchars; /* number of internal characters in this run */
+ int nwchars; /* number of Unicode chars in this run */
+} textual_run;
+
+static void
+carbon_bevel_area (struct window *w, face_index UNUSED (findex), int x, int y, int width, int height, int shadow_thickness, int edges, enum edge_style style);
+
+/* Taken from src/redisplay-msw.c. */
+/* Separate out the text in STR into a series of textual runs of a
+particular charset. Returns the number of runs actually used.
+Returns the textual runs (STATICALLY ALLOCATED!) in RUN_STORAGE_PTR. */
+static int
+separate_textual_runs (textual_run **run_storage_ptr, const Ichar *str, Charcount len)
+{
+ static UniChar *ext_storage;
+ static int ext_storage_size; /* in WCHARS! */
+ static textual_run *run_storage;
+ static int run_storage_size;
+ int runs_so_far = 0;
+ int runbegin = 0;
+ int total_nchars = 0;
+ int i;
+ Lisp_Object prev_charset;
+
+ if (len == 0)
+ return 0;
+
+ prev_charset = ichar_charset (str[0]);
+
+ for (i = 1; i <= len; i++)
+ {
+ if (i == len || !EQ (ichar_charset (str[i]), prev_charset))
+ {
+ int j;
+ Ibyte *int_storage =
+ alloca_ibytes (MAX_ICHAR_LEN * (i - runbegin));
+ int int_storage_ptr = 0;
+ Extbyte *alloca_ext_storage;
+ int nchars;
+
+ int_storage_ptr = 0;
+ for (j = runbegin; j < i; j++)
+ int_storage_ptr +=
+ set_itext_ichar (int_storage + int_storage_ptr, str[j]);
+ TO_EXTERNAL_FORMAT (DATA, (int_storage, int_storage_ptr), ALLOCA, (alloca_ext_storage, nchars), Qcarbon_unicode);
+ nchars /= sizeof (UniChar); /* Tricky ... */
+ DO_REALLOC (ext_storage, ext_storage_size, total_nchars + nchars, UniChar);
+ memcpy (ext_storage + total_nchars, alloca_ext_storage, nchars * sizeof (UniChar));
+ DO_REALLOC (run_storage, run_storage_size, runs_so_far + 1, textual_run);
+ run_storage[runs_so_far].ptr = ext_storage + total_nchars;
+ run_storage[runs_so_far].charset = prev_charset;
+ run_storage[runs_so_far].nwchars = nchars;
+ run_storage[runs_so_far].nchars = i - runbegin;
+ total_nchars += nchars;
+ runs_so_far++;
+ runbegin = i;
+ if (i < len)
+ prev_charset = ichar_charset (str[i]);
+ }
+ }
+
+ *run_storage_ptr = run_storage;
+ return runs_so_far;
+}
+
+static int
+create_ATSU_style (ATSUFontID font, Fixed size, Boolean bold, Boolean italic, ATSUStyle *style)
+{
+ /* ### TO DO: Implement a cache. */
+
+ if (ATSUCreateStyle (style) != noErr)
+ return 0;
+
+ ATSUAttributeTag s_tags[] = { kATSUFontTag, kATSUSizeTag, kATSUQDBoldfaceTag,
+ kATSUQDItalicTag };
+ ByteCount s_sizes[] = { sizeof (ATSUFontID), sizeof (Fixed), sizeof (Boolean),
+ sizeof (Boolean) };
+ ATSUAttributeValuePtr s_values[] = { &font, &size, &bold, &italic };
+
+ if (ATSUSetAttributes (*style, 4, s_tags, s_sizes, s_values) != noErr)
+ {
+ (void) ATSUDisposeStyle (*style);
+ return 0;
+ }
+
+ /* Turn of all font features such as ligatures. */
+ ATSUFontFeatureType ff_type = kAllTypographicFeaturesType;
+ ATSUFontFeatureSelector ff_selector = kAllTypeFeaturesOffSelector;
+ if (ATSUSetFontFeatures(*style, 1, &ff_type, &ff_selector) != noErr)
+ return 0;
+
+ return 1;
+}
+
+static int
+create_ATSU_text_layout (ConstUniCharArrayPtr text, UniCharCount text_length, ATSUStyle style, CGContextRef context, ATSUTextLayout *text_layout)
+{
+ /* ### TO DO: Implement a cache. */
+
+ UniCharCount run_length = kATSUToTextEnd;
+
+ if (ATSUCreateTextLayoutWithTextPtr (text, kATSUFromTextBeginning, kATSUToTextEnd, text_length, 1, &run_length, &style, text_layout) != noErr)
+ return 0;
+
+ ATSUAttributeTag lo_tags[] = { kATSUCGContextTag, kATSULineLayoutOptionsTag };
+ ByteCount lo_sizes[] = { sizeof (CGContextRef), sizeof(ATSLineLayoutOptions) };
+
+ ATSLineLayoutOptions atsLineLayoutOptions = kATSLineDisableAllLayoutOperations | kATSLineUseDeviceMetrics;
+
+ ATSUAttributeValuePtr lo_values[] = { &context, &atsLineLayoutOptions };
+ ATSUSetLayoutControls (*text_layout, 2, lo_tags, lo_sizes, lo_values);
+
+ /* Automatically font substitution. */
+ if (ATSUSetTransientFontMatching (*text_layout, TRUE) != noErr)
+ {
+ (void) ATSUDisposeTextLayout (*text_layout);
+ return 0;
+ }
+
+ return 1;
+}
+
+static int
+carbon_text_width_single_run (CGContextRef context, struct face_cachel *cachel, textual_run *run)
+{
+ Lisp_Object font_inst = FACE_CACHEL_FONT (cachel, run->charset);
+ Lisp_Font_Instance *fi = XFONT_INSTANCE (font_inst);
+
+ ATSUStyle style;
+ if (!create_ATSU_style (FONT_INSTANCE_CARBON_FONT (fi), FONT_INSTANCE_CARBON_SIZE (fi), FONT_INSTANCE_CARBON_BOLD (fi), FONT_INSTANCE_CARBON_ITALIC (fi), &style))
+ stderr_out ("Can't create style");
+
+ ATSUTextLayout text_layout;
+ if (!create_ATSU_text_layout ((UniChar *) run->ptr, run->nwchars, style, context, &text_layout))
+ stderr_out ("Can't text layout");
+
+ ATSUTextMeasurement text_before, text_after, ascent, descent;
+ if (ATSUGetUnjustifiedBounds (text_layout, kATSUFromTextBeginning, kATSUToTextEnd, &text_before, &text_after, &ascent, &descent) != noErr)
+ stderr_out ("Can't get unjustified bounds");
+
+ if (ATSUDisposeStyle (style) != noErr)
+ stderr_out ("Can't dispose of style");
+ if (ATSUDisposeTextLayout (text_layout) != noErr)
+ stderr_out ("Can't dispose of text layout");
+
+ return Fix2Long (text_after);
+}
+
+static int
+carbon_text_width (struct frame *f, struct face_cachel *cachel, const Ichar *str, Charcount len)
+{
+ CGContextRef context = FRAME_CARBON_CONTEXT (f);
+ int width_so_far = 0;
+ textual_run *runs;
+ int nruns;
+ int i;
+
+ nruns = separate_textual_runs (&runs, str, len);
+
+ for (i = 0; i < nruns; i++)
+ width_so_far += carbon_text_width_single_run (context, cachel, runs + i);
+
+ return width_so_far;
+}
+
+/* Output a pixmap at the desired location.
+ DB - normalized display_box.
+ DGA - normalized display_glyph_area. */
+static void
+carbon_output_pixmap (struct window *w, Lisp_Object image_instance,
+ struct display_box *db,
+ struct display_glyph_area * UNUSED (dga), face_index findex,
+ int UNUSED (cursor_start), int UNUSED (cursor_width),
+ int UNUSED (cursor_height), int UNUSED (bg_pixmap))
+{
+ struct frame *f = XFRAME (w->frame);
+ /*HDC hdc = get_frame_dc (f, 1);*/
+ CGContextRef context = FRAME_CARBON_CONTEXT (f);
+
+ CGRect pixmap_rect = CGRectMake(db->xpos, FRAME_PIXHEIGHT (f) - (db->ypos + db->height), db->width, db->height);
+
+ CGContextSetFillColorWithColor (context, COLOR_INSTANCE_CARBON_COLOR (XCOLOR_INSTANCE (WINDOW_FACE_CACHEL_BACKGROUND (w, findex))));
+ CGContextFillRect (context, pixmap_rect);
+
+ Lisp_Image_Instance *p = XIMAGE_INSTANCE (image_instance);
+
+ CGContextDrawImage (context, pixmap_rect, IMAGE_INSTANCE_CARBON_IMAGE_REF (p));
+}
+
+static void
+draw_text_clipped (CGContextRef context, UniChar *text, int text_len, Fixed x, Fixed y, CGRect clipping_rect, ATSUFontID font, Fixed size, Boolean bold, Boolean italic, CGColorRef fgcolor, CGColorRef bgcolor)
+{
+ ATSUStyle style;
+ if (!create_ATSU_style (font, size, bold, italic, &style))
+ stderr_out ("Can't create style");
+
+ ATSUTextLayout text_layout;
+ if (!create_ATSU_text_layout (text, text_len, style, context, &text_layout))
+ stderr_out ("Can't create text layout");
+
+ CGContextSaveGState (context);
+
+ const float *bgc = CGColorGetComponents (bgcolor);
+ CGContextSetRGBFillColor (context, bgc[0], bgc[1], bgc[2], bgc[3]);
+
+ CGRect clipping_rect2 = clipping_rect;
+ clipping_rect2.size.height -= 1;
+ CGContextFillRect (context, clipping_rect);
+
+ const float *fgc = CGColorGetComponents (fgcolor);
+ CGContextSetRGBFillColor (context, fgc[0], fgc[1], fgc[2], fgc[3]);
+
+ CGContextClipToRect (context, clipping_rect);
+
+ ATSUDrawText (text_layout, kATSUFromTextBeginning, kATSUToTextEnd, x, y);
+
+ CGContextRestoreGState (context);
+}
+
+/* Adapted from src/redisplay-msw.c. */
+/*****************************************************************************
+ Given a string and a starting position, output that string in the
+ given face.
+ Correctly handles multiple charsets in the string.
+
+ The meaning of the parameters is something like this:
+
+ W Window that the text is to be displayed in.
+ DL Display line that this text is on. The values in the
+ structure are used to determine the vertical position and
+ clipping range of the text.
+ BUF Dynamic array of Ichars specifying what is actually to be
+ drawn.
+ XPOS X position in pixels where the text should start being drawn.
+ XOFFSET Number of pixels to be chopped off the left side of the
+ text. The effect is as if the text were shifted to the
+ left this many pixels and clipped at XPOS.
+ CLIP_START Clip everything left of this X position.
+ WIDTH Clip everything right of XPOS + WIDTH.
+ FINDEX Index for the face cache element describing how to display
+ the text.
+ CURSOR #### I don't understand this. There's something
+ strange and overcomplexified with this variable.
+ Chuck, explain please?
+ CURSOR_START Starting X position of cursor.
+ CURSOR_WIDTH Width of cursor in pixels.
+ CURSOR_HEIGHT Height of cursor in pixels.
+ ****************************************************************************/
+static void
+carbon_output_string (struct window *w, struct display_line *dl, Ichar_dynarr *buf, int xpos, int xoffset, int clip_start, int width, face_index findex, int cursor, int UNUSED (cursor_start), int UNUSED (cursor_width), int UNUSED (cursor_height))
+{
+ struct frame *f = XFRAME (w->frame);
+ Lisp_Object window = wrap_window (w);
+ CGContextRef context = FRAME_CARBON_CONTEXT (f);
+ int clip_end;
+ /* Lisp_Object bg_pmap; */
+ textual_run *runs;
+ int nruns;
+ int i, height;
+ CGRect rect;
+ struct face_cachel *cachel = WINDOW_FACE_CACHEL (w, findex);
+ struct device *d = XDEVICE (f->device);
+ int focus = EQ (w->frame, DEVICE_FRAME_WITH_FOCUS_REAL (d));
+ Lisp_Object bar = symbol_value_in_buffer (Qbar_cursor, WINDOW_BUFFER (w));
+
+ assert (width >= 0);
+
+ /* Regularize the variables passed in. */
+ if (clip_start < xpos)
+ clip_start = xpos;
+ clip_end = xpos + width;
+ if (clip_start >= clip_end)
+ return; /* It's all clipped out. */
+
+ xpos -= xoffset;
+
+ /* Sort out the destination rectangle. Note Quartz 2D coordinate
+ system is flipped! */
+ height = DISPLAY_LINE_HEIGHT (dl);
+ rect.origin.x = clip_start;
+ rect.origin.y = FRAME_PIXHEIGHT (f) - (DISPLAY_LINE_YPOS (dl) + height);
+ rect.size.width = clip_end - clip_start;
+ rect.size.height = height;
+
+ /* make sure the area we are about to display is subwindow free. */
+ redisplay_unmap_subwindows_maybe (f, clip_start, DISPLAY_LINE_YPOS (dl), clip_end - clip_start, DISPLAY_LINE_HEIGHT (dl));
+
+ nruns = separate_textual_runs (&runs, Dynarr_atp (buf, 0), Dynarr_length (buf));
+
+ for (i = 0; i < nruns; i++)
+ {
+ Lisp_Object font = FACE_CACHEL_FONT (cachel, runs[i].charset);
+ Lisp_Font_Instance *fi = XFONT_INSTANCE (font);
+ int this_width;
+
+ if (EQ (font, Vthe_null_font_instance))
+ continue;
+
+ this_width = carbon_text_width_single_run (context, cachel, runs + i);
+
+ /* cope with fonts taller than lines */
+ if ((int) fi->height < (int) (height + dl->clip + dl->top_clip))
+ {
+ int clear_start = max (xpos, clip_start);
+ int clear_end = min (xpos + this_width, clip_end);
+
+ {
+ redisplay_clear_region (window, findex, clear_start, DISPLAY_LINE_YPOS (dl), clear_end - clear_start, height);
+ /* output pixmap calls this so we have to recall to get correct
+ references */
+ cachel = WINDOW_FACE_CACHEL (w, findex);
+ }
+ }
+
+ CGColorRef fgcolor = COLOR_INSTANCE_CARBON_COLOR (XCOLOR_INSTANCE (cachel->foreground));
+ CGColorRef bgcolor = COLOR_INSTANCE_CARBON_COLOR (XCOLOR_INSTANCE (cachel->background));
+
+ CGColorRef cursor_fgcolor = 0;
+ CGColorRef cursor_bgcolor = 0;
+
+ if (cursor)
+ {
+ face_index elt = get_builtin_face_cache_index (w, Vtext_cursor_face);
+ struct face_cachel *cursor_cachel = WINDOW_FACE_CACHEL (w, elt);
+
+ cursor_fgcolor = COLOR_INSTANCE_CARBON_COLOR (XCOLOR_INSTANCE (cursor_cachel->foreground));
+ cursor_bgcolor = COLOR_INSTANCE_CARBON_COLOR (XCOLOR_INSTANCE (cursor_cachel->background));
+ }
+
+ if (cursor && focus && NILP (bar))
+ {
+ fgcolor = cursor_fgcolor;
+ bgcolor = cursor_bgcolor;
+ }
+
+ draw_text_clipped (context, runs[i].ptr, runs[i].nwchars, Long2Fix (xpos), Long2Fix (FRAME_PIXHEIGHT (f) - dl->ypos), rect, FONT_INSTANCE_CARBON_FONT (fi), FONT_INSTANCE_CARBON_SIZE (fi), FONT_INSTANCE_CARBON_BOLD (fi), FONT_INSTANCE_CARBON_ITALIC (fi), fgcolor, bgcolor);
+
+ if (cursor && focus && !NILP (bar))
+ {
+ CGRect bar_cursor_rect = rect;
+ bar_cursor_rect.size.width = EQ (bar, Qt) ? 1 : min (2, bar_cursor_rect.size.width);
+
+ CGContextSetFillColorWithColor (context, cursor_bgcolor);
+
+ CGContextFillRect (context, bar_cursor_rect);
+ }
+
+ if (cursor && !focus && NILP (bar))
+ {
+ CGContextSetStrokeColorWithColor (context, cursor_bgcolor);
+
+ /* Set line width and inset stroke rect so box is drawn within the bounding box of the run. */
+ CGContextSetLineWidth (context, 1.0);
+ CGContextStrokeRect (context, CGRectInset (rect, 0.5, 0.5));
+ }
+
+ xpos += this_width;
+ }
+}
+
+#define EOL_CURSOR_WIDTH 5
+
+/* Adapted from src/redisplay-x.c. */
+/*****************************************************************************
+ Draw a cursor at the end of a line. The end-of-line cursor is
+ narrower than the normal cursor.
+****************************************************************************/
+static void
+carbon_output_eol_cursor (struct window *w, struct display_line *dl, int xpos, face_index findex)
+{
+ struct frame *f = XFRAME (w->frame);
+ struct device *d = XDEVICE (f->device);
+ Lisp_Object window;
+
+ CGContextRef context = FRAME_CARBON_CONTEXT (f);
+ face_index elt = get_builtin_face_cache_index (w, Vtext_cursor_face);
+ struct face_cachel *cursor_cachel = WINDOW_FACE_CACHEL (w, elt);
+ CGColorRef cursor_bgcolor = COLOR_INSTANCE_CARBON_COLOR (XCOLOR_INSTANCE (cursor_cachel->background));
+
+ int focus = EQ (w->frame, DEVICE_FRAME_WITH_FOCUS_REAL (d));
+ Lisp_Object bar_cursor_value = symbol_value_in_buffer (Qbar_cursor, WINDOW_BUFFER (w));
+
+ int x = xpos;
+ int y = DISPLAY_LINE_YPOS (dl);
+ int width = EOL_CURSOR_WIDTH;
+ int height = DISPLAY_LINE_HEIGHT (dl);
+ int cursor_height, cursor_y;
+ int defheight, defascent;
+
+ window = wrap_window (w);
+ redisplay_clear_region (window, findex, x, y, width, height);
+
+ if (NILP (w->text_cursor_visible_p))
+ return;
+
+ /* gc = x_get_gc (d, Qnil, cursor_cachel->background, Qnil, Qnil, Qnil); */
+
+ default_face_font_info (window, &defascent, 0, &defheight, 0, 0);
+
+ /* make sure the cursor is entirely contained between y and y+height */
+ cursor_height = min (defheight, height);
+ cursor_y = max (y, min (y + height - cursor_height, dl->ypos - defascent));
+
+ CGRect cursor_rect = CGRectMake (x, FRAME_PIXHEIGHT (f) - (cursor_y + cursor_height - 1), width, cursor_height - 1);
+
+ if (NILP (bar_cursor_value))
+ {
+ if (focus)
+ {
+ CGContextSetFillColorWithColor (context, cursor_bgcolor);
+
+ CGContextFillRect (context, cursor_rect);
+ }
+ else
+ {
+ CGContextSetStrokeColorWithColor (context, cursor_bgcolor);
+
+ CGContextSetLineWidth (context, 1.0);
+ CGContextStrokeRect (context, CGRectInset (cursor_rect, 0.5, 0.5));
+ }
+ }
+ else
+ {
+ if (focus)
+ {
+ cursor_rect.size.width = EQ (bar_cursor_value, Qt) ? 1 : 2;
+
+ CGContextSetFillColorWithColor (context, cursor_bgcolor);
+
+ CGContextFillRect (context, cursor_rect);
+ }
+ }
+}
+
+/* Adapted from src/redisplay-x.c. */
+/*****************************************************************************
+ Output a blank by clearing the area it covers in the foreground color
+ of its face.
+ ****************************************************************************/
+static void
+carbon_output_blank (struct window *w, struct display_line *dl, struct rune *rb, int start_pixpos, int cursor_start, int cursor_width)
+{
+ struct frame *f = XFRAME (w->frame);
+ CGContextRef context = FRAME_CARBON_CONTEXT (f);
+
+ struct face_cachel *cursor_cachel = WINDOW_FACE_CACHEL (w, get_builtin_face_cache_index (w, Vtext_cursor_face));
+ /* Lisp_Object bg_pmap; */
+ Lisp_Object buffer = WINDOW_BUFFER (w);
+ Lisp_Object bar_cursor_value = symbol_value_in_buffer (Qbar_cursor, buffer);
+
+ int x = rb->xpos;
+ int y = DISPLAY_LINE_YPOS (dl);
+ int width = rb->width;
+ int height = DISPLAY_LINE_HEIGHT (dl);
+
+ /* Unmap all subwindows in the area we are going to blank. */
+ redisplay_unmap_subwindows_maybe (f, x, y, width, height);
+
+ if (start_pixpos > x)
+ {
+ if (start_pixpos >= (x + width))
+ return;
+ else
+ {
+ width -= (start_pixpos - x);
+ x = start_pixpos;
+ }
+ }
+
+ Lisp_Object color = WINDOW_FACE_CACHEL_BACKGROUND (w, rb->findex);
+
+ if (COLOR_INSTANCEP (color))
+ {
+ CGContextSetFillColorWithColor (FRAME_CARBON_CONTEXT (f), COLOR_INSTANCE_CARBON_COLOR (XCOLOR_INSTANCE (color)));
+
+ CGContextFillRect (FRAME_CARBON_CONTEXT (f), CGRectMake (x, FRAME_PIXHEIGHT (f) - (y + height), width, height));
+ }
+
+ /* If this rune is marked as having the cursor, then it is actually
+ representing a tab. */
+ if (!NILP (w->text_cursor_visible_p)
+ && (rb->cursor_type == CURSOR_ON
+ || (cursor_width
+ && (cursor_start + cursor_width > x)
+ && cursor_start < (x + width))))
+ {
+ int cursor_height, cursor_y;
+ int focus = FRAME_CARBON_WINDOW (f) == FrontWindow ();
+ Lisp_Font_Instance *fi;
+
+ fi = XFONT_INSTANCE (FACE_CACHEL_FONT
+ (WINDOW_FACE_CACHEL (w, rb->findex),
+ Vcharset_ascii));
+
+ /* gc = x_get_gc (d, Qnil, cursor_cachel->background, Qnil, Qnil, Qnil); */
+
+ cursor_y = dl->ypos - fi->ascent;
+ cursor_height = fi->height;
+ if (cursor_y + cursor_height > y + height)
+ cursor_height = y + height - cursor_y;
+
+ if (focus)
+ {
+ if (NILP (bar_cursor_value))
+ {
+ CGContextSetFillColorWithColor (context, COLOR_INSTANCE_CARBON_COLOR (XCOLOR_INSTANCE (cursor_cachel->background)));
+
+ CGContextFillRect (context, CGRectMake (cursor_start, FRAME_PIXHEIGHT (f) - (cursor_y + cursor_height), fi->width, cursor_height));
+ }
+ else
+ {
+ int bar_width = EQ (bar_cursor_value, Qt) ? 1 : 2;
+
+ /* gc = x_get_gc (d, Qnil, cursor_cachel->background, Qnil, Qnil,
+ make_int (bar_width)); */
+ CGContextSetFillColorWithColor (context, COLOR_INSTANCE_CARBON_COLOR (XCOLOR_INSTANCE (cursor_cachel->background)));
+
+ CGContextFillRect (context, CGRectMake (cursor_start + bar_width - 1, FRAME_PIXHEIGHT (f) - (cursor_y + cursor_height - 1), bar_width, cursor_height));
+ }
+ }
+ else if (NILP (bar_cursor_value))
+ {
+ CGContextSetStrokeColorWithColor (context, COLOR_INSTANCE_CARBON_COLOR (XCOLOR_INSTANCE (cursor_cachel->background)));
+
+ CGContextStrokeRect (context, CGRectMake (cursor_start, FRAME_PIXHEIGHT (f) - (cursor_y + cursor_height - 1), fi->width - 1, cursor_height - 1));
+ }
+ }
+}
+
+/* Adapted from src/redisplay-x.c. */
+/*****************************************************************************
+ Output a horizontal line in the foreground of its face.
+ ****************************************************************************/
+static void
+carbon_output_hline (struct window *w, struct display_line *dl, struct rune *rb)
+{
+ struct frame *f = XFRAME (w->frame);
+ CGContextRef context = FRAME_CARBON_CONTEXT (f);
+
+ int x = rb->xpos;
+ int width = rb->width;
+ int height = DISPLAY_LINE_HEIGHT (dl);
+ int ypos1, ypos2, ypos3, ypos4;
+
+ ypos1 = DISPLAY_LINE_YPOS (dl);
+ ypos2 = ypos1 + rb->object.hline.yoffset;
+ ypos3 = ypos2 + rb->object.hline.thickness;
+ ypos4 = dl->ypos + dl->descent - dl->clip;
+
+ /* First clear the area not covered by the line. */
+ if (height - rb->object.hline.thickness > 0)
+ {
+ /* gc = x_get_gc (d, Qnil, WINDOW_FACE_CACHEL_FOREGROUND (w, rb->findex),
+ Qnil, Qnil, Qnil); */
+ CGContextSetFillColorWithColor (context, COLOR_INSTANCE_CARBON_COLOR (XCOLOR_INSTANCE (WINDOW_FACE_CACHEL_FOREGROUND (w, rb->findex))));
+
+ if (ypos2 - ypos1 > 0)
+ CGContextFillRect (context, CGRectMake (x, FRAME_PIXHEIGHT (f) - ypos2, width, ypos2 - ypos1));
+ if (ypos4 - ypos3 > 0)
+ CGContextFillRect (context, CGRectMake (x, FRAME_PIXHEIGHT (f) - ypos2, width, ypos2 - ypos1));
+ }
+
+ /* Now draw the line. */
+ /* gc = x_get_gc (d, Qnil, WINDOW_FACE_CACHEL_BACKGROUND (w, rb->findex),
+ Qnil, Qnil, Qnil); */
+ CGContextSetFillColorWithColor (context, COLOR_INSTANCE_CARBON_COLOR (XCOLOR_INSTANCE (WINDOW_FACE_CACHEL_BACKGROUND (w, rb->findex))));
+
+ if (ypos2 < ypos1)
+ ypos2 = ypos1;
+ if (ypos3 > ypos4)
+ ypos3 = ypos4;
+
+ if (ypos3 - ypos2 > 0)
+ CGContextFillRect (context, CGRectMake (x, FRAME_PIXHEIGHT (f) - ypos3, width, ypos3 - ypos2));
+}
+
+/* Taken from src/redisplay-x.c. */
+/*****************************************************************************
+ Given a display line, a block number for that start line, output all
+ runes between start and end in the specified display block.
+ ****************************************************************************/
+static void
+carbon_output_display_block (struct window *w, struct display_line *dl, int block,
+ int start, int end, int start_pixpos, int cursor_start,
+ int cursor_width, int cursor_height)
+{
+ struct frame *f = XFRAME (w->frame);
+ Ichar_dynarr *buf = Dynarr_new (Ichar);
+ Lisp_Object window;
+
+ struct display_block *db = Dynarr_atp (dl->display_blocks, block);
+ rune_dynarr *rba = db->runes;
+ struct rune *rb;
+
+ int elt = start;
+ face_index findex;
+ int xpos, width = 0;
+ Lisp_Object charset = Qunbound; /* Qnil is a valid charset when
+ MULE is not defined */
+
+ window = wrap_window (w);
+ rb = Dynarr_atp (rba, start);
+
+ if (!rb)
+ /* Nothing to do so don't do anything. */
+ return;
+
+ findex = rb->findex;
+ xpos = rb->xpos;
+ if (rb->type == RUNE_CHAR)
+ charset = ichar_charset (rb->object.chr.ch);
+
+ if (end < 0)
+ end = Dynarr_length (rba);
+ Dynarr_reset (buf);
+
+ while (elt < end)
+ {
+ rb = Dynarr_atp (rba, elt);
+
+ if (rb->findex == findex && rb->type == RUNE_CHAR
+ && rb->object.chr.ch != '\n' && rb->cursor_type != CURSOR_ON
+ && EQ (charset, ichar_charset (rb->object.chr.ch)))
+ {
+ Dynarr_add (buf, rb->object.chr.ch);
+ width += rb->width;
+ elt++;
+ }
+ else
+ {
+ if (Dynarr_length (buf))
+ {
+ carbon_output_string (w, dl, buf, xpos, 0, start_pixpos, width, findex, 0, cursor_start, cursor_width, cursor_height);
+ xpos = rb->xpos;
+ width = 0;
+ }
+ Dynarr_reset (buf);
+ width = 0;
+
+ if (rb->type == RUNE_CHAR)
+ {
+ findex = rb->findex;
+ xpos = rb->xpos;
+ charset = ichar_charset (rb->object.chr.ch);
+
+ if (rb->cursor_type == CURSOR_ON)
+ {
+ if (rb->object.chr.ch == '\n')
+ {
+ carbon_output_eol_cursor (w, dl, xpos, findex);
+ }
+ else
+ {
+ Dynarr_add (buf, rb->object.chr.ch);
+ carbon_output_string (w, dl, buf, xpos, 0, start_pixpos, rb->width, findex, 1, cursor_start, cursor_width, cursor_height);
+ Dynarr_reset (buf);
+ }
+
+ xpos += rb->width;
+ elt++;
+ }
+ else if (rb->object.chr.ch == '\n')
+ {
+ /* Clear in case a cursor was formerly here. */
+ redisplay_clear_region (window, findex, xpos,
+ DISPLAY_LINE_YPOS (dl),
+ rb->width,
+ DISPLAY_LINE_HEIGHT (dl));
+ elt++;
+ }
+ }
+ else if (rb->type == RUNE_BLANK || rb->type == RUNE_HLINE)
+ {
+ if (rb->type == RUNE_BLANK)
+ carbon_output_blank (w, dl, rb, start_pixpos, cursor_start,
+ cursor_width);
+ else
+ {
+ /* #### Our flagging of when we need to redraw the
+ modeline shadows sucks. Since RUNE_HLINE is only used
+ by the modeline at the moment it is a good bet
+ that if it gets redrawn then we should also
+ redraw the shadows. This won't be true forever.
+ We borrow the shadow_thickness_changed flag for
+ now. */
+ w->shadow_thickness_changed = 1;
+ carbon_output_hline (w, dl, rb);
+ }
+
+ elt++;
+ if (elt < end)
+ {
+ rb = Dynarr_atp (rba, elt);
+
+ findex = rb->findex;
+ xpos = rb->xpos;
+ }
+ }
+ else if (rb->type == RUNE_DGLYPH)
+ {
+ Lisp_Object instance;
+ struct display_box dbox;
+ struct display_glyph_area dga;
+
+ redisplay_calculate_display_boxes (dl, rb->xpos, rb->object.dglyph.xoffset,
+ rb->object.dglyph.yoffset,
+ start_pixpos, rb->width, &dbox, &dga);
+
+ window = wrap_window (w);
+ instance = glyph_image_instance (rb->object.dglyph.glyph,
+ window, ERROR_ME_DEBUG_WARN, 1);
+ findex = rb->findex;
+
+ if (IMAGE_INSTANCEP (instance))
+ {
+ switch (XIMAGE_INSTANCE_TYPE (instance))
+ {
+ case IMAGE_MONO_PIXMAP:
+ case IMAGE_COLOR_PIXMAP:
+ redisplay_output_pixmap (w, instance, &dbox, &dga, findex,
+ cursor_start, cursor_width,
+ cursor_height, 0);
+ break;
+
+#if 0
+ case IMAGE_WIDGET:
+ if (EQ (XIMAGE_INSTANCE_WIDGET_TYPE (instance),
+ Qlayout))
+ {
+ redisplay_output_layout (window, instance, &dbox, &dga, findex,
+ cursor_start, cursor_width,
+ cursor_height);
+ break;
+ }
+ case IMAGE_SUBWINDOW:
+ redisplay_output_subwindow (w, instance, &dbox, &dga, findex,
+ cursor_start, cursor_width,
+ cursor_height);
+ break;
+
+ case IMAGE_NOTHING:
+ /* nothing is as nothing does */
+ break;
+
+ case IMAGE_TEXT:
+ case IMAGE_POINTER:
+#endif
+ default:
+ abort ();
+ }
+ IMAGE_INSTANCE_OPTIMIZE_OUTPUT
+ (XIMAGE_INSTANCE (instance)) = 0;
+ }
+
+ xpos += rb->width;
+ elt++;
+ }
+ else
+ abort ();
+ }
+ }
+
+ if (Dynarr_length (buf))
+ carbon_output_string (w, dl, buf, xpos, 0, start_pixpos, width, findex, 0, cursor_start, cursor_width, cursor_height);
+
+ if (dl->modeline
+ && !EQ (Qzero, w->modeline_shadow_thickness)
+ && (f->clear
+ || f->windows_structure_changed
+ || w->shadow_thickness_changed))
+ bevel_modeline (w, dl);
+
+ Dynarr_free (buf);
+}
+
+static int
+carbon_divider_height (void)
+{
+ return 1;
+}
+
+static int
+carbon_eol_cursor_width (void)
+{
+ return 5;
+}
+
+static void
+carbon_output_vertical_divider (struct window *w, int clear)
+{
+ struct frame *f = XFRAME (w->frame);
+
+ int width = window_divider_width (w);
+ int shadow_thickness = XINT (w->vertical_divider_shadow_thickness);
+ int spacing = XINT (w->vertical_divider_spacing);
+ int line_width = XINT (w->vertical_divider_line_width);
+ int x = WINDOW_RIGHT (w) - width;
+ int y1 = WINDOW_TOP (w);
+ int y2 = WINDOW_BOTTOM (w);
+ enum edge_style style;
+
+ face_index div_face = get_builtin_face_cache_index (w, Vvertical_divider_face);
+ Lisp_Object tmp_pixel = WINDOW_FACE_CACHEL_BACKGROUND (w, div_face);
+
+ /* Clear the divider area first. This needs to be done when a
+ window split occurs. */
+ if (clear)
+ {
+ Lisp_Object pixel = FACE_BACKGROUND (Vdefault_face, wrap_frame (f));
+
+ CGContextSetFillColorWithColor (FRAME_CARBON_CONTEXT (f), COLOR_INSTANCE_CARBON_COLOR (XCOLOR_INSTANCE (pixel)));
+
+ CGContextFillRect (FRAME_CARBON_CONTEXT (f), CGRectMake (x, FRAME_PIXHEIGHT (f) - y2, width, y2 - y1));
+ }
+
+ /* Draw the divider line. */
+ CGContextSetFillColorWithColor (FRAME_CARBON_CONTEXT (f), COLOR_INSTANCE_CARBON_COLOR (XCOLOR_INSTANCE (tmp_pixel)));
+ CGContextFillRect (FRAME_CARBON_CONTEXT (f), CGRectMake (x + spacing + shadow_thickness, FRAME_PIXHEIGHT (f) - y2, line_width, y2 - y1));
+
+ if (shadow_thickness < 0)
+ {
+ shadow_thickness = -shadow_thickness;
+ style = EDGE_BEVEL_IN;
+ }
+ else
+ {
+ style = EDGE_BEVEL_OUT;
+ }
+
+ /* Draw the shadows around the divider line */
+ carbon_bevel_area (w, div_face, x + spacing, y1, width - 2 * spacing, y2 - y1, shadow_thickness, EDGE_ALL, style);
+}
+
+static void
+carbon_clear_region (Lisp_Object UNUSED (locale), struct device* UNUSED (d),
+ struct frame* f, face_index UNUSED (findex),
+ int x, int y,
+ int width, int height,
+ Lisp_Object fcolor, Lisp_Object UNUSED (bcolor),
+ Lisp_Object UNUSED (background_pixmap))
+{
+ CGContextSetFillColorWithColor (FRAME_CARBON_CONTEXT (f), COLOR_INSTANCE_CARBON_COLOR (XCOLOR_INSTANCE (fcolor)));
+
+ CGContextFillRect (FRAME_CARBON_CONTEXT (f), CGRectMake (x, FRAME_PIXHEIGHT (f) - y - height, width, height));
+}
+
+static void
+carbon_clear_frame (struct frame *f)
+{
+ Lisp_Object pixel = FACE_BACKGROUND (Vdefault_face, wrap_frame (f));
+
+ CGContextSetFillColorWithColor (FRAME_CARBON_CONTEXT (f), COLOR_INSTANCE_CARBON_COLOR (XCOLOR_INSTANCE (pixel)));
+
+ CGContextFillRect (FRAME_CARBON_CONTEXT (f), CGRectMake (0, 0, FRAME_PIXWIDTH (f), FRAME_PIXHEIGHT (f)));
+}
+
+static void
+carbon_frame_output_begin (struct frame *f)
+{
+ /* Calls to carbon_frame_output_begin and carbon_frame_output_end
+ may be nested. However CoreGraphics only allows a context to be
+ opened once for each window. */
+ if (FRAME_CARBON_NESTEDNESS (f)++ > 0)
+ return;
+
+ if (QDBeginCGContext (GetWindowPort (FRAME_CARBON_WINDOW (f)), &FRAME_CARBON_CONTEXT (f)) != noErr)
+ stderr_out ("Can't begin CG context");
+
+ scrollbars_need_redraw = 0;
+}
+
+static void
+carbon_frame_output_end (struct frame *f)
+{
+ CGContextFlush (FRAME_CARBON_CONTEXT (f));
+
+ if (--FRAME_CARBON_NESTEDNESS (f) > 0)
+ return;
+
+ if (QDEndCGContext (GetWindowPort (FRAME_CARBON_WINDOW (f)), &FRAME_CARBON_CONTEXT (f)) != noErr)
+ stderr_out ("Can't end CG context");
+
+ if (!inhibit_warning_display && scrollbars_need_redraw)
+ carbon_enqueue_misc_user_event (wrap_frame (f), Qredraw_frame, wrap_frame (f));
+}
+
+static int
+carbon_flash (struct device * UNUSED (d))
+{
+ /* From doc: call twice for menu bar to blink. */
+ FlashMenuBar (0);
+ FlashMenuBar (0);
+
+ return 1;
+}
+
+static void
+carbon_ring_bell (struct device * UNUSED (d), int UNUSED (volume), int UNUSED (pitch), int UNUSED (duration))
+{
+ SysBeep(30);
+}
+
+static void
+draw_trapezoid (CGContextRef context, const float *comp, CGPoint p1, CGPoint p2, CGPoint p3, CGPoint p4)
+{
+ CGContextBeginPath (context);
+ CGContextMoveToPoint (context, p1.x, p1.y);
+ CGContextAddLineToPoint (context, p2.x, p2.y);
+ CGContextAddLineToPoint (context, p3.x, p3.y);
+ CGContextAddLineToPoint (context, p4.x, p4.y);
+ CGContextClosePath(context);
+
+ CGContextSetRGBFillColor (context, comp[0], comp[1], comp[2], comp[3]);
+
+ CGContextFillPath (context);
+}
+
+static void
+carbon_bevel_area (struct window *w, face_index UNUSED (findex), int x, int y, int width, int height, int shadow_thickness, int edges, enum edge_style style)
+{
+ struct frame *f = XFRAME (w->frame);
+
+ CGRect outer = CGRectMake (x, FRAME_PIXHEIGHT (f) - (y + height), width, height);
+ CGRect inner = CGRectInset (outer, shadow_thickness, shadow_thickness);
+
+ /* Corners of the inner and outer rectangles. */
+ CGPoint ibl = CGPointMake (inner.origin.x, inner.origin.y);
+ CGPoint ibr = CGPointMake (inner.origin.x + inner.size.width, inner.origin.y);
+ CGPoint itl = CGPointMake (inner.origin.x, inner.origin.y + inner.size.height);
+ CGPoint itr = CGPointMake (inner.origin.x + inner.size.width, inner.origin.y + inner.size.height);
+ CGPoint obl = CGPointMake (outer.origin.x, outer.origin.y);
+ CGPoint obr = CGPointMake (outer.origin.x + outer.size.width, outer.origin.y);
+ CGPoint otl = CGPointMake (outer.origin.x, outer.origin.y + outer.size.height);
+ CGPoint otr = CGPointMake (outer.origin.x + outer.size.width, outer.origin.y + outer.size.height);
+
+ /* RGB (plus alpha) color components. Gray1 is the lightest. */
+ const float gray1_comp[4] = { 0.9, 0.9, 0.9, 1.0 };
+ const float gray2_comp[4] = { 0.8, 0.8, 0.8, 1.0 };
+ const float gray3_comp[4] = { 0.7, 0.7, 0.7, 1.0 };
+ const float gray4_comp[4] = { 0.6, 0.6, 0.6, 1.0 };
+ const float *top_comp, *left_comp, *bottom_comp, *right_comp;
+
+ if (style == EDGE_ETCHED_IN || style == EDGE_BEVEL_IN)
+ {
+ top_comp = gray4_comp;
+ left_comp = gray3_comp;
+ bottom_comp = gray1_comp;
+ right_comp = gray2_comp;
+ }
+ else
+ {
+ top_comp = gray1_comp;
+ left_comp = gray2_comp;
+ bottom_comp = gray4_comp;
+ right_comp = gray3_comp;
+ }
+
+ if (edges & EDGE_TOP)
+ draw_trapezoid (FRAME_CARBON_CONTEXT (f), top_comp, otr, otl, itl, itr);
+
+ if (edges & EDGE_LEFT)
+ draw_trapezoid (FRAME_CARBON_CONTEXT (f), left_comp, otl, obl, ibl, itl);
+
+ if (edges & EDGE_BOTTOM)
+ draw_trapezoid (FRAME_CARBON_CONTEXT (f), bottom_comp, obl, obr, ibr, ibl);
+
+ if (edges & EDGE_RIGHT)
+ draw_trapezoid (FRAME_CARBON_CONTEXT (f), right_comp, obr, otr, itr, ibr);
+}
+
+
+/************************************************************************/
+/* initialization */
+/************************************************************************/
+
+void
+console_type_create_redisplay_carbon (void)
+{
+ CONSOLE_HAS_METHOD (carbon, text_width);
+ CONSOLE_HAS_METHOD (carbon, output_pixmap);
+ CONSOLE_HAS_METHOD (carbon, output_string);
+ CONSOLE_HAS_METHOD (carbon, output_display_block);
+ CONSOLE_HAS_METHOD (carbon, divider_height);
+ CONSOLE_HAS_METHOD (carbon, eol_cursor_width);
+ CONSOLE_HAS_METHOD (carbon, output_vertical_divider);
+ CONSOLE_HAS_METHOD (carbon, clear_region);
+ CONSOLE_HAS_METHOD (carbon, clear_frame);
+ CONSOLE_HAS_METHOD (carbon, frame_output_begin);
+ CONSOLE_HAS_METHOD (carbon, frame_output_end);
+ CONSOLE_HAS_METHOD (carbon, flash);
+ CONSOLE_HAS_METHOD (carbon, ring_bell);
+ CONSOLE_HAS_METHOD (carbon, bevel_area);
+}
+
+void
+syms_of_redisplay_carbon (void)
+{
+ DEFSYMBOL (Qredraw_frame);
+}
1.1.2.1 +357 -0 XEmacs/xemacs/src/Attic/scrollbar-carbon.c
Index: scrollbar-carbon.c
===================================================================
RCS file: scrollbar-carbon.c
diff -N scrollbar-carbon.c
--- /dev/null Fri Feb 25 17:30:16 2005
+++ /tmp/cvsAAActaWTi Fri Feb 25 17:30:16 2005
＠＠ -0,0 +1,357 ＠＠
+/*
+ The following code is original work by me, except where noted with
+ the comments "Taken from ..." or "Adapted from ...". I now place
+ it in the public domain.
+
+ Andrew Choi. Calgary, Canada, February 9, 2005. */
+
+#include <config.h>
+#include "lisp.h"
+
+#include "scrollbar.h"
+#include "faces.h"
+#include "window-impl.h"
+
+#include "console-carbon-impl.h"
+#include "objects-carbon-impl.h"
+
+extern void carbon_enqueue_misc_user_event (Lisp_Object, Lisp_Object, Lisp_Object); /* In event-carbon.c */
+extern unsigned long current_time_milliseconds (void); /* In event-carbon.c */
+
+/* Used in redisplayed-carbon.c. Reset in carbon_frame_output_begin and checked in carbon_frame_output_end. Set in this file below. */
+int scrollbars_need_redraw;
+
+static ControlRef active_scrollbar;
+static struct scrollbar_instance *active_scrollbar_instance;
+static ControlPartCode scrollbar_part_clicked;
+static unsigned long scrollbar_last_processing_time;
+static Point scrollbar_begin_mouse;
+static SInt32 scrollbar_begin_value;
+static SInt32 scrollbar_previous_value;
+static int mouse_just_clicked;
+
+/* In frame-carbon.c. */
+extern Point window_to_content_coord_adj (WindowRef);
+
+/* Determine where scrollbar should scroll to if mouse is at "point". */
+static SInt32
+scrollbar_value_from_point (ControlRef scrollbar, Point point)
+{
+ SInt32 new_value;
+
+ SInt32 max = GetControl32BitMaximum (scrollbar);
+ SInt32 min = GetControl32BitMinimum (scrollbar);
+ SInt32 view_size = GetControlViewSize (scrollbar);
+
+ Rect bounds;
+ (void) GetControlBounds (scrollbar, &bounds);
+ int vert = bounds.bottom - bounds.top > bounds.right - bounds.left;
+
+ int scrollbar_screen_range;
+ int scrollbar_screen_displacement;
+
+ if (vert)
+ {
+ scrollbar_screen_range = bounds.bottom - bounds.top - 32;
+ scrollbar_screen_displacement = point.v - scrollbar_begin_mouse.v;
+ }
+ else
+ {
+ scrollbar_screen_range = bounds.right - bounds.left - 32;
+ scrollbar_screen_displacement = point.h - scrollbar_begin_mouse.h;
+ }
+
+ new_value = scrollbar_begin_value + (max - min) * scrollbar_screen_displacement / (scrollbar_screen_range * (max - min - view_size) / (max - min));
+
+ if (new_value > max)
+ new_value = max;
+
+ if (new_value < min)
+ new_value = min;
+
+ return new_value;
+}
+
+/* This function replaces normal event processing (calls to ReceiveNextEvent and SendEventToEventTarget) after the mouse is clicked on a scrollbar and before it is released. Returns 1 if the mouse is still down. Used in event-carbon.c. */
+int track_mouse_down_on_scrollbar (void);
+
+int
+track_mouse_down_on_scrollbar (void)
+{
+ if (!active_scrollbar)
+ return 0;
+
+ Lisp_Object win = real_window (active_scrollbar_instance->mirror, 1);
+ if (NILP (win))
+ return 0;
+
+ Lisp_Object frame = WINDOW_FRAME (XWINDOW (win));
+
+ WindowRef window = FRAME_CARBON_WINDOW (XFRAME (frame));
+
+ Point point;
+ UInt32 modifiers;
+ MouseTrackingResult result;
+
+ /* Don't delay immediately after click. */
+ EventTimeout delay = mouse_just_clicked ? 0.0 : 0.105;
+
+ if (TrackMouseLocationWithOptions (GetWindowPort (window), 0, delay, &point, &modifiers, &result) != noErr)
+ return 0;
+
+ if (result == kMouseTrackingMouseUp)
+ {
+ active_scrollbar = 0;
+ return 0;
+ }
+
+ unsigned long next_processing_time;
+ if (mouse_just_clicked)
+ {
+ /* Do it right away the first time through. */
+ next_processing_time = scrollbar_last_processing_time;
+ mouse_just_clicked = 0;
+ }
+ else
+ {
+ switch (scrollbar_part_clicked)
+ {
+ case kControlDownButtonPart:
+ case kControlUpButtonPart:
+ next_processing_time = scrollbar_last_processing_time + 300;
+ break;
+ case kControlIndicatorPart:
+ next_processing_time = scrollbar_last_processing_time + 150;
+ break;
+ case kControlPageUpPart:
+ case kControlPageDownPart:
+ next_processing_time = scrollbar_last_processing_time + 300;
+ break;
+ default:
+ next_processing_time = scrollbar_last_processing_time + 150;
+ }
+ }
+
+ ControlPartCode part_under_mouse = TestControl (active_scrollbar, point);
+
+ unsigned long current_time = current_time_milliseconds();
+
+ Rect bounds;
+ (void) GetControlBounds (active_scrollbar, &bounds);
+ int vert = bounds.bottom - bounds.top > bounds.right - bounds.left;
+
+ if (current_time >= next_processing_time)
+ {
+ switch (scrollbar_part_clicked)
+ {
+ case kControlDownButtonPart:
+ if (part_under_mouse == kControlDownButtonPart)
+ {
+ carbon_enqueue_misc_user_event (frame, vert ? Qscrollbar_line_down : Qscrollbar_char_right, win);
+ scrollbar_last_processing_time = current_time;
+ }
+ break;
+ case kControlUpButtonPart:
+ if (part_under_mouse == kControlUpButtonPart)
+ {
+ carbon_enqueue_misc_user_event (frame, vert ? Qscrollbar_line_up : Qscrollbar_char_left, win);
+ scrollbar_last_processing_time = current_time;
+ }
+ break;
+ case kControlPageDownPart:
+ if (part_under_mouse == kControlPageDownPart)
+ {
+ carbon_enqueue_misc_user_event (frame, vert ? Qscrollbar_page_down : Qscrollbar_page_right, vert ? Fcons (win, Qnil) : win);
+ scrollbar_last_processing_time = current_time;
+ }
+ break;
+ case kControlPageUpPart:
+ if (part_under_mouse == kControlPageUpPart)
+ {
+ carbon_enqueue_misc_user_event (frame, vert ? Qscrollbar_page_up : Qscrollbar_page_left, vert ? Fcons (win, Qnil) : win);
+ scrollbar_last_processing_time = current_time;
+ }
+ break;
+ case kControlIndicatorPart:
+ {
+ SInt32 value = scrollbar_value_from_point (active_scrollbar, point);
+
+ if (value != scrollbar_previous_value)
+ {
+ scrollbar_previous_value = value;
+
+ carbon_enqueue_misc_user_event (frame, vert ? Qscrollbar_vertical_drag : Qscrollbar_horizontal_drag, Fcons (win, make_int (value)));
+ }
+
+ scrollbar_last_processing_time = current_time;
+ }
+ break;
+ default:
+ ;
+ }
+ }
+
+ return 1;
+}
+
+static OSStatus
+scrollbar_event_handler (EventHandlerCallRef UNUSED (next_handler), EventRef event, void *data)
+{
+ switch (GetEventKind (event))
+ {
+ case kEventControlClick:
+ GetEventParameter (event, kEventParamDirectObject, typeControlRef, NULL, sizeof (active_scrollbar), NULL, &active_scrollbar);
+
+ active_scrollbar_instance = (struct scrollbar_instance *) data;
+
+ HIPoint mouse_location;
+ GetEventParameter (event, kEventParamWindowMouseLocation, typeHIPoint, NULL, sizeof(mouse_location), NULL, &mouse_location);
+
+ scrollbar_begin_mouse.v = (short) mouse_location.y;
+ scrollbar_begin_mouse.h = (short) mouse_location.x;
+
+ Lisp_Object win = real_window (active_scrollbar_instance->mirror, 1);
+ if (NILP (win))
+ return noErr;
+
+ Lisp_Object frame = WINDOW_FRAME (XWINDOW (win));
+ WindowRef window = FRAME_CARBON_WINDOW (XFRAME (frame));
+
+ AddPt (window_to_content_coord_adj (window), &scrollbar_begin_mouse);
+
+ Rect bounds;
+ (void) GetControlBounds (active_scrollbar, &bounds);
+
+ scrollbar_part_clicked = TestControl (active_scrollbar, scrollbar_begin_mouse);
+
+ scrollbar_begin_value = GetControl32BitValue (active_scrollbar);
+ scrollbar_previous_value = scrollbar_begin_value;
+
+ scrollbar_last_processing_time = current_time_milliseconds ();
+
+ mouse_just_clicked = 1;
+
+ break;
+ default:
+ ;
+ }
+
+ /* Don't call next_handler. We're tracking this one. */
+ return noErr;
+}
+
+static void
+carbon_create_scrollbar_instance (struct frame *f, int UNUSED (vertical), struct scrollbar_instance *sb)
+{
+ /* Carbon determines whether scrollbar is vertical from its bounds. They are set in carbon_update_scrollbar_instance_values. */
+ Rect r = { 0, 0, 15, 15 };
+
+ ControlRef scrollbar;
+ if (CreateScrollBarControl (FRAME_CARBON_WINDOW (f), &r, 0, 0, 0, 0, FALSE, 0, &scrollbar) != noErr)
+ invalid_operation ("Can't create scrollbar for frame", wrap_frame (f));
+
+ sb->scrollbar_data = scrollbar;
+
+ EventHandlerUPP sb_handler;
+ sb_handler = NewEventHandlerUPP (scrollbar_event_handler);
+
+ EventTypeSpec sb_types[] =
+ {
+ { kEventClassControl, kEventControlClick }
+ };
+
+ InstallControlEventHandler (scrollbar, sb_handler, sizeof (sb_types) / sizeof (sb_types[0]), sb_types, sb, NULL);
+
+ DisposeEventHandlerUPP (sb_handler);
+}
+
+static void
+carbon_free_scrollbar_instance (struct scrollbar_instance *sb)
+{
+ DisposeControl ((ControlRef) sb->scrollbar_data);
+}
+
+static void
+carbon_release_scrollbar_instance (struct scrollbar_instance *sb)
+{
+ Lisp_Object win = real_window (sb->mirror, 1);
+ if (NILP (win))
+ return;
+
+ Lisp_Object frame = WINDOW_FRAME (XWINDOW (win));
+
+ /* Carbon doesn't allow moves/visibility changes of scrollbars in non-compositing windows when a CG context is open. This kludge lets carbon_frame_output_end in redisplay-carbon.c know it should queue a misc user event containing a Lisp redraw-frame call. */
+ if (FRAME_CARBON_NESTEDNESS (XFRAME (frame)) > 0)
+ {
+ if (IsControlVisible ((ControlRef) sb->scrollbar_data))
+ scrollbars_need_redraw = 1;
+
+ SetControlVisibility ((ControlRef) sb->scrollbar_data, FALSE, FALSE);
+ }
+ else
+ SetControlVisibility ((ControlRef) sb->scrollbar_data, FALSE, TRUE);
+}
+
+static void
+carbon_update_scrollbar_instance_values (struct window * UNUSED (w), struct scrollbar_instance *sb, int UNUSED (new_line_increment), int UNUSED (new_page_increment), int new_minimum, int new_maximum, int new_slider_size, int new_slider_position, int new_scrollbar_width, int new_scrollbar_height, int new_scrollbar_x, int new_scrollbar_y)
+{
+ SetControl32BitMinimum ((ControlRef) sb->scrollbar_data, new_minimum);
+ SetControl32BitMaximum ((ControlRef) sb->scrollbar_data, new_maximum);
+
+ SetControlViewSize ((ControlRef) sb->scrollbar_data, new_slider_size);
+
+ SetControl32BitValue ((ControlRef) sb->scrollbar_data, new_slider_position);
+
+ Rect bounds;
+ (void) GetControlBounds ((ControlRef) sb->scrollbar_data, &bounds);
+ if (bounds.top != new_scrollbar_y || bounds.left != new_scrollbar_x || bounds.bottom != new_scrollbar_y + new_scrollbar_height || bounds.right != new_scrollbar_x + new_scrollbar_width)
+ scrollbars_need_redraw = 1;
+
+ bounds.top = new_scrollbar_y;
+ bounds.left = new_scrollbar_x;
+ bounds.bottom = new_scrollbar_y + new_scrollbar_height;
+ bounds.right = new_scrollbar_x + new_scrollbar_width;
+ SetControlBounds ((ControlRef) sb->scrollbar_data, &bounds);
+}
+
+static void
+carbon_update_scrollbar_instance_status (struct window *w, int active, int size, struct scrollbar_instance *sb)
+{
+ if (active && size)
+ {
+ SetControlVisibility ((ControlRef) sb->scrollbar_data, TRUE, TRUE);
+ }
+ else
+ {
+ if (FRAME_CARBON_NESTEDNESS (WINDOW_XFRAME (w)) > 0)
+ {
+ /* If visibility changes, tell carbon_frame_output_end in redisplay-carbon.c to queue a redraw-frame call */
+ if (IsControlVisible ((ControlRef) sb->scrollbar_data))
+ scrollbars_need_redraw = 1;
+
+ SetControlVisibility ((ControlRef) sb->scrollbar_data, FALSE, FALSE);
+ }
+ else
+ SetControlVisibility ((ControlRef) sb->scrollbar_data, FALSE, TRUE);
+ }
+}
+
+/************************************************************************/
+/* initialization */
+/************************************************************************/
+
+void
+console_type_create_scrollbar_carbon (void)
+{
+ CONSOLE_HAS_METHOD (carbon, create_scrollbar_instance);
+ CONSOLE_HAS_METHOD (carbon, free_scrollbar_instance);
+ CONSOLE_HAS_METHOD (carbon, release_scrollbar_instance);
+ CONSOLE_HAS_METHOD (carbon, update_scrollbar_instance_values);
+ CONSOLE_HAS_METHOD (carbon, update_scrollbar_instance_status);
+}
+
+void
+reinit_vars_of_scrollbar_carbon (void)
+{
+ active_scrollbar = 0;
+}
1.1.2.1 +402 -0 XEmacs/xemacs/src/Attic/select-carbon.c
Index: select-carbon.c
===================================================================
RCS file: select-carbon.c
diff -N select-carbon.c
--- /dev/null Fri Feb 25 17:30:16 2005
+++ /tmp/cvsAAAMuaiUi Fri Feb 25 17:30:16 2005
＠＠ -0,0 +1,402 ＠＠
+/*
+ The following code is original work by me, except where noted with
+ the comments "Taken from ..." or "Adapted from ...". I now place
+ it in the public domain.
+
+ Andrew Choi. Calgary, Canada, February 9, 2005. */
+
+#include <config.h>
+#include "lisp.h"
+
+#include "select.h"
+#include "buffer.h"
+#include "commands.h"
+#include "dragdrop.h"
+
+#include "console-carbon-impl.h"
+#include "objects-carbon-impl.h"
+
+extern Lisp_Object Qcarbon_unicode; /* From intl-carbon.c. */
+
+extern void carbon_enqueue_dragdrop_event (Lisp_Object, Lisp_Object); /* From event-carbon.c. */
+extern void carbon_enqueue_misc_user_event (Lisp_Object, Lisp_Object, Lisp_Object);
+/* In event-carbon.c */
+
+EXFUN (Fregion_beginning, 1); /* In editfns.c */
+EXFUN (Fregion_end, 1); /* In editfns.c */
+
+static PasteboardRef clipboard;
+
+static Lisp_Object Qinsert;
+static Lisp_Object Qkill_primary_selection;
+
+/* Taken from select-msw.c */
+/* Test if this is an X symbol that we understand */
+static int
+x_sym_p (Lisp_Object value)
+{
+ if (NILP (value) || INTP (value))
+ return 0;
+
+ if (EQ (value, QSTRING)) return 1;
+ if (EQ (value, QTEXT)) return 1;
+ if (EQ (value, QCOMPOUND_TEXT)) return 1;
+
+ return 0;
+}
+
+static void
+pasteboard_put_utxt_and_text (PasteboardRef pasteboard, Lisp_Object unicode_value, Lisp_Object text_value)
+{
+ if (!STRINGP (unicode_value))
+ return;
+
+ Extbyte *alloca_ext_storage;
+ int alloca_ext_storage_len;
+ TO_EXTERNAL_FORMAT (LISP_STRING, unicode_value, ALLOCA, (alloca_ext_storage, alloca_ext_storage_len), Qcarbon_unicode);
+
+ if (PasteboardClear (pasteboard) != noErr)
+ stderr_out ("Can't clear pasteboard\n");
+
+ PasteboardSyncFlags sync_flags = PasteboardSynchronize (pasteboard);
+
+ if (sync_flags & kPasteboardModified)
+ stderr_out ("Pasteboard not synchronized after clear\n");
+
+ if (!(sync_flags & kPasteboardClientIsOwner))
+ stderr_out ("Pasteboard not owned after clear\n");
+
+ CFDataRef data_ref = CFDataCreate (NULL, (UInt8 *) alloca_ext_storage, alloca_ext_storage_len);
+ if (!data_ref)
+ stderr_out ("Can't create unicode data for pasteboard\n");
+
+ if (PasteboardPutItemFlavor (pasteboard, (PasteboardItemID) 1, CFSTR("public.utf16-plain-text"), data_ref, 0) != noErr)
+ stderr_out ("Can't put unicode to pasteboard\n");
+
+ CFRelease (data_ref);
+
+ if (!STRINGP (text_value))
+ return;
+
+ CFDataRef text_data_ref = CFDataCreate (NULL, (UInt8 *) XSTRING_DATA (text_value), XSTRING_LENGTH (text_value));
+ if (!text_data_ref)
+ stderr_out ("Can't create text data for pasteboard\n");
+
+ if (PasteboardPutItemFlavor (pasteboard, (PasteboardItemID) 1, CFSTR("com.apple.traditional-mac-plain-text"), text_data_ref, 0) != noErr)
+ stderr_out ("Can't put text to pasteboard\n");
+
+ CFRelease (text_data_ref);
+}
+
+static Lisp_Object
+carbon_own_selection (Lisp_Object selection_name, Lisp_Object selection_value, Lisp_Object how_to_add, Lisp_Object selection_type, int UNUSED (owned_p))
+{
+ /* Carbon supports only one clipboard. */
+ if (!EQ (selection_name, QCLIPBOARD))
+ return Qnil;
+
+ /* Can only handle text for now. */
+ if (!NILP (selection_type) && !x_sym_p (selection_type))
+ return Qnil;
+
+ /* Can only do Qreplace_all. */
+ if (!NILP (how_to_add) && !EQ (how_to_add, Qreplace_all))
+ return Qnil;
+
+ Lisp_Object unicode_data = select_convert_out (selection_name, QCOMPOUND_TEXT, selection_value);
+
+ Lisp_Object text_data = select_convert_out (selection_name, QTEXT, selection_value);
+
+ pasteboard_put_utxt_and_text (clipboard, unicode_data, text_data);
+
+ return Qnil;
+}
+
+static void
+carbon_disown_selection (Lisp_Object UNUSED (selection), Lisp_Object UNUSED (timeval))
+{
+ /* Carbon's ownership is a different concept. */
+}
+
+static Lisp_Object
+carbon_selection_exists_p (Lisp_Object selection, Lisp_Object selection_type)
+{
+ if (!EQ (selection, QCLIPBOARD))
+ return Qnil;
+
+ /* Don't really don't how to deal with a specific selection type yet. */
+ if (!NILP (selection_type))
+ return Qnil;
+
+ (void) PasteboardSynchronize (clipboard);
+
+ ItemCount item_count;
+ if (PasteboardGetItemCount (clipboard, &item_count) != noErr)
+ invalid_operation ("Can't get clipboard item count", selection);
+
+ for (UInt32 item_index = 1; item_index <= item_count; item_index++ )
+ {
+ PasteboardItemID item_id;
+ if (PasteboardGetItemIdentifier (clipboard, item_index, &item_id) != noErr)
+ invalid_operation ("Can't get clipboard item", selection);
+
+ CFArrayRef flavor_type_array;
+ if (PasteboardCopyItemFlavors (clipboard, item_id, &flavor_type_array) != noErr)
+ invalid_operation ("Can't get clipboard item flavor type array", selection);
+
+ CFIndex flavor_count = CFArrayGetCount (flavor_type_array);
+
+ for (CFIndex flavor_index = 0; flavor_index < flavor_count; flavor_index++)
+ {
+ CFStringRef flavor_type = (CFStringRef) CFArrayGetValueAtIndex (flavor_type_array, flavor_index);
+
+ if (UTTypeConformsTo (flavor_type, CFSTR("public.utf16-plain-text")) || UTTypeConformsTo (flavor_type, CFSTR("com.apple.traditional-mac-plain-text")))
+ {
+ CFRelease (flavor_type_array);
+ return Qt;
+ }
+ }
+
+ CFRelease (flavor_type_array);
+ }
+
+ return Qnil;
+}
+
+static Lisp_Object
+pasteboard_get_utext_or_text (PasteboardRef pasteboard)
+{
+ ItemCount item_count;
+ if (PasteboardGetItemCount (pasteboard, &item_count ) != noErr)
+ stderr_out ("Can't get pasteboard item count");
+
+ for (UInt32 item_index = 1; item_index <= item_count; item_index++ )
+ {
+ PasteboardItemID item_id;
+ if (PasteboardGetItemIdentifier (pasteboard, item_index, &item_id) != noErr)
+ stderr_out ("Can't get pasteboard item");
+
+ CFArrayRef flavor_type_array;
+ if (PasteboardCopyItemFlavors (pasteboard, item_id, &flavor_type_array) != noErr)
+ stderr_out ("Can't get pasteboard item flavor type array");
+
+ CFIndex flavor_count = CFArrayGetCount (flavor_type_array);
+
+ for (CFIndex flavor_index = 0; flavor_index < flavor_count; flavor_index++)
+ {
+ CFStringRef flavor_type = (CFStringRef) CFArrayGetValueAtIndex (flavor_type_array, flavor_index);
+
+ /* Return the first UTF-16 or TEXT item found. */
+ if (UTTypeConformsTo (flavor_type, CFSTR("public.utf16-plain-text")))
+ {
+ CFDataRef flavor_data;
+ if (PasteboardCopyItemFlavorData (pasteboard, item_id, flavor_type, &flavor_data) != noErr)
+ stderr_out ("Can't get flavor data");
+
+ Lisp_Object data = make_ext_string (CFDataGetBytePtr (flavor_data), CFDataGetLength (flavor_data), Qcarbon_unicode);
+
+ CFRelease (flavor_data);
+ CFRelease (flavor_type_array);
+ return data;
+ }
+ else if (UTTypeConformsTo (flavor_type, CFSTR("com.apple.traditional-mac-plain-text")))
+ {
+ CFDataRef flavor_data;
+ if (PasteboardCopyItemFlavorData (pasteboard, item_id, flavor_type, &flavor_data) != noErr)
+ stderr_out ("Can't get flavor data");
+
+ Lisp_Object data = make_string (CFDataGetBytePtr (flavor_data), CFDataGetLength (flavor_data));
+
+ CFRelease (flavor_data);
+ CFRelease (flavor_type_array);
+ return data;
+ }
+ }
+
+ CFRelease (flavor_type_array);
+ }
+
+ return Qnil;
+}
+
+static Lisp_Object
+carbon_get_foreign_selection (Lisp_Object selection_symbol, Lisp_Object target_type)
+{
+ /* Carbon supports only one clipboard. */
+ if (!EQ (selection_symbol, QCLIPBOARD))
+ return Qnil;
+
+ /* Can only handle text for now. */
+ if (!NILP (target_type) && !x_sym_p (target_type))
+ return Qnil;
+
+ (void) PasteboardSynchronize (clipboard);
+
+ return pasteboard_get_utext_or_text (clipboard);
+}
+
+static OSStatus
+app_event_handler (EventHandlerCallRef next_handler, EventRef event, void * UNUSED (data))
+{
+ PasteboardSyncFlags sync_flags = PasteboardSynchronize (clipboard);
+
+ if (sync_flags & kPasteboardModified)
+ {
+ /* Clear the local copy of the selection so Fget_selection_internal will correctly call carbon_get_foreign_selection. */
+ handle_selection_clear (QCLIPBOARD);
+ }
+
+ return CallNextEventHandler (next_handler, event);
+}
+
+static void
+handle_service_get_types_event (EventRef event)
+{
+ int selection_exists_p = zmacs_regions && zmacs_region_active_p;
+
+ CFMutableArrayRef copy_types;
+ GetEventParameter (event, kEventParamServiceCopyTypes, typeCFMutableArrayRef, NULL, sizeof (CFMutableArrayRef), NULL, ©_types);
+
+ CFMutableArrayRef paste_types;
+ GetEventParameter (event, kEventParamServicePasteTypes, typeCFMutableArrayRef, NULL, sizeof (CFMutableArrayRef), NULL, &paste_types);
+
+ CFStringRef text_os_type = CreateTypeStringWithOSType ('TEXT');
+ if (text_os_type)
+ {
+ if (selection_exists_p)
+ CFArrayAppendValue (copy_types, text_os_type);
+ CFArrayAppendValue (paste_types, text_os_type);
+ CFRelease (text_os_type);
+ }
+
+ CFStringRef utxt_os_type = CreateTypeStringWithOSType ('utxt');
+ if (utxt_os_type)
+ {
+ if (selection_exists_p)
+ CFArrayAppendValue (copy_types, utxt_os_type);
+ /*CFArrayAppendValue (paste_types, utxt_os_type);*/
+ CFRelease (utxt_os_type);
+ }
+}
+
+static void
+handle_service_copy_event (EventRef event)
+{
+ int selection_exists_p = zmacs_regions && zmacs_region_active_p;
+
+ if (selection_exists_p)
+ {
+ Lisp_Object buf = Fcurrent_buffer ();
+ CHECK_BUFFER (buf);
+
+ Lisp_Object selection = Fbuffer_substring (Fregion_beginning (Qnil), Fregion_end (Qnil), buf);
+
+ PasteboardRef pasteboard;
+ GetEventParameter (event, kEventParamPasteboardRef, typePasteboardRef, NULL, sizeof (pasteboard), NULL, &pasteboard);
+
+ pasteboard_put_utxt_and_text (pasteboard, selection, selection);
+ }
+}
+
+static void
+handle_service_paste_event (EventRef event)
+{
+ printf("handle_service_paste_event\n");
+
+ PasteboardRef pasteboard;
+ GetEventParameter (event, kEventParamPasteboardRef, typePasteboardRef, NULL, sizeof (pasteboard), NULL, &pasteboard);
+
+ Lisp_Object pasteboard_contents = pasteboard_get_utext_or_text (pasteboard);
+
+ debug_print(pasteboard_contents);
+
+#if 0
+ Lisp_Object dnd_list = list1 (list3 (list1 (make_string ((Ibyte *) "text/plain", 10)), make_string ((Ibyte *) "8bit", 4), pasteboard_contents));
+
+ carbon_enqueue_dragdrop_event (Qdragdrop_MIME, dnd_list);
+#else
+ carbon_enqueue_misc_user_event (wrap_frame (selected_frame ()), Qeval, list1 (Qkill_primary_selection));
+ carbon_enqueue_misc_user_event (wrap_frame (selected_frame ()), Qeval, list2 (Qinsert, pasteboard_contents));
+#endif
+}
+
+static OSStatus
+service_event_handler (EventHandlerCallRef UNUSED (next_handler), EventRef event, void * UNUSED (data))
+{
+ switch (GetEventKind (event))
+ {
+ case kEventServiceGetTypes:
+ handle_service_get_types_event (event);
+ break;
+ case kEventServiceCopy:
+ handle_service_copy_event (event);
+ break;
+ case kEventServicePaste:
+ handle_service_paste_event (event);
+ break;
+ default:
+ stderr_out ("Unknown service event.\n");
+ return eventNotHandledErr;
+ }
+
+ return noErr;
+}
+
+/************************************************************************/
+/* initialization */
+/************************************************************************/
+
+void
+console_type_create_select_carbon (void)
+{
+ CONSOLE_HAS_METHOD (carbon, own_selection);
+ CONSOLE_HAS_METHOD (carbon, disown_selection);
+ CONSOLE_HAS_METHOD (carbon, selection_exists_p);
+ CONSOLE_HAS_METHOD (carbon, get_foreign_selection);
+}
+
+void
+syms_of_select_carbon (void)
+{
+ DEFSYMBOL (Qinsert);
+ DEFSYMBOL (Qkill_primary_selection);
+}
+
+void
+reinit_vars_of_select_carbon (void)
+{
+ if (PasteboardCreate (kPasteboardClipboard, &clipboard) != noErr)
+ fatal ("Can't create clipboard reference.");
+
+ EventHandlerUPP ae_handler = NewEventHandlerUPP (app_event_handler);
+
+ EventTypeSpec ae_types[] =
+ {
+ { kEventClassApplication, kEventAppActivated }
+ };
+
+ if (InstallApplicationEventHandler (ae_handler, sizeof (ae_types) / sizeof (ae_types[0]), ae_types, NULL, NULL) != noErr)
+ fatal ("Cannot install application event handler");
+
+ DisposeEventHandlerUPP (ae_handler);
+
+ EventHandlerUPP se_handler = NewEventHandlerUPP (service_event_handler);
+
+ EventTypeSpec se_types[] =
+ {
+ { kEventClassService, kEventServiceGetTypes },
+ { kEventClassService, kEventServiceCopy },
+ { kEventClassService, kEventServicePaste }
+ };
+
+ if (InstallApplicationEventHandler (se_handler, sizeof (se_types) / sizeof (se_types[0]), se_types, NULL, NULL) != noErr)
+ fatal ("Cannot install application event handler");
+
+ DisposeEventHandlerUPP (se_handler);
+}
+
+void
+vars_of_select_carbon (void)
+{
+ reinit_vars_of_select_carbon ();
+}
1.1.2.1 +380 -0 XEmacs/xemacs/src/Attic/toolbar-carbon.c
Index: toolbar-carbon.c
===================================================================
RCS file: toolbar-carbon.c
diff -N toolbar-carbon.c
--- /dev/null Fri Feb 25 17:30:16 2005
+++ /tmp/cvsAAAxwaOUi Fri Feb 25 17:30:16 2005
＠＠ -0,0 +1,380 ＠＠
+/*
+ The following code is original work by me, except where noted with
+ the comments "Taken from ..." or "Adapted from ...". I now place
+ it in the public domain.
+
+ Andrew Choi. Calgary, Canada, February 9, 2005. */
+
+#include <config.h>
+#include "lisp.h"
+
+#include "glyphs-carbon.h"
+#include "gui.h"
+#include "toolbar.h"
+
+#include "console-carbon-impl.h"
+#include "objects-carbon-impl.h"
+
+extern void carbon_enqueue_misc_user_event (Lisp_Object, Lisp_Object, Lisp_Object); /* In event-carbon.c. */
+
+static CFStringRef
+toolbar_item_create_command_id_from_index (int i)
+{
+ CFMutableStringRef command_id = CFStringCreateMutable (NULL, 4);
+
+ CFStringAppendCString (command_id, "TB", kCFStringEncodingISOLatin1);
+
+ CFStringAppendFormat (command_id, NULL, CFSTR ("%c%c"), '0' + ((i >> 6) & 0x3f), '0' + (i & 0x3f));
+
+ CFStringRef result = CFStringCreateCopy (NULL, command_id);
+ CFRelease (command_id);
+
+ return result;
+}
+
+static int
+toolbar_item_index_from_identifier (CFStringRef identifier)
+{
+ if (!CFStringHasPrefix (identifier, CFSTR ("org.xemacs.carbontoolbar.")))
+ return -1;
+
+ int prefix_len = CFStringGetLength (CFSTR ("org.xemacs.carbontoolbar."));
+
+ if (CFStringGetLength (identifier) != prefix_len + 4)
+ return -1;
+
+ if (CFStringGetCharacterAtIndex (identifier, prefix_len) != 'T')
+ return -1;
+
+ if (CFStringGetCharacterAtIndex (identifier, prefix_len + 1) != 'B')
+ return -1;
+
+ int d1 = CFStringGetCharacterAtIndex (identifier, prefix_len + 2) - '0';
+ int d2 = CFStringGetCharacterAtIndex (identifier, prefix_len + 3) - '0';
+
+ return (d1 << 6) | d2;
+}
+
+/* Command ID's for toolbar items are of the form TBxx where x is ['0' .. 'o'] representing 64 x 64 possible ID's. */
+static UInt32
+toolbar_item_uint32_command_id_from_index (int i)
+{
+ return ('T' << 24) | ('B' << 16) | (('0' + ((i >> 6) & 0x3f)) << 8) | ('0' + (i & 0x3f));
+}
+
+static int
+toolbar_item_index_from_uint32_command_id (UInt32 uint32_command_id)
+{
+ if (uint32_command_id >> 24 != 'T')
+ return -1;
+ if (((uint32_command_id >> 16) & 0xff) != 'B')
+ return -1;
+
+ return ((((uint32_command_id >> 8) & 0xff) - '0') << 6) | ((uint32_command_id & 0xff) - '0');
+}
+
+static HIToolbarItemRef
+create_toolbar_item (CFStringRef identifier, CGImageRef image_ref, const char *help_string)
+{
+ HIToolbarItemRef item;
+
+ if (HIToolbarItemCreate (identifier, kHIToolbarItemCantBeRemoved | kHIToolbarItemAllowDuplicates, &item) != noErr)
+ invalid_operation ("Can't create toolbar item", Qnil);
+
+ if (HIToolbarItemSetImage (item, image_ref) != noErr)
+ invalid_operation ("Can't set toolbar item image", Qnil);
+
+ CFStringRef cf_help_string = CFStringCreateWithCString (NULL, help_string, kCFStringEncodingISOLatin1);
+ if (HIToolbarItemSetHelpText (item, cf_help_string, NULL) != noErr)
+ invalid_operation ("Can't set toolbar item help text", Qnil);
+
+ /* XEmacs button don't have names. So setting label to help text. Crude. */
+ if (HIToolbarItemSetLabel (item, cf_help_string) != noErr)
+ invalid_operation ("Can't set toolbar item label", Qnil);
+ CFRelease (cf_help_string);
+
+ int i = toolbar_item_index_from_identifier (identifier);
+ UInt32 uint32_command_id = toolbar_item_uint32_command_id_from_index (i);
+
+ if (HIToolbarItemSetCommandID (item, uint32_command_id) != noErr)
+ invalid_operation ("Can't set toolbar item command ID", Qnil);
+
+ return item;
+}
+
+static HIToolbarItemRef
+create_toolbar_item_for_identifier (CFStringRef identifier, CFTypeRef UNUSED (config_data), struct frame *f)
+{
+ HIToolbarItemRef item = NULL;
+
+ int index = toolbar_item_index_from_identifier (identifier);
+ if (index >= 0)
+ {
+ Lisp_Object window = FRAME_LAST_NONMINIBUF_WINDOW (f);
+ struct window *w = XWINDOW (window);
+
+ Lisp_Object button = FRAME_TOOLBAR_BUTTONS (f, TOP_TOOLBAR);
+
+ int i = 0;
+ while (!NILP (button))
+ {
+ if (!XTOOLBAR_BUTTON (button)->blank)
+ {
+ if (i >= index)
+ break;
+ i++;
+ }
+
+ button = XTOOLBAR_BUTTON (button)->next;
+ }
+
+ if (!NILP (button))
+ {
+ Lisp_Object glyph = get_toolbar_button_glyph (w, XTOOLBAR_BUTTON (button));
+
+ Lisp_Object instance;
+ if (GLYPHP (glyph))
+ instance = glyph_image_instance (glyph, window, ERROR_ME_DEBUG_WARN, 1);
+ else
+ instance = Qnil;
+
+ if (IMAGE_INSTANCEP (instance))
+ {
+ Lisp_Image_Instance *p = XIMAGE_INSTANCE (instance);
+
+ if (IMAGE_INSTANCE_PIXMAP_TYPE_P (p))
+ {
+ item = create_toolbar_item (identifier, IMAGE_INSTANCE_CARBON_IMAGE_REF (p), XSTRING_DATA (XTOOLBAR_BUTTON (button)->help_string));
+ }
+ }
+ }
+ }
+
+ return item;
+}
+
+static void
+get_toolbar_items (CFMutableArrayRef array, struct frame *f)
+{
+ Lisp_Object button = FRAME_TOOLBAR_BUTTONS (f, TOP_TOOLBAR);
+
+ int i = 0;
+
+ while (!NILP (button))
+ {
+ if (!XTOOLBAR_BUTTON (button)->blank)
+ {
+ CFStringRef command_id = toolbar_item_create_command_id_from_index (i++);
+ CFStringRef item_identifier = CFStringCreateWithFormat (NULL, NULL, CFSTR ("%＠.%＠"), CFSTR ("org.xemacs.carbontoolbar"), command_id);
+ CFArrayAppendValue (array, item_identifier);
+ CFRelease (command_id);
+ CFRelease (item_identifier);
+ }
+
+ button = XTOOLBAR_BUTTON (button)->next;
+ }
+}
+
+static OSStatus
+toolbar_delegate (EventHandlerCallRef UNUSED (next_handler), EventRef event, void *data)
+{
+ struct frame *f = (struct frame *) data;
+
+ OSStatus result = eventNotHandledErr;
+ CFMutableArrayRef array;
+
+ switch (GetEventKind (event))
+ {
+ case kEventToolbarGetDefaultIdentifiers:
+ GetEventParameter (event, kEventParamMutableArray, typeCFMutableArrayRef, NULL, sizeof (CFMutableArrayRef), NULL, &array);
+ get_toolbar_items (array, f);
+ result = noErr;
+ break;
+
+ case kEventToolbarGetAllowedIdentifiers:
+ GetEventParameter (event, kEventParamMutableArray, typeCFMutableArrayRef, NULL, sizeof (CFMutableArrayRef), NULL, &array);
+ get_toolbar_items (array, f);
+ result = noErr;
+ break;
+
+ case kEventToolbarCreateItemWithIdentifier:
+ {
+ CFStringRef identifier;
+ GetEventParameter (event, kEventParamToolbarItemIdentifier, typeCFStringRef, NULL, sizeof (CFStringRef), NULL, &identifier);
+
+ CFTypeRef config_data;
+ GetEventParameter (event, kEventParamToolbarItemConfigData, typeCFTypeRef, NULL, sizeof (CFTypeRef), NULL, &config_data);
+
+ HIToolbarItemRef item = create_toolbar_item_for_identifier (identifier, config_data, f);
+
+ if (item)
+ {
+ SetEventParameter (event, kEventParamToolbarItem, typeHIToolbarItemRef, sizeof (HIToolbarItemRef), &item);
+ result = noErr;
+ }
+ }
+ default:
+ ;
+ }
+
+ return result;
+}
+
+static OSStatus
+window_event_handler (EventHandlerCallRef UNUSED (next_handler), EventRef event, void *data)
+{
+ if (GetEventKind(event) == kEventCommandProcess)
+ {
+ HICommand command;
+ GetEventParameter(event, kEventParamDirectObject, typeHICommand, NULL, sizeof (command), NULL, &command);
+
+ int index = toolbar_item_index_from_uint32_command_id (command.commandID);
+ if (index >= 0)
+ {
+ struct frame *f = (struct frame *) data;
+
+ Lisp_Object button = FRAME_TOOLBAR_BUTTONS (f, TOP_TOOLBAR);
+
+ int i = 0;
+ while (!NILP (button))
+ {
+ if (!XTOOLBAR_BUTTON (button)->blank)
+ {
+ if (i >= index)
+ break;
+ i++;
+ }
+
+ button = XTOOLBAR_BUTTON (button)->next;
+ }
+
+ if (!NILP (button))
+ {
+ Lisp_Object callback = XTOOLBAR_BUTTON (button)->callback;
+
+ if (!UNBOUNDP (callback))
+ {
+ Lisp_Object fn, arg;
+
+ get_gui_callback (callback, &fn, &arg);
+ carbon_enqueue_misc_user_event (wrap_frame (f), fn, arg);
+ }
+ }
+
+ return noErr;
+ }
+ else
+ return eventNotHandledErr;
+ }
+ else
+ return eventNotHandledErr;
+}
+
+static void
+carbon_initialize_frame_toolbars (struct frame *f)
+{
+ HIToolbarRef toolbar;
+
+ /* The toolbar identifier isn't used because the auto-save attribute hasn't been specified. */
+ if (HIToolbarCreate (CFSTR ("org.xemacs.carbontoolbar"), kHIToolbarNoAttributes, &toolbar) != noErr)
+ invalid_operation ("Can't create toolbar for frame", wrap_frame (f));
+
+ EventHandlerUPP tb_handler;
+ tb_handler = NewEventHandlerUPP (toolbar_delegate);
+
+ EventTypeSpec tb_types[] =
+ {
+ { kEventClassToolbar, kEventToolbarGetDefaultIdentifiers },
+ { kEventClassToolbar, kEventToolbarGetAllowedIdentifiers },
+ { kEventClassToolbar, kEventToolbarCreateItemWithIdentifier }
+ };
+
+ if (InstallEventHandler (HIObjectGetEventTarget (toolbar), tb_handler, sizeof (tb_types) / sizeof (tb_types[0]), tb_types, f, NULL) != noErr)
+ invalid_operation ("Cannot install window event handler", wrap_frame (f));
+
+ DisposeEventHandlerUPP (tb_handler);
+ SetWindowToolbar (FRAME_CARBON_WINDOW (f), toolbar);
+ CFRelease (toolbar);
+
+ if (HIToolbarSetDisplayMode (toolbar, kHIToolbarDisplayModeIconOnly) != noErr)
+ invalid_operation ("Can't set toolbar display mode for frame", wrap_frame (f));
+
+ ShowHideWindowToolbar (FRAME_CARBON_WINDOW (f), true, false);
+
+ ChangeWindowAttributes (FRAME_CARBON_WINDOW (f), kWindowToolbarButtonAttribute, 0);
+
+ /*SetAutomaticControlDragTrackingEnabledForWindow (FRAME_CARBON_WINDOW (f), true);*/
+
+ EventHandlerUPP we_handler;
+ we_handler = NewEventHandlerUPP (window_event_handler);
+
+ EventTypeSpec we_types[] =
+ {
+ { kEventClassCommand, kEventCommandProcess }
+ };
+
+ if (InstallWindowEventHandler (FRAME_CARBON_WINDOW (f), we_handler, sizeof (we_types) / sizeof (we_types[0]), we_types, f, NULL) != noErr)
+ invalid_operation ("Cannot install window event handler for commands", wrap_frame (f));
+
+ DisposeEventHandlerUPP (we_handler);
+}
+
+static void
+carbon_output_frame_toolbars (struct frame *f)
+{
+ if (!FRAME_REAL_TOP_TOOLBAR_VISIBLE (f))
+ return;
+
+ HIToolbarRef toolbar;
+ if (GetWindowToolbar (FRAME_CARBON_WINDOW (f), &toolbar) != noErr)
+ invalid_operation ("Can't get toolbar for frame", wrap_frame (f));
+
+ CFArrayRef items;
+ if (HIToolbarCopyItems (toolbar, &items) != noErr)
+ invalid_operation ("Can't get toolbar items for frame", wrap_frame (f));
+ CFIndex item_count = CFArrayGetCount (items);
+ CFRelease (items);
+
+ for (CFIndex i = 0 ; i < item_count; i++)
+ HIToolbarRemoveItemAtIndex (toolbar, 0);
+
+ Lisp_Object button = FRAME_TOOLBAR_BUTTONS (f, TOP_TOOLBAR);
+
+ int i = 0;
+
+ while (!NILP (button))
+ {
+ if (!XTOOLBAR_BUTTON (button)->blank)
+ {
+ CFStringRef command_id = toolbar_item_create_command_id_from_index (i++);
+ CFStringRef item_identifier = CFStringCreateWithFormat (NULL, NULL, CFSTR ("%＠.%＠"), CFSTR ("org.xemacs.carbontoolbar"), command_id);
+
+ HIToolbarItemRef item = create_toolbar_item_for_identifier (item_identifier, NULL, f);
+ if (HIToolbarAppendItem (toolbar, item) != noErr)
+ invalid_operation ("Can't append item to toolbar for frame", wrap_frame (f));
+
+ CFRelease (command_id);
+ CFRelease (item_identifier);
+ }
+
+ button = XTOOLBAR_BUTTON (button)->next;
+ }
+}
+
+static void
+carbon_clear_frame_toolbars (struct frame * UNUSED (f))
+{
+}
+
+/************************************************************************/
+/* initialization */
+/************************************************************************/
+
+void
+console_type_create_toolbar_carbon (void)
+{
+ CONSOLE_HAS_METHOD (carbon, initialize_frame_toolbars);
+ CONSOLE_HAS_METHOD (carbon, output_frame_toolbars);
+ CONSOLE_HAS_METHOD (carbon, clear_frame_toolbars);
+ /*CONSOLE_HAS_METHOD (carbon, free_frame_toolbars);*/
+}
- 1 participants
- 0 comments
CVS update by stephent ( User: stephent Date: 05/02/25 17:27:25) NEW: XEmacs/xemacs/carbon/XEmacs.app/Contents/Resources
19 years, 2 months
CVS Monitor
CVS Monitor
XEmacs/xemacs/carbon/XEmacs.app/Contents/Resources - New directory
- 1 participants
- 0 comments
CVS update by stephent ( User: stephent Date: 05/02/25 17:25:49) NEW: XEmacs/xemacs/carbon/XEmacs.app/Contents
19 years, 2 months
CVS Monitor
CVS Monitor
XEmacs/xemacs/carbon/XEmacs.app/Contents - New directory
- 1 participants
- 0 comments
CVS update by stephent ( User: stephent Date: 05/02/25 17:24:03) NEW: XEmacs/xemacs/carbon/xpm
19 years, 2 months
CVS Monitor
CVS Monitor
XEmacs/xemacs/carbon/xpm - New directory
- 1 participants
- 0 comments
CVS update by stephent ( User: stephent Date: 05/02/25 17:24:02) NEW: XEmacs/xemacs/carbon/XEmacs.app
19 years, 2 months
CVS Monitor
CVS Monitor
XEmacs/xemacs/carbon/XEmacs.app - New directory
- 1 participants
- 0 comments
CVS update by stephent ( User: stephent Date: 05/02/25 17:23:35) NEW: XEmacs/xemacs/carbon
19 years, 2 months
CVS Monitor
CVS Monitor
XEmacs/xemacs/carbon - New directory
- 1 participants
- 0 comments