December 2004 - XEmacs-Patches - XEmacs Mailing List Archives

Error in internals.texi manual 19 years, 4 months

robert delius royar

A stray period causes make to fail for the latest CVS 21.5-b18 (+CVS-20041213) diff -U4 man/internals/internals.texi.~1~ man/internals/internals.texi --- man/internals/internals.texi.~1~ Tue Dec 14 11:50:47 2004 +++ man/internals/internals.texi Tue Dec 14 12:01:57 2004 ＠＠ -13475,9 +13475,9 ＠＠＠item Create a lighter-weight interface, perhaps an extension of the device interface, that allows widgets to access face information from the device it is implemented on. -＠end enumerate. +＠end enumerate ＠example

2 participants
1 comments

[AC21.5] document `signal-error-on-buffer-boundary' in next-line, previous-line 19 years, 4 months

Stephen J. Turnbull

APPROVE COMMIT 21.5 Index: lisp/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v retrieving revision 1.601 diff -u -U0 -r1.601 ChangeLog --- lisp/ChangeLog 12 Dec 2004 02:47:06 -0000 1.601 +++ lisp/ChangeLog 13 Dec 2004 00:31:11 -0000 ＠＠ -0,0 +1,6 ＠＠ +2004-12-13 Stephen J. Turnbull <stephen(a)xemacs.org> + + * simple.el (next-line): + (previous-line): + Document effect of `signal-error-on-buffer-boundary'. + Index: lisp/simple.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/simple.el,v retrieving revision 1.47 diff -u -r1.47 simple.el --- lisp/simple.el 20 Sep 2003 01:46:54 -0000 1.47 +++ lisp/simple.el 13 Dec 2004 00:31:18 -0000 ＠＠ -2238,7 +2238,9 ＠＠ If there is no line in the buffer after this one, behavior depends on the value of `next-line-add-newlines'. If non-nil, it inserts a newline character to create a line, and moves the cursor to that line. Otherwise it moves the -cursor to the end of the buffer. +cursor to the end of the buffer. If `signal-error-on-buffer-boundary' is +non-nil and you attempt to move past a buffer boundary, XEmacs will ring the +bell using `ding'. The command \\[set-goal-column] can be used to create a semipermanent goal column to which this command always moves. ＠＠ -2285,6 +2287,9 ＠＠ \(i.e. active region) if the Shift key is held down, a motion key is used to invoke this command, and `shifted-motion-keys-select-region' is t; see the documentation for this variable for more details. + +If `signal-error-on-buffer-boundary' is non-nil and you attempt to move past +a buffer boundary, XEmacs will ring the bell using `ding'. If you are thinking of using this in a Lisp program, consider using `forward-line' with a negative argument instead. It is usually easier -- Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Ask not how you can "do" free software business; ask what your business can "do for" free software.

1 participants
0 comments

[AC21.5] internals.texi: document some issues raised by Xft 19 years, 4 months

Stephen J. Turnbull

APPROVE COMMIT 21.5 Index: man/ChangeLog =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/man/ChangeLog,v retrieving revision 1.276 diff -u -U0 -r1.276 ChangeLog --- man/ChangeLog 2004/12/10 06:35:54 1.276 +++ man/ChangeLog 2004/12/12 14:56:43 ＠＠ -0,0 +1,6 ＠＠ +2004-12-12 Stephen J. Turnbull <stephen(a)xemacs.org> + + * internals/internals.texi (Modules for the Basic Displayable Lisp + Objects): Comment on problems, and extensions needed to handle + native widgets properly. + Index: man/internals/internals.texi =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/man/internals/internals.texi,v retrieving revision 1.56 diff -u -r1.56 internals.texi --- man/internals/internals.texi 2004/12/10 06:36:00 1.56 +++ man/internals/internals.texi 2004/12/12 14:54:50 ＠＠ -13395,6 +13395,12 ＠＠ contains multiple display devices, but only one keyboard and mouse. Most of the time, a console will contain exactly one device. +＠strong{This model may no longer suffice.} The X Window System (at +least) now supports a variety of input devices, including touchscreens +and tablets, as well as the traditional keyboard and mouse, and may even +be able to support multiple instances of a single type of input device +(especially pointing devices) on a single console. + Consoles are the top of a lisp object inclusion hierarchy. Consoles contain devices, which contain frames, which contain windows. ＠＠ -13420,6 +13426,57 ＠＠ menubar, scrollbar, toolbar, and other displayable-object subsystems. The reason for this is that all of these subsystems have the same subtypes (X, TTY, NeXTstep, Microsoft Windows, etc.) as devices do. + +＠strong{This abstraction is probably broken} (as of late 2004), at least +for X consoles, with the advent of the ＠strong{Xft} library. Xft is a +complete break from the traditional approach to text rendering in the +X11 environment, since fonts are composed of glyphs rendered by +＠emph{client-side} code. These glyphs are then transmitted to the +server as sets of trapezoids, and displayed by the ＠strong{XRender} +extension (where available; the X11 core protocol can also be used, but +this is slow). The XRender extension is especially attractive because +it allows modern image composition techniques to be used to render +antialiased fonts. + +By contrast, the traditional approach renders fonts on the server side +as a collection of bitmaps. It is also possible use a ＠emph{font +server} that knows how to render antialiased fonts, but for some reason +this approach has never caught on. + +The problem that this creates for XEmacs is that the traditional (and +still popular) widget sets, the various Athena variants and the Motif +widget set, are based on the server-side rendering model. Thus, even if +XEmacs-specific widgets (such as the basic text window, the Lucid +menubar, and the recently added tab control) can be adapted to render +text via Xft, older widgets (such as buttons and labels) and ``modern'' +widgets derived from traditional widgets (the progress gauge) still +expect their font resources to be converted to server-side fonts. Then +text is rendered by calls to the core protocol via Xlib, rather than by +calls to the XRender protocol via Xft. + +It's even possible to imagine a situation where a widget is composed of +components which draw their own text (＠emph{predefined widgets}) as well +as new components which can draw using more modern methods. Handling +this will either require reworking the Emacs face mechanism to provide a +way to determine whether this widget can use that font, or ways to give +each of several different widgets, even different components of a given +widget, a different face property. This is already an issue, as widgets +generally derive their font from the gui-element face, but this might +not be appropriate for widgets embedded in a buffer. + +There seem to be two overall ways to go. + +＠enumerate +＠item +Add face information to the Lucid widget library, and extend the +coverage of that library to device types that aren't supported by it yet +(MS Windows, and maybe TTY). + +＠item +Create a lighter-weight interface, perhaps an extension of the device +interface, that allows widgets to access face information from the +device it is implemented on. +＠end enumerate. -- Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Ask not how you can "do" free software business; ask what your business can "do for" free software.

1 participants
0 comments

[AC21.5] gnuserv-related doc improvements 19 years, 4 months

Stephen J. Turnbull

APPROVE COMMIT 21.5 I'm pretty sure these are "improvements" but if people have questions or further suggestions, I'd be happy to incorporate them. With regard to gnuserv.README, I think it should be removed but there's some historical material I'd like to move somewhere (maybe Internals), so I've left it for now. Index: etc/ChangeLog =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/etc/ChangeLog,v retrieving revision 1.48 diff -u -U0 -r1.48 ChangeLog --- etc/ChangeLog 2004/11/07 12:03:45 1.48 +++ etc/ChangeLog 2004/11/17 13:31:41 ＠＠ -0,0 +1,5 ＠＠ +2004-11-16 Stephen J. Turnbull <stephen(a)xemacs.org> + + * gnuserv.1: Various fixes and improvements. + * gnuserv.README: Strengthen self-deprecation. + Index: lisp/ChangeLog =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/lisp/ChangeLog,v retrieving revision 1.600 diff -u -U0 -r1.600 ChangeLog --- lisp/ChangeLog 2004/12/06 03:51:15 1.600 +++ lisp/ChangeLog 2004/12/10 08:18:15 ＠＠ -0,0 +1,4 ＠＠ +2004-11-16 Stephen J. Turnbull <stephen(a)xemacs.org> + + * gnuserv.el (gnuserv-edit-files): Improve docstring. + Index: etc/gnuserv.1 =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/etc/gnuserv.1,v retrieving revision 1.6 diff -u -r1.6 gnuserv.1 --- etc/gnuserv.1 2001/04/12 18:20:50 1.6 +++ etc/gnuserv.1 2004/11/15 18:36:49 ＠＠ -17,29 +17,32 ＠＠ .SH DESCRIPTION .PP +\fIgnuserv\fP is a server program run as a subprocess of XEmacs to handle +all incoming and outgoing requests from \fIgnuclient\fP. It is not usually +invoked directly, but is started from XEmacs by loading the \fIgnuserv\fP +package and evaluating the Lisp form (gnuserv-start). +.PP \fIgnuclient\fP allows the user to request a running XEmacs process to edit the named files or directories and/or evaluate lisp forms. -Depending on your environment, it can be an X frame or a TTY frame. +Depending on your environment, TTY, X, GTK, or MS Windows frames, as well as +batch (frameless) execution of Lisp may be available. One typical use for this is with a dialup connection to a machine on which an XEmacs process is currently running. .PP \fIgnudoit\fP is a shell script frontend to ``gnuclient -batch -eval form''. Its use is deprecated. Try to get used to calling gnuclient directly. .PP -\fIgnuserv\fP is the server program that is set running by XEmacs to -handle all incoming and outgoing requests. It is not usually invoked -directly, but is started from XEmacs by loading the \fIgnuserv\fP -package and evaluating the Lisp form (gnuserv-start). -.PP \fIgnuattach\fP no longer exists. Its functionality has been replaced by \fIgnuclient -nw\fP. .SH OPTIONS .PP -\fIgnuclient\fP supports as much of the command line options of Emacs as -makes sense in this context. In addition it adds a few of its own. +\fIgnuclient\fP supports as many of the command line options of Emacs as +make sense in this context. In addition it adds a few of its own. .br -Options with long names can also be specified using a double -hyphen instead of a single one. +For backward compatibility, ``long'' options (\fi.e.\fP, with doubled hyphen) +may be specified using a single hyphen instead of a doubled one. Similarly, +the ``-nw'' option is a historical artifact: a multiletter option with no +double-hyphen version. .TP 8 .BI \-nw This option makes \fIgnuclient\fP act as a frontend such that XEmacs ＠＠ -49,7 +52,7 ＠＠ the same machine as gnuclient. This is the default if the `DISPLAY' environment variable is not set. .TP 8 -.BI \-display " display, " \--display " display" +.BI \--display " display, " \-display " display" If this option is given or the `DISPLAY' environment variable is set then gnuclient will tell XEmacs to edit files in a frame on the specified X device. ＠＠ -59,7 +62,8 ＠＠ made with the XEmacs process. Normally \fIgnuclient\fP waits until all of the files on the command line have been finished with (their buffers killed) by the XEmacs process, and all the forms have been -evaluated. +evaluated. Note that this is \fIdifferent\fP from XEmacs itself, where +this option means to inhibit loading of the user init file. .TP 8 .BI \-v When this option is specified \fIgnuclient\fP will request for the ＠＠ -81,26 +85,25 ＠＠ .BI \-f " function," Make Emacs execute the lisp function. .TP 8 -.BI \-eval " form" -Make Emacs execute the lisp form. +.BI \--eval " form, " \-eval " form" +Make Emacs execute the Lisp form. .TP 8 .BI \-h " hostname" Used only with Internet-domain sockets, this option specifies the host machine which should be running \fIgnuserv\fP. If this option is not specified then the value of the environment variable GNU_HOST is used if set. If no hostname is specified, and the GNU_HOST variable is not -set, an internet connection will not be attempted. N\.B.: -\fIgnuserv\fP does NOT allow internet connections unless XAUTH +set, an Internet connection will not be attempted. N\.B.: +\fIgnuserv\fP does NOT allow Internet connections unless XAUTH authentication is used or the GNU_SECURE variable has been specified and points at a file listing all trusted hosts. (See SECURITY below.) .br -Note that an internet address may be specified instead of a hostname -which can speed up connections to the server by quite a bit, -especially if the client machine is running YP. +An Internet address (``dotted-quad'') may be specified instead of a +hostname. IPv6 support is not robust. .br -Note also that a hostname of \fBunix\fP can be used to specify that +A hostname of \fBunix\fP can be used to specify that the connection to the server should use a Unix-domain socket (if supported) rather than an Internet-domain socket. .TP 8 ＠＠ -133,16 +136,15 ＠＠ The cursor is put at line number 'n' if specified. .SH SETUP -\fIgnuserv\fP is packaged standardly with recent versions of XEmacs. -Therefore, you should be able to start the server simply by evaluating -the XEmacs Lisp form (gnuserv-start), or equivalently by typing -`M-x gnuserv-start'. +\fIgnuserv\fP is included with recent versions of XEmacs; no installation +is required. The server must be started before clients may attempt to +connect. Start the server by evaluating the Lisp form (gnuserv-start), or +interactively by typing `M-x gnuserv-start'. .SH CONFIGURATION -The behavior of this suite of program is mostly controlled on the lisp -side in Emacs and its behavior can be customized to a large extent. -Type `M-x customize-group RET gnuserv RET' for easy access. More -documentation can be found in the file `gnuserv.el' +The behavior of this suite of programs can be customized to a large extent. +Type `M-x customize-group RET gnuserv RET'. More documentation can be found +in the file `gnuserv.el' .SH EXAMPLE .RS 4 ＠＠ -156,62 +158,63 ＠＠ .br More examples and sample wrapper scripts are provided in the -etc/gnuserv directory of the Emacs installation. +etc/gnuserv directory of the XEmacs installation. .SH SYSV IPC -SysV IPC is used to communicate between \fIgnuclient\fP and -\fIgnuserv\fP if the symbol SYSV_IPC is defined at the top of -gnuserv.h. This is incompatible with both Unix-domain and +SysV IPC is a build-time option, enabled by defining the symbol SYSV_IPC +at the top of gnuserv.h. It is used to communicate between \fIgnuclient\fP +and \fIgnuserv\fP. It is incompatible with both Unix-domain and Internet-domain socket communication as described below. A file called /tmp/gsrv??? is created as a key for the message queue, and if removed will cause the communication between server and client to fail until the server is restarted. .SH UNIX-DOMAIN SOCKETS -A Unix-domain socket is used to communicate between \fIgnuclient\fP -and \fIgnuserv\fP if the symbol UNIX_DOMAIN_SOCKETS is defined at the -top of gnuserv.h. A file called /tmp/gsrvdir????/gsrv is created for +Unix-domain sockets are a build-time option, enabled by defining the symbol +UNIX_DOMAIN_SOCKETS at the top of gnuserv.h. A Unix-domain socket is used +to communicate between \fIgnuclient\fP +and \fIgnuserv\fP. A file called /tmp/gsrvdir????/gsrv is created for communication. If the symbol USE_TMPDIR is set at the top of gnuserv.h, $TMPDIR, when set, is used instead of /tmp. If that file is deleted, or TMPDIR has different values for the server and the client, communication between server and client will fail. Only the user running gnuserv will be able to connect to the socket. .SH INTERNET-DOMAIN SOCKETS -Internet-domain sockets are used to communicate between -\fIgnuclient\fP and \fIgnuserv\fP if the symbol -INTERNET_DOMAIN_SOCKETS is defined at the top of gnuserv.h. Both -Internet-domain and Unix-domain sockets can be used at the same -time. If a hostname is specified via -h or via the GNU_HOST +Internet-domain sockets are a build-time option, enabled by defining the +symbol INTERNET_DOMAIN_SOCKETS at the top of gnuserv.h. Internet-domain +sockets are used to communicate between \fIgnuclient\fP and \fIgnuserv\fP. +Both Internet-domain and Unix-domain sockets can be used at the same +time. If a hostname is specified via -h or via the GNU_HOST environment variable, \fIgnuclient\fP establish connections using an -internet domain socket. If not, a local connection is attempted via -either a unix-domain socket or SYSV IPC. +Internet domain socket. If not, a local connection is attempted via +either a Unix-domain socket or SYSV IPC. .SH SECURITY Using Internet-domain sockets, a more robust form of security is needed that wasn't necessary with either Unix-domain sockets or SysV IPC. Currently, two authentication protocols are supported to provide this: MIT-MAGIC-COOKIE-1 (based on the X11 xauth(1) program) and a simple host-based access control mechanism, hereafter called -GNUSERV-1. The GNUSERV-1 protocol is always available, whereas support -for MIT-MAGIC-COOKIE-1 may or may not have been enabled (via a #define -at the top of gnuserv.h) at compile-time. +GNUSERV-1. The GNUSERV-1 protocol is always available. Support +for MIT-MAGIC-COOKIE-1 is enabled (by defining AUTH_MAGIC_COOKIE +at the top of gnuserv.h. .PP \fIgnuserv\fP, using GNUSERV-1, performs a limited form of access -control at the machine level. By default no internet-domain socket is +control at the machine level. By default no Internet-domain socket is opened. If the variable GNU_SECURE can be found in \fIgnuserv\fP's environment, and it names a readable filename, then this file is opened and assumed to be a list of hosts, one per line, from which the server will allow requests. Connections from any other host will be rejected. Even the machine on which \fIgnuserv\fP is running is not -permitted to make connections via the internet socket unless its +permitted to make connections via the Internet socket unless its hostname is explicitly specified in this file. Note that a host may be either a numeric IP address or a hostname, and that .I any user on an approved host may connect to your gnuserv and execute arbitrary -elisp (e.g., delete all your files). +Lisp (e.g., delete all your files). If this file contains a lot of -hostnames then the server may take quite a time to start up. +hostnames then the server may take quite a long time to start up. .PP -When the MIT-MAGIC-COOKIE-1 protocol is enabled, an internet socket +When the MIT-MAGIC-COOKIE-1 protocol is enabled, an Internet socket \fIis\fP opened by default. \fIgnuserv\fP will accept a connection from any host, and will wait for a "magic cookie" (essentially, a password) to be presented by the client. If the client doesn't present the ＠＠ -267,7 +270,7 ＠＠ .PP .TP 8 .B DISPLAY -Default X device to put edit frame. +Default X (or GTK) device for display of edit frame. .SH FILES .PP ＠＠ -278,7 +281,7 ＠＠ .B /tmp/gsrvdir???/gsrv (unix domain sockets only) .TP 8 -.B ~/.emacs +.B ~/.xemacs/init.el XEmacs customization file, see xemacs(1). .SH SEE ALSO .PP Index: etc/gnuserv.README =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/etc/gnuserv.README,v retrieving revision 1.2 diff -u -r1.2 gnuserv.README --- etc/gnuserv.README 1998/06/30 06:35:13 1.2 +++ etc/gnuserv.README 2004/11/15 18:00:23 ＠＠ -1,5 +1,6 ＠＠ -This file is not meant to be proper documentation. See the file gnuserv.1 for -more information. +**** WARNING **** +This file was never meant to be proper documentation, and now is bitrotted. +See the file gnuserv.1 and/or the sources for more information. **** NOTE: This version of gnuserv has some enhancements over the original version Index: lisp/gnuserv.el =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/xemacs/lisp/gnuserv.el,v retrieving revision 1.13 diff -u -r1.13 gnuserv.el --- lisp/gnuserv.el 2003/09/19 17:07:07 1.13 +++ lisp/gnuserv.el 2004/11/15 17:47:34 ＠＠ -419,11 +419,14 ＠＠ ;; backbone of gnuserv.el. (defun gnuserv-edit-files (type list &rest flags) "For each (line-number . file) pair in LIST, edit the file at line-number. -The visited buffers are memorized, so that when \\[gnuserv-edit] is invoked +The visited buffers are recorded, so that when \\[gnuserv-edit] is invoked in such a buffer, or when it is killed, or the client's device deleted, the -client will be invoked that the edit is finished. +client will be informed that the edit is finished. -TYPE should either be a (tty TTY TERM PID) list, or (x DISPLAY) list. +TYPE should be a list in one of the forms (tty TTY TERM PID), (x DISPLAY), +\(gtk DISPLAY), or (mswindows DISPLAY). Currently GTK and MS Windows do not +support multiple displays, so the DISPLAY member is ignored. Conventionally +it is set to nil. If a flag is `quick', just edit the files in Emacs. If a flag is `view', view the files read-only." (let (quick view) -- Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Ask not how you can "do" free software business; ask what your business can "do for" free software.

1 participants
0 comments

[SAC pkg] general-docs: fontconfig (Xft-related) documentation 19 years, 4 months

Stephen J. Turnbull

SUPERSEDES APPROVE COMMIT general-docs With Norbert's OK. Fire when ready, Norbert! Sorry about this big superseding patch, but I applied a bunch of patches to the work space and then realized I'd never committed the original. Index: xemacs-packages/general-docs/ChangeLog =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/packages/xemacs-packages/general-docs/ChangeLog,v retrieving revision 1.9 diff -u -r1.9 ChangeLog --- xemacs-packages/general-docs/ChangeLog 2003/10/31 16:52:56 1.9 +++ xemacs-packages/general-docs/ChangeLog 2004/11/26 15:30:08 ＠＠ -1,3 +1,66 ＠＠ +2004-11-27 Stephen J. Turnbull <stephen(a)xemacs.org> + + * texi/xemacs/fontconfig.texi (Constants): New node. + (The fontconfig API): + (Data Types): + Adjust node pointers for new node Constants. + (Font Properties): Move table to Constants. + + (FcLangSet): New node. + (Functions): + (FcObjectType): + (Querying Fonts and Their Properties): + Update node pointers for new node FcLangSet. + + (Querying Fonts and Their Properties): + Clarify description of FcFontList. + + (FcPattern): Use mnemonic id instead of n in prototypes of + FcPatternGetTYPE functions. + + (Overview): Specify the version of fontconfig described. + + (FcFontSet): + (FcValue): + Add entries for debug print functions. + + (Data Types): Document FcMatchKind, FcLangResult, FcSetName, FcEndian. + + (FcObjectType): Get rid of extraneous semicolon. + +2004-11-22 Stephen J. Turnbull <stephen(a)xemacs.org> + + * texi/xemacs/fontconfig.texi (FcObjectType): + (Querying Fonts and Their Properties): + (Initialization): + Split FcObjectType into FcObjectType and Querying Fonts and Their + Properties. Reorganize functions in Querying. Move descriptions + of FcConfigFilename, FcConfigCreate, FcConfigDestroy, + FcConfigSetCurrent, FcConfigGetCurrent, FcConfigUptoDate, + FcConfigBuildFonts, FcConfigGetConfigDirs, FcConfigGetFontDirs, + FcConfigGetConfigFiles, FcConfigGetCache, FcConfigGetFonts, + FcConfigGetBlanks, FcConfigGetRescanInverval, + FcConfigSetRescanInverval, FcConfigAppFontAddFile, + FcConfigAppFontAddDir, and FcConfigAppFontClear into Initialization. + (FcObjectType): + (Functions): + (Initialization): + (Top): + Update pointers for Querying Fonts and Their Properties. + + (Querying Fonts and Their Properties): + (FcObjectSet): + Fix typos. + + (Functions): + (Top): + Fix capitalization and whitespace of menus. + +2004-11-21 Stephen J. Turnbull <stephen(a)xemacs.org> + + * texi/xemacs/fontconfig.texi: Add file. + * Makefile (EXPLICIT_DOCS): Add fontconfig.texi. + 2003-10-31 Norbert Koch <viteno(a)xemacs.org> * Makefile (VERSION): XEmacs package 1.01 released. Index: xemacs-packages/general-docs/Makefile =================================================================== RCS file: /Users/steve/Software/Repositories/cvs.xemacs.org/XEmacs/packages/xemacs-packages/general-docs/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- xemacs-packages/general-docs/Makefile 2003/10/31 16:52:56 1.9 +++ xemacs-packages/general-docs/Makefile 2004/11/26 07:03:03 ＠＠ -27,5 +27,6 ＠＠ # We'll need something like this. #EXPLICIT_DOCS = texi/*.texi texi/xemacs/*.texi texi/packages/*.texi +EXPLICIT_DOCS = texi/xemacs/fontconfig.texi include ../../XEmacs.rules Index: xemacs-packages/general-docs/texi/xemacs/fontconfig.texi =================================================================== RCS file: fontconfig.texi diff -N fontconfig.texi --- /dev/null Sat Dec 11 16:21:25 2004 +++ xemacs-packages/general-docs/texi/xemacs/fontconfig.texi Mon Nov 29 17:55:19 2004 ＠＠ -0,0 +1,2007 ＠＠ +\input texinfo.tex +＠c %**start of header +＠setfilename ../../info/fontconfig.info +＠settitle Fontconfig: Font configuration and customization library + +＠set synched-to-pkg-version 1.0 +＠set synched-to-doc-versions Package: ＠value{synched-to-package-version} +＠set last-released-month-year October 2003 +＠set last-released-date 20 October 2003 + +＠footnotestyle separate +＠paragraphindent 2 +＠c %**end of header + +＠dircategory Permissively licensed documentation +＠direntry +* fontconfig:: Managing font metainformation. +＠end direntry + +＠setchapternewpage odd + +＠shorttitlepage Fontconfig + +＠titlepage +＠title Fontconfig +＠subtitle Font configuration and customization library +＠subtitle A Rendering-Engine-Independent Library +＠subtitle for Managing Font Metainformation + +＠author Keith Packard +＠author Stephen J. Turnbull + +＠end titlepage + +＠ifinfo +＠node Top, Copying, (dir), (dir) +＠top Fontconfig + +This file documents fontconfig, a rendering-engine-independent library +for managing font metainformation (＠emph{i.e.}, everything but the glyph +data themselves). It is ＠emph{not} part of XEmacs. + +Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. +Copyright © 2003 Stephen J. Turnbull, member of the XEmacs Project + +In the following notice, the term "Authors" refers to the copyright +holders listed above, and "Documentation" refers to this version of the +documentation supplied by Keith Packard, as adapted to Texinfo by +Stephen J. Turnbull. The fontconfig library itself and the original +documentation are covered by a similar license. + +Permission to use, copy, modify, distribute, and sell this Documentation +for any purpose is hereby granted without fee, provided that the above +copyright notice appear in all copies and that both that copyright +notice and this permission notice appear in copies of the Documentation, +and that the names of the Authors not be used in advertising or +publicity pertaining to distribution of the Documentation without +specific, written prior permission. The Authors make no representations +about the suitability of this Documentation for any purpose. It is +provided "as is" without express or implied warranty. + +THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS DOCUMENTATION, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS DOCUMENTATION. + +＠c I believe that this document can legally be distributed under the +＠c above permission. rms's opinion is that there is nothing left of +＠c `texinfo.tex' after processing this document, and therefore nothing +＠c forces this document to be distributed under GPL. + +＠c The original permissively licensed document may be obtained in +＠c distributions of the fontconfig library available from the CVS +＠c repository of the XFree86 Project in module xc/extra/fontconfig. + +＠end ifinfo + +＠menu +* Copying:: +* Overview:: +* The fontconfig API:: +* Configuration File Format:: +* Files:: +* Authors:: + +＠detailmenu + --- The Detailed Node Listing --- + +Overview + +* Font Configuration:: +* Font Properties:: +* Font Matching:: +* Font List Matching:: +* Font Names:: +* LANG Tags:: + +The fontconfig API + +* Data Types:: +* Functions:: + +Functions + +* FcMatrix:: +* FcCharSet:: +* FcValue:: +* FcPattern:: +* FcFontSet:: +* FcObjectSet:: +* FcObjectType:: +* Querying Fonts and Their Properties:: +* Initialization:: +* FcAtomic:: +* FreeType-Specific Functions:: +* XML-Specific Functions:: +* File and Directory Routines:: +* FcStrSet and FcStrList:: +* String Utilities:: + +Configuration File Format + +* Example System Configuration File:: +* Example User Configuration File:: + +＠end detailmenu +＠end menu + +＠node Copying, Overview, Top, Top +＠chapter Copying + +The fontconfig library and the accompanying documentation are covered by +the following copyright notice and license, except for this Texinfo +version which has additional authors but is otherwise substantially the +same. + +Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of Keith Packard not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. Keith Packard makes no +representations about the suitability of this software for any purpose. It +is provided "as is" without express or implied warranty. + +KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + +＠node Overview, The fontconfig API, Copying, Top +＠chapter Overview + +＠c DESCRIPTION +Fontconfig is a library designed to provide system-wide font +configuration, customization and application access. + +This manual describes fontconfig version 1.0.2. + +＠c FUNCTIONAL OVERVIEW +Fontconfig contains two essential modules, the configuration module which +builds an internal configuration from XML files and the matching module +which accepts font patterns and returns the nearest matching font. + +＠menu +* Font Configuration:: +* Font Properties:: +* Font Matching:: +* Font List Matching:: +* Font Names:: +* LANG Tags:: +＠end menu + +＠node Font Configuration, Font Properties, Overview, Overview +＠section Font Configuration + +The configuration module consists of the FcConfig datatype, libexpat and +FcConfigParse which walks over an XML tree and amends a configuration with +data found within. From an external perspective, configuration of the +library consists of generating a valid XML tree and feeding that to +FcConfigParse. The only other mechanism provided to applications for +changing the running configuration is to add fonts and directories to the +list of application-provided font files. + +The intent is to make font configurations relatively static, and shared by +as many applications as possible. It is hoped that this will lead to more +stable font selection when passing names from one application to another. +XML was chosen as a configuration file format because it provides a format +which is easy for external agents to edit while retaining the correct +structure and syntax. + +Font configuration is separate from font matching; applications needing to +do their own matching can access the available fonts from the library and +perform private matching. The intent is to permit applications to pick and +choose appropriate functionality from the library instead of forcing them to +choose between this library and a private configuration mechanism. The hope +is that this will ensure that configuration of fonts for all applications +can be centralized in one place. Centralizing font configuration will make +simplify and regularize font installation and customization. + +＠node Font Properties, Font Matching, Font Configuration, Overview +＠section Font Properties + +While font patterns may contain essentially any properties, there are some +well known properties with associated types. Fontconfig uses some of these +properties for font matching and font completion. Others are provided as a +convenience for the applications rendering mechanism. Some symbolic +constants are provided for common values or enumerated types. +＠xref{Constants}, for the list of standard properties and values. + + +＠node Font Matching, Font List Matching, Font Properties, Overview +＠section Font Matching + +Fontconfig performs matching by measuring the distance from a provided +pattern to all of the available fonts in the system. The closest matching +font is selected. This ensures that a font will always be returned, but +doesn't ensure that it is anything like the requested pattern. + +Font matching starts with an application constructed pattern. The desired +attributes of the resulting font are collected together in an FcPattern +object. Each property of the pattern can contain one or more values; these +are listed in priority order; matches earlier in the list are considered +"closer" than matches later in the list. + +The initial pattern is modified by applying the list of editing instructions +specific to patterns found in the configuration; each consists of a match +predicate and a set of editing operations. They are executed in the order +they appeared in the configuration. Each match causes the associated +sequence of editing operations to be applied. + +After the pattern has been edited, a sequence of default substitutions are +performed to canonicalize the set of available properties; this avoids the +need for the lower layers to constantly provide default values for various +font properties during rendering. + +The canonical font pattern is finally matched against all available fonts. +The distance from the pattern to the font is measured for each of several +properties: foundry, charset, family, lang, spacing, pixelsize, style, +slant, weight, antialias, rasterizer and outline. This list is in priority +order---results of comparing earlier elements of this list weigh more +heavily than later elements. + +There is one special case to this rule; family names are split into two +bindings; strong and weak. Strong family names are given greater precedence +in the match than lang elements while weak family names are given lower +precedence than lang elements. This permits the document language to drive +font selection when any document specified font is unavailable. + +The pattern representing that font is augmented to include any properties +found in the pattern but not found in the font itself; this permits the +application to pass rendering instructions or any other data through the +matching system. Finally, the list of editing instructions specific to +fonts found in the configuration are applied to the pattern. This modified +pattern is returned to the application. + +The return value contains sufficient information to locate and rasterize the +font, including the file name, pixel size and other rendering data. As +none of the information involved pertains to the FreeType library, +applications are free to use any rasterization engine or even to take +the identified font file and access it directly. + +The match/edit sequences in the configuration are performed in two passes +because there are essentially two different operations necessary -- the +first is to modify how fonts are selected; aliasing families and adding +suitable defaults. The second is to modify how the selected fonts are +rasterized. Those must apply to the selected font, not the original pattern +as false matches will often occur. + +＠node Font List Matching, Font Names, Font Matching, Overview +＠section Font List Matching + +While many applications want to locate a single font best matching their +search criteria, other applications need to build a set of fonts which can +be used to present any Unicode data. Fontconfig provides an API to generate +a list sorted by the nearness of each font to the pattern. Every font in +the system is considered, the best matching fonts are placed first. The +application then can select whether the remaining fonts are unconditionally +included in the list, or whether they are included only if they cover +portions of Unicode not covered by any of the preceeding fonts. + +The list resulting from this match is represented by references to the +original font patterns and so consumes very little memory. Using a list +entry involves creating a pattern which combines the information from the +font with the information from the original pattern and executing the font +substitutions. + +＠node Font Names, LANG Tags, Font List Matching, Overview +＠section Font Names + +Fontconfig provides a textual representation for patterns that the library +can both accept and generate. The representation is in three parts, first a +list of family names, second a list of point sizes and finally a list of +additional properties: + +＠example + <families>-<point sizes>:<name1>=<values1>:<name2>=<values2>... +＠end example + +Values in a list are separated with commas. A hyphen or comma in a family +name must be escaped with a backslash. The name needn't include either +families or point sizes; they can be elided. If the family name only is +given, the hyphen may be omitted. If there are no additional properties, +no trailing colon should be used. In addition, there are +symbolic constants that simultaneously indicate both a name and a value. +Here are some examples: + +＠example +Times-12 12 point Times Roman +Times-12:bold 12 point Times Bold +Courier:italic Courier Italic in the default size +Monospace:matrix=1 .1 0 1 The users preferred monospace font + with artificial obliquing +Mikachan\-PB-16 12 point Mikachan-PB +＠end example + +＠node LANG Tags, , Font Names, Overview +＠section LANG Tags + +Each font in the database contains a list of languages it supports. This is +computed by comparing the Unicode coverage of the font with the orthography +of each language. Languages are tagged using an RFC-3066 compatible naming +and occur in two parts -- the ISO639 language tag followed a hyphen and then +by the ISO 3166 country code. The hyphen and country code may be elided. + +Fontconfig has orthographies for several languages built into the library. +No provision has been made for adding new ones aside from rebuilding the +library. It currently supports 122 of the 139 languages named in ISO 639-1, +141 of the languages with two-letter codes from ISO 639-2 and another 30 +languages with only three-letter codes. + +＠node The fontconfig API, Configuration File Format, Overview, Top +＠chapter The fontconfig API + +＠example +#include <fontconfig/fontconfig.h> +#include <fontconfig/fcfreetype.h> +＠end example + +＠menu +* Constants:: +* Data Types:: +* Functions:: +＠end menu + +＠node Constants, Data Types, The fontconfig API, The fontconfig API + +While fontconfig is designed to be extensible, it provides a comprehensive +set of standard properties and values for fonts. + +The following table gives the list of standard font properties. The property +name is represented as a string. In C code a C preprocessor symbol may be +used to help with typo detection. + +＠example +Property CPP symbol Type Description + +family FC_FAMILY String Font family name +style FC_STYLE String Font style. Overrides weight and slant +slant FC_SLANT Int Italic, oblique or roman +weight FC_WEIGHT Int Light, medium, demibold, bold or black +size FC_SIZE Double Point size +aspect FC_ASPECT Double Stretch glyphs horizontally, then hint +pixelsize FC_PIXEL_SIZE Double Pixel size +spacing FC_SPACING Int Proportional, monospace or charcell +foundry FC_FOUNDRY String Font foundry name +antialias FC_ANTIALIAS Bool Should glyphs be antialiased? +hinting FC_HINTING Bool Should the rasterizer use hinting? +verticallayout FC_VERTICAL_LAYOUT Bool Use vertical layout +autohint FC_AUTOHINT Bool Use autohinter instead of normal hinter +globaladvance FC_GLOBAL_ADVANCE Bool Use font global advance data +file FC_FILE String The filename holding the font +index FC_INDEX Int The index of the font within the file +ftface FC_FT_FACE FT_Face Use the specified FreeType face object +rasterizer FC_RASTERIZER String Which rasterizer is in use +outline FC_OUTLINE Bool Whether the glyphs are outlines +scalable FC_SCALABLE Bool Whether glyphs can be scaled +scale FC_SCALE Double Point->pixel conversion scale factor +dpi FC_DPI Double Target dots per inch +rgba FC_RGBA Int unknown, rgb, bgr, vrgb, vbgr, none + - subpixel geometry +source FC_SOURCE String X11, freetype +minspace FC_MINSPACE Bool Eliminate leading from line spacing +charset FC_CHARSET CharSet Unicode chars encoded by the font +lang FC_LANG String List of RFC-3066-style languages + this font supports +fontversion FC_FONTVERSION Int From 'head' table +＠end example + +C code can check the fontconfig version number with the numerical +preprocessor constants ＠code{FC_MAJOR}, ＠code{FC_MINOR}, and +＠code{FC_REVISION}, or use the combined constant ＠code{FC_VERSION}, defined +as ＠code{FC_MAJOR*10000 + FC_MINOR*100 + FC_REVISION}. + +The cache version (format of ＠file{font.cache-1}?) is given by +＠code{FC_CACHE_VERSION}, and is a string, not an integer. The cache file +names are defined as ＠code{FC_DIR_CACHE_FILE} and ＠code{FC_USER_CACHE_FILE}. + +The Boolean constants are ＠code{FcFalse} (0) and ＠code{FcTrue} (1). + +Properties used to control the rasterizer, their preprocessor constants, and +their types, include: + +＠example +charwidth FC_CHAR_WIDTH Int +charheight FC_CHAR_HEIGHT Int +matrix FC_MATRIX FcMatrix +＠end example + +Preprocessor constants are defined for common standard font weights. All are +Ints. + +＠example +FC_WEIGHT_LIGHT 0 +FC_WEIGHT_MEDIUM 100 +FC_WEIGHT_DEMIBOLD 180 +FC_WEIGHT_BOLD 200 +FC_WEIGHT_BLACK 210 +＠end example + +Preprocessor constants are defined for common standard slants. All are Ints. + +＠example +FC_SLANT_ROMAN 0 +FC_SLANT_ITALIC 100 +FC_SLANT_OBLIQUE 110 +＠end example + +Preprocessor constants are defined for the three spacing types. All are +Ints, but should be treated as symbolic constants. + +＠example +FC_PROPORTIONAL 0 +FC_MONO 100 +FC_CHARCELL 110 +＠end example + +Preprocessor constants are defined for the subpixel orders. All are +Ints, but should be treated as symbolic constants. + +＠example +FC_RGBA_UNKNOWN 0 +FC_RGBA_RGB 1 +FC_RGBA_BGR 2 +FC_RGBA_VRGB 3 +FC_RGBA_VBGR 4 +FC_RGBA_NONE 5 +＠end example + + +＠node Data Types, Functions, Constants, The fontconfig API +＠section Data Types + +＠table ＠samp +＠item FcChar8 +＠itemx FcChar16 +＠itemx FcChar32 +＠itemx FcBool +These are primitive data types; the FcChar* types hold precisely the number +of bits stated (if supported by the C implementation). FcBool holds +one of two CPP symbols: FcFalse or FcTrue. + +＠item FcMatrix +An FcMatrix holds an affine transformation, usually used to reshape glyphs. +A small set of matrix operations are provided to manipulate these. + +＠example + typedef struct _FcMatrix ＠{ + double xx, xy, yx, yy; + ＠} FcMatrix; +＠end example + +＠item FcCharSet +An FcCharSet is an abstract type that holds the set of encoded unicode chars +in a font. Operations to build and compare these sets are provided. + +＠item FcType +Tags the kind of data stored in an FcValue. + +＠item FcValue +An FcValue object holds a single value with one of a number of different +types. The 'type' tag indicates which member is valid. + +＠example + typedef struct _FcValue ＠{ + FcType type; + union ＠{ + const FcChar8 *s; + int i; + FcBool b; + double d; + const FcMatrix *m; + const FcCharSet *c; + void *f; + const FcPattern *p; + const FcLangSet *l; + ＠} u; + ＠} FcValue; +＠end example + +＠example + type Union member Datatype + + FcTypeVoid (none) (none) + FcTypeInteger i int + FcTypeDouble d double + FcTypeString s TcChar8 * + FcTypeBool b b + FcTypeMatrix m FcMatrix * + FcTypeCharSet c FcCharSet * + FcTypeFTFace f void * + p FcPattern * + FcTypeLangSet l FcLangSet * +＠end example + +＠item FcPattern +holds a set of names with associated value lists; each name refers to a +property of a font. FcPatterns are used as inputs to the matching code as +well as holding information about specific fonts. Each property can hold +one or more values; conventionally all of the same type, although the +interface doesn't demand that. + +＠item FcFontSet + +＠example + typedef struct _FcFontSet ＠{ + int nfont; + int sfont; + FcPattern **fonts; + ＠} FcFontSet; +＠end example + +An FcFontSet contains a list of FcPatterns. Internally fontconfig uses this +data structure to hold sets of fonts. Externally, fontconfig returns the +results of listing fonts in this format. 'nfont' holds the number of +patterns in the 'fonts' array; 'sfont' is used to indicate the size of that +array. + +＠item FcStrSet +＠itemx FcStrList +FcStrSet holds a list of strings that can be appended to and enumerated. +Its unique characteristic is that the enumeration works even while strings +are appended during enumeration. FcStrList is used during enumeration to +safely and correctly walk the list of strings even while that list is edited +in the middle of enumeration. + +＠item FcObjectSet + +＠example + typedef struct _FcObjectSet ＠{ + int nobject; + int sobject; + const char **objects; + ＠} FcObjectSet; +＠end example +holds a set of names and is used to specify which fields from fonts are +placed in the the list of returned patterns when listing fonts. + +＠item FcObjectType + +＠example + typedef struct _FcObjectType ＠{ + const char *object; + FcType type; + ＠} FcObjectType; +＠end example +marks the type of a pattern element generated when parsing font names. +Applications can add new object types so that font names may contain the new +elements. + +＠item FcConstant + +＠example + typedef struct _FcConstant ＠{ + const FcChar8 *name; + const char *object; + int value; + ＠} FcConstant; +＠end example +Provides for symbolic constants for new pattern elements. When 'name' is +seen in a font name, an 'object' element is created with value 'value'. + +＠item FcBlanks +holds a list of Unicode chars which are expected to be blank; unexpectedly +blank chars are assumed to be invalid and are elided from the charset +associated with the font. + +＠item FcFileCache +holds the per-user cache information for use while loading the font +database. This is built automatically for the current configuration when +that is loaded. Applications must always pass '0' when one is requested. + +＠item FcConfig +holds a complete configuration of the library; there is one default +configuration, other can be constructed from XML data structures. All +public entry points that need global data can take an optional FcConfig* +argument; passing 0 uses the default configuration. FcConfig objects hold two +sets of fonts, the first contains those specified by the configuration, the +second set holds those added by the application at run-time. Interfaces +that need to reference a particulat set use one of the FcSetName enumerated +values. + +＠item FcSetName +Specifies one of the two sets of fonts available in a configuration; +FcSetSystem for those fonts specified in the configuration and +FcSetApplication which holds fonts provided by the application. + +＠item FcResult +Used as a return type for functions manipulating FcPattern objects. + +＠example +Result code Meaning +FcResultMatch Object exists with the specified ID +FcResultNoMatch Object doesn't exist at all +FcResultTypeMismatch Object exists, but the type doesn't match +FcResultNoId Object exists, but has fewer values than specified +＠end example + +＠item FcAtomic +Used for locking access to config files. Provides a safe way to update +configuration files. + +＠item FcMatchKind +An enumeration containing ＠code{FcMatchPattern} and ＠code{FcMatchFont}. + +＠item FcLangResult +An enumeration containing ＠code{FcLangEqual}, ＠code{FcLangDifferentCountry}, +and ＠code{FcLangDifferentLang}. Presumably ＠code{FcLangDifferentLang} +implies ＠code{FcLangDifferentCountry}. + +＠item FcSetName +An enumeration containing ＠code{FcSetSystem} and ＠code{FcSetApplication}. + +＠item FcEndian +An enumeration containing ＠code{FcEndianBig} and ＠code{FcEndianLittle}. +＠end table + +＠node Functions, , Data Types, The fontconfig API +＠section Functions + +＠menu +* FcMatrix:: +* FcCharSet:: +* FcValue:: +* FcPattern:: +* FcFontSet:: +* FcObjectSet:: +* FcObjectType:: +* FcLangSet:: +* Querying Fonts and Their Properties:: +* Initialization:: +* FcAtomic:: +* FreeType-Specific Functions:: +* XML-Specific Functions:: +* File and Directory Routines:: +* FcStrSet and FcStrList:: +* String Utilities:: +＠end menu + +＠node FcMatrix, FcCharSet, Functions, Functions +＠subsection FcMatrix + +FcMatrix structures hold an affine transformation in matrix form. + +＠example +#define FcMatrixInit(m) ((m)->xx = (m)->yy = 1, (m)->xy = (m)->yx = 0) +＠end example +Initializes a matrix to the identify transformation. + +＠deftypefun {FcMatrix *} FcMatrixCopy (const FcMatrix *＠var{mat}) + +Allocates a new FcMatrix and copies 'mat' into it. +＠end deftypefun + +＠deftypefun FcBool FcMatrixEqual (const FcMatrix *＠var{mat1}, const FcMatrix *var{mat2}) + +Returns FcTrue if 'mat1' and 'mat2' are equal, else FcFalse. +＠end deftypefun + +＠deftypefun void FcMatrixMultiply (FcMatrix *＠var{result}, const FcMatrix *＠var{a}, const FcMatrix *var{b}) + +Multiplies 'a' and 'b' together, placing the result in 'result'. 'result' +may refer to the sam matrix as either 'a' or 'b'. +＠end deftypefun + +＠deftypefun void FcMatrixRotate (FcMatrix *m, double c, double s) + +If 'c' is cos(angle) and 's' is sin(angle), FcMatrixRotate rotates the +matrix by 'angle'. +＠end deftypefun + +＠deftypefun void FcMatrixScale (FcMatrix *m, double sx, double sy) + +Scales 'm' by 'sx' in the horizontal dimension and 'sy' in the +vertical dimension. +＠end deftypefun + +＠deftypefun void FcMatrixShear (FcMatrix *m, double sh, double sv) +Shears 'm' by 'sh' in the horizontal direction and 'sv' in the +vertical direction. +＠end deftypefun + +＠node FcCharSet, FcValue, FcMatrix, Functions +＠subsection FcCharSet + +An FcCharSet is a boolean array indicating a set of unicode chars. Those +associated with a font are marked constant and cannot be edited. +FcCharSets may be reference counted internally to reduce memory consumption; +this may be visible to applications as the result of FcCharSetCopy may +return its argument, and that CharSet may remain unmodifiable. + +＠deftypefun {FcCharSet *} FcCharSetCreate (void) + +Creates an empty FcCharSet object. +＠end deftypefun + +＠deftypefun void FcCharSetDestroy (FcCharSet *fcs) + +Frees an FcCharSet object. +＠end deftypefun + +＠deftypefun FcBool FcCharSetAddChar (FcCharSet *fcs, FcChar32 ucs4) + +Adds a single unicode char to the set, returning FcFalse on +failure, either as a result of a constant set or from running out of memory. +＠end deftypefun + +＠deftypefun {FcCharSet *} FcCharSetCopy (FcCharSet *src) + +Makes a copy of 'src'; note that this may not actually do anything more than +increment the reference count on 'src'. +＠end deftypefun + +＠deftypefun FcBool FcCharSetEqual (const FcCharSet *a, const FcCharSet *b) + +Returns whether 'a' and 'b' contain the same set of unicode chars. +＠end deftypefun + +＠deftypefun {FcCharSet *} FcCharSetIntersect (const FcCharSet *a, const FcCharSet *b) + +Returns a set including only those chars found in both 'a' and 'b'. +＠end deftypefun + +＠deftypefun {FcCharSet *} FcCharSetUnion (const FcCharSet *a, const FcCharSet *b); + +Returns a set including only those chars found in either 'a' or 'b'. +＠end deftypefun + +＠deftypefun {FcCharSet *} FcCharSetSubtract (const FcCharSet *a, const FcCharSet *b) + +Returns a set including only those chars found in 'a' but not 'b'. +＠end deftypefun + +＠deftypefun FcBool FcCharSetHasChar (const FcCharSet *fcs, FcChar32 ucs4) + +Returns whether 'fcs' contains the char 'ucs4'. +＠end deftypefun + +＠deftypefun FcChar32 FcCharSetCount (const FcCharSet *a) + +Returns the total number of unicode chars in 'a'. +＠end deftypefun + +＠deftypefun FcChar32 FcCharSetIntersectCount (const FcCharSet *a, const FcCharSet *b) + +Returns the number of chars that are in both 'a' and 'b'. +＠end deftypefun + +＠deftypefun FcChar32 FcCharSetSubtractCount (const FcCharSet *a, const FcCharSet *b) + +Returns the number of chars that are in 'a' but not in 'b'. +＠end deftypefun + +＠deftypefun FcBool FcCharSetIsSubset (const FcCharSet *a, const FcCharSet *b) + +Returns whether 'a' is a subset of 'b'. +＠end deftypefun + +＠deftypefun FcChar32 FcCharSetFirstPage (const FcCharSet *a, FcChar32 [FC_CHARSET_MAP_SIZE], FcChar32 *next) + +Builds an array of bits marking the first page of Unicode coverage of 'a'. +Returns the base of the array. 'next' contains the next page in the font. +＠end deftypefun + +＠deftypefun FcChar32 FcCharSetNextPage (const FcCharSet *a, FcChar32 [FC_CHARSET_MAP_SIZE], FcChar32 *next) + +Builds an array of bits marking the Unicode coverage of 'a' for page '*next'. +Returns the base of the array. 'next' contains the next page in the font. +＠end deftypefun + +＠node FcValue, FcPattern, FcCharSet, Functions +＠subsection FcValue + +FcValue is a structure containing a type tag and a union of all possible +data types. The tag is an enum of type FcType and is intended to provide +a measure of run-time typechecking, although that depends on careful +programming. + +＠deftypefun void FcValueDestroy (FcValue v) + +Frees any memory referenced by `v'. Values of type FcTypeString, +FcTypeMatrix and FcTypeCharSet reference memory, the other types do not. +＠end deftypefun + +＠deftypefun FcValue FcValueSave (FcValue v) + +Returns a copy of `v' duplicating any object referenced by it so that `v' +may be safely destroyed without harming the new value. +＠end deftypefun + +＠deftypefun void FcValuePrint (const FcValue v) + +Prints an easily readable version of the value to stdout. There is +no provision for reparsing data in this format, it's just for diagnostics +and debugging. +＠end deftypefun + + +＠node FcPattern, FcFontSet, FcValue, Functions +＠subsection FcPattern + +An FcPattern is an opaque type that holds both patterns to match against the +available fonts, as well as the information about each font. + +＠deftypefun {FcPattern *} FcPatternCreate (void) + +Creates a pattern with no properties; used to build patterns from scratch. +＠end deftypefun + +＠deftypefun void FcPatternDestroy (FcPattern *p) + +Destroys a pattern, in the process destroying all related values. +＠end deftypefun + +＠deftypefun FcBool FcPatternEqual (const FcPattern *pa, const FcPattern *pb); + +Returns whether 'pa' and 'pb' are exactly alike. +＠end deftypefun + +＠deftypefun FcBool FcPatternEqualSubset (const FcPattern *pa, const FcPattern *pb, const FcObjectSet *os) + +Returns whether 'pa' and 'pb' have exactly the same values for all of the +objects in 'os'. +＠end deftypefun + +＠deftypefun FcChar32 FcPatternHash (const FcPattern *p) + +Returns a 32-bit number which is the same for any two patterns which are +exactly alike. +＠end deftypefun + +＠deftypefun FcBool FcPatternAdd (FcPattern *p, const char *object, FcValue value, FcBool append) + +Adds a single value to the list of values associated with the property named +`object'. If `append' is FcTrue, the value is added at the end of any +existing list, otherwise it is inserted at the begining. `value' is saved +(with FcValueSave) when inserted into the pattern so that the library +retains no reference to any application-supplied data structure. +＠end deftypefun + +＠deftypefun FcBool FcPatternAddWeak (FcPattern *p, const char *object, FcValue value, FcBool append) + +FcPatternAddWeak is essentially the same as FcPatternAdd except that any +values added to the list have binding 'weak' instead of 'strong'. +＠end deftypefun + +＠deftypefun FcBool FcPatternAddInteger (FcPattern *p, const char *object, int i) +＠deftypefunx FcBool FcPatternAddDouble (FcPattern *p, const char *object, double d) +＠deftypefunx FcBool FcPatternAddString (FcPattern *p, const char *object, const char *s) +＠deftypefunx FcBool FcPatternAddMatrix (FcPattern *p, const char *object, const FcMatrix *s) +＠deftypefunx FcBool FcPatternAddCharSet (FcPattern *p, const char *object, const FcCharSet *c) +＠deftypefunx FcBool FcPatternAddBool (FcPattern *p, const char *object, FcBool b) + +These are all convenience functions that insert objects of the specified +type into the pattern. Use these in preference to FcPatternAdd as they +will provide compile-time typechecking. These all append values to +any existing list of values. +＠end deftypefun + +＠deftypefun FcResult FcPatternGet (FcPattern *p, const char *object, int id, FcValue *v) + +Returns in `v' the `id'th value associated with the property `object'. +The value returned is not a copy, but rather refers to the data stored +within the pattern directly. Applications must not free this value. +＠end deftypefun + +＠deftypefun FcResult FcPatternGetInteger (FcPattern *p, const char *object, int id, int *i); +＠deftypefunx FcResult FcPatternGetDouble (FcPattern *p, const char *object, int id, double *d); +＠deftypefunx FcResult FcPatternGetString (FcPattern *p, const char *object, int id, char **const s); +＠deftypefunx FcResult FcPatternGetMatrix (FcPattern *p, const char *object, int id, FcMatrix **s); +＠deftypefunx FcResult FcPatternGetCharSet (FcPattern *p, const char *object, int id, FcCharSet **c); +＠deftypefunx FcResult FcPatternGetBool (FcPattern *p, const char *object, int id, FcBool *b); + +These are convenience functions that call FcPatternGet and verify that the +returned data is of the expected type. They return FcResultTypeMismatch if +this is not the case. Note that these (like FcPatternGet) do not make a +copy of any data structure referenced by the return value. Use these +in preference to FcPatternGet to provide compile-time typechecking. +＠end deftypefun + +＠deftypefun {FcPattern *} FcPatternBuild (FcPattern *orig, ...); +＠deftypefunx FcPattern *FcPatternVaBuild (FcPattern *orig, va_list va) + +Builds a pattern using a list of objects, types and values. Each +value to be entered in the pattern is specified with three arguments: +＠enumerate +＠item +Object name, a string describing the property to be added. +＠item +Object type, one of the FcType enumerated values +＠item +Value, not an FcValue, but the raw type as passed to any of the +FcPatternAdd<type> functions. Must match the type of the second +argument. +＠end enumerate + +The argument list is terminated by a null object name, no object type nor +value need be passed for this. The values are added to `pattern', if +`pattern' is null, a new pattern is created. In either case, the pattern is +returned. Example: + +＠example +pattern = FcPatternBuild (0, FC_FAMILY, FtTypeString, "Times", (char *) 0); +＠end example + +FcPatternVaBuild is used when the arguments are already in the form of a +varargs value. +＠end deftypefun + +＠deftypefun FcBool FcPatternDel (FcPattern *p, const char *object) + +Deletes all values associated with the property `object', returning +whether the property existed or not. +＠end deftypefun + +＠deftypefun void FcPatternPrint (const FcPattern *p) + +Prints an easily readable version of the pattern to stdout. There is +no provision for reparsing data in this format, it's just for diagnostics +and debugging. +＠end deftypefun + +＠deftypefun void FcDefaultSubstitute (FcPattern *pattern) + +Supplies default values for underspecified font patterns: +＠itemize +＠item +Patterns without a specified style or weight are set to Medium +＠item +Patterns without a specified style or slant are set to Roman +＠item +Patterns without a specified pixel size are given one computed from +any specified point size (default 12), dpi (default 75) and scale (default +1). +＠end itemize +＠end deftypefun + +＠deftypefun {FcPattern *} FcNameParse (const char *name) + +Converts 'name' from the standard text format described above into a pattern. +＠end deftypefun + +＠deftypefun FcChar8 *FcNameUnparse (FcPattern *pat) + +Converts the given pattern into the standard text format described above. +The return value is not static, but instead refers to newly allocated memory +which should be freed by the caller. +＠end deftypefun + +＠node FcFontSet, FcObjectSet, FcPattern, Functions +＠subsection FcFontSet + +An FcFontSet simply holds a list of patterns; these are used to return the +results of listing available fonts. + +＠deftypefun FcFontSet *FcFontSetCreate (void) + +Creates an empty font set. +＠end deftypefun + +＠deftypefun void FcFontSetDestroy (FcFontSet *s); + +Destroys a font set. Note that this destroys any referenced patterns as +well. +＠end deftypefun + +＠deftypefun FcBool FcFontSetAdd (FcFontSet *s, FcPattern *font) + +Adds a pattern to a font set. Note that the pattern is not copied before +being inserted into the set. +＠end deftypefun + +＠deftypefun void FcFontSetPrint (const FcFontSet *s) + +Prints an easily readable version of the font set to stdout. There is +no provision for reparsing data in this format, it's just for diagnostics +and debugging. +＠end deftypefun + + +＠node FcObjectSet, FcObjectType, FcFontSet, Functions +＠subsection FcObjectSet + +An FcObjectSet holds a list of pattern property names; it is used to +indicate which properties are to be returned in the patterns from +FcFontList. + +＠deftypefun FcObjectSet *FcObjectSetCreate (void) + +Creates an empty set. +＠end deftypefun + +＠deftypefun FcBool FcObjectSetAdd (FcObjectSet *os, const char *object) + +Adds a property name to the set. +＠end deftypefun + +＠deftypefun void FcObjectSetDestroy (FcObjectSet *os) + +Destroys an object set. +＠end deftypefun + +＠deftypefun FcObjectSet *FcObjectSetBuild (const char *first, ...) +＠deftypefunx FcObjectSet *FcObjectSetVaBuild (const char *first, va_list va) + +These build an object set from a null-terminated list of property names. +＠end deftypefun + +＠node FcObjectType, Querying Fonts and Their Properties, FcObjectSet, Functions +＠subsection FcObjectType + +Provides for application-specified font name object types so that new +pattern elements can be generated from font names. + +＠deftypefun FcBool FcNameRegisterObjectTypes (const FcObjectType *types, int ntype) + +Register 'ntype' new object types. +＠end deftypefun + +＠deftypefun FcBool FcNameUnregisterObjectTypes (const FcObjectType *types, int ntype) + +Unregister 'ntype' object types. +＠end deftypefun + +＠deftypefun const FcObjectType *FcNameGetObjectType (const char *object) + +Return the object type for the pattern element named 'object'. +＠end deftypefun + +FcConstant + +Provides for application-specified symbolic constants for font names. + +＠deftypefun FcBool FcNameRegisterConstants (const FcConstant *consts, int nconsts) + +Register 'nconsts' new symbolic constants. +＠end deftypefun + +＠deftypefun FcBool FcNameUnregisterConstants (const FcConstant *consts, int nconsts) + +Unregister 'nconsts' symbolic constants. +＠end deftypefun + +＠deftypefun const FcConstant *FcNameGetConstant (FcChar8 *string) + +Return the FcConstant structure related to symbolic constant 'string'. +＠end deftypefun + +＠deftypefun FcBool FcNameConstant (FcChar8 *string, int *result) + +Returns whether a symbolic constant with name 'string' is registered, +placing the value of the constant in 'result' if present. +＠end deftypefun + + +＠node FcLangSet, Querying Fonts and Their Properties, FcObjectType, Functions +＠subsection FcLangSet + +An ＠code{FcLangSet} holds a set of RFC 3066 language tags, ＠ref{LANG tags}. +This module provides functions to determine whether a given language is +fully supported by a font. Partial support can be determined using the +font's character set, ＠ref{FcCharSet}. + +＠deftypefun FcLangSet *FcLangSetCreate (void); + +Create an empty ＠code{FcLangSet}. +＠end deftypefun + +＠deftypefun void FcLangSetDestroy (FcLangSet *ls); + +Destroy a ＠code{FcLangSet}, freeing any associated storage. +＠end deftypefun + +＠deftypefun FcLangSet *FcLangSetCopy (const FcLangSet *ls); + +Copy ＠var{ls} to a newly allocated ＠code{FcLangSet}. +＠end deftypefun + +＠deftypefun FcBool FcLangSetAdd (FcLangSet *ls, const FcChar8 *lang); + +Add ＠var{lang} to ＠code{FcLangSet} ＠var{ls}. +＠end deftypefun + +＠deftypefun FcLangResult FcLangSetHasLang (const FcLangSet *ls, const FcChar8 *lang); + +Check whether ＠var{lang} is a member of ＠code{FcLangSet} ＠var{ls}. Note that +the return value is a ＠code{FcLangResult}, not a Boolean. +＠end deftypefun + +＠deftypefun FcLangResult FcLangSetCompare (const FcLangSet *lsa, const FcLangSet *lsb); + +#### Document me. +＠end deftypefun + +＠deftypefun FcBool FcLangSetEqual (const FcLangSet *lsa, const FcLangSet *lsb); + +Check whether the ＠code{FcLangSet}s ＠var{lsa} and ＠var{lsb} contain the same +members. +＠end deftypefun + +＠deftypefun FcChar32 FcLangSetHash (const FcLangSet *ls); + +Return a hash value; two ＠code{FcLangSet}s which hash to different values +cannot contain the same members. +＠end deftypefun + + +＠node Querying Fonts and Their Properties, Initialization, FcLangSet, Functions +＠subsection Querying Fonts and Their Properties + +An FcBlanks object holds a list of Unicode chars which are expected to +be blank when drawn. When scanning new fonts, any glyphs which are +empty and not in this list will be assumed to be broken and not placed in +the FcCharSet associated with the font. This provides a significantly more +accurate CharSet for applications. + +＠deftypefun FcBlanks *FcBlanksCreate (void) + +Creates an empty FcBlanks object. +＠end deftypefun + +＠deftypefun void FcBlanksDestroy (FcBlanks *b) + +Destroys an FcBlanks object, freeing any associated memory. +＠end deftypefun + +＠deftypefun FcBool FcBlanksAdd (FcBlanks *b, FcChar32 ucs4) + +Adds a single character to an FcBlanks object, returning FcFalse +if this process ran out of memory. +＠end deftypefun + +＠deftypefun FcBool FcBlanksIsMember (FcBlanks *b, FcChar32 ucs4) + +Returns whether the specified FcBlanks object contains the indicated Unicode +value. +＠end deftypefun + +The site or user may specify substitutions for certain font patterns, +for convenience or to get more accurate results for the local +installation or preferences. These functions execute the substitution +based on a specified configuration. + +＠deftypefun FcBool FcConfigSubstituteWithPat (FcConfig *config, FcPattern *p, FcPattern *p_pat FcMatchKind kind) + +Performs the sequence of pattern modification operations, if 'kind' is +FcMatchPattern, then those tagged as pattern operations are applied, else +if 'kind' is FcMatchFont, those tagged as font operations are applied and +p_pat is used for <test> elements with target=pattern. +＠end deftypefun + +＠deftypefun FcBool FcConfigSubstitute (FcConfig *config, FcPattern *p, FcMatchKind kind) + +Calls FcConfigSubstituteWithPat setting p_pat to NULL. +＠end deftypefun + +The following functions return fonts that match a certain pattern. +＠code{FcFontRenderPrepare} and ＠code{FcFontMatch} always return a single +best match. ＠code{FcFontList} returns the list of fonts that match a a +given pattern on a certain set of properties. ＠code{FcFontSort} returns +the entire list of fonts, sorted in order of match quality, possibly +filtering out fonts that do not provide additional characters beyond +those provided by preferred fonts. + +＠deftypefun {FcPattern *} FcFontRenderPrepare (FcConfig *config, FcPattern *pat, FcPattern *font) + +Creates a new pattern consisting of elements of 'font' not appearing +in 'pat', elements of 'pat' not appearing in 'font' and the best matching +value from 'pat' for elements appearing in both. The result is passed to +FcConfigSubstitute with 'kind' FcMatchFont and then returned. +＠end deftypefun + +＠deftypefun {FcPattern *} FcFontMatch (FcConfig *config, FcPattern *p, FcResult *result) + +Returns the font in 'config' most close matching 'p'. This function +should be called only after FcConfigSubstitute and FcDefaultSubstitute have +been called for 'p'; otherwise the results will not be correct. +＠end deftypefun + +＠deftypefun FcFontSet *FcFontList (FcConfig *config, FcPattern *p, FcObjectSet *os) + +Selects fonts matching 'p', creates patterns containing only the objects in +'os' from those fonts, and returns the set of unique such patterns. + +The FcFontSet returned by FcFontList is destroyed by calling FcFontSetDestroy. +＠end deftypefun + +＠deftypefun FcFontSet *FcFontSort (FcConfig *config, FcPattern *p, FcBool trim, FcCharSet **csp, FcResult *result) + +Returns the list of all fonts sorted by closeness to 'p'. If 'trim' is +FcTrue, elements in the list which don't include Unicode coverage not +provided by earlier elements in the list are elided. The union of +Unicode coverage of all of the fonts is returned in 'csp', if 'csp' is +not NULL. This function should be called only after FcConfigSubstitute +and FcDefaultSubstitute have been called for 'p'; otherwise the results +will not be correct. + +The returned FcFontSet references FcPattern structures which may be shared +by the return value from multiple FcFontSort calls, applications must not +modify these patterns. Instead, they should be passed, along with 'p' to +FcFontRenderPrepare which combines them into a complete pattern. + +The FcFontSet returned by FcFontSort is destroyed by calling FcFontSetDestroy. +＠end deftypefun + + +＠node Initialization, FcAtomic, Querying Fonts and Their Properties, Functions +＠subsection Initialization + +An FcConfig object holds the internal representation of a configuration. +There is a default configuration which applications may use by passing 0 to +any function using the data within an FcConfig. + +＠deftypefun FcConfig *FcConfigCreate (void) + +Creates an empty configuration. +＠end deftypefun + +＠deftypefun void FcConfigDestroy (FcConfig *config) + +Destroys a configuration and any data associated with it. Note that calling +this function with the return from FcConfigGetCurrent will place the library +in an indeterminate state. +＠end deftypefun + +＠deftypefun FcBool FcConfigSetCurrent (FcConfig *config) + +Sets the current default configuration to 'config'. Implicitly calls +FcConfigBuildFonts if necessary, returning FcFalse if that call fails. +＠end deftypefun + +＠deftypefun FcConfig *FcConfigGetCurrent (void) + +Returns the current default configuration. +＠end deftypefun + +＠deftypefun FcBool FcConfigUptoDate (FcConfig *config) + +Checks all of the files related to 'config' and returns whether the +in-memory version is in sync with the disk version. +＠end deftypefun + +＠deftypefun FcBool FcConfigBuildFonts (FcConfig *config) + +Builds the set of available fonts for the given configuration. Note that +any changes to the configuration after this call have indeterminate effects. +Returns FcFalse if this operation runs out of memory. +＠end deftypefun + +＠deftypefun FcStrList *FcConfigGetConfigDirs (FcConfig *config) + +Returns the list of font directories specified in the configuration files +for 'config'. Does not include any subdirectories. +＠end deftypefun + +＠deftypefun FcStrList *FcConfigGetFontDirs (FcConfig *config) + +Returns the list of font directories in 'config'. This includes the +configured font directories along with any directories below those in the +filesystem. +＠end deftypefun + +＠deftypefun FcStrList *FcConfigGetConfigFiles (FcConfig *config) + +Returns the list of known configuration files used to generate 'config'. +Note that this will not include any configuration done with FcConfigParse. +＠end deftypefun + +＠deftypefun char *FcConfigGetCache (FcConfig *config) + +Returns the name of the file used to store per-user font information. +＠end deftypefun + +＠deftypefun FcFontSet *FcConfigGetFonts (FcConfig *config, FcSetName set) + +Returns one of the two sets of fonts from the configuration as specified +by 'set'. +＠end deftypefun + +＠deftypefun FcBlanks *FcConfigGetBlanks (FcConfig *config) + +Returns the FcBlanks object associated with the given configuration, if no +blanks were present in the configuration, this function will return 0. +＠end deftypefun + +＠deftypefun int FcConfigGetRescanInverval (FcConfig *config) + +Returns the interval between automatic checks of the configuration (in +seconds) specified in 'config'. The configuration is checked during +a call to FcFontList when this interval has passed since the last check. +＠end deftypefun + +＠deftypefun FcBool FcConfigSetRescanInverval (FcConfig *config, int rescanInterval) + +Sets the rescan interval; returns FcFalse if an error occurred. +＠end deftypefun + +＠deftypefun FcBool FcConfigAppFontAddFile (FcConfig *config, const char *file) + +Adds an application-specific font to the configuration. +＠end deftypefun + +＠deftypefun FcBool FcConfigAppFontAddDir (FcConfig *config, const char *dir) + +Scans the specified directory for fonts, adding each one found to the +application-specific set of fonts. +＠end deftypefun + +＠deftypefun void FcConfigAppFontClear (FcConfig *config) + +Clears the set of application-specific fonts. +＠end deftypefun + +These functions provide some control over how the default configuration of +the library is initialized. (This configuration is normally implicitly +initialized.) + +＠deftypefun char *FcConfigFilename (const char *name) + +Given the specified external entity name, return the associated filename. +This provides applications a way to convert various configuration file +references into filename form. + +A null or empty 'name' indicates that the default configuration file should +be used; which file this references can be overridden with the +FC_CONFIG_FILE environment variable. Next, if the name starts with '~', it +refers to a file in the current users home directory. Otherwise if the name +doesn't start with '/', it refers to a file in the default configuration +directory; the built-in default directory can be overridden with the +FC_CONFIG_DIR environment variable. +＠end deftypefun + +＠deftypefun FcConfig *FcInitLoadConfig (void) + +Loads the default configuration file and returns the resulting configuration. +Does not load any font information. +＠end deftypefun + +＠deftypefun FcConfig *FcInitLoadConfigAndFonts (void) + +Loads the default configuration file and builds information about the +available fonts. Returns the resulting configuration. +＠end deftypefun + +＠deftypefun FcBool FcInit (void) + +Loads the default configuration file and the fonts referenced therein and +sets the default configuration to that result. Returns whether this +process succeeded or not. If the default configuration has already +been loaded, this routine does nothing and returns FcTrue. +＠end deftypefun + +＠deftypefun int FcGetVersion (void) + +Returns the version number of the library. +＠end deftypefun + +＠deftypefun FcBool FcInitReinitialize (void) + +Forces the default configuration file to be reloaded and resets the default +configuration. +＠end deftypefun + +＠deftypefun FcBool FcInitBringUptoDate (void) + +Checks the rescan interval in the default configuration, checking the +configuration if the interval has passed and reloading the configuration +when any changes are detected. +＠end deftypefun + + +＠node FcAtomic, FreeType-Specific Functions, Initialization, Functions +＠subsection FcAtomic + +These functions provide a safe way to update config files, allowing ongoing +reading of the old config file while locked for writing and ensuring that a +consistent and complete version of the config file is always available. + +＠deftypefun FcAtomic * FcAtomicCreate (const FcChar8 *file) + +Creates a data structure containing data needed to control access to 'file'. +Writing is done to a separate file. Once that file is complete, the original +configuration file is atomically replaced so that reading process always see +a consistent and complete file without the need to lock for reading. +＠end deftypefun + +＠deftypefun FcBool FcAtomicLock (FcAtomic *atomic) + +Attempts to lock the file referenced by 'atomic'. Returns FcFalse if the +file is locked by another process, else returns FcTrue and leaves the file +locked. +＠end deftypefun + +＠deftypefun FcChar8 *FcAtomicNewFile (FcAtomic *atomic) + +Returns the filename for writing a new version of the file referenced +by 'atomic'. +＠end deftypefun + +＠deftypefun FcChar8 *FcAtomicOrigFile (FcAtomic *atomic) + +Returns the file refernced by 'atomic'. +＠end deftypefun + +＠deftypefun FcBool FcAtomicReplaceOrig (FcAtomic *atomic) + +Replaces the original file referenced by 'atomic' with the new file. +＠end deftypefun + +＠deftypefun void FcAtomicDeleteNew (FcAtomic *atomic) + +Deletes the new file. +＠end deftypefun + +＠deftypefun void FcAtomicUnlock (FcAtomic *atomic) + +Unlocks the file. +＠end deftypefun + +＠deftypefun void FcAtomicDestroy (FcAtomic *atomic) + +Destroys 'atomic'. +＠end deftypefun + +＠node FreeType-Specific Functions, XML-Specific Functions, FcAtomic, Functions +＠subsection FreeType-Specific Functions + +＠example +#include <fontconfig/fcfreetype.h> +＠end example + +While the fontconfig library doesn't insist that FreeType be used as the +rasterization mechanism for fonts, it does provide some convenience +functions. + +＠deftypefun FT_UInt FcFreeTypeCharIndex (FT_Face face, FcChar32 ucs4) + +Maps a Unicode char to a glyph index. This function uses information from +several possible underlying encoding tables to work around broken fonts. +As a result, this function isn't designed to be used in performance +sensitive areas; results from this function are intended to be cached by +higher level functions. +＠end deftypefun + +＠deftypefun {FcCharSet *} FcFreeTypeCharSet (FT_Face face, FcBlanks *blanks) Scans a + +FreeType face and returns the set of encoded Unicode chars. This scans +several encoding tables to build as complete a list as possible. +If 'blanks' is not 0, the glyphs in the font are examined and any blank glyphs +not in 'blanks' are not placed in the returned FcCharSet. +＠end deftypefun + +＠deftypefun {FcPattern *} FcFreeTypeQuery (const char *file, int id, FcBlanks *blanks, int *count) + +Constructs a pattern representing the 'id'th font in 'file'. The number +of fonts in 'file' is returned in 'count'. +＠end deftypefun + +＠node XML-Specific Functions, File and Directory Routines, FreeType-Specific Functions, Functions +＠subsection XML-Specific Functions + +＠deftypefun FcBool FcConfigParseAndLoad (FcConfig *config, const FcChar8 *file, FcBool complain) + +Walks the configuration in 'file' and constructs the internal representation +in 'config'. Any include files referenced from within 'file' will be loaded +with FcConfigLoad and also parsed. If 'complain' is FcFalse, no warning +will be displayed if 'file' does not exist. +＠end deftypefun + +＠node File and Directory Routines, FcStrSet and FcStrList, XML-Specific Functions, Functions +＠subsection File and Directory Routines + +＠deftypefun FcBool FcFileScan (FcFontSet *set, FcStrSet *dirs, FcFileCache *cache, FcBlanks *blanks, const char *file, FcBool force) + +Scans a single file and adds all fonts found to 'set'. If 'force' is FcTrue, +then the file is scanned even if associated information is found in 'cache'. +If 'file' is a directory, it is added to 'dirs'. +＠end deftypefun + +＠deftypefun FcBool FcDirScan (FcFontSet *set, FcStrSet *dirs, FcFileCache *cache, FcBlanks *blanks, const char *dir, FcBool force) + +Scans an entire directory and adds all fonts found to 'set'. If 'force' is +FcTrue, then the directory and all files within it are scanned even if +information is present in the per-directory cache file or 'cache'. Any +subdirectories found are added to 'dirs'. +＠end deftypefun + +＠deftypefun FcBool FcDirSave (FcFontSet *set, FcStrSet *dirs, const char *dir) + +Creates the per-directory cache file for 'dir' and populates it with the +fonts in 'set' and subdirectories in 'dirs'. +＠end deftypefun + +＠deftypefun FcBool FcDirCacheValid (const FcChar8 *cache_file) + +Returns FcTrue if 'cache_file' is no older than the directory containing it, +else FcFalse. +＠end deftypefun + +＠node FcStrSet and FcStrList, String Utilities, File and Directory Routines, Functions +＠subsection FcStrSet and FcStrList + +A data structure for enumerating strings, used to list directories while +scanning the configuration as directories are added while scanning. + +＠deftypefun FcStrSet *FcStrSetCreate (void) + +Create an empty set. +＠end deftypefun + +＠deftypefun FcBool FcStrSetMember (FcStrSet *set, const FcChar8 *s) + +Returns whether 's' is a member of 'set'. +＠end deftypefun + +＠deftypefun FcBool FcStrSetAdd (FcStrSet *set, const FcChar8 *s) + +Adds a copy of 's' to 'set'. +＠end deftypefun + +＠deftypefun FcBool FcStrSetAddFilename (FcStrSet *set, const FcChar8 *s) + +Adds a copy 's' to 'set', The copy is created with FcStrCopyFilename +so that leading '~' values are replaced with the value of the HOME +environment variable. +＠end deftypefun + +＠deftypefun FcBool FcStrSetDel (FcStrSet *set, const FcChar8 *s) + +Removes 's' from 'set', returning FcTrue if 's' was a member else FcFalse. +＠end deftypefun + +＠deftypefun void FcStrSetDestroy (FcStrSet *set) + +Destroys 'set'. +＠end deftypefun + +＠deftypefun FcStrList *FcStrListCreate (FcStrSet *set) + +Creates an enumerator to list the strings in 'set'. +＠end deftypefun + +＠deftypefun FcChar8 *FcStrListNext (FcStrList *list) + +Returns the next string in 'set'. +＠end deftypefun + +＠deftypefun void FcStrListDone (FcStrList *list) + +Destroys the enumerator 'list'. +＠end deftypefun + +＠node String Utilities, , FcStrSet and FcStrList, Functions +＠subsection String Utilities + +＠deftypefun int FcUtf8ToUcs4 (FcChar8 *src, FcChar32 *dst, int len) + +Converts the next Unicode char from 'src' into 'dst' and returns the number +of bytes containing the char. 'src' must be at least 'len' bytes long. +＠end deftypefun + +＠deftypefun int FcUcs4ToUtf8 (FcChar32 src, FcChar8 dst[FC_UTF8_MAX_LEN]) + +Converts the Unicode char from 'src' into 'dst' and returns the +number of bytes needed to encode the char. +＠end deftypefun + +＠deftypefun FcBool FcUtf8Len (FcChar8 *src, int len, int *nchar, int *wchar) + +Counts the number of Unicode chars in 'len' bytes of 'src'. Places that +count in 'nchar'. 'wchar' contains 1, 2 or 4 depending on the number of +bytes needed to hold the largest unicode char counted. The return value +indicates whether 'src' is a well-formed UTF8 string. +＠end deftypefun + +＠deftypefun int FcUtf16ToUcs4 (FcChar8 *src, FcEndian endian, FcChar32 *dst, int len) + +Converts the next Unicode char from 'src' into 'dst' and returns the +number of bytes containing the char. 'src' must be at least 'len' bytes +long. Bytes of 'src' are combined into 16-bit units according to 'endian'. +＠end deftypefun + +＠deftypefun FcBool FcUtf16Len (FcChar8 *src, FcEndian endian, int len, int *nchar, int *wchar) + +Counts the number of Unicode chars in 'len' bytes of 'src'. Bytes of 'src' +are combined into 16-bit units according to 'endian'. Places that +count in 'nchar'. 'wchar' contains 1, 2 or 4 depending on the number of +bytes needed to hold the largest unicode char counted. The return value +indicates whether 'string' is a well-formed UTF16 string. +＠end deftypefun + +＠deftypefun FcChar8 *FcStrCopy (const FcChar8 *s) + +Allocates memory, copies 's' and returns the resulting buffer. Yes, this +is 'strdup', but that function isn't available on every platform. +＠end deftypefun + +＠deftypefun FcChar8 *FcStrCopyFilename (const FcChar8 *s) + +Just like FcStrCopy except that it converts any leading '~' characters +in 's' to the value of the HOME environment variable. +＠end deftypefun + +＠deftypefun int FcStrCmpIgnoreCase (const char *s1, const char *s2) + +Returns the usual <0, 0, >0 result of comparing 's1' and 's2'. This test +is case-insensitive in the ASCII range and will operate properly with UTF8 +encoded strings, although it does not check for well formed strings. +＠end deftypefun + +＠deftypefun FcChar8 *FcStrDirname (const FcChar8 *file) + +Returns the directory containing 'file'. +＠end deftypefun + +＠deftypefun FcChar8 *FcStrBasename (const FcChar8 *file) + +Returns the filename of 'file' stripped of any leading directory names. +＠end deftypefun + +＠node Configuration File Format, Files, The fontconfig API, Top +＠chapter Configuration File Format + +Configuration files for fontconfig are stored in XML format; this +format makes external configuration tools easier to write and ensures that +they will generate syntactically correct configuration files. As XML +files are plain text, they can also be manipulated by the expert user using +a text editor. + +The fontconfig document type definition resides in the external entity +(a)samp{fonts.dtd}; this is normally stored in the default font configuration +directory (＠file{/etc/fonts}). Each configuration file should contain the +following structure: + +＠example + <?xml version="1.0"?> + <!DOCTYPE fontconfig SYSTEM "fonts.dtd"> + <fontconfig> + ... + </fontconfig> +＠end example + +＠table ＠samp +＠item <fontconfig> +This is the top level element for a font configuration and can contain +＠samp{<dir>}, ＠samp{<cache>}, ＠samp{<include>}, ＠samp{<match>} and ＠samp{<alias>} elements in any order. + +＠item <dir> +This element contains a directory name which will be scanned for font files +to include in the set of available fonts. The scan does not recurse into +subdirectories. + +＠item <cache> +This element contains a file name for the per-user cache of font +information. If it starts with '~', it refers to a file in the users +home directory. This file is used to hold information about fonts that +isn't present in the per-directory cache files. It is automatically +maintained by the fontconfig library. The default for this file +is ``~/.fonts.cache-<version>'', where <version> is the font configuration +file version number (currently 1). + +＠item <include ignore_missing="no"> +This element contains the name of an additional configuration file. When +the XML datatype is traversed by FcConfigParse, the contents of the file +will also be incorporated into the configuration by passing the filename to +FcConfigLoadAndParse. If 'ignore_missing' is set to "yes" instead of the +default "no", a missing file will elicit no warning message from the library. + +＠item <config> +This element provides a place to consolidate additional configuration +information. ＠samp{<config>} can contain ＠samp{<blank>} and ＠samp{<rescan>} elements in any +order. + +＠item <blank> +Fonts often include "broken" glyphs which appear in the encoding but are +drawn as blanks on the screen. Within the ＠samp{<blank>} element, place each +Unicode characters which is supposed to be blank in an ＠samp{<int>} element. +Characters outside of this set which are drawn as blank will be elided from +the set of characters supported by the font. + +＠item <rescan> +The ＠samp{<rescan>} element holds an ＠samp{<int>} element which indicates the default +interval between automatic checks for font configuration changes. +Fontconfig will validate all of the configuration files and directories and +automatically rebuild the internal datastructures when this interval passes. + +＠item <match target="pattern"> +This element holds first a (possibly empty) list of ＠samp{<test>} elements and then +a (possibly empty) list of ＠samp{<edit>} elements. Patterns which match all of the +tests are subjected to all the edits. If 'target' is set to "font" instead +of the default "pattern", then this element applies to the font name +resulting from a match rather than a font pattern to be matched. + +＠item <test qual="any" name="property" compare="eq"> +This element contains a single value which is compared with the pattern +property "property" (substitute any of the property names seen +above). 'compare' can be one of "eq", "not_eq", "less", "less_eq", "more", or +"more_eq". 'qual' may either be the default, "any", in which case the match +succeeds if any value associated with the property matches the test value, or +"all", in which case all of the values associated with the property must +match the test value. + +＠item <edit name="property" mode="assign" binding="weak"> +This element contains a list of expression elements (any of the value or +operator elements). The expression elements are evaluated at run-time and +modify the property "property". The modification depends on whether +"property" was matched by one of the associated ＠samp{<test>} elements, if so, the +modification may affect the first matched value. Any values inserted into +the property are given the indicated binding. 'mode' is one of: + +＠example +Mode Operation with match Operation without match + +"assign" Replace matching value Replace all values +"assign_replace" Replace all values Replace all values +"prepend" Insert before matching value Insert at head of list +"prepend_first" Insert at head of list Insert at head of list +"append" Append after matching value Append at end of list +"append_last" Append at end of list Append at end of list +＠end example + +＠item <int> +＠itemx <double> +＠itemx <string> +＠itemx <bool> +These elements hold a single value of the indicated type. ＠samp{<bool>} elements +hold either true or false. + +＠item <matrix> + +This element holds the four ＠samp{<double>} elements of an affine transformation. + +＠item <name> +Holds a property name. Evaluates to the first value from the property of +the font, not the pattern. + +＠item <const> +Holds the name of a constant; these are always integers and serve as +symbolic names for common font values: + +＠example +Constant Property CPP symbol + +light weight FC_WEIGHT_LIGHT +medium weight FC_WEIGHT_MEDIUM +demibold weight FC_WEIGHT_DEMIBOLD +bold weight FC_WEIGHT_BOLD +black weight FC_WEIGHT_BLACK +roman slant FC_SLANT_ROMAN +italic slant FC_SLANT_ITALIC +oblique slant FC_SLANT_OBLIQUE +proportional spacing FC_PROPORTIONAL +mono spacing FC_MONO +charcell spacing FC_CHARCELL +unknown rgba FC_RGBA_UNKNOWN +rgb rgba FC_RGBA_RGB +bgr rgba FC_RGBA_BGR +vrgb rgba FC_RGBA_VRGB +vbgr rgba FC_RGBA_VBGR +none rgba FC_RGBA_NONE +＠end example + +＠item <or> +＠itemx <and> +＠itemx <plus> +＠itemx <minus> +＠itemx <times> +＠itemx <divide> +These elements perform the specified operation on a list of expression +elements. ＠samp{<or>} and ＠samp{<and>} are boolean, not bitwise. + +＠item <eq> +＠itemx <not_eq> +＠itemx <less> +＠itemx <less_eq> +＠itemx <more> +＠itemx <more_eq> +These elements compare two values, producing a boolean result. + +＠item <not> +Inverts the boolean sense of its one expression element + +＠item <if> +This element takes three expression elements; if the value of the first is +true, it produces the value of the second, otherwise it produces the value +of the third. + +＠item <alias> +Alias elements provide a shorthand notation for the set of common match +operations needed to substitute one font family for another. They contain a +＠samp{<family>} element followed by optional ＠samp{<prefer>}, ＠samp{<accept>} and ＠samp{<default>} +elements. Fonts matching the ＠samp{<family>} element are edited to prepend the +list of ＠samp{<prefer>}ed families before the matching ＠samp{<family>}, append the +＠samp{<accept>}able families after the matching ＠samp{<family>} and append the ＠samp{<default>} +families to the end of the family list. + +＠item <family> +Holds a single font family name + +＠item <prefer> +＠itemx <accept> +＠itemx <default> +These each hold a list of ＠samp{<family>} elements to be used by the ＠samp{<alias>} +element. +＠end table + +＠menu +* Example System Configuration File:: +* Example User Configuration File:: +＠end menu + +＠node Example System Configuration File, Example User Configuration File, Configuration File Format, Configuration File Format +＠section Example System Configuration File + +This is an example of a system-wide configuration file: + +＠example +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> + +<fontconfig> + +<dir>/usr/X11R6/lib/X11/fonts/truetype</dir> +<dir>/usr/X11R6/lib/X11/fonts/Type1</dir> + + +<match target="pattern"> + <test qual="any" name="family"><string>mono</string></test> + <edit name="family" mode="assign"><string>monospace</string></edit> +</match> + + +<match target="pattern"> + <test qual="all" name="family" mode="not_eq">sans</test> + <test qual="all" name="family" mode="not_eq">serif</test> + <test qual="all" name="family" mode="not_eq">monospace</test> + <edit name="family" mode="append_last"><string>sans</string></edit> +</match> + + +<include ignore_missing="yes">~/.fonts.conf</include> + + +<alias> + <family>Times</family> + <prefer><family>Times New Roman</family></prefer> + <default><family>serif</family></default> +</alias> +<alias> + <family>Helvetica</family> + <prefer><family>Verdana</family></prefer> + <default><family>sans</family></default> +</alias> +<alias> + <family>Courier</family> + <prefer><family>Courier New</family></prefer> + <default><family>monospace</family></default> +</alias> + + +<alias> + <family>serif</family> + <prefer><family>Times New Roman</family></prefer> +</alias> +<alias> + <family>sans</family> + <prefer><family>Verdana</family></prefer> +</alias> +<alias> + <family>monospace</family> + <prefer><family>Andale Mono</family></prefer> +</alias> +</fontconfig> +＠end example + +＠node Example User Configuration File, , Example System Configuration File, Configuration File Format +＠section Example User Configuration File + +This is an example of a per-user configuration file that lives in +(a)file{~/.fonts.conf}: + +＠example +<?xml version="1.0"?> +<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> + +<fontconfig> + + +<dir>~/misc/fonts</dir> + + +<match target="font"> + <edit name="rgba" mode="assign"><const>rgb</const></edit> +</match> +</fontconfig> +＠end example + +＠node Files, Authors, Configuration File Format, Top +＠chapter Files + +＠table ＠file +＠item fonts.dtd +is a DTD that describes the format of the configuration files. + +＠item fonts.conf +is the default system-wide font configuration file. It +contains configuration information for the fontconfig library +consisting of directories to look at for font information as well as +instructions on editing program specified font patterns before attempting to +match the available fonts. It is in xml format, with DTD ＠file{fonts.dtd}. + +＠item local.conf +is the conventional default location for local font configuration. It +is sourced by the default system-wide fonts.conf file. +Note that the normal 'make install' procedure for XFree86 is to +replace any existing fonts.conf file with the new version. Place +any local customizations in local.conf which this file references. +It is in xml format, with DTD ＠file{fonts.dtd}. + +＠item ~/.fonts.conf +is the conventional location for per-user font configuration, although the +actual location is specified in the global fonts.conf file. +It is in xml format, with DTD ＠file{fonts.dtd}. + +＠item fonts.cache-* +is found in each font directory where fonts were found. This file is +automatically maintained by fontconfig. It is a flat text table, and +should be treated as opaque. + +＠item ~/.fonts.cache-* +is the conventional repository of font information that isn't found in the +per-directory caches. This file is automatically maintained by fontconfig. +It is a flat text table, and should be treated as opaque. +＠end table + +＠node Authors, , Files, Top +＠chapter Authors + +＠table ＠strong +＠item Keith Packard +member of the XFree86 Project, Inc. + +＠item Stephen J. Turnbull +member of the XEmacs Project +＠end table + +＠bye + +＠c Local variables: +＠c mode: texinfo +＠c End: + +＠c arch-tag: 108A3E8B-1CE1-11D9-9957-000A959E994E + +＠c end of fontconfig.texi -- Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Ask not how you can "do" free software business; ask what your business can "do for" free software.

2 participants
5 comments

[C] ECB: Sync with current upstream 2.31 19 years, 4 months

Berndl, Klaus

? ecb-autoloads.el Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/ChangeLog,v retrieving revision 1.50 diff -u -r1.50 ChangeLog --- ChangeLog 1 Dec 2004 16:31:37 -0000 1.50 +++ ChangeLog 10 Dec 2004 16:06:05 -0000 ＠＠ -1,3 +1,7 ＠＠ +2004-12-10 Klaus Berndl <klaus.berndl(a)sdm.de> + + * Sync with current upstream 2.31 + 2004-12-01 Norbert Koch <viteno(a)xemacs.org> * Makefile (VERSION): XEmacs package 1.20 released. Index: Makefile =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/Makefile,v retrieving revision 1.41 diff -u -r1.41 Makefile --- Makefile 1 Dec 2004 16:31:38 -0000 1.41 +++ Makefile 10 Dec 2004 16:06:05 -0000 ＠＠ -18,7 +18,7 ＠＠ # Boston, MA 02111-1307, USA. VERSION = 1.20 -AUTHOR_VERSION = 2.30.1 +AUTHOR_VERSION = 2.31 MAINTAINER = Klaus Berndl <klaus.berndl(a)sdm.de> PACKAGE = ecb PKG_TYPE = regular Index: Makefile.upstream =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/Makefile.upstream,v retrieving revision 1.15 diff -u -r1.15 Makefile.upstream --- Makefile.upstream 1 Dec 2004 16:04:53 -0000 1.15 +++ Makefile.upstream 10 Dec 2004 16:06:06 -0000 ＠＠ -26,7 +26,7 ＠＠ # GNU Emacs; see the file COPYING. If not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# $Id: Makefile.upstream,v 1.15 2004/12/01 16:04:53 berndl Exp $ +# $Id: Makefile,v 1.102 2004/12/10 12:56:32 berndl Exp $ # ======================================================================== ＠＠ -144,11 +144,11 ＠＠ # Do not change anything below! -# $Id: Makefile.upstream,v 1.15 2004/12/01 16:04:53 berndl Exp $ +# $Id: Makefile,v 1.102 2004/12/10 12:56:32 berndl Exp $ # For the ECB-maintainers: Change the version-number here and not # elsewhere! -ecb_VERSION=2.30.1 +ecb_VERSION=2.31 include ecb-makedef.mk Index: NEWS =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/NEWS,v retrieving revision 1.13 diff -u -r1.13 NEWS --- NEWS 1 Dec 2004 16:04:53 -0000 1.13 +++ NEWS 10 Dec 2004 16:06:07 -0000 ＠＠ -1,3 +1,56 ＠＠ +* Changes for ECB version 2.31 + +** Fixed bugs + +*** Fixed a recently introduced bug with XEmacs and an active isearch. + This bug occured when a user has clicked onto a node in a tree-buffer + during an active isearch and it had as result completely out-of-order + tree-buffers. This buf is now fixed and should never occur. + +*** Fixed a bug concerning accessing root-drives in native window-XEmacs + Fixes an annoying behavior of the native windows-version of XEmacs: When a + path contains only a drive-letter and a : (e.g. C:) then + `expand-file-name' (and a lot of other file-operations) do not interpret + this path as root of that drive. So ECB adds temporary a trailing + `directory-sep-char' and calls file-operations like `expand-file-name' + with this new path because then `expand-file-name' treats this as root-dir + of that drive. For all (X)Emacs-version besides the native-windows-XEmacs + this fix is not needed and takes no effect. + +*** Better recognizing of remote CVS-root-repositories for the VC-support + +** Enhancement for the VC-support + +*** New option `ecb-vc-xemacs-exclude-remote-cvs-repository' + This excludes directories with a remote cvs-repository from VC-check. This + option takes only effect for XEmacs and is needed cause of the outdated + VC-package of XEmacs which offers no heuristic state-checking and also no + option `vc-cvs-stay-local'. So this option takes only effect if + `vc-cvs-stay-local' is not avaiable. In this case ECB treats directories + which are managed by CVS but have a remote repository as if the directory + would not being managed by CVS (so the files are not checked for their + VC-state). This is done to avoid blocking XEmacs cause of running full + cvs-commands (e.g. ``cvs status'') for a bunch of files over the net. + +*** Added beta-support for Clearcase + There is already an identify-backend-function `ecb-vc-dir-managed-by-CC' + and a check-state-function `ecb-vc-check-CC-state' and an advice for + `clearcase-sync-from-disk' which enable automatic state-update after + checkin/out. These code seems to work quite well but nevertheless there + are some problems so this Clearcase-support is not added per default to + `ecb-vc-supported-backends'. + + So if you want Clearcase-support you have to customize the option + `ecb-vc-supported-backends' and add these functions mentioned above (the + advice of `clearcase-sync-from-disk' takes only effect if the function + `ecb-vc-dir-managed-by-CC' can be found in `ecb-vc-supported-backends' and + ECB is active!). But use it at your own risk. Of course the best would be + if a lot of people would test this Clearcase-support and fix the + encountered problems ;-). Thanks to David Ostrovsky for providing a first + implementation! + + + * Changes for ECB version 2.30.1 ** Enhancement to the automatic option-upgrading mechanism Index: README =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/README,v retrieving revision 1.15 diff -u -r1.15 README --- README 1 Dec 2004 16:04:54 -0000 1.15 +++ README 10 Dec 2004 16:06:07 -0000 ＠＠ -1,4 +1,4 ＠＠ -README for the Emacs Code Browser (ECB) version 2.30.1 +README for the Emacs Code Browser (ECB) version 2.31 About Index: RELEASE_NOTES =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/RELEASE_NOTES,v retrieving revision 1.14 diff -u -r1.14 RELEASE_NOTES --- RELEASE_NOTES 1 Dec 2004 16:04:54 -0000 1.14 +++ RELEASE_NOTES 10 Dec 2004 16:06:07 -0000 ＠＠ -1,4 +1,4 ＠＠ -This file contains some important release-notes for ECB version 2.30.1 +This file contains some important release-notes for ECB version 2.31 General: -------- Index: ecb-autogen.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/ecb-autogen.el,v retrieving revision 1.13 diff -u -r1.13 ecb-autogen.el --- ecb-autogen.el 1 Dec 2004 16:04:54 -0000 1.13 +++ ecb-autogen.el 10 Dec 2004 16:06:07 -0000 ＠＠ -26,7 +26,7 ＠＠ ;; GNU Emacs; see the file COPYING. If not, write to the Free Software ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -;; $Id: ecb-autogen.el,v 1.13 2004/12/01 16:04:54 berndl Exp $ +;; $Id: ecb-autogen.el,v 1.12 2004/05/06 09:02:08 berndl Exp $ ;;; Commentary: ;; Index: ecb-common-browser.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/ecb-common-browser.el,v retrieving revision 1.1 diff -u -r1.1 ecb-common-browser.el --- ecb-common-browser.el 1 Dec 2004 16:04:55 -0000 1.1 +++ ecb-common-browser.el 10 Dec 2004 16:06:07 -0000 ＠＠ -25,7 +25,7 ＠＠ ;; GNU Emacs; see the file COPYING. If not, write to the Free Software ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -;; $Id: ecb-common-browser.el,v 1.1 2004/12/01 16:04:55 berndl Exp $ +;; $Id: ecb-common-browser.el,v 1.11 2004/12/10 12:54:42 berndl Exp $ ;;; History ＠＠ -704,6 +704,30 ＠＠ (defsubst ecb-directory-sep-string (&optional refdir) (char-to-string (ecb-directory-sep-char refdir))) + + +;;; ----- Wrappers for file- and directory-operations ------ + +(dolist (f '(file-name-nondirectory + file-exists-p + file-name-directory + file-readable-p + file-attributes + file-name-extension + file-directory-p + file-accessible-directory-p + file-name-sans-extension + file-writable-p + file-name-as-directory + directory-files)) + (fset (intern (format "ecb-%s" f)) + `(lambda (file-or-dir-name &rest args) + ,(format "Delegate all args to `%s' but call first `ecb-fix-path' for FILE-OR-DIR-NAME." f) + (apply (quote ,f) (ecb-fix-path file-or-dir-name) args)))) + +(defun ecb-expand-file-name (name &optional default-dir) + "Delegate all args to `expand-file-name' but call first `ecb-fix-path' for both args." + (expand-file-name (ecb-fix-path name) (ecb-fix-path default-dir))) ;;; ----- Canonical filenames ------------------------------ Index: ecb-compatibility.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/ecb-compatibility.el,v retrieving revision 1.6 diff -u -r1.6 ecb-compatibility.el --- ecb-compatibility.el 1 Dec 2004 16:04:56 -0000 1.6 +++ ecb-compatibility.el 10 Dec 2004 16:06:07 -0000 ＠＠ -24,7 +24,7 ＠＠ ;; GNU Emacs; see the file COPYING. If not, write to the Free Software ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -;; $Id: ecb-compatibility.el,v 1.6 2004/12/01 16:04:56 berndl Exp $ +;; $Id: ecb-compatibility.el,v 1.4 2004/02/17 16:50:10 berndl Exp $ ;;; Commentary: ;; Index: ecb-create-layout.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/ecb-create-layout.el,v retrieving revision 1.14 diff -u -r1.14 ecb-create-layout.el --- ecb-create-layout.el 1 Dec 2004 16:04:56 -0000 1.14 +++ ecb-create-layout.el 10 Dec 2004 16:06:07 -0000 ＠＠ -26,7 +26,7 ＠＠ ;; GNU Emacs; see the file COPYING. If not, write to the Free Software ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -;; $Id: ecb-create-layout.el,v 1.14 2004/12/01 16:04:56 berndl Exp $ +;; $Id: ecb-create-layout.el,v 1.29 2004/05/06 09:02:08 berndl Exp $ ;;; Commentary: ;; Index: ecb-examples.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/ecb-examples.el,v retrieving revision 1.14 diff -u -r1.14 ecb-examples.el --- ecb-examples.el 1 Dec 2004 16:04:57 -0000 1.14 +++ ecb-examples.el 10 Dec 2004 16:06:11 -0000 ＠＠ -26,7 +26,7 ＠＠ ;; GNU Emacs; see the file COPYING. If not, write to the Free Software ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -;; $Id: ecb-examples.el,v 1.14 2004/12/01 16:04:57 berndl Exp $ +;; $Id: ecb-examples.el,v 1.14 2004/11/17 17:28:39 berndl Exp $ ;;; Commentary: ;; Index: ecb-face.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/ecb-face.el,v retrieving revision 1.15 diff -u -r1.15 ecb-face.el --- ecb-face.el 1 Dec 2004 16:04:57 -0000 1.15 +++ ecb-face.el 10 Dec 2004 16:06:11 -0000 ＠＠ -26,7 +26,7 ＠＠ ;; GNU Emacs; see the file COPYING. If not, write to the Free Software ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -;; $Id: ecb-face.el,v 1.15 2004/12/01 16:04:57 berndl Exp $ +;; $Id: ecb-face.el,v 1.21 2004/08/31 15:33:04 berndl Exp $ ;;; Commentary: Index: ecb-file-browser.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/ecb-file-browser.el,v retrieving revision 1.7 diff -u -r1.7 ecb-file-browser.el --- ecb-file-browser.el 1 Dec 2004 16:04:57 -0000 1.7 +++ ecb-file-browser.el 10 Dec 2004 16:06:11 -0000 ＠＠ -23,7 +23,7 ＠＠ ;; GNU Emacs; see the file COPYING. If not, write to the Free Software ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -;; $Id: ecb-file-browser.el,v 1.7 2004/12/01 16:04:57 berndl Exp $ +;; $Id: ecb-file-browser.el,v 1.49 2004/12/10 12:55:48 berndl Exp $ ;;; Commentary: ＠＠ -373,6 +373,7 ＠＠ The option `ecb-prescan-directories-exclude-regexps' offers are more fine granularity to exclude certain directories from this prescan." :group 'ecb-directories +:group 'ecb-most-important :type '(radio (const :tag "Switch on" :value t) (const :tag "Switch off for remote directories" :value unless-remote) (const :tag "Switch off completely" :value nil))) ＠＠ -433,6 +434,7 ＠＠ state-check." :group 'ecb-sources :group 'ecb-directories +:group 'ecb-most-important :type '(radio (const :tag "Switch on" :value t) (const :tag "Switch off for remote directories" :value unless-remote) (const :tag "Switch off completely" :value nil))) ＠＠ -905,6 +907,7 ＠＠ See `ecb-vc-supported-backends' how to customize the VC-support itself." :group 'ecb-version-control :group 'ecb-sources +:group 'ecb-most-important :type '(radio (const :tag "Switch on" :value t) (const :tag "Switch off for remote directories" :value unless-remote) (const :tag "Switch off completely" :value nil))) ＠＠ -918,6 +921,24 ＠＠ :group 'ecb-sources :type '(repeat (regexp :tag "Directory-regexp"))) +(defcustom ecb-vc-xemacs-exclude-remote-cvs-repository + (if ecb-running-xemacs t nil) + "*Exclude directories with a remote cvs-repository from VC-check. +This option takes only effect for XEmacs and is needed cause of the outdated +VC-package of XEmacs which offers no heuristic state-checking and also no +option `vc-cvs-stay-local'. So this option takes only effect if +`vc-cvs-stay-local' is not avaiable. In this case ECB treats directories which +are managed by CVS but have a remote repository as if the directory would be +not managed by CVS \(so the files are not checked for their VC-state). This si +done to avoid blocking XEmacs when running full cvs-commands \(e.g. \"cvs +status\") over the net. + +Note: When ECB can find the option `vc-cvs-stay-local' then this option will +automatically take no effect regardless which Emacs-version is used." +:group 'ecb-version-control +:group 'ecb-sources +:type 'boolean) + (defsubst ecb-vc-directory-should-be-checked-p (dir) "Return not nil if the sources of DIR should be checked for VC-state. The check is performed according to the settings in the options ＠＠ -1012,12 +1033,12 ＠＠ (const :tag "unknown" :value unknown))))) (defcustom ecb-vc-supported-backends - (if ecb-running-xemacs - '((ecb-vc-dir-managed-by-CVS . vc-cvs-status)) - '((ecb-vc-dir-managed-by-CVS . ecb-vc-state) - (ecb-vc-dir-managed-by-RCS . ecb-vc-state) - (ecb-vc-dir-managed-by-SCCS . ecb-vc-state) - (ecb-vc-dir-managed-by-SVN . ecb-vc-state))) + (delq nil (if ecb-running-xemacs + `((ecb-vc-dir-managed-by-CVS . vc-cvs-status)) + `((ecb-vc-dir-managed-by-CVS . ecb-vc-state) + (ecb-vc-dir-managed-by-RCS . ecb-vc-state) + (ecb-vc-dir-managed-by-SCCS . ecb-vc-state) + (ecb-vc-dir-managed-by-SVN . ecb-vc-state)))) "*Define how to to identify the VC-backend and how to check the state. The value of this option is a list containing cons-cells where the car is a function which is called to identify the VC-backend for a DIRECTORY and the ＠＠ -1050,16 +1071,17 ＠＠ Default value for GNU Emacs: Support for CVS, RCS, SCCS and Subversion \(for the later one the most recent version of the VC-package incl. the vc-svn -library is needed) is added per default. To identify the VC-backend the -functions `ecb-vc-managed-by-CVS', `ecb-vc-managed-by-RCS' rsp. -`ecb-vc-managed-by-SCCS' rsp. `ecb-vc-managed-by-SVN' are used. For all three -backends the function `ecb-vc-state' of the VC-package is used. +library is needed). To identify the VC-backend the functions +`ecb-vc-managed-by-CVS', `ecb-vc-managed-by-RCS' rsp. `ecb-vc-managed-by-SCCS' +rsp. `ecb-vc-managed-by-SVN' are used. For all four backends the function +`ecb-vc-state' of the VC-package is used. Default value for XEmacs: XEmacs contains only a quite outdated VC-package, especially there is no backend-independent check-vc-state-function available \(like `vc-state' for GNU Emacs). Only for CVS a check-vc-state-function is available: `vc-cvs-status'. Therefore ECB adds per default only support for -CVS and uses `ecb-vc-managed-by-CVS' rsp. `vc-cvs-status'. +CVS and uses `ecb-vc-managed-by-CVS' rsp. `vc-cvs-status'. But read the +documentation of `ecb-vc-dir-managed-by-CVS'! Example for GNU Emacs: If `vc-recompute-state' \(to get real state-values not only heuristic ones) should be used to check the state for CVS-managed files ＠＠ -1490,14 +1512,13 ＠＠ (defun ecb-files-from-cvsignore (dir) "Return an expanded list of filenames which are excluded by the .cvsignore file in current directory." - (let* ((fixed-path (ecb-fix-path dir)) - (cvsignore-content (ecb-file-content-as-string - (expand-file-name ".cvsignore" fixed-path))) + (let ((cvsignore-content (ecb-file-content-as-string + (ecb-expand-file-name ".cvsignore" dir))) (files nil)) (when cvsignore-content (dolist (f (split-string cvsignore-content)) - (setq files (append (directory-files fixed-path nil - (wildcard-to-regexp f) t) + (setq files (append (ecb-directory-files dir nil + (wildcard-to-regexp f) t) files))) files))) ＠＠ -1515,8 +1536,8 ＠＠ ((equal sort-method 'extension) (function (lambda(a b) - (let ((ext-a (file-name-extension a t)) - (ext-b (file-name-extension b t))) + (let ((ext-a (ecb-file-name-extension a t)) + (ext-b (ecb-file-name-extension b t))) (if (ecb-string= ext-a ext-b ecb-sources-sort-ignore-case) (ecb-string< a b ecb-sources-sort-ignore-case) (ecb-string< ext-a ext-b ecb-sources-sort-ignore-case)))))) ＠＠ -1530,7 +1551,7 ＠＠ according to `ecb-sources-sort-method'." (or (ecb-files-and-subdirs-cache-get dir) ;; dir is not cached - (let ((files (directory-files (ecb-fix-path dir) nil nil t)) + (let ((files (ecb-directory-files dir nil nil t)) (source-regexps (or (ecb-check-directory-for-source-regexps (ecb-fix-filename dir)) '(("") ("")))) ＠＠ -1547,9 +1568,9 ＠＠ ;; 2000 entries) this is the performance-bottleneck in the ;; file-browser of ECB. (dolist (file sorted-files) - (if (file-directory-p (ecb-fix-filename dir file)) + (if (ecb-file-directory-p (ecb-fix-filename dir file)) (when (not (ecb-check-dir-exclude file)) -;; (when (not (file-accessible-directory-p file)) +;; (when (not (ecb-file-accessible-directory-p file)) ;; (ecb-merge-face-into-text file ;; ecb-directory-not-accessible-face)) (setq subdirs (append subdirs (list file)))) ＠＠ -1637,7 +1658,7 ＠＠ (ecb-sources-filter-by-ext (read-string "Insert the filter-extension without leading dot: " (and node - (file-name-extension (tree-node-get-data node)))))) + (ecb-file-name-extension (tree-node-get-data node)))))) (defun ecb-sources-filter-by-regexp () "Filter the sources by a regexp. Ask for the regexp." ＠＠ -1854,10 +1875,10 ＠＠ (defun ecb-get-source-name (filename) "Returns the source name of a file." - (let ((f (file-name-nondirectory filename))) + (let ((f (ecb-file-name-nondirectory filename))) (if ecb-show-source-file-extension f - (file-name-sans-extension f)))) + (ecb-file-name-sans-extension f)))) (defun ecb-select-source-file (filename &optional force) ＠＠ -1865,7 +1886,7 ＠＠ given. If FORCE is not nil then the update of the directories buffer is done even if current directory is equal to `ecb-path-selected-directory'." (save-selected-window - (ecb-set-selected-directory (file-name-directory filename) force) + (ecb-set-selected-directory (ecb-file-name-directory filename) force) (setq ecb-path-selected-source filename) ;; Update directory buffer ＠＠ -1959,7 +1980,7 ＠＠ (buffer-name b) (ecb-get-source-name filename))) (ecb-get-source-name filename))) - (dir (file-name-directory filename))) + (dir (ecb-file-name-directory filename))) (if (and (ecb-vc-directory-should-be-checked-p dir) (ecb-vc-managed-dir-p dir)) (ecb-vc-generate-node-name file-1 ＠＠ -2003,8 +2024,8 ＠＠ (if (string-match "^(.) \$.+\$$" r0) (match-string 1 r0) r0))) - (ext-l (file-name-extension l1 t)) - (ext-r (file-name-extension r1 t))) + (ext-l (ecb-file-name-extension l1 t)) + (ext-r (ecb-file-name-extension r1 t))) (if (ecb-string= ext-l ext-r ecb-history-sort-ignore-case) (ecb-string< l1 r1 ecb-history-sort-ignore-case) (ecb-string< ext-l ext-r ecb-history-sort-ignore-case)))))) ＠＠ -2067,7 +2088,7 ＠＠ (let ((old-children (tree-node-get-children node)) (path (tree-node-get-data node))) (tree-node-set-children node nil) - (if (file-accessible-directory-p path) + (if (ecb-file-accessible-directory-p path) (let ((files-and-dirs (ecb-get-files-and-subdirs path))) (ecb-tree-node-add-files node path (cdr files-and-dirs) ecb-directories-nodetype-directory ＠＠ -2121,7 +2142,7 ＠＠ (progn (setq norm-dir (ecb-fix-filename path nil t)) (setq name (if (listp dir) (cadr dir) norm-dir)) - (if (file-accessible-directory-p norm-dir) + (if (ecb-file-accessible-directory-p norm-dir) (tree-node-add-child node (ecb-new-child old-children name ＠＠ -2235,8 +2256,8 ＠＠ (equal (cdr cache-value) show-sources)) (car cache-value) (ecb-directory-empty-cache-remove dir) - (let ((entries (and (file-accessible-directory-p dir) - (directory-files dir nil nil t))) + (let ((entries (and (ecb-file-accessible-directory-p dir) + (ecb-directory-files dir nil nil t))) (just-files-means-empty (not show-sources)) (full-file-name nil) (empty-p nil)) ＠＠ -2245,7 +2266,7 ＠＠ (dolist (e entries) (when (not (member e '("." ".." "CVS"))) (setq full-file-name (ecb-fix-filename dir e)) - (if (file-directory-p full-file-name) + (if (ecb-file-directory-p full-file-name) (throw 'found 'nil) (if (not just-files-means-empty) (throw 'found 'nil))))) ＠＠ -2334,10 +2355,10 ＠＠ (setq curr-node (tree-buffer-get-node-at-point)) (when (and (= (tree-node-get-type curr-node) node-type-to-check) (ecb-sources-read-only-check-p - (file-name-directory (tree-node-get-data curr-node)))) + (ecb-file-name-directory (tree-node-get-data curr-node)))) (setq new-name (tree-node-get-name curr-node)) (setq read-only-p - (not (file-writable-p (tree-node-get-data curr-node)))) + (not (ecb-file-writable-p (tree-node-get-data curr-node)))) (if read-only-p (ecb-merge-face-into-text new-name ecb-source-read-only-face)) ＠＠ -2446,7 +2467,7 ＠＠ (and last-check-time (or (null last-state) ;; FILE has been checked but is not in VC (not (ecb-time-less-p last-check-time - (ecb-subseq (nth 5 (file-attributes file)) + (ecb-subseq (nth 5 (ecb-file-attributes file)) 0 2)))))) (result nil)) (if no-need-for-state-check-p ＠＠ -2529,6 +2550,30 ＠＠ (buffer-substring (point-min) (point-max)))))))) +(defun ecb-vc-cvs-root-remote-p (root) + "Return not nil if ROOT is a remote CVS-repository." + (if (string-match "^:local:" root) + nil + (and (string-match "^\$:ext:\\|:server:\$?\$[^＠]+＠\$?\$[^:]+\$:" + root) + (match-string 3 root)))) + +;; some tests: +;; The following must all return cvs.sourceforge.net! +;; (ecb-vc-cvs-root-remote-p ":ext:berndl＠cvs.sourceforge.net:/usr/local/root") +;; (ecb-vc-cvs-root-remote-p "berndl＠cvs.sourceforge.net:/usr/local/root") +;; (ecb-vc-cvs-root-remote-p ":ext:cvs.sourceforge.net:/usr/local/root") +;; (ecb-vc-cvs-root-remote-p "cvs.sourceforge.net:/usr/local/root") +;; (ecb-vc-cvs-root-remote-p ":ext:berndl＠cvs.sourceforge.net:C:/local/root") +;; (ecb-vc-cvs-root-remote-p "berndl＠cvs.sourceforge.net:C:/local/root") +;; (ecb-vc-cvs-root-remote-p ":ext:cvs.sourceforge.net:C:/local/root") +;; (ecb-vc-cvs-root-remote-p "cvs.sourceforge.net:C:/local/root") +;; The following has to return nil! +;; (ecb-vc-cvs-root-remote-p "/local/root") +;; (ecb-vc-cvs-root-remote-p ":local:C:/local/root") +;; The following is allowed to return "C" because CVS forbids to use +;; windows-path as root without keyword :local:! +;; (ecb-vc-cvs-root-remote-p "C:/local/root") (defun ecb-vc-dir-managed-by-CVS (directory) "Return 'CVS if DIRECTORY is managed by CVS. nil if not. ＠＠ -2549,8 +2594,9 ＠＠ option `vc-cvs-stay-local' so the user can not work with remote CVS-repositories if working offline for example. So if there is no option `vc-cvs-stay-local' then ECB performs always the repository check mentioned -above." - (and (file-exists-p (concat directory "/CVS/")) +above and it depends on the value of `ecb-vc-xemacs-exclude-remote-repository' +if ECB treats such a directory as managed by CVS or not!" + (and (ecb-file-exists-p (concat directory "/CVS/")) (or (ignore-errors (progn (require 'vc) (require 'vc-cvs))) ＠＠ -2566,46 +2612,83 ＠＠ (let* ((Root-content (ecb-file-content-as-string (concat directory "/CVS/Root"))) (host (and Root-content - ;; TODO: Klaus Berndl <klaus.berndl(a)sdm.de>: This - ;; regexp will fail when the user＠ is not - ;; contained in the Root - it can be omitted if - ;; the user on the local and remote machines is - ;; the same! But for now it should be enough... - (string-match "＠\$.+\$:" Root-content) - (match-string 1 Root-content)))) - (when (or (null host) ;; local repository - ;; vc-cvs-stay-local says VC should stay local for this - ;; host - (and (boundp 'vc-cvs-stay-local) - (stringp vc-cvs-stay-local) - (string-match vc-cvs-stay-local host)) - ;; the host is at least accessible - (ecb-host-accessible-p host)) - 'CVS)) + (ecb-vc-cvs-root-remote-p Root-content)))) + (if (and host + ecb-vc-xemacs-exclude-remote-cvs-repository + (not (boundp 'vc-cvs-stay-local))) + nil + (when (or (null host) ;; local repository + ;; vc-cvs-stay-local says VC should stay local for this + ;; host + (and (boundp 'vc-cvs-stay-local) + (stringp vc-cvs-stay-local) + (string-match vc-cvs-stay-local host)) + ;; the host is at least accessible + (ecb-host-accessible-p host)) + 'CVS))) ;; VC always will stay local so we are satisfied ;-) 'CVS))) (defun ecb-vc-dir-managed-by-RCS (directory) "Return 'RCS if DIRECTORY is managed by RCS. nil if not." - (and (file-exists-p (concat directory "/RCS/")) + (and (ecb-file-exists-p (concat directory "/RCS/")) 'RCS)) (defun ecb-vc-dir-managed-by-SVN (directory) "Return 'SVN if DIRECTORY is managed by SVN. nil if not." - (and (file-exists-p (concat directory "/.svn/")) + (and (ecb-file-exists-p (concat directory "/.svn/")) (locate-library "vc-svn") 'SVN)) (defun ecb-vc-dir-managed-by-SCCS (directory) "Return 'SCCS if DIRECTORY is managed by SCCS. nil if not." - (or (and (file-exists-p (concat directory "/SCCS/")) 'SCCS) + (or (and (ecb-file-exists-p (concat directory "/SCCS/")) 'SCCS) ;; Remote SCCS project (let ((proj-dir (getenv "PROJECTDIR"))) (if proj-dir - (and (file-exists-p (concat proj-dir "/SCCS")) 'SCCS) + (and (ecb-file-exists-p (concat proj-dir "/SCCS")) 'SCCS) nil)))) +;; clearcase support + +;; Problem: is this OK to assume, that the clearcase-specific +;; stuff is already loaded? may be we need more checks here. +(silentcomp-defun clearcase-file-is-in-view-p) +(defun ecb-vc-dir-managed-by-CC (directory) + "Return 'CC if DIRECTORY is managed by ClearCase. nil if not." + (and (fboundp 'clearcase-file-is-in-view-p) + (if (clearcase-file-is-in-view-p directory) + 'CC))) + +(silentcomp-defun clearcase-compute-next-action) +(defun ecb-vc-check-CC-state (file) + "Checks the VC-state of FILE when under Control of Clearcase. +Returns the following different state-values: 'unknown, 'up-to-date, 'edited +and 'unlocked-changes." + (let ((action (and (fboundp 'clearcase-compute-next-action) + (clearcase-compute-next-action file)))) + (cond + ((eq action 'mkelem) + 'unknown) + ((eq action 'checkout) + 'up-to-date) + ((eq action 'uncheckout) + 'edited) + ((eq action 'illegal-checkin) + ;; ??? Is OK ??? + 'unlocked-changes) + ((eq action 'checkin) + 'edited)))) + +(defadvice clearcase-sync-from-disk (after ecb) + "Ensures that the ECB-cache is reset and the entry for the currently +checked-in/out or added file is cleared. Does nothing if the function +`ecb-vc-dir-managed-by-CC' is not contained in `ecb-vc-supported-backends'!" + (when (assoc 'ecb-vc-dir-managed-by-CC ecb-vc-supported-backends) + (ecb-vc-cache-remove (ecb-fix-filename (ad-get-arg 0))) + (ecb-vc-reset-vc-stealthy-checks))) + (defun ecb-vc-state (file) "Same as `vc-state' but it clears the internal caches of the VC-package for FILE before calling `vc-state'. Finally calls `vc-state' and returns that value." ＠＠ -2694,7 +2777,7 ＠＠ (<= state lines-of-buffer)) (goto-line state) (setq curr-node (tree-buffer-get-node-at-point)) - (setq curr-dir (file-name-directory (tree-node-get-data curr-node))) + (setq curr-dir (ecb-file-name-directory (tree-node-get-data curr-node))) (when (and (= (tree-node-get-type curr-node) node-type-to-check) (ecb-vc-directory-should-be-checked-p curr-dir)) (setq vc-state-fcn (ecb-vc-get-state-fcn-for-dir curr-dir)) ＠＠ -2754,7 +2837,7 ＠＠ (or update-performed-for-dir (setq update-performed-for-dir (ecb-fix-filename - (file-name-directory (tree-node-get-data curr-node))))) + (ecb-file-name-directory (tree-node-get-data curr-node))))) (tree-buffer-update-node nil new-name 'use-old-value 'use-old-value 'use-old-value 'use-old-value t)) ＠＠ -2842,7 +2925,8 ＠＠ ;; with a good documentation what a user has to do.... ;-) -(defconst ecb-vc-advices '((vc-checkin . after)) +(defvar ecb-vc-advices '((vc-checkin . after) + (clearcase-sync-from-disk . after)) "All advices needed for the builtin VC-support of ECB. Same format as `ecb-basic-adviced-functions'.") ＠＠ -2872,7 +2956,7 ＠＠ "Ensures that the ECB-cache is reset and the entry for the currently reverted file-buffer is cleared." (let ((file (ignore-errors (ecb-fix-filename buffer-file-name)))) - (when (and file (file-exists-p file)) + (when (and file (ecb-file-exists-p file)) (ecb-vc-cache-remove file) (ecb-vc-reset-vc-stealthy-checks)))) ＠＠ -2933,7 +3017,7 ＠＠ (let* ((filename (ecb-fix-filename path file)) (file-1 (if include-extension file - (file-name-sans-extension file)))) + (ecb-file-name-sans-extension file)))) (tree-node-add-child node (ecb-new-child ＠＠ -2981,7 +3065,7 ＠＠ (let* ((use-dialog-box nil) (my-dir (ecb-fix-filename (or dir - (file-name-directory (read-file-name "Add source path: "))) + (ecb-file-name-directory (read-file-name "Add source path: "))) nil t)) (my-alias (or alias (read-string (format "Alias for \"%s\" (empty = no alias): " ＠＠ -3129,7 +3213,7 ＠＠ (defun ecb-get-file-info-text (file) "Return a file-info string for a file in the ECB sources buffer" - (let ((attrs (file-attributes file))) + (let ((attrs (ecb-file-attributes file))) (format "%s %8s %4d %10d %s %s" (nth 8 attrs) (user-login-name (nth 2 attrs)) ＠＠ -3139,7 +3223,7 ＠＠ (if (equal (ecb-show-node-info-what ecb-sources-buffer-name) 'file-info-full) file - (file-name-nondirectory file))) + (ecb-file-name-nondirectory file))) )) ＠＠ -3214,11 +3298,11 ＠＠ "Creates a new sourcefile in current directory." (let* ((use-dialog-box nil) (dir (ecb-fix-filename - (funcall (if (file-directory-p (tree-node-get-data node)) + (funcall (if (ecb-file-directory-p (tree-node-get-data node)) 'identity - 'file-name-directory) + 'ecb-file-name-directory) (tree-node-get-data node)))) - (filename (file-name-nondirectory + (filename (ecb-file-name-nondirectory (read-file-name "Source name: " (concat dir "/"))))) (ecb-select-edit-window) (if (string-match "\\.java$" filename) ＠＠ -3238,9 +3322,9 ＠＠ (ecb-select-edit-window) (let* ((node-data (tree-node-get-data node)) (default-directory (concat (ecb-fix-filename - (if (file-directory-p node-data) + (if (ecb-file-directory-p node-data) node-data - (file-name-directory node-data))) + (ecb-file-name-directory node-data))) (ecb-directory-sep-string node-data)))) (call-interactively (if find (or (and (fboundp ecb-grep-find-function) ＠＠ -3280,9 +3364,9 ＠＠ (defun ecb-dired-directory-internal (node &optional other) (ecb-select-edit-window) (let ((dir (ecb-fix-filename - (funcall (if (file-directory-p (tree-node-get-data node)) + (funcall (if (ecb-file-directory-p (tree-node-get-data node)) 'identity - 'file-name-directory) + 'ecb-file-name-directory) (tree-node-get-data node))))) (ecb-with-adviced-functions (funcall (if other ＠＠ -3451,8 +3535,8 ＠＠ (tree-buffer-defpopup-command ecb-delete-source "Deletes current sourcefile." (let* ((file (tree-node-get-data node)) - (dir (ecb-fix-filename (file-name-directory file)))) - (when (ecb-confirm (concat "Really delete " (file-name-nondirectory file) "? ")) + (dir (ecb-fix-filename (ecb-file-name-directory file)))) + (when (ecb-confirm (concat "Really delete " (ecb-file-name-nondirectory file) "? ")) (when (get-file-buffer file) (kill-buffer (get-file-buffer file))) (ecb-delete-file file) ＠＠ -3500,7 +3584,7 ＠＠ (tree-buffer-defpopup-command ecb-file-popup-vc-refresh-dir "Recompute the VC-state-values for the whole directory." - (let ((dir (ecb-fix-filename (file-name-directory (tree-node-get-data node))))) + (let ((dir (ecb-fix-filename (ecb-file-name-directory (tree-node-get-data node))))) (ecb-vc-cache-remove-files-of-dir dir) (ecb-vc-reset-vc-stealthy-checks))) ＠＠ -3527,7 +3611,7 ＠＠ (defvar ecb-sources-menu-title-creator (function (lambda (node) - (file-name-nondirectory (tree-node-get-data node)))) + (ecb-file-name-nondirectory (tree-node-get-data node)))) "The menu-title for the sources menu. See `ecb-directories-menu-title-creator'.") ＠＠ -3574,7 +3658,7 ＠＠ "Filter history entries by extension by popup." (let ((ext-str (read-string "Insert the filter-extension without leading dot: " (and node - (file-name-extension (tree-node-get-data node)))))) + (ecb-file-name-extension (tree-node-get-data node)))))) (ecb-history-filter-by-ext ext-str))) (defun ecb-history-filter-by-regexp () Index: ecb-jde.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/ecb-jde.el,v retrieving revision 1.14 diff -u -r1.14 ecb-jde.el --- ecb-jde.el 1 Dec 2004 16:04:59 -0000 1.14 +++ ecb-jde.el 10 Dec 2004 16:06:12 -0000 ＠＠ -26,7 +26,7 ＠＠ ;; GNU Emacs; see the file COPYING. If not, write to the Free Software ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -;; $Id: ecb-jde.el,v 1.14 2004/12/01 16:04:59 berndl Exp $ +;; $Id: ecb-jde.el,v 1.11 2004/10/04 15:53:06 berndl Exp $ ;;; Commentary: ;; Index: ecb-layout-defs.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/ecb-layout-defs.el,v retrieving revision 1.14 diff -u -r1.14 ecb-layout-defs.el --- ecb-layout-defs.el 1 Dec 2004 16:05:00 -0000 1.14 +++ ecb-layout-defs.el 10 Dec 2004 16:06:12 -0000 ＠＠ -26,7 +26,7 ＠＠ ;; GNU Emacs; see the file COPYING. If not, write to the Free Software ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -;; $Id: ecb-layout-defs.el,v 1.14 2004/12/01 16:05:00 berndl Exp $ +;; $Id: ecb-layout-defs.el,v 1.16 2003/09/12 09:19:25 berndl Exp $ ;;; Commentary: ;; Index: ecb-makedef.mk =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/ecb-makedef.mk,v retrieving revision 1.2 diff -u -r1.2 ecb-makedef.mk --- ecb-makedef.mk 1 Dec 2004 16:05:03 -0000 1.2 +++ ecb-makedef.mk 10 Dec 2004 16:06:13 -0000 ＠＠ -1,37 +1,37 ＠＠ -RM=rm -f -CP=cp -MV=mv -f -MKDIR=mkdir -p - -EBATCH=$(EMACS) -batch -no-site-file - -ecb_LISP_EL=tree-buffer.el ecb-util.el ecb-mode-line.el ecb-help.el \ - ecb-layout.el ecb-layout-defs.el ecb-navigate.el ecb.el \ - ecb-eshell.el ecb-cycle.el ecb-face.el ecb-compilation.el \ - ecb-upgrade.el ecb-create-layout.el silentcomp.el \ - ecb-speedbar.el ecb-examples.el ecb-tod.el ecb-autogen.el \ - ecb-jde.el ecb-file-browser.el ecb-method-browser.el \ - ecb-winman-support.el ecb-semantic-wrapper.el \ - ecb-compatibility.el ecb-common-browser.el - -ecb_LISP_ELC=$(ecb_LISP_EL:.el=.elc) - -ecb_AUTOLOADS=ecb-autoloads.el - -ecb_ETC=NEWS README RELEASE_NOTES ecb-makedef.mk Makefile make.bat - -ecb_TEXI=ecb.texi - -ecb_INFO=$(ecb_TEXI:.texi=.info) -ecb_HTML=$(ecb_TEXI:.texi=.html) -ecb_HTML_DIR=html-help -ecb_INFO_DIR=info-help - -ecb_DVI=$(ecb_TEXI:.texi=.dvi) -ecb_PS=$(ecb_TEXI:.texi=.ps) -ecb_PDF=$(ecb_TEXI:.texi=.pdf) - -ecb_I! MAGE_DIR=ecb-images - -ecb_DISTRIB_FILES=$(ecb_LISP_EL) $(ecb_AUTOLOADS) $(ecb_TEXI) $(ecb_ETC) - +RM=rm -f +CP=cp +MV=mv -f +MKDIR=mkdir -p + +EBATCH=$(EMACS) -batch -no-site-file + +ecb_LISP_EL=tree-buffer.el ecb-util.el ecb-mode-line.el ecb-help.el \ + ecb-layout.el ecb-layout-defs.el ecb-navigate.el ecb.el \ + ecb-eshell.el ecb-cycle.el ecb-face.el ecb-compilation.el \ + ecb-upgrade.el ecb-create-layout.el silentcomp.el \ + ecb-speedbar.el ecb-examples.el ecb-tod.el ecb-autogen.el \ + ecb-jde.el ecb-file-browser.el ecb-method-browser.el \ + ecb-winman-support.el ecb-semantic-wrapper.el \ + ecb-compatibility.el ecb-common-browser.el + +ecb_LISP_ELC=$(ecb_LISP_EL:.el=.elc) + +ecb_AUTOLOADS=ecb-autoloads.el + +ecb_ETC=NEWS README RELEASE_NOTES ecb-makedef.mk Makefile make.bat + +ecb_TEXI=ecb.texi + +ecb_INFO=$(ecb_TEXI:.texi=.info) +ecb_HTML=$(ecb_TEXI:.texi=.html) +ecb_HTML_DIR=html-help +ecb_INFO_DIR=info-help + +ecb_DVI=$(ecb_TEXI:.texi=.dvi) +ecb_PS=$(ecb_TEXI:.texi=.ps) +ecb_PDF=$(ecb_TEXI:.texi=.pdf) + +ecb_IMAGE_DIR=ecb-images + +ecb_DISTRIB_FILES=$(ecb_LISP_EL) $(ecb_AUTOLOADS) $(ecb_TEXI) $(ecb_ETC) + Index: ecb-method-browser.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/ecb-method-browser.el,v retrieving revision 1.7 diff -u -r1.7 ecb-method-browser.el --- ecb-method-browser.el 1 Dec 2004 16:05:03 -0000 1.7 +++ ecb-method-browser.el 10 Dec 2004 16:06:13 -0000 ＠＠ -24,7 +24,7 ＠＠ ;; GNU Emacs; see the file COPYING. If not, write to the Free Software ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -;; $Id: ecb-method-browser.el,v 1.7 2004/12/01 16:05:03 berndl Exp $ +;; $Id: ecb-method-browser.el,v 1.63 2004/12/10 12:54:41 berndl Exp $ ;;; Commentary: ＠＠ -3338,7 +3338,7 ＠＠ search-result n))) (if (and (cdr r) (stringp (cdr r)) - (file-readable-p (cdr r))) + (ecb-file-readable-p (cdr r))) (cons (cdr r) (car r)))))) type-tag-numbers))))))) ＠＠ -3412,7 +3412,7 ＠＠ (progn (set-buffer (get-file-buffer ecb-path-selected-source)) (let ((file (ecb--semantic-dependency-tag-file tag))) - (when (and file (file-exists-p file)) + (when (and file (ecb-file-exists-p file)) (ecb-find-file-and-display file (ecb-combine-ecb-button/edit-win-nr ecb-button edit-window-nr))))) (ecb-jump-to-tag filename Index: ecb-navigate.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/ecb-navigate.el,v retrieving revision 1.15 diff -u -r1.15 ecb-navigate.el --- ecb-navigate.el 1 Dec 2004 16:05:04 -0000 1.15 +++ ecb-navigate.el 10 Dec 2004 16:06:13 -0000 ＠＠ -26,7 +26,7 ＠＠ ;; GNU Emacs; see the file COPYING. If not, write to the Free Software ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -;; $Id: ecb-navigate.el,v 1.15 2004/12/01 16:05:04 berndl Exp $ +;; $Id: ecb-navigate.el,v 1.21 2004/03/05 16:46:32 berndl Exp $ ;;; Commentary: Index: ecb-semantic-wrapper.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/ecb-semantic-wrapper.el,v retrieving revision 1.7 diff -u -r1.7 ecb-semantic-wrapper.el --- ecb-semantic-wrapper.el 1 Dec 2004 16:05:04 -0000 1.7 +++ ecb-semantic-wrapper.el 10 Dec 2004 16:06:13 -0000 ＠＠ -23,7 +23,7 ＠＠ ;; GNU Emacs; see the file COPYING. If not, write to the Free Software ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -;; $Id: ecb-semantic-wrapper.el,v 1.7 2004/12/01 16:05:04 berndl Exp $ +;; $Id: ecb-semantic-wrapper.el,v 1.20 2004/09/24 12:21:16 berndl Exp $ ;;; Commentary: Index: ecb-speedbar.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/ecb-speedbar.el,v retrieving revision 1.11 diff -u -r1.11 ecb-speedbar.el --- ecb-speedbar.el 1 Dec 2004 16:05:05 -0000 1.11 +++ ecb-speedbar.el 10 Dec 2004 16:06:13 -0000 ＠＠ -26,7 +26,7 ＠＠ ;; GNU Emacs; see the file COPYING. If not, write to the Free Software ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -;; $Id: ecb-speedbar.el,v 1.61 2004/11/17 17:28:23 berndl Exp $ +;; $Id: ecb-speedbar.el,v 1.62 2004/12/10 12:54:41 berndl Exp $ ;;; Commentary: ＠＠ -128,8 +128,8 ＠＠ (equal (selected-frame) ecb-frame) (window-live-p (get-buffer-window ecb-speedbar-buffer-name)) (and item - (file-exists-p item) - (not (file-directory-p item)))) + (ecb-file-exists-p item) + (not (ecb-file-directory-p item)))) (ecb-select-edit-window)))) Index: ecb-tod.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/ecb-tod.el,v retrieving revision 1.15 diff -u -r1.15 ecb-tod.el --- ecb-tod.el 1 Dec 2004 16:05:06 -0000 1.15 +++ ecb-tod.el 10 Dec 2004 16:06:13 -0000 ＠＠ -26,7 +26,7 ＠＠ ;; GNU Emacs; see the file COPYING. If not, write to the Free Software ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -;; $Id: ecb-tod.el,v 1.15 2004/12/01 16:05:06 berndl Exp $ +;; $Id: ecb-tod.el,v 1.19 2004/12/01 14:19:39 berndl Exp $ ;;; Commentary: ;; Index: ecb-upgrade.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/ecb-upgrade.el,v retrieving revision 1.16 diff -u -r1.16 ecb-upgrade.el --- ecb-upgrade.el 1 Dec 2004 16:05:07 -0000 1.16 +++ ecb-upgrade.el 10 Dec 2004 16:06:17 -0000 ＠＠ -26,7 +26,7 ＠＠ ;; GNU Emacs; see the file COPYING. If not, write to the Free Software ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -;; $Id: ecb-upgrade.el,v 1.16 2004/12/01 16:05:07 berndl Exp $ +;; $Id: ecb-upgrade.el,v 1.98 2004/12/10 12:56:32 berndl Exp $ ;;; Commentary: ;; ＠＠ -159,7 +159,7 ＠＠ ;; IMPORTANT: The version-number is auto-frobbed from the Makefile. Do not ;; change it here! -(defconst ecb-version "2.30.1" +(defconst ecb-version "2.31" "Current ECB version.") (eval-when-compile Index: ecb-winman-support.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/ecb-winman-support.el,v retrieving revision 1.9 diff -u -r1.9 ecb-winman-support.el --- ecb-winman-support.el 1 Dec 2004 16:05:08 -0000 1.9 +++ ecb-winman-support.el 10 Dec 2004 16:06:17 -0000 ＠＠ -21,7 +21,7 ＠＠ ;; GNU Emacs; see the file COPYING. If not, write to the Free Software ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -;; $Id: ecb-winman-support.el,v 1.9 2004/12/01 16:05:08 berndl Exp $ +;; $Id: ecb-winman-support.el,v 1.12 2004/07/15 15:26:27 berndl Exp $ ;;; Commentary ;; Index: ecb.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/ecb.el,v retrieving revision 1.15 diff -u -r1.15 ecb.el --- ecb.el 1 Dec 2004 16:05:09 -0000 1.15 +++ ecb.el 10 Dec 2004 16:06:18 -0000 ＠＠ -26,7 +26,7 ＠＠ ;; GNU Emacs; see the file COPYING. If not, write to the Free Software ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -;; $Id: ecb.el,v 1.417 2004/12/01 14:19:37 berndl Exp $ +;; $Id: ecb.el,v 1.419 2004/12/10 12:54:38 berndl Exp $ ;;; Commentary: ;; ＠＠ -440,6 +440,7 ＠＠ stealthy tasks. It can be a floating-point value in seconds. The value can also be changed during running ECB." :group 'ecb-general +:group 'ecb-most-important :type '(number :tag "Idle time before running stealthy tasks" :value 1) :initialize 'custom-initialize-default ＠＠ -704,8 +705,8 ＠＠ ;; also the drive is added. (substring norm-filename 0 2))) ;; add the full directory as source-path - (file-name-directory norm-filename)))) - (ecb-add-source-path source-path source-path + (ecb-file-name-directory norm-filename)))) + (ecb-add-source-path source-path (ecb-fix-filename source-path) (not (cdr ecb-add-path-for-not-matching-files))))) ;; now we can be sure that a matching source-path exists ＠＠ -731,7 +732,7 ＠＠ (eq major-mode 'dired-mode) (ecb-set-selected-directory (or (and (stringp dired-directory) - (file-exists-p dired-directory) + (ecb-file-exists-p dired-directory) dired-directory) (and (listp dired-directory) (car dired-directory))))) ＠＠ -2134,9 +2135,9 ＠＠ (defun ecb-compile-file-if-necessary (file &optional force) "Compile the ECB-file FILE if necessary. This is done if FORCE is not nil or FILE.el is newer than FILE.elc or if FILE.elc doesn't exist." - (let ((elc-file (concat (file-name-sans-extension file) ".elc"))) + (let ((elc-file (concat (ecb-file-name-sans-extension file) ".elc"))) (if (or force - (not (file-exists-p elc-file)) + (not (ecb-file-exists-p elc-file)) (file-newer-than-file-p file elc-file)) (byte-compile-file file)))) ＠＠ -2152,19 +2153,19 ＠＠ (ecb-error "Incorrect requirements; check the versions of semantic, eieio and speedbar!")) (ecb-check-requirements)) (let ((load-path - (append (list (file-name-directory + (append (list (ecb-file-name-directory (or (locate-library "semantic") (ecb-error "Semantic is not in the load-path!"))) - (file-name-directory + (ecb-file-name-directory (or (locate-library "eieio") (ecb-error "Eieio is not in the load-path!"))) - (file-name-directory + (ecb-file-name-directory (or (locate-library "speedbar") (ecb-error "Speedbar is not in the load-path!"))) - (file-name-directory (locate-library "ecb"))) + (ecb-file-name-directory (locate-library "ecb"))) load-path)) - (files (directory-files (file-name-directory (locate-library "ecb")) - t))) + (files (ecb-directory-files (ecb-file-name-directory (locate-library "ecb")) + t))) (save-excursion (dolist (file files) (if (and (string-match "\$silentcomp\\|tree-buffer\\|ecb.*\$\\.el$" file) Index: ecb.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/ecb.texi,v retrieving revision 1.19 diff -u -r1.19 ecb.texi --- ecb.texi 1 Dec 2004 16:05:11 -0000 1.19 +++ ecb.texi 10 Dec 2004 16:06:20 -0000 ＠＠ -26,7 +26,7 ＠＠＠c GNU Emacs; see the file COPYING. If not, write to the Free Software ＠c Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -＠c $Id: ecb.texi,v 1.19 2004/12/01 16:05:11 berndl Exp $ +＠c $Id: ecb.texi,v 1.198 2004/12/10 12:57:11 berndl Exp $ ＠setfilename ecb.info ＠＠ -49,7 +49,7 ＠＠＠c edit the Makefile to change the version number. mechanism stolen ＠c from Tramp ＠macro ecbver{} -2.30.1 +2.31 ＠end macro ＠＠ -323,6 +323,7 ＠＠ * Remote repositories:: What you should now about this * Refreshing the VC-state:: How to refresh when state changed outside * Adding new backends:: Necessary steps for adding new backends +* Known VC-problems:: Currently known problems of the VC-support Displaying the trees of the ECB-windows with different styles ＠＠ -8644,6 +8645,23 ＠＠ should be added at the beginning of this option. ＠end defopt +＠defopt vc-xemacs-exclude-remote-cvs-repository +Exclude directories with a remote cvs-repository from VC-check. This +option takes only effect for XEmacs and is needed cause of the +outdated VC-package of XEmacs which offers no heuristic state-checking +and also no option ＠code{vc-cvs-stay-local}. So this option takes only +effect if ＠code{vc-cvs-stay-local} is not avaiable. In this case ECB +treats directories which are managed by CVS but have a remote +repository as if the directory would be not managed by CVS (so the +files are not checked for their VC-state). This si done to avoid +blocking XEmacs when running full cvs-commands (e.g. ``cvs status'') +over the net. + +Note: When ECB can find the option ＠code{vc-cvs-stay-local} then this +option will automatically take no effect regardless which +Emacs-version is used. +＠end defopt + ＠node Submitting problem report, Upgrading, Customizing, Top ＠chapter Submitting a problem report ＠＠ -9422,6 +9440,7 ＠＠ * Remote repositories:: What you should now about this * Refreshing the VC-state:: How to refresh when state changed outside * Adding new backends:: Necessary steps for adding new backends +* Known VC-problems:: Currently known problems of the VC-support ＠end menu ＠node Identifying backends, Checking the state, Version-control support, Version-control support ＠＠ -9493,7 +9512,7 ＠＠＠code{vc-state} for GNU Emacs). Only for CVS a check-vc-state-function is available: ＠code{vc-cvs-status}. Therefore ECB adds per default only support for CVS and uses ＠code{ecb-vc-managed-by-CVS} rsp. -＠code{vc-cvs-status}. +＠code{vc-cvs-status}. See also ＠ref{Known VC-problems}! ＠node Checking the state, Remote repositories, Identifying backends, Version-control support ＠subsection How ECB checks the VC-state of a file ＠＠ -9604,7 +9623,8 ＠＠ exclude such directories with a remote repository from the VC-support of ECB and secondary the identify-backend-funtion ＠code{ecb-vc-dir-managed-by-CVS} behaves smart with that respect -(＠pxref{Identifying backends}). +(＠pxref{Identifying backends}). See also +＠code{ecb-vc-xemacs-exclude-remote-cvs-repository}! ＠subsubsection Remote paths and the VC-support of ECB ＠＠ -9682,7 +9702,7 ＠＠ ECB refreshes the VC-state-values of all files contained in this directory too. -＠node Adding new backends, ,Refreshing the VC-state, Version-control support +＠node Adding new backends, Known VC-problems, Refreshing the VC-state, Version-control support ＠subsection Necessary steps and informations for adding new backends There are mainly three necessary steps for adding a new(a)footnote{i.e. ＠＠ -9752,6 +9772,31 ＠＠＠end enumerate +＠node Known VC-problems, ,Adding new backends, Version-control support +＠subsection Currently know problems with the VC-support + +＠subsubsection Remote repositories and XEmacs + +Currently there are mostly problems related to XEmacs - cause of its +outdated VC-package which allows no heuristic state-computation but +always runs ``cvs status'' to get the VC-state for a file (done by +＠code{vc-cvs-status}). This can be horrible slow for remote +CVS-root-repositories. Now ECB performs the VC-check stealthy and only +in idle-time of Emacs but even so XEmacs can be blocked espcially if +the cygwin-build of XEmacs is used: This XEmacs-version is +substantially slower concering file-operations and has sometimes a +very slow and delayed response-behavior for mouse- and keyboard +interrupts - so even ECB let the user interrupt by using +＠code{input-pending-p} before getting the VC-state of a file XEmacs +sometimes does not react to such user-interrupts and seems to be +blocked. + +Current solution: ECB offers the option +＠code{ecb-vc-xemacs-exclude-remote-cvs-repository} which excludes +remote repositories from being checked. This option is per default t +for XEmacs. Whenever XEmacs syncs up its VC-package with the Emacs one +this option will automatically take no effect. + ＠node Using eshell, Grepping directories, Version-control support, Tips and tricks ＠section Optimal using of eshell in ECB ＠＠ -12486,6 +12531,19 ＠＠＠* ＠end ifinfo See also ＠ref{Remote directories}. + +＠item ＠tab ＠tab + +＠item +ECB seems to be blocked a long time. +＠tab ＠tab +Maybe you use cygwin-XEmacs. Then either the empty-dir-check (see +option ＠code{ecb-prescan-directories-for-emptyness}) or the VC-support +(see ＠code{ecb-vc-enable-support}) can block ECB. +＠ifinfo +＠* +＠end ifinfo +For the latter one see ＠ref{Known VC-problems}. ＠item ＠tab ＠tab Index: silentcomp.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/silentcomp.el,v retrieving revision 1.14 diff -u -r1.14 silentcomp.el --- silentcomp.el 1 Dec 2004 16:05:16 -0000 1.14 +++ silentcomp.el 10 Dec 2004 16:06:20 -0000 ＠＠ -21,7 +21,7 ＠＠ ;; GNU Emacs; see the file COPYING. If not, write to the Free Software ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -;; $Id: silentcomp.el,v 1.14 2004/12/01 16:05:16 berndl Exp $ +;; $Id: silentcomp.el,v 1.4 2003/07/31 16:02:07 berndl Exp $ ;;; Location Index: tree-buffer.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ecb/tree-buffer.el,v retrieving revision 1.15 diff -u -r1.15 tree-buffer.el --- tree-buffer.el 1 Dec 2004 16:05:16 -0000 1.15 +++ tree-buffer.el 10 Dec 2004 16:06:20 -0000 ＠＠ -26,7 +26,7 ＠＠ ;; GNU Emacs; see the file COPYING. If not, write to the Free Software ;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -;; $Id: tree-buffer.el,v 1.15 2004/12/01 16:05:16 berndl Exp $ +;; $Id: tree-buffer.el,v 1.160 2004/12/10 12:52:41 berndl Exp $ ;;; Commentary: ＠＠ -208,7 +208,7 ＠＠ ;; timer stuff -(if (not ecb-running-xemacs) +(if (not tree-buffer-running-xemacs) (progn (defalias 'tree-buffer-run-with-idle-timer 'run-with-idle-timer) (defalias 'tree-buffer-cancel-timer 'cancel-timer)) ＠＠ -233,6 +233,21 ＠＠ "Remove TIMER from the list of active timers." (delete-itimer timer)))) +;; debugging + +(defvar tree-buffer-debug-mode nil + "If not nil then all functions of tree-buffer which are debug-able write +debug-messages to the message-log of Emacs. Ensure that this variable is opnlx +not nil if you want find or report an error!") + +(defun tree-buffer-debug-error (&rest args) + "Run ARGS through `format' and write it to the *Messages*-buffer. +Do nothing if `tree-buffer-debug-mode' is nil!" + (when tree-buffer-debug-mode + (message (concat (format "Tree-buffer-debug: [%s] " + (format-time-string "%H:%M:%S")) + (apply 'format args))))) + ;; tree-buffer local variables (defvar tree-buffer-root nil) ＠＠ -554,7 +569,7 ＠＠ (defvar tree-buffer-enable-xemacs-image-bug-hack tree-buffer-running-xemacs - "If true then ECB tries to deal best with the XEmacs-bug to display + "If true then tree-buffer tries to deal best with the XEmacs-bug to display adjacent images not correctly. Set this to nil if your XEmacs-version has fixed this bug.") ＠＠ -619,9 +634,9 ＠＠ (when (equal 'image (tree-buffer-style)) ;; Regular images (created with `insert-image' are intangible ;; which (I suppose) make them more compatible with XEmacs 21. - ;; Unfortunately, there is a giant pile o code dependent on the + ;; Unfortunately, there is a giant pile of code dependent on the ;; underlying text. This means if we leave it tangible, then I - ;; don't have to change said giant piles o code. + ;; don't have to change said giant piles of code. (if image-icon (if tree-buffer-running-xemacs (add-text-properties (+ start len) start ＠＠ -693,6 +708,22 ＠＠ image) image))))) +;; utilities + +(defun tree-buffer-position (seq elem) + "Return the position of ELEM within SEQ counting from 0. Comparison is done +with `equal'." + (if (listp seq) + (let ((pos (- (length seq) (length (member elem seq))))) + (if (= pos (length seq)) + nil + pos)) + (catch 'found + (dotimes (i (length seq)) + (if (equal elem (aref seq i)) + (throw 'found i))) + nil))) + (defun tree-buffer-nolog-message (&rest args) "Works exactly like `message' but does not log the message" (let ((msg (cond ((or (null args) ＠＠ -744,6 +775,8 ＠＠ (defun tree-buffer-get-node-name-start-point (name node) "Returns the buffer point where the name of the node starts." (let ((linenr (tree-buffer-find-node node))) + (tree-buffer-debug-error "tree-buffer-get-node-name-start-point: Cur-buf: %s, name: %s, linenr: %d" + (current-buffer) name linenr) (when linenr (goto-line linenr) (beginning-of-line) ＠＠ -751,10 +784,14 ＠＠ (defun tree-buffer-get-node-name-end-point (name node) "Returns the buffer point where the name of the node ends." + (tree-buffer-debug-error "tree-buffer-get-node-name-end-point: Cur-buf: %s, name: %s" + (current-buffer) name) (+ (tree-buffer-get-node-name-start-point name node) (length name))) (defun tree-buffer-at-expand-symbol (name node p) + (tree-buffer-debug-error "tree-buffer-at-expand-symbol: Cur-buf: %s, name: %s, p: %d, exp-sym-before: %s" + (current-buffer) name p tree-buffer-expand-symbol-before) (if tree-buffer-expand-symbol-before (< p (1- (tree-buffer-get-node-name-start-point name node))) (> p (tree-buffer-get-node-name-end-point name node)))) ＠＠ -773,16 +810,26 ＠＠ (funcall tree-buffer-is-click-valid-fn mouse-button shift-pressed control-pressed meta-pressed (buffer-name))) + (tree-buffer-debug-error "tree-buffer-select-1: Cur-buf: %s" + (current-buffer)) (let* ((p (point)) (name-node (tree-buffer-get-name-node-at-point)) (name (car name-node)) (node (cdr name-node))) (when node + (tree-buffer-debug-error "tree-buffer-select-2: Cur-buf: %s" + (current-buffer)) ;; TODO: Klaus Berndl <klaus.berndl(a)sdm.de>: Is this the right place - ;; for this? - (ignore-errors - (let ((search-nonincremental-instead nil)) - (isearch-exit))) + ;; for this? probably it can cause some erros...... Yep - it causes + ;; serious XEmacs-sideeffects: clicking into tree-buffer doesn't + ;; work anymore when doing this during an active isearch! Seems that + ;; isearch-exit switches the current buffer so the buffer after the + ;; isearch-exit is not the same as before!! So we comment this out!! +;; (ignore-errors +;; (let ((search-nonincremental-instead nil)) +;; (isearch-exit))) + (tree-buffer-debug-error "tree-buffer-select-3: Cur-buf: %s" + (current-buffer)) (if (and (tree-buffer-at-expand-symbol name node p) ;; if the expand-symbol is displayed before and mouse-button ;; = 0, means RET is pressed, we do not toggle-expand but work ＠＠ -868,11 +915,11 ＠＠ ;; tree-buffer-nodes which begins with the P-th element ;; of tree-buffer-nodes (nthcdr P tree-buffer-nodes). (or (ignore-errors - (nthcdr (ecb-position (mapcar (lambda (n) - (tree-node-get-name - (cdr n))) - tree-buffer-nodes) - (tree-node-get-name start-node)) + (nthcdr (tree-buffer-position (mapcar (lambda (n) + (tree-node-get-name + (cdr n))) + tree-buffer-nodes) + (tree-node-get-name start-node)) tree-buffer-nodes)) tree-buffer-nodes))) (equal-fcn 'tree-buffer-node-data-equal-p)) Klaus Berndl mailto: klaus.berndl(a)sdm.de sd&m AG http://www.sdm.de software design & management Carl-Wery-Str. 42, 81739 Muenchen, Germany Tel +49 89 63812-392, Fax -220

1 participants
0 comments

[xft-sjt] Workaround crash in Label widget, build fixes 19 years, 4 months

Stephen J. Turnbull

Informative patch to xft-sjt branch Fixes crash in Label widget and problems with building without Xft. Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.418 diff -u -r1.418 ChangeLog --- ChangeLog 14 Nov 2004 12:31:09 -0000 1.418 +++ ChangeLog 10 Dec 2004 03:34:47 -0000 ＠＠ -0,0 +1,11 ＠＠ +2004-12-10 Stephen J. Turnbull <stephen(a)xemacs.org> + + * configure.usage: Various minor improvements. + +2004-12-09 Stephen J. Turnbull <stephen(a)xemacs.org> + + * configure.in: Update FSF's copyright. Support --with-xft=LIST + syntax. Try to find a directory containing freetype/ftheader.h. + + * configure.usage (--with-xft): Update. + Index: lwlib/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v retrieving revision 1.64.2.1 diff -u -r1.64.2.1 ChangeLog --- lwlib/ChangeLog 3 Dec 2004 07:40:58 -0000 1.64.2.1 +++ lwlib/ChangeLog 10 Dec 2004 03:34:50 -0000 ＠＠ -0,0 +1,21 ＠＠ +2004-12-10 Stephen J. Turnbull <stephen(a)xemacs.org> + + * lwlib-Xaw.c (xaw_create_button): + (xaw_create_progress): + (xaw_create_text_field): + Changed XtCreateManagedWidget to XtCreateWidget when child is + managed later in the same function. + + (debug_gauge): New variable. + (lw_debug_print_xt_arglist): + (lw_debug_print_class_resources): + New debug functions. + +2004-12-09 Stephen J. Turnbull <stephen(a)xemacs.org> + + * xlwmenu.c (xlwMenuResources): Use "redundant" XftFont resource. + + * xlwtabs.c: + * xlwtabsP.h: + Use USE_XFT_TABS consistently. + Index: man/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v retrieving revision 1.269 diff -u -r1.269 ChangeLog --- man/ChangeLog 16 Nov 2004 07:37:29 -0000 1.269 +++ man/ChangeLog 10 Dec 2004 03:34:53 -0000 ＠＠ -0,0 +1,19 ＠＠ +2004-11-26 Stephen J. Turnbull <stephen(a)xemacs.org> + + * internals/internals.texi (Better Rendering Support -- + Configuration with the Interim Patches): + Add documentation of X resources, especially for GUI elements. + (Better Rendering Support -- Implementation): + More comments about specification and design issues. + (Better Rendering Support -- Current Status): + New subsubsection "Bugs Reported in sjt-xft". + +2004-11-26 Stephen J. Turnbull <stephen(a)xemacs.org> + + * internals/internals.texi (Future Work -- Better Rendering Support): + New node. + (Top): + (Future Work): + (Future Work -- Lisp Engine Replacement): + Add pointers to new node. + Index: src/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v retrieving revision 1.758.2.1 diff -u -r1.758.2.1 ChangeLog --- src/ChangeLog 27 Nov 2004 05:56:00 -0000 1.758.2.1 +++ src/ChangeLog 10 Dec 2004 03:35:20 -0000 ＠＠ -0,0 +1,26 ＠＠ +2004-12-10 Stephen J. Turnbull <stephen(a)xemacs.org> + + * redisplay-x.c (x_text_width_single_run): Whitespace improvement. + +2004-12-09 Stephen J. Turnbull <stephen(a)xemacs.org> + + * glyphs-widget.c (image_instantiator_progress_gauge): + (image_instantiator_format_create_glyphs_widget): + Fix typo guage->gauge. + + * emacs.c (main_1): Casting out devils (size_t). + + * compiler.h (USED_IF_XFT): New variant. + * objects-x.c (x_font_spec_matches_charset): + * redisplay-x.c (x_text_width_single_run): + Use it. + + * config.h.in: Support USE_XFT_TABS and USE_XFT_GAUGE. + +2004-11-28 Stephen J. Turnbull <stephen(a)xemacs.org> + + * objects-x.c (x_initialize_font_instance): Make sure + FONT_INSTANCE_X_FONT is cleared for Xft fonts. Add comments. + Fiddle whitespace. + (x_print_font_instance): Clarify printed font instance. + Index: configure.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.in,v retrieving revision 1.233.2.1 diff -u -r1.233.2.1 configure.in --- configure.in 25 Nov 2004 12:43:52 -0000 1.233.2.1 +++ configure.in 10 Dec 2004 03:34:49 -0000 ＠＠ -3,7 +3,7 ＠＠ [#### Configuration script for XEmacs. Largely divergent from FSF. #### Guess values for system-dependent variables and create Makefiles. #### Generated automatically using autoconf version] AC_ACVERSION [ -#### Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +#### Copyright (C) 1992-2004 Free Software Foundation, Inc. #### Copyright (C) 1993-1995 Board of Trustees, University of Illinois. #### Copyright (C) 1996, 1997 Sun Microsystems, Inc. #### Copyright (C) 1995, 1996, 2002, 2003, 2004 Ben Wing. ＠＠ -373,7 +373,10 ＠＠ need_modules_common='' with_menubars='' dnl These conflict, try to detect incompatibility early -with_xft_menubars='no' +with_xft_emacs='yes' +with_xft_menubars='yes' +with_xft_tabs='yes' +with_xft_gauge='yes' with_xfs='no' with_scrollbars='' with_widgets='' ＠＠ -533,7 +536,6 ＠＠ with_hesiod | \ with_dnet | \ with_infodock | \ - with_xft | \ with_netinstall | \ with_ipv6_cname | \ external_widget | \ ＠＠ -838,9 +840,6 ＠＠ l | lu | luc | luci | lucid ) val=lucid ;; mo | mot | moti | motif ) val=motif ;; a | at | ath | athe | athen | athena ) val=athena ;; - dnl not in xft reloaded #3 - dnl #### for menubars only; rethink this interface - x | xf | xft ) val=xft ;; n | no | non | none ) val=no ;; y | ye | yes ) val=yes ;; dnl Explicit --with-widgets on command line means yes. ＠＠ -853,6 +852,51 ＠＠ eval "$opt=\"$val\"" ;; + dnl Has the user requested Xft support? + dnl Borrowed from the sound code + dnl not in xft reloaded #3 + "with_xft" ) + dnl values is a subset of all,emacs,menubars,tabs,gauge + dnl or their negatives: none,noemacs,nomenubars,notabs,nogauge + for x in `echo "$val" | sed -e 's/,/ /g'` ; do + case "$x" in + dnl all and none are only permitted as the first in the list. + n | no | non | none ) new_fdefault=no ;; + a | al | all | both ) new_fdefault=yes ;; + + emacs ) with_xft_emacs=yes ;; + # noemacs makes no sense + + menubars ) with_xft_menubars=yes with_xft_emacs=yes ;; + nomenubars ) with_xft_menubars=no ;; + + tabs ) with_xft_tabs=yes with_xft_emacs=yes ;; + notabs ) with_xft_tabs=no ;; + + gauge ) with_xft_gauge=yes with_xft_emacs=yes ;; + nogauge ) with_xft_gauge=no ;; + + * ) bogus_xft=yes ;; + esac + if test "$bogus_xft" -o \ + $ -n "$new_fdefault" -a -n "$xft_notfirst" $ ; then + types="\`all', \`none', \`(no)menubars', \`no(tabs)', \`(no)gauge', \`emacs'." + USAGE_ERROR(["Valid types for the \`--$optname' option are: + $types. +Option \`all' or \`none' must be first in the list. +All of \`menubars', \`tabs', and \`gauge' force \`emacs' (buffer text) on. +Use \`none,emacs' to have only the buffer text supporting Xft."]) + elif test -n "$new_fdefault" ; then + with_xft_emacs=$new_fdefault + with_xft_menubars=$new_fdefault + with_xft_tabs=$new_fdefault + with_xft_gauge=$new_fdefault + new_fdefault= # reset this + fi + xft_notfirst=true + done + ;; + dnl Obsolete legacy argument? Warn, but otherwise ignore. "use_minimal_tagbits" | \ "use_indexed_lrecord_implementation" | \ ＠＠ -881,7 +925,7 ＠＠ dnl Check for incompatible settings dnl ------------------------------- -if test "$with_xfs" = "yes" -a "$with_menubars" = "xft"; then +if test "$with_xfs" = "yes" -a "$with_xft_menubars" = "yes"; then USAGE_ERROR("XFS and Xft in the menubars are incompatible!") fi ＠＠ -3249,7 +3293,22 ＠＠ dnl include xft/AA support? dnl #### need to check for includes here (especially, freetype.h for v.2) - if test "$with_xft" = "yes"; then + if test "$with_xft_emacs" = "yes"; then + AC_CHECKING([for Xrender, fontconfig, and Xft]) + xft_includes_found=no + AC_CHECK_HEADER(freetype/config/ftheader.h,xft_includes_found=yes) + + dnl do this for /usr/include, /sw/include, and /opt/local/include, too? + freetype_include_top="/usr/X11R6/include/freetype2" + if test "$xft_includes_found" = "no" -a "$with_xft_emacs" != "no" -a \ + -d $freetype_include_top; then + save_c_switch_site="$c_switch_site" + c_switch_site="$c_switch_site -I$freetype_include_top" + AC_CHECK_HEADER(freetype/config/ftheader.h,xft_includes_found=yes) + if test "$xft_includes_found" != "yes"; then + XE_DIE(["Unable to find headers for --with-xft"]) + fi + fi AC_CHECK_LIB(Xrender, XRenderQueryExtension, XE_PREPEND(-lXrender, libs_x), [XE_DIE(["Unable to find libXrender for --with-xft"])]) AC_CHECK_LIB(fontconfig, FcPatternCreate, XE_PREPEND(-lfontconfig, libs_x), ＠＠ -4022,13 +4081,13 ＠＠ with_menubars="lucid" ;; esac -dnl "$with_menubars" = "xft" dnl this is not in xft reloaded #3 -if test "$with_menubars" = "xft" ; then - if test "$with_xft" = "yes" ; then +if test "$with_xft_menubars" != "no" ; then + if test "$with_xft_emacs" = "yes" -a "$with_menubars" != "no" ; then with_xft_menubars="yes" + else + with_xft_menubars="no" fi - with_menubars="lucid" fi case "$with_dialogs" in "" | "yes" | "lucid" ) ＠＠ -4049,6 +4108,24 ＠＠ fi ;; esac +dnl this is not in xft reloaded #3 +if test "$with_xft_tabs" != "no" ; then + if test "$with_xft_emacs" = "yes" -a "$with_widgets" != "no" ; then + with_xft_tabs="yes" + else + with_xft_tabs="no" + fi +fi + +dnl this is not in xft reloaded #3 +if test "$with_xft_gauge" != "no" ; then + if test "$with_xft_emacs" = "yes" -a "$with_widgets" != "no" ; then + with_xft_gauge="yes" + else + with_xft_gauge="no" + fi +fi + all_widgets="$with_menubars $with_scrollbars $with_dialogs $with_toolbars $with_widgets" case "$all_widgets" in ＠＠ -4138,6 +4215,9 ＠＠ dnl this is not in xft reloaded #3 test "$with_xft_menubars" = "yes" && AC_DEFINE(USE_XFT_MENUBARS) +dnl these are new in sjt-xft +test "$with_xft_tabs" = "yes" && AC_DEFINE(USE_XFT_TABS) +test "$with_xft_gauge" = "yes" && AC_DEFINE(USE_XFT_GAUGE) dnl ---------------------- dnl Mule-dependent options ＠＠ -5565,6 +5645,17 ＠＠ athena ) echo " Using Athena native widgets." ;; msw ) echo " Using MS-Windows native widgets." ;; esac +dnl this is not in xft reloaded #3 +if test "$with_xft_tabs" = "yes"; then + echo " - Using Xft to render antialiased fonts in tab controls." + echo " WARNING: This feature will be replaced with a face." +fi +dnl this is not in xft reloaded #3 +if test "$with_xft_gauge" = "yes"; then + echo " - Using Xft to render antialiased fonts in progress bars." + echo " WARNING: This feature will be replaced with a face." + echo " WARNING: This feature not yet implemented; setting ignored." +fi if test "$with_dragndrop" = yes; then echo " Compiling in support for Drag'n'Drop (EXPERIMENTAL)." echo " - Drag'n'Drop prototype: $dragndrop_proto." Index: configure.usage =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.usage,v retrieving revision 1.36.2.1 diff -u -r1.36.2.1 configure.usage --- configure.usage 25 Nov 2004 12:43:53 -0000 1.36.2.1 +++ configure.usage 10 Dec 2004 03:34:49 -0000 ＠＠ -2,10 +2,10 ＠＠ Set compilation and installation parameters for XEmacs, and report. -Note that for most of the following options, you can explicitly enable -them using `--OPTION=yes' and explicitly disable them using `--OPTION=no'. -This is especially useful for auto-detected options. -The option `--without-FEATURE' is a synonym for `--with-FEATURE=no'. +You can explicitly enable most of the following options using `--OPTION=yes' +and explicitly disable them using `--OPTION=no'. This is especially useful +for auto-detected options. The option `--without-FEATURE' is a synonym for +`--with-FEATURE=no'. Options marked with a (*) are auto-detected. ＠＠ -40,8 +40,8 ＠＠ all default compiler flags except those that control warnings. --cflags-warning=FLAGS Override compiler flags used to control warnings. - Normally, don't set this, as XEmacs already turns on - the maximum safe warning level. + Normally, use configure's defaults, and report + warnings as bugs to xemacs-beta(a)xemacs.org. --cpp=PROG C preprocessor to use (e.g. /usr/ccs/lib/cpp or cc -E) --cppflags=FLAGS C preprocessor flags (e.g. -I/foo or -Dfoo=bar) --libs=LIBS Additional libraries (e.g. -lfoo) ＠＠ -53,7 +53,7 ＠＠ 'site-libraries' --site-runtime-libraries=PATH List of ALL directories to search for dynamically - linked libraries at run time + linked libraries at run time. --dynamic=yes Link dynamically if supported by system. --dynamic=no Force static linking on systems where dynamic linking is the default. ＠＠ -85,33 +85,33 ＠＠ --docdir=DIR --moduledir=DIR You may also control individually where various - parts of XEmacs are installed. Note that we - recommend against explicitly setting any of these - variables. See the INSTALL file for a complete list + parts of XEmacs are installed. We recommend that you + accept configure's computed defaults for all of these + variables. See the INSTALL file for descriptions plus the reasons we advise not changing them. Run-time path-searching options: -------------------------------- ---with-site-lisp=yes Allow for a site-lisp directory in the XEmacs hierarchy - searched before the installation packages. +--with-site-lisp=yes Enable the formerly standard site-lisp directory in + the XEmacs hierarchy. It precedes the installation + packages in `load-path'. Now deprecated, with + installation of site LISP in the site-packages + hierarchy recommended. --with-site-modules=no Disable site-modules directory in the XEmacs hierarchy, which is searched before the installation modules. ---package-path=PATH Directories to search for packages to dump with xemacs. - PATH splits into three parts separated by double - colons (::), an early, a late, and a last part, - corresponding to their position in the various - system paths: The early part is always first, - the late part somewhere in the middle, and the - last part at the very back. - Only the late part gets seen at dump time. +--package-path=PATH Directories to search for LISP packages. + PATH has three parts separated by double colons (::), + early, late, and last. Only the late part gets seen + at dump time. Use of the "last" component should be + avoided. If PATH has only one component, that component is late. If PATH has two components, the first is early, the second is late. ---infopath=PATH Directories to search for Info documents, info dir - and localdir files in case run-time searching +--infopath=PATH Fallback directories to search for Info documents, + info dir and localdir files when run-time searching for them fails. ＠＠ -134,7 +134,6 ＠＠ widgets emulate Motif (mostly) but are faster. *WARNING* The Motif menubar is currently broken. Lucid menubars are the default. - *Experimental* (xft). Xft menubar, requires --with-xft --with-scrollbars=TYPE Use TYPE scrollbars (lucid, motif, athena, or no). Lucid scrollbars are the default. --with-dialogs=TYPE Use TYPE dialog boxes (lucid, motif, athena, or no). ＠＠ -159,6 +158,14 ＠＠ unpredictable. --with-xmu=no (*) For those unfortunates whose vendors don't ship Xmu. --external-widget Compile with external widget support. +--with-xft=TYPE[,TYPE[,...]] Compile with support for Xft. Valid types are + emacs (ie, in the text buffer), menubars, tabs, and + gauge (currently unsupported), and all and none. + *WARNING* This interface is UNSTABLE. `all' and + `none' should continue to be accepted + indefinitely, but the other types may + change WITHOUT NOTICE. + Non-nil values are incompatible with --with-xfs. TTY (character terminal) options: ＠＠ -166,29 +173,23 ＠＠ --with-tty=no Don't support ttys. --with-ncurses (*) Use the ncurses library for tty support. ---with-gpm (*) Compile in GPM mouse support for ttys. +--with-gpm (*) Support mouse pointer on ttys. Requires libgpm. Image options: -------------- ---with-xpm (*) Compile with support for XPM images. PRACTICALLY - REQUIRED. Although this library is nonstandard and - a real hassle to build, many basic things (e.g. - toolbars) depend on it, and you will run into - many problems without it. ---with-png (*) Compile with support for PNG images. Recommended - because the images on the About page are not viewable - without it. ---with-jpeg (*) Compile with support for JPEG images. Useful if - you are using a mail, news reader, or web browser - in XEmacs, so that JPEG images can be displayed. ---with-tiff (*) Compile with support for TIFF images. Possibly - useful, for the same reason as JPEG images. ---with-xface (*) Compile with support for X-Face mail headers. - Requires the compface package. Of doubtful - usefulness. ---with-gif=no Compile without the (builtin) support for GIF images. +--with-xpm (*) Support display of XPM images. PRACTICALLY REQUIRED. + Many basic things (e.g. toolbars) depend on it, and + you will run into many problems without it. + Requires libXpm, not standard in older X11s. +--with-png (*) Support display of PNG images. Recommended; + the About page uses PNG images. Requires libpng. +--with-jpeg (*) Support display of JPEG images. Requires libjpeg. +--with-tiff (*) Support display of TIFF images. Requires libtiff. +--with-xface (*) Support display of X-Face mail headers. + Requires compface. +--with-gif=no Disable builtin support for GIF images. Sound options: ＠＠ -202,36 +203,34 ＠＠ Later options override earlier ones for the same TYPE. The default is to autodetect all sound support except for ESD which defaults to off. ---native-sound-lib=LIB Native sound support library. Needed on Suns - with `--with-sound=native,nas' because both sound - libraries are called libaudio. +--native-sound-lib=LIB Native sound support library. For Suns with + `--with-sound=native,nas' because both sound libraries + are called libaudio. Internationalization options: ----------------------------- ---with-mule Compile with Mule (MUlti-Lingual Emacs) support, - needed to support non-Latin-1 (including Asian) - languages. ---with-xim=xlib Compile with support for X input methods, ---with-xim=motif (*) Used in conjunction with Mule support. - Use either raw Xlib to provide XIM support, or - the Motif XmIm* routines (when available). +--with-mule Enable MUlti-Lingual Extensions to Emacs. + Supported interface for input and display of languages + not supportable with ISO 8859/1. +--with-xim=xlib Support the X Input Method protocol with Mule. +--with-xim=motif (*) `xlib' uses raw Xlib to provide XIM support. `motif' + uses the Motif XmIm* routines (when available). NOTE: On some systems bugs in X11's XIM support will cause XEmacs to crash, so by default, no XIM support is compiled in, unless running on Solaris and the XmIm* routines are detected. ---with-canna (*) Compile with support for Canna (a Japanese input method - used in conjunction with Mule support). ---with-wnn (*) Compile with support for Wnn (a multi-language input - method used in conjunction with Mule support). ---with-wnn6 (*) Compile with support for the commercial package Wnn6. +--with-canna (*) Enable "native" support of Japanese input via Canna. + Requires libcanna. +--with-wnn (*) Enable "native" support of Japanese input via Wnn. + Requires libwnn (from the FreeWnn project). +--with-wnn6 (*) Enable "native" support of Japanese input via Wnn6. + Requires libwnn6, a commercial package from Omron. --with-i18n3 Compile with I18N level 3 (support for message - translation). This doesn't currently work. ---with-xfs Compile with XFontSet support for internationalized - menubar. Incompatible with `--with-xim=motif'. - `--with-menubars=lucid' (the default) is desirable. - + translation). CURRENTLY BROKEN. +--with-xfs Enable XFontSet support for localized menubar. + Incompatible with `--with-xim=motif' and `--with-xft'. File-related options: --------------------- ＠＠ -281,6 +280,11 ＠＠ Memory allocation options: -------------------------- +--pdump Portable, relocatable dumper. Now stable, and + recommended for use on all platforms. It is the + default on most platforms now. +--with-modules (*) Compile in experimental support for dynamically + loaded libraries (Dynamic Shared Objects). --rel-alloc Use the relocating allocator (default for this option is system-dependent). --with-dlmalloc Control usage of Doug Lea malloc on systems that have ＠＠ -290,12 +294,16 ＠＠ --with-debug-malloc Use the debugging malloc package. -Emacs Lisp options: -------------------- +Emacs LISP extension options: +----------------------------- --use-number-lib=TYPE Compile in support for bignums, ratios, or bigfloats using library support. TYPE must be one of "gmp" (for GNU MP), "mp" (for BSD MP), or "no" (disabled). + GNU MP is recommended over BSD MP. + *WARNING* The meaning of existing valid programs will + change on some data. Almost always this is + desirable, but there are a few subtle cases. Debugging options: ＠＠ -317,25 +325,23 ＠＠ XEmacs will still work (more or less) without them. Potentially dangerous if you don't know what you're doing. This (1) doesn't garbage-collect after loading - each file during dumping, (2) doesn't - automatically rebuild the DOC file (remove it by hand - to get it rebuilt), (3) Removes config.h, lisp.h and - associated files from the dependency lists, so changes - to these files don't automatically cause all .c files - to be rebuilt. + each file during dumping, (2) doesn't automatically + rebuild the DOC file (remove it by hand to get it + rebuilt), (3) Removes config.h, lisp.h and associated + files from the dependency lists, so changes to these + files will not force all .c files to be rebuilt. --use-union-type Enable or disable use of a union, instead of an int, for the fundamental Lisp_Object type; this - provides stricter type-checking. WARNING: This has - a tendency to trigger compiler bugs, especially in + provides stricter type-checking. *WARNING* This has + a history of triggering compiler bugs, especially in combination with other features that increase the complexity of expressions, for example `--with-mule' and `--error-checking=all'. Crashes have been - observed with union type in combination with the - two options just mentioned under various versions of - GCC as well as MSVC++ 6.0. Furthermore, many - debuggers have problems (i.e. bugs) dealing with - unions, and even for those that don't, debugging can - be inconvenient because of no syntax for entering a + observed with union type in combination with the two + options just mentioned under various versions of GCC + as well as MSVC++ 6.0. Furthermore, many debuggers + handle unions incorrectly, and those that do display + them correctly may lack any syntax for entering a union. We recommend `--use-union-type' *ONLY* for testing purposes, not for production builds. If you are using `-use-union-type' and get some weird ＠＠ -349,15 +355,7 ＠＠ --with-workshop Support the Sun WorkShop (formerly Sparcworks) development environment. ---pdump New, portable, relocatable dumper. Currently works - quite well, somewhere in beta-to-late-beta, we - might say. (Infamous for being the former - "experimental, don't-sue-me-if-your-house-collapses- - and-your-wife-leaves-you" portable dumper.) --use-kkcc Enable the use of new GC algorithms. (EXPERIMENTAL) ---with-modules (*) Compile in experimental support for dynamically - loaded libraries (Dynamic Shared Objects). ---with-xft Antialiased Fonts via Xft If successful, configure leaves its status in config.status. If Index: lwlib/lwlib-Xaw.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/lwlib-Xaw.c,v retrieving revision 1.11 diff -u -r1.11 lwlib-Xaw.c --- lwlib/lwlib-Xaw.c 20 Sep 2004 19:19:16 -0000 1.11 +++ lwlib/lwlib-Xaw.c 10 Dec 2004 03:34:50 -0000 ＠＠ -52,6 +52,7 ＠＠ static void xaw_generic_callback (Widget, XtPointer, XtPointer); +extern int debug_xft; Boolean lw_xaw_widget_p (Widget widget) ＠＠ -738,7 +739,7 ＠＠ lw_add_value_args_to_args (val, al, &ac); if (!val->call_data) - button = XtCreateManagedWidget (val->name, labelWidgetClass, + button = XtCreateWidget (val->name, labelWidgetClass, instance->parent, al, ac); else ＠＠ -746,20 +747,21 ＠＠ if (val->type == TOGGLE_TYPE || val->type == RADIO_TYPE) { XtSetArg (al [ac], XtNstate, val->selected); ac++; - button = XtCreateManagedWidget + button = XtCreateWidget (val->name, val->type == TOGGLE_TYPE ? checkboxWidgetClass : radioWidgetClass, instance->parent, al, ac); } else { - button = XtCreateManagedWidget (val->name, commandWidgetClass, + button = XtCreateWidget (val->name, commandWidgetClass, instance->parent, al, ac); } XtRemoveAllCallbacks (button, XtNcallback); XtAddCallback (button, XtNcallback, xaw_generic_callback, (XtPointer)instance); } + /* #### this maybe can be folded into the XtCreateWidget calls above */ XtManageChild (button); return button; ＠＠ -788,7 +790,8 ＠＠ label = XtCreateManagedWidget (val->name, labelWidgetClass, parent, al, ac); - /* Do it again for arguments that have no effect until the widget is realized. */ + /* Do it again for arguments that have no effect until the widget is realized. + #### Uh, but the widget isn't realized until later? Do we mean "created"? */ ac = 0; lw_add_value_args_to_args (val, al, &ac); if (ac > 20) ＠＠ -798,6 +801,60 ＠＠ return label; } +static int debug_gauge = 1; + +static void +lw_debug_print_xt_arglist (ArgList al, int ac) +{ + int i; + for (i = 0; i < ac; i++) + fprintf (stderr, "Widget has arg of type %s with value %lu.\n", + al[i].name, (unsigned long) al[i].value); +} + +static void +lw_debug_print_class_resources (WidgetClass class_) +{ + Cardinal i; + do { + Cardinal m, n = class_->core_class.num_resources; + XtResourceList rl; + fprintf (stderr, "Class is %s (%p/%p) with %d resources.\n", + class_->core_class.class_name, class_, &(class_->core_class), n); + fprintf (stderr, " Class's resources are at %p. Converting...\n", + class_->core_class.resources); + /* resources may be compiled to an internal format */ + XtGetResourceList (class_, &rl, &m); + for (i = 0; i < m; i++) + fprintf (stderr, + " Class has a %s resource of type %s initialized from %s.\n", + rl[i].resource_class, rl[i].resource_type, rl[i].default_type); + /* special cases for commonly problematic resources */ + for (i = 0; i < m; i++) + { + if (!strcmp (rl[i].resource_class, "Font")) + { + fprintf (stderr, " Class has a Font resource.\n"); + fprintf (stderr, " Font resource is %s.\n", + (char *) rl[i].default_addr); + } + if (!strcmp (rl[i].resource_class, "FontSet")) + { + fprintf (stderr, " Class has a FontSet resource.\n"); + fprintf (stderr, " FontSet resource is %s.\n", + (char *) rl[i].default_addr); + } + if (!strcmp (rl[i].resource_class, "International")) + { + fprintf (stderr, " Class has an International resource.\n"); + fprintf (stderr, " International resource is %d.\n", + (int) rl[i].default_addr); + } + } + class_ = class_->core_class.superclass; + } while (class_ != NULL); +} + static Widget xaw_create_progress (widget_instance *instance) { ＠＠ -826,12 +883,20 ＠＠ /* add any args the user supplied for creation time */ lw_add_value_args_to_args (val, al, &ac); - scale = XtCreateManagedWidget (val->name, gaugeWidgetClass, - instance->parent, al, ac); + if (debug_gauge > 1) + lw_debug_print_class_resources (gaugeWidgetClass); + if (debug_gauge > 0) + lw_debug_print_xt_arglist (al, ac); + + scale = XtCreateWidget (val->name, gaugeWidgetClass, + instance->parent, al, ac); + /* add the callback */ if (val->call_data) - XtAddCallback (scale, XtNgetValue, xaw_generic_callback, (XtPointer)instance); + XtAddCallback (scale, XtNgetValue, xaw_generic_callback, + (XtPointer) instance); + /* #### this maybe can be folded into the XtCreateWidget call above */ XtManageChild (scale); return scale; ＠＠ -864,7 +929,7 ＠＠ /* add any args the user supplied for creation time */ lw_add_value_args_to_args (val, al, &ac); - text = XtCreateManagedWidget (val->name, asciiTextWidgetClass, + text = XtCreateWidget (val->name, asciiTextWidgetClass, instance->parent, al, ac); /* add the callback */ Index: lwlib/lwlib-colors.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/Attic/lwlib-colors.c,v retrieving revision 1.1.2.1 diff -u -r1.1.2.1 lwlib-colors.c --- lwlib/lwlib-colors.c 25 Nov 2004 12:44:04 -0000 1.1.2.1 +++ lwlib/lwlib-colors.c 10 Dec 2004 03:34:50 -0000 ＠＠ -33,7 +33,7 ＠＠ #include <X11/ShellP.h> /* for ShellWidget */ #include "lwlib-colors.h" -extern int debug_xft; +static int debug_colors = 1; #ifdef __cplusplus #define X_CLASSFIELD c_class ＠＠ -64,14 +64,15 ＠＠ } if (*visual == CopyFromParent || !*visual) { - if (debug_xft) + if (debug_colors > 1) fprintf (stderr, "\nvisual_info_from_widget:" " failed, using DefaultVisualOfScreen"); *visual = DefaultVisualOfScreen (XtScreen (widget)); /* #### Why doesn't DefaultDepth0fScreen work here? */ - *depth = DefaultDepth (XtDisplay (widget), 0); + /* *depth = DefaultDepth (XtDisplay (widget), 0); */ + *depth = DefaultDepthOfScreen (XtScreen (widget)); } - else if (debug_xft) + else if (debug_colors > 1) fprintf (stderr, "\nvisual_info_from_widget: succeeded"); } Index: lwlib/xlwmenu.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwmenu.c,v retrieving revision 1.37.2.1 diff -u -r1.37.2.1 xlwmenu.c --- lwlib/xlwmenu.c 25 Nov 2004 12:44:06 -0000 1.37.2.1 +++ lwlib/xlwmenu.c 10 Dec 2004 03:34:51 -0000 ＠＠ -90,13 +90,12 ＠＠ *fontList resource set, or at least know how to deal with this. */ XtRString, (XtPointer) "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1"}, #else -#ifdef USE_XFT_MENUBARS - {XtNfont, XtCFont, XtRString, sizeof (String), - offset(menu.renderFontSpec), - XtRString, (XtPointer) "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1"}, -#else {XtNfont, XtCFont, XtRFontStruct, sizeof(XFontStruct *), offset(menu.font), XtRString, (XtPointer) "XtDefaultFont"}, +#ifdef USE_XFT_MENUBARS + {XtNxftFont, XtCXftFont, XtRString, sizeof (String), + offset(menu.renderFontSpec), + XtRString, (XtPointer) "Helvetica-12:bold"}, #endif # ifdef USE_XFONTSET /* #### Consider using the same method as for Motif; see the comment in Index: lwlib/xlwmenuP.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwmenuP.h,v retrieving revision 1.4.20.1 diff -u -r1.4.20.1 xlwmenuP.h --- lwlib/xlwmenuP.h 25 Nov 2004 12:44:06 -0000 1.4.20.1 +++ lwlib/xlwmenuP.h 10 Dec 2004 03:34:51 -0000 ＠＠ -32,11 +32,11 ＠＠ XmFontList font_list_2; XmFontList fallback_font_list; #else + XFontStruct * font; #ifdef USE_XFT_MENUBARS + /* #### Fix naming convention here */ String renderFontSpec; XftFont *renderFont; -#else - XFontStruct * font; #endif # ifdef USE_XFONTSET XFontSet font_set; Index: lwlib/xlwtabs.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwtabs.c,v retrieving revision 1.4.2.2 diff -u -r1.4.2.2 xlwtabs.c --- lwlib/xlwtabs.c 3 Dec 2004 07:40:58 -0000 1.4.2.2 +++ lwlib/xlwtabs.c 10 Dec 2004 03:34:52 -0000 ＠＠ -148,7 +148,7 ＠＠ offset(selectInsensitive), XtRImmediate, (XtPointer) True}, {XtNfont, XtCFont, XtRFontStruct, sizeof(XFontStruct *), offset(font), XtRString, (XtPointer) XtDefaultFont}, -#ifdef USE_XFT +#ifdef USE_XFT_TABS /* #### Maybe use "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1" here? */ {XtNxftFont, XtCXftFont, XtRString, sizeof (String), offset(renderFontSpec), XtRString, ＠＠ -416,7 +416,7 ＠＠ ((TabsConstraints)((tab)->core.constraints))->tabs.visible) -#ifdef USE_XFT +#ifdef USE_XFT_TABS extern int debug_xft; /* from lwlib-face.c */ /* #### duplicated from xlwmenu.c -- CLEAN THIS SHIT UP! ＠＠ -472,7 +472,7 ＠＠ */ newTw->tabs.tab_height = 2 * newTw->tabs.internalHeight + SHADWID ; -#ifdef USE_XFT +#ifdef USE_XFT_TABS /* must get font here to do this right, we should add a new Xt Resource type + conversion function ＠＠ -487,11 +487,11 ＠＠ newTw->tabs.tab_height += newTw->tabs.renderFont->ascent + newTw->tabs.renderFont->descent; #endif /* XFT_USE_HEIGHT_NOT_ASCENT_DESCENT */ -#else /* ! USE_XFT */ +#else /* ! USE_XFT_TABS */ if (newTw->tabs.font != NULL) newTw->tabs.tab_height += newTw->tabs.font->max_bounds.ascent + newTw->tabs.font->max_bounds.descent; -#endif /* ! USE_XFT */ +#endif /* ! USE_XFT_TABS */ /* if size not explicitly set, set it to our preferred size now. */ ＠＠ -666,7 +666,7 ＠＠ int i ; if( -#ifdef USE_XFT +#ifdef USE_XFT_TABS tw->tabs.renderFont != curtw->tabs.renderFont || #else tw->tabs.font != curtw->tabs.font || ＠＠ -676,7 +676,7 ＠＠ { tw->tabs.tab_height = 2 * tw->tabs.internalHeight + SHADWID; -#ifdef USE_XFT +#ifdef USE_XFT_TABS if (tw->tabs.renderFont != NULL) #if XFT_USE_HEIGHT_NOT_ASCENT_DESCENT tw->tabs.tab_height += tw->tabs.renderFont->height; ＠＠ -684,11 +684,11 ＠＠ tw->tabs.tab_height += tw->tabs.renderFont->ascent + tw->tabs.renderFont->descent; #endif /* XFT_USE_HEIGHT_NOT_ASCENT_DESCENT */ -#else /* ! USE_XFT */ +#else /* ! USE_XFT_TABS */ if (tw->tabs.font != NULL) tw->tabs.tab_height += tw->tabs.font->max_bounds.ascent + tw->tabs.font->max_bounds.descent; -#endif /* ! USE_XFT */ +#endif /* ! USE_XFT_TABS */ /* Tab size has changed. Resize all tabs and request a new size */ for(i=0, childP=tw->composite.children; ＠＠ -705,7 +705,7 ＠＠ if (tw->core.background_pixel != curtw->core.background_pixel || tw->core.background_pixmap != curtw->core.background_pixmap || -#ifdef USE_XFT +#ifdef USE_XFT_TABS tw->tabs.renderFont != curtw->tabs.renderFont #else tw->tabs.font != curtw->tabs.font ＠＠ -1579,8 +1579,8 ＠＠ GC gc ; int x,y ; -#ifdef USE_XFT - if (debug_xft) fprintf (stderr, "\nDrawTab called.\n"); +#ifdef USE_XFT_TABS + if (debug_xft > 0) fprintf (stderr, "DrawTab called.\n"); #endif if( !XtIsRealized((Widget)tw)) ＠＠ -1595,7 +1595,7 ＠＠ Window win = XtWindow((Widget)tw) ; String lbl = tab->tabs.label != NULL ? tab->tabs.label : XtName(child) ; -#ifdef USE_XFT +#ifdef USE_XFT_TABS XftColor color; XftColor colorBG; Colormap cmap = tw->core.colormap; ＠＠ -1606,17 +1606,14 ＠＠ colorBG = xft_convert_color (dpy, cmap, visual, tw->core.background_pixel, 0); - if (debug_xft) - { - fprintf (stderr, "\n(Re)drawing labels."); - fprintf (stderr, "\nlbl: %s.", lbl); - } + if (debug_xft > 0) + fprintf (stderr, "(Re)drawing labels.\n"); #endif if (XtIsSensitive(child)) { gc = tw->tabs.foregroundGC; -#ifdef USE_XFT +#ifdef USE_XFT_TABS color = xft_convert_color (dpy, cmap, visual, tab->tabs.foreground, 0); #else ＠＠ -1638,7 +1635,7 ＠＠ tab->tabs.greyAlloc = True; } gc = tw->tabs.greyGC; -#ifdef USE_XFT +#ifdef USE_XFT_TABS color = xft_convert_color (dpy, cmap, visual, tab->tabs.grey, 0); #else XSetForeground(dpy, gc, tab->tabs.grey); ＠＠ -1663,14 +1660,14 ＠＠ } if (lbl != NULL && -#ifdef USE_XFT +#ifdef USE_XFT_TABS tw->tabs.renderFont != NULL #else tw->tabs.font != NULL #endif ) { -#ifdef USE_XFT +#ifdef USE_XFT_TABS XftDraw *xftDraw = XftDrawCreate (dpy, win, visual, cmap); XftFont *renderFont = tw->tabs.renderFont; /* [[ #### FMH!! something is tromping on this string! ]] ＠＠ -1685,9 +1682,9 ＠＠ /* #### unnecessary? */ /* draw background rect */ #if 1 - if (debug_xft) - fprintf (stderr, "\nColor: pixel=%08lx, red=%04x," - " green=%04x, blue=%04x, alpha=%04x.", + if (debug_xft > 0) + fprintf (stderr, "background color: pixel=%08lx, r=%04x," + " g=%04x, b=%04x, alpha=%04x.\n", colorDBG.pixel, colorDBG.color.red, colorDBG.color.green, colorDBG.color.blue, colorDBG.color.alpha); ＠＠ -1698,7 +1695,7 ＠＠ glyphinfo.width, glyphinfo.height); #endif /* draw text */ - if (debug_xft) + if (debug_xft > 0) { /* [[ #### URK! fontconfig frees size!! ]] That has got to be an artifact of something writing ＠＠ -1707,17 +1704,17 ＠＠ FcValue size; FcPatternGet (renderFont->pattern, FC_FAMILY, 0, &name); FcPatternGet (renderFont->pattern, FC_SIZE, 0, &size); - fprintf (stderr, "\nlbl: %s.", lbl); - fprintf (stderr, "\nColor: pixel=%08lx, red=%04x," - " green=%04x, blue=%04x, alpha=%04x.", + fprintf (stderr, "label: %s.", lbl); + fprintf (stderr, "foreground color: pixel=%08lx, r=%04x," + " g=%04x, b=%04x, alpha=%04x.\n", color.pixel, color.color.red, color.color.green, color.color.blue, color.color.alpha); - fprintf (stderr, "\nExtent: x=%d, y=%d, xOffset=%d," - " yOffset=%d, height=%d, width=%d", + fprintf (stderr, "extent: x=%d, y=%d, xOffset=%d," + " yOffset=%d, height=%d, width=%d.\n", glyphinfo.x, glyphinfo.y, glyphinfo.xOff, glyphinfo.yOff, glyphinfo.height, glyphinfo.width); - fprintf (stderr, "\nFont: name=%s-%.1f, height=%d," - " ascent=%d, descent=%d", + fprintf (stderr, "font: name=%s-%.1f," + " height=%d, ascent=%d, descent=%d.\n", name.u.s, size.u.d, renderFont->height, renderFont->ascent, renderFont->descent); } ＠＠ -1735,9 +1732,6 ＠＠ if (child == tw->tabs.hilight) DrawHighlight(tw, child, False); -#ifdef USE_XFT - if (debug_xft) fprintf (stderr, "\n"); -#endif } ＠＠ -1939,7 +1933,7 ＠＠ TabsWidget tw = (TabsWidget)XtParent(w) ; String lbl = tab->tabs.label != NULL ? tab->tabs.label : XtName(w); -#ifdef USE_XFT +#ifdef USE_XFT_TABS XftFont *font = tw->tabs.renderFont; #else XFontStruct *font = tw->tabs.font; ＠＠ -1958,7 +1952,7 ＠＠ if( lbl != NULL && font != NULL ) { -#ifdef USE_XFT +#ifdef USE_XFT_TABS tab->tabs.width += x_xft_text_width (XtDisplay(tw), font, lbl, (int)strlen(lbl)) + iw; tab->tabs.l_y = (tw->tabs.tab_height ＠＠ -1967,12 +1961,12 ＠＠ - tw->tabs.renderFont->descent)/2; if (debug_xft) { - fprintf (stderr, "\nTab: height=%d, width=%d, baseline=%d", - tw->tabs.tab_height, tab->tabs.width, tab->tabs.l_y); - fprintf (stderr, "\nFont: height=%d, ascent=%d, descent=%d\n", - tw->tabs.renderFont->height, - tw->tabs.renderFont->ascent, - tw->tabs.renderFont->descent); + fprintf (stderr, "tab: height=%d, width=%d, baseline=%d.\n", + tw->tabs.tab_height, tab->tabs.width, tab->tabs.l_y); + fprintf (stderr, "font: height=%d, ascent=%d, descent=%d.\n", + tw->tabs.renderFont->height, + tw->tabs.renderFont->ascent, + tw->tabs.renderFont->descent); } #else tab->tabs.width += XTextWidth (font, lbl, (int)strlen(lbl)) + iw; ＠＠ -2364,7 +2358,7 ＠＠ values.background = tw->core.background_pixel; values.font = -#ifdef USE_XFT +#ifdef USE_XFT_TABS None; #else tw->tabs.font->fid; ＠＠ -2374,13 +2368,13 ＠＠ tw->tabs.foregroundGC = XtAllocateGC(w, w->core.depth, -#ifndef USE_XFT +#ifndef USE_XFT_TABS GCFont| #endif GCBackground|GCLineStyle, &values, GCForeground, -#ifdef USE_XFT +#ifdef USE_XFT_TABS GCFont| #endif GCSubwindowMode|GCGraphicsExposures|GCDashOffset| ＠＠ -2395,7 +2389,7 ＠＠ values.background = tw->core.background_pixel; values.font = -#ifdef USE_XFT +#ifdef USE_XFT_TABS None; #else tw->tabs.font->fid; ＠＠ -2409,12 +2403,12 ＠＠ tw->tabs.greyGC = XtAllocateGC(w, w->core.depth, -#ifndef USE_XFT +#ifndef USE_XFT_TABS GCFont| #endif GCBackground|GCStipple|GCFillStyle, &values, GCForeground, -#ifdef USE_XFT +#ifdef USE_XFT_TABS GCFont| #endif GCSubwindowMode|GCGraphicsExposures|GCDashOffset| ＠＠ -2425,14 +2419,14 ＠＠ { tw->tabs.greyGC = XtAllocateGC(w, w->core.depth, -#ifdef USE_XFT +#ifdef USE_XFT_TABS 0L, #else GCFont, #endif &values, GCForeground, -#ifdef USE_XFT +#ifdef USE_XFT_TABS GCFont| #endif GCBackground|GCSubwindowMode|GCGraphicsExposures|GCDashOffset| Index: lwlib/xlwtabsP.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwtabsP.h,v retrieving revision 1.2.20.1 diff -u -r1.2.20.1 xlwtabsP.h --- lwlib/xlwtabsP.h 25 Nov 2004 12:44:07 -0000 1.2.20.1 +++ lwlib/xlwtabsP.h 10 Dec 2004 03:34:52 -0000 ＠＠ -41,7 +41,7 ＠＠ #endif #include "xlwtabs.h" -#ifdef USE_XFT +#ifdef USE_XFT_TABS #include <X11/Xft/Xft.h> #endif ＠＠ -73,10 +73,10 ＠＠ typedef struct { /* resources */ XFontStruct *font ; -#ifdef USE_XFT_MENUBARS +#ifdef USE_XFT_TABS String renderFontSpec; XftFont *renderFont; #endif Index: man/internals/internals.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/internals/internals.texi,v retrieving revision 1.52 diff -u -r1.52 internals.texi --- man/internals/internals.texi 16 Nov 2004 07:37:31 -0000 1.52 +++ man/internals/internals.texi 10 Dec 2004 03:35:05 -0000 ＠＠ -638,6 +638,7 ＠＠ * Future Work -- Display Tables:: * Future Work -- Making Elisp Function Calls Faster:: * Future Work -- Lisp Engine Replacement:: +* Future Work -- Better Rendering Support:: Future Work -- Toolbars ＠＠ -17523,6 +17524,7 ＠＠ * Future Work -- Display Tables:: * Future Work -- Making Elisp Function Calls Faster:: * Future Work -- Lisp Engine Replacement:: +* Future Work -- Better Rendering Support:: ＠end menu ＠node Future Work -- General Suggestions, Future Work -- Elisp Compatibility Package, Future Work, Future Work ＠＠ -22362,7 +22364,7 ＠＠＠end itemize -＠node Future Work -- Lisp Engine Replacement, , Future Work -- Making Elisp Function Calls Faster, Future Work +＠node Future Work -- Lisp Engine Replacement, Future Work -- Better Rendering Support, Future Work -- Making Elisp Function Calls Faster, Future Work ＠section Future Work -- Lisp Engine Replacement ＠cindex future work, lisp engine replacement ＠cindex lisp engine replacement, future work ＠＠ -22972,6 +22974,332 ＠＠ ad-hocked since kingdom come, and it's high time that we make this work properly so that it could be relied upon, and a lot of things could "just work". + + +＠node Future Work -- Better Rendering Support, , Future Work -- Lisp Engine Replacement, Future Work +＠section Future Work -- Better Rendering Support +＠cindex future work, better rendering support +＠cindex better rendering support, future work + +This section was written by Stephen Turnbull <stephen＠(a)xemacs.org>, so +don't blame Ben (or Eric and Matthias, for that matter). Feel free to +add, edit, and share the blame, guys! + +＠c #### make these ＠urlref's!! +As of late November 2004, this principally means adding support for the +＠file{Xft} library, which provides a more robust ＠emph{font +configuration} mechanism via Keith Packard's ＠file{fontconfig} library +improved glyph rendering, including antialiasing, via the +＠file{freetype} library, and client-side rendering (saving bandwidth and +server memory) via the ＠file{XRender extension}. In fact, patches which +provide Xft support have been available for several years, but the +authors have been unwilling to deal with several important issues which +block integration. These are ＠emph{Mule}, and more generally, +＠emph{face} support; ＠emph{widget} support (including the toolbar and +menubar); and ＠emph{redisplay refactoring}. + +＠c Describe Alexey Gladkov and Yury Konovalov's work. + +However, in late 2003 Eric Knauel <knauel＠(a)informatik.uni-tuebingen.de> +and Matthias Neubauer <neubauer＠(a)informatik.uni-freiburg.de> put forward +a relatively complete patch which was robust to daily use in ISO 8859-1 +locales, and Stephen Turnbull began work on the integration issues. At +this point a (private) CVS branch is available for Stephen's patch +(branch point tag ＠samp{sjt-xft-bp}, branch tag ＠samp{sjt-xft}), and +one may be made available for the Knauel-Matthias patch soon. + +＠menu +* Better Rendering Support -- Issues:: +* Better Rendering Support -- Implementation:: +* Better Rendering Support -- Current Status:: +* Better Rendering Support -- Configuration with the Interim Patches:: +＠end menu + + +＠node Better Rendering Support -- Issues, Better Rendering Support -- Implementation, , Future Work -- Better Rendering Support +＠subsection Better Rendering Support -- Issues +＠cindex better rendering support, issues +＠cindex issues, better rendering support + +Of course it's ``unfair'' to demand that the implementers of a nice +feature like anti-aliasing support deal with accumulated cruft of the +last few years, but somebody must, sometime soon. Even core developers +are complaining about how slow XEmacs is in some applications, and there +is reason to believe that some of the problem is in redisplay. +Adding more ＠emph{ad hoc} features to redisplay will make the whole +module more complex and unintelligible. Even if it doesn't inherently +further detract from efficiency, it will surely make reform and +refactoring harder. + +Similar considerations apply to Mule support. If Xft support is not +carefully designed, or implemented with Mule support soon, it will +undoubtedly make later Mule implementation far more difficult than it +needs to be, and require redundant work be done (＠emph{e.g.}, on +＠samp{Options} menu support). + +Besides the design issue---and many users are requesting more +flexibility, primarily face support, from the widgets---with widget +support there is also an aesthetic issue. It is horribly unimpressive to +have clunky bitmapped fonts on the decorations when pleasant antialiased +fonts are available in the buffer. + +Finally, these issues interact. Widgets and faces are inherently +heavyweight objects, requiring orders of magnitude more computation than +simply displaying a string in a fixed font. This will have an +efficiency impact, of course. And they interact with each other; Mule +was designed for use in buffers and display in Emacs windows---but a +widget's content is usually not a buffer, and widgets need not be +displayed in a window, but may appear in other contexts, especially in +the gutters. So specifiers will probably have to be reworked, in order +to properly support display of different faces in non-buffer, non-window +contexts. + +＠node Better Rendering Support -- Implementation, Better Rendering Support -- Current Status, Better Rendering Support -- Issues, Future Work -- Better Rendering Support +＠subsection Better Rendering Support -- Implementation +＠cindex better rendering support, implementation +＠cindex implementation, better rendering support + +Stephen is thinking in terms of the following components of a +comprehensive proposal. + +＠table ＠strong +＠item Font configuration +In XEmacs, font configuration is handled via ＠emph{faces}. Currently +XEmacs uses a special type of ＠emph{font specifier} to map XEmacs +locales to font names. Especially under X11, this can cause annoying +problems because of the unreliability of X servers' mappings from +＠samp{XLFD} names to X11 fonts, over which XEmacs has no influence +whatsoever. However, the ＠file{fontconfig} library which is used with +＠file{Xft} provides much more reliable mapping, along with a more +reliably parsable naming scheme similar to that used by TrueType fonts +on MS Windows and the Macintosh. Since the capabilities of font +specifiers and ＠file{fontconfig} overlap, we should consider using +＠file{fontconfig} instead of ＠samp{XLFD} names. This implies that use +of ＠file{Xft}'s rendering functionality should be separated from use of +＠file{fontconfig}. + +＠item Font menus +The ＠samp{Options->Font} and ＠samp{Options->Font Sizes} menus are +broken, by design, not just by ＠file{Xft}. Although they work better +in Eric and Matthias's patch than in Stephen's, even their version has +the problem that many fonts are unavailable because they don't match the +current size---which is very strange, since ＠file{Xft} fonts are of +course scalable. But the whole idea of requiring that the font match +the size is strange. And the ＠samp{Options->Font Weights} menu is just +disabled, and has been for eons. + +＠item X resources +Currently in Stephen's patch there are ＠emph{four} treatments of font +resources. There are the ＠samp{XEmacs.(a)var{face}.attributeFont} +resources used to set a single global font specification. In the +widgets, some (still) have a ＠samp{font} resource using the automatic +＠file{Xt} resource conversion to ＠samp{FontStruct}, some have separate +＠samp{font} and ＠samp{xftFont} resources with the former automatically +converted to ＠samp{FontStruct} by ＠file{Xt} and the latter left as a +string, to be converted by ＠samp{XftParseName} later, and some have a +single ＠samp{font} resource which is converted to ＠samp{FontStruct} by +＠file{Xt} or the latter left as a string, depending on whether +＠file{Xft} was enabled by ＠samp{configure} or not. + +Stephen thinks that all of these should be converted to use the face +approach, perhaps with some way to set specifications for individual +widgets, frames, or buffers. This will require some careful design work +to incorporate face support in the widgets. We should just accept any +or all of ＠samp{font}, ＠samp{fontSet}, and ＠samp{fontList} resources, +treat them all as lists of font names, either ＠samp{XLFD}- or +＠file{fontconfig}-style, parse them ourselves (ie, not use the ＠file{Xt} +resource manager), and add them to font specifiers as appropriate. But +this will require a bit of thought to obey POLA vis-a-vis usual ＠file{Xt} +conventions. + +＠item Rendering engine objects +With the introduction of the ``Xft patch,'' the X11, Macintosh, and MS +Windows platforms are all able to support multiple font rendering +engines in the same binary. Generically, there are several tasks that +must be accomplished to render text on the display. In both cases the +code is rather disorganized, with substantial cross-platform duplication +of similar routines. While it may not be worthwhile to go the whole way +to ＠samp{RENDERER_HAS_METHOD} and ＠samp{MAYBE_RENDMETH}, refactoring +these modules around the notion of interfacing a ``generic rendering +engine interface'' to ``text'' seems like a plausible way to focus this +work. + +＠item Colors, fonts, and faces +Besides the rendering engine itself, the XEmacs implementations of these +objects are poorly supported by current widget implementations, +including the traditional menubar and toolbar, as well as the more +recent button, tab control, and progress bar widgets. The refactoring +suggested under ``Rendering engine objects'' should be conducted with an +eye to making these widgets support faces, perhaps even to the extent of +allowing rendering to X pixmaps (which some Athena widgets support, +although they will not support rendering via Xft directly). Especially +with ＠samp{XRender} technology this should not be horribly inefficient. + +＠item Specifiers, charsets, and languages +Traditionally Mule uses a rather rigid and low-level abstraction, the +＠emph{charset}, to characterize font repertoires. Unfortunately, +support for a given charset is generally neither necessary nor +sufficient to support a language. Worse, although X11's only means for +indicating font repertoires is the font's ＠emph{registry}, the actual +repertoire of many fonts is either deficient or font-dependent. The +only convenience is that the registry maps directly to a Mule charset in +most cases, and vice versa. + +To date, XEmacs Mule has supported identification of appropriate fonts +to support a language's repertoire of characters by identifying the +repertoire as a subset of a union of charsets. To each charset there is +a regular expression matching the registry portion of a font name. Then +instantiation of a font proceeds by identifying the specifier domain, +and then walking down the list of specifications, matching the regexp +against font names until a match is found. That font is requested from +the system, and if not found, the process continues similarly until a +font that can be loaded is found. + +This has several problems. First, there's no guarantee that the union +will be disjoint. This problem manifests both in the case of display of +Unicode representations of text in the ＠samp{POSIX} default locale, +where glyphs are typically drawn from several inappropriate fonts. A +similar problem often occurs, though for a different reason, in +multilingual messages composed using ＠file{Gnus}'s ＠samp{message-mode} +and MIME support. This problem ＠emph{cannot} be avoided with the +current design; it is quite possible that a font desired in one context +will be shadowed by a font intended to get higher priority in a +semantically different but syntactically similar (as far as Mule can +tell) context. (Of course, one could attach a different face as a text +property, but that requires programming support; it can't be done by +user configuration.) The problem is only exacerbated as more and more +Unicode fonts, supporting large repertoires with substantial overlap +across fonts, are designed and published. + +A second problem is that registry names are often inaccurate. For +example, the Japanese JIS X 0208 standard was first published in 1978 +(as a relabelling of an older standard). It was then revised in 1983, +again in 1990, and once again in 2000, with slight changes to the +repertoire and mapping in each revision. Technically, these standards +can be distinguished in properly named fonts as ＠samp{jisx0208.1978}, +(a)samp{jisx0208.1983}, ＠samp{jisx0208.1990}, ＠samp{jisx0208.2000}, but +all of them are commonly simply labelled ＠samp{jisx0208}, and Western +distributors, of course, generally lack the expertise to correctly +relabel them. + +A third problem is that you generally can't tell if there are ``holes'' +in the repertoire until you try to display the glyph. + +All of this tends to break standard idioms for handling Mule fonts in +＠file{init} files because they depend on charsets being disjoint +repertoires. + +The TrueType fonts (and the later OpenType standard) provides for a +proper character set query (as a Boolean vector indexed by Unicode code +points), as well as providing a list of supported languages. + +I propose that we take advantage of these latter facilities by allowing +a font to be specified either as a string (a font name), or as a list +whose head is the font name and whose tail is a list of languages and +Mule charsets (for backward compatibility) that user intends to use the +font to display. This will probably require a change to the specifier +code. + +As mentioned above, specifiers will probably also have to be enhanced to +recognize ＠samp{widget} locales and domains, instead of the current hack +where special ＠samp{widget} and ＠samp{gui-element} faces are created. + +＠item Customize + +Customize needs to deal with all this stuff!! +＠end table + + +＠node Better Rendering Support -- Current Status, Better Rendering Support -- Configuration with the Interim Patches, Better Rendering Support -- Implementation, Future Work -- Better Rendering Support +＠subsection Better Rendering Support -- Current Status +＠cindex better rendering support, current status +＠cindex current status, better rendering support + +Stephen has a branch containing his stuff in XEmacs CVS. The branch +point tag is ＠samp{sjt-xft-bp}, roughly corresponding to XEmacs 21.5.18, +and branch tag is ＠samp{sjt-xft}. + +＠subsubsection Bugs Reported in sjt-xft + +＠table ＠code +＠item ChangeLogs +A lot of these, especially for Eric and Matthias's work, are missing. +Mea culpa. + +＠item Options->Font +＠itemx Options->Font Size +These menus don't work. All fonts are greyed out. All sizes are +available, but many (most?) faces don't change size, in particular, +＠samp{default} does not. +＠end table + + +＠node Better Rendering Support -- Configuration with the Interim Patches, , Better Rendering Support -- Current Status, Future Work -- Better Rendering Support +＠subsection Better Rendering Support -- Configuration with the Interim Patches +＠cindex better rendering support, configuration with the interim patches +＠cindex configuration with the interim patches, better rendering support + +For Stephen's ＠samp{sjt-xft} branch, you should keep the following in +mind when configuring: + +＠itemize +＠item +The only way to configure widget fonts at the present time is to use X +resources (or hack the source and rebuild). Currently supported widgets +are +＠itemize +＠item +menubars +＠item +tab controls +＠end itemize + +Here are the resources I use. ＠strong{Warning:} ＠emph{This interface +will change.} The tab control has separate Font and XftFont resources, +and uses the X resource manager to instantiate a FontStruct from the +Font resource. The menubar on the other hand uses Font for both, but +converts to FontStruct if Xft is not compiled in, and leaves it as a +string if Xft is compiled in. There is no equivalent facility for +XftFont yet, and creating one that handles both FontStruct and XftFont +depending on XEmacs's configuration and the font name seems error-prone +at best. Probably we will revert to a simple string representation for +this resource, and convert to a face in XEmacs rather than a font in +Xt/Xft. +＠example +XEmacs*Tabs.xftFont: Bitstream Vera Sans-18 +XEmacs*menubar.font: Bitstream Vera Sans-18 +XEmacs.modeline.attributeFont: Bitstream Charter-26 +XEmacs.default.attributeFont: Bitstream Vera Sans Mono-24 +＠end example +No, I don't understand why I need to use different point sizes to get +what looks like good balance to my eyes. I do highly recommend use of a +proportional font in the modeline because it allows a lot more text to +fit there. + +＠item +Because fonts supporting other languages tend to support English as +well, if you want to use one font for English and another for the other +language, you must use the ＠code{append} method when adding font +specifications for the other language. + +However, this leaves you with a problem if you want to change the other +language's font: you have to remove the existing specification so it +won't shadow the new one when you append. + +I use ＠code{define-specifier-tag} like this: + +＠example +(define-specifier-tag 'lang-ja) +;; No, I don't try to do real work with this font! But it makes it +;; obvious that I got the requested font. :-) +(set-face-font 'default "AirCut-14") +(set-face-font 'default "Kochi Mincho-14" nil '(lang-ja) 'append) +;; Oops, too sober. Try something to match AirCut. +(set-face-font 'default "Mikachan-14" + nil '(lang-ja) 'remove-tag-set-append) +＠end example +＠end itemize + ＠node Future Work Discussion, Old Future Work, Future Work, Top ＠chapter Future Work Discussion Index: src/compiler.h =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/compiler.h,v retrieving revision 1.8 diff -u -r1.8 compiler.h --- src/compiler.h 4 Nov 2004 23:06:17 -0000 1.8 +++ src/compiler.h 10 Dec 2004 03:35:20 -0000 ＠＠ -215,6 +215,11 ＠＠ # else # define USED_IF_MULE_OR_CHECK_TEXT(decl) UNUSED (decl) # endif +# ifdef USE_XFT +# define USED_IF_XFT(decl) decl +# else +# define USED_IF_XFT(decl) UNUSED (decl) +# endif #endif /* UNUSED */ #ifdef DEBUG_XEMACS Index: src/config.h.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/config.h.in,v retrieving revision 1.95.2.1 diff -u -r1.95.2.1 config.h.in --- src/config.h.in 25 Nov 2004 12:44:11 -0000 1.95.2.1 +++ src/config.h.in 10 Dec 2004 03:35:20 -0000 ＠＠ -207,9 +207,10 ＠＠ /* Compile with support for Xft? */ #undef USE_XFT - -/* Compile with support for Xft menubars? */ +/* Per-widget stuff will go away? */ #undef USE_XFT_MENUBARS +#undef USE_XFT_TABS +#undef USE_XFT_GAUGE /* Defines for building X applications */ #ifdef HAVE_X_WINDOWS Index: src/emacs.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v retrieving revision 1.150.2.1 diff -u -r1.150.2.1 emacs.c --- src/emacs.c 25 Nov 2004 12:44:12 -0000 1.150.2.1 +++ src/emacs.c 10 Dec 2004 03:35:21 -0000 ＠＠ -954,7 +954,9 ＠＠ if (argmatch (argv, argc, "-si", "--show-inline-info", 0, NULL, &skip_args)) { #if defined (PDUMP) && !defined (WIN32_NATIVE) - printf ("%u %u\n", dumped_data_max_size (), dumped_data_align_offset ()); + /* #### We really should check for sizeof (size_t) > sizeof (long) */ + printf ("%lu %lu\n", (unsigned long) dumped_data_max_size (), + (unsigned long) dumped_data_align_offset ()); #else printf ("Portable dumper not configured or windows native; -si just forces exit.\n"); #endif Index: src/glyphs-widget.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-widget.c,v retrieving revision 1.17 diff -u -r1.17 glyphs-widget.c --- src/glyphs-widget.c 4 Nov 2004 23:06:33 -0000 1.17 +++ src/glyphs-widget.c 10 Dec 2004 03:35:22 -0000 ＠＠ -1819,7 +1819,7 ＠＠ IIFORMAT_VALID_KEYWORD (scrollbar, Q_face, check_valid_face); } -static void image_instantiator_progress_guage (void) +static void image_instantiator_progress_gauge (void) { INITIALIZE_IMAGE_INSTANTIATOR_FORMAT (progress_gauge, "progress-gauge"); IIFORMAT_HAS_SHARED_METHOD (progress_gauge, validate, widget); ＠＠ -1927,7 +1927,7 ＠＠ image_instantiator_edit_fields(); image_instantiator_combo_box(); image_instantiator_scrollbar(); - image_instantiator_progress_guage(); + image_instantiator_progress_gauge(); image_instantiator_tree_view(); image_instantiator_tab_control(); image_instantiator_labels(); Index: src/glyphs-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-x.c,v retrieving revision 1.80.2.1 diff -u -r1.80.2.1 glyphs-x.c --- src/glyphs-x.c 25 Nov 2004 12:44:14 -0000 1.80.2.1 +++ src/glyphs-x.c 10 Dec 2004 03:35:23 -0000 ＠＠ -2325,22 +2325,27 ＠＠ bcolor = COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (pixel)); lw_add_widget_value_arg (wv, XtNbackground, bcolor.pixel); - /* #### What to do about Xft? */ + { + /* #### What to do about Xft? */ + Lisp_Object face = IMAGE_INSTANCE_WIDGET_FACE (ii); + XFontStruct *fs = + FONT_INSTANCE_X_FONT (XFONT_INSTANCE (query_string_font + (IMAGE_INSTANCE_WIDGET_TEXT (ii), + face, + domain))); #ifdef LWLIB_WIDGETS_MOTIF - fontList = XmFontListCreate - (FONT_INSTANCE_X_FONT - (XFONT_INSTANCE (query_string_font - (IMAGE_INSTANCE_WIDGET_TEXT (ii), - IMAGE_INSTANCE_WIDGET_FACE (ii), - domain))), XmSTRING_DEFAULT_CHARSET); - lw_add_widget_value_arg (wv, XmNfontList, (XtArgVal)fontList); + fontList = XmFontListCreate (fs, XmSTRING_DEFAULT_CHARSET); + lw_add_widget_value_arg (wv, XmNfontList, (XtArgVal)fontList); #endif - lw_add_widget_value_arg - (wv, XtNfont, (XtArgVal)FONT_INSTANCE_X_FONT - (XFONT_INSTANCE (query_string_font - (IMAGE_INSTANCE_WIDGET_TEXT (ii), - IMAGE_INSTANCE_WIDGET_FACE (ii), - domain)))); + /* #### This is an unacceptable hack. */ + if (fs) + lw_add_widget_value_arg (wv, XtNfont, (XtArgVal) fs); + else + warn_when_safe_lispobj + (intern ("xft"), Qwarning, + Fcons (build_string ("missing font in update_widget_face"), + Fface_name (face))); + } wv->change = VISIBLE_CHANGE; /* #### Megahack - but its just getting too complicated to do this in the right place. */ Index: src/objects-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/objects-x.c,v retrieving revision 1.26.2.3 diff -u -r1.26.2.3 objects-x.c --- src/objects-x.c 3 Dec 2004 07:41:10 -0000 1.26.2.3 +++ src/objects-x.c 10 Dec 2004 03:35:24 -0000 ＠＠ -206,16 +210,18 ＠＠ Display *dpy = DEVICE_X_DISPLAY (XDEVICE (device)); Extbyte *extname; XFontStruct *fs = NULL; /* _F_ont _S_truct */ - /* always initialize; then constant folding should optimize away anything - that depends on rf != NULL, and we can eliminate most of the #ifdefs */ +#ifdef USE_XFT XftFont *rf = NULL; /* _R_ender _F_ont (X Render extension) */ +#else +#define rf (0) +#endif LISP_STRING_TO_EXTERNAL (f->name, extname, Qx_font_name_encoding); +#ifdef USE_XFT if (debug_xft > 0) stderr_out ("attempting to initialize font spec %s\n", extname); /* #### serialize (optimize) these later... */ -#ifdef USE_XFT /* #### This function really needs to go away. The problem is that the fontconfig/Xft functions work much too hard to ensure that something is returned; but that something need not be ＠＠ -229,8 +235,6 ＠＠ /* #### should this refer to X and/or Xft? */ maybe_signal_error (Qgui_error, "Couldn't load font", f->name, Qfont, errb); - if (debug_xft > 0) - stderr_out ("failed to initialize font spec %s\n", extname); return 0; } ＠＠ -250,13 +254,11 ＠＠ fear that the finalize method may get fucked. */ f->data = xnew (struct x_font_instance_data); - /* handle Xft fonts */ +#ifdef USE_XFT + FONT_INSTANCE_X_XFTFONT (f) = rf; if (rf) + /* Have an Xft font, initialize font info from it. */ { - if (fs) - XFreeFont (dpy, fs); - FONT_INSTANCE_X_XFTFONT (f) = rf; - FONT_INSTANCE_X_FONT (f) = NULL; if (f->ascent < rf->ascent) f->ascent = rf->ascent; if (f->descent < rf->descent) ＠＠ -271,9 +273,16 ＠＠ if (debug_xft > 0) stderr_out ("initialized Xft font %s\n", extname); } - - else if (fs) - /* Handle a core font. */ + else + { + if (debug_xft > 0) + stderr_out ("couldn't initialize Xft font %s\n", extname); + } +#endif + + FONT_INSTANCE_X_FONT (f) = fs; + if (fs && !rf) /* fs && rf is unlikely, but play it safe */ + /* Have to use a core font, initialize font info from it. */ { FONT_INSTANCE_X_FONT (f) = fs; FONT_INSTANCE_X_XFTFONT (f) = NULL; ＠＠ -335,15 +344,20 ＠＠ f->proportional_p = (fs->min_bounds.width != fs->max_bounds.width || (x_handle_non_fully_specified_fonts && !fs->all_chars_exist)); - if (debug_xft > 0) - stderr_out ("initialized Xft font %s\n", extname); } - /* #### check for weirdness */ - if (f->height < f->width) - if (debug_xft > 0) - stderr_out ("width of font %s is %d, larger than its height %d\n", - extname, f->width, f->height); +#ifdef USE_XFT + if (debug_xft > 0) + { + /* #### check for weirdness */ + if (f->height < f->width) + stderr_out ("width of font %s is %d, larger than its height %d\n", + extname, f->width, f->height); + stderr_out ("initialized Xft font %s\n", extname); + } +#else +#undef rf +#endif return 1; } ＠＠ -368,10 +382,13 ＠＠ x_finalize_font_instance (Lisp_Font_Instance *f) { +#ifdef USE_XFT if (debug_xft > 0) stderr_out ("finalizing %s", (STRINGP (f->name) ? (char *) XSTRING_DATA (f->name) : "no font name")); +#endif + if (f->data) { if (DEVICE_LIVE_P (XDEVICE (f->device))) ＠＠ -686,19 +703,19 ＠＠ { struct device *d = XDEVICE (f->device); Display *dpy = DEVICE_X_DISPLAY (d); -#ifndef USE_XFT Extbyte *nameext; char* xlfd; -#else - FcChar8* xlfd; +#ifdef USE_XFT + FcChar8* fcfont; #endif +#ifdef USE_XFT + /* First, try an Xft font. */ if (NILP (FONT_INSTANCE_TRUENAME (f))) { -#ifdef USE_XFT int core; FcPattern *pat = FONT_INSTANCE_X_XFTFONT (f)->pattern; - FcResult res_xlfd = FcPatternGetString (pat, XFT_XLFD, 0, &xlfd); + FcResult res_xlfd = FcPatternGetString (pat, XFT_XLFD, 0, &fcfont); FcResult res_core = FcPatternGetBool (pat, XFT_CORE, 0, &core); if (res_xlfd == FcResultTypeMismatch || res_core == FcResultTypeMismatch) ＠＠ -730,19 +747,25 ＠＠ /* #### Why isn't this appropriate for core fonts, too? */ FONT_INSTANCE_TRUENAME (f) = build_ext_string (truename_via_XListFonts (dpy, - (Extbyte *) &xlfd[0]), + (Extbyte *) &fcfont[0]), Qx_font_name_encoding); } -#else + } +#endif + + /* OK, fall back to core font. */ + if (NILP (FONT_INSTANCE_TRUENAME (f))) + { nameext = &xlfd[0]; LISP_STRING_TO_EXTERNAL (f->name, nameext, Qx_font_name_encoding); FONT_INSTANCE_TRUENAME (f) = x_font_truename (dpy, nameext, FONT_INSTANCE_X_FONT (f)); -#endif } + if (NILP (FONT_INSTANCE_TRUENAME (f))) { + /* Urk, no luck. Whine about our bad luck and exit. */ Lisp_Object font_instance = wrap_font_instance (f); ＠＠ -752,6 +775,8 ＠＠ (This is only used by Fequal() right now.) */ return f->name; } + + /* Return what we found. */ return FONT_INSTANCE_TRUENAME (f); } ＠＠ -764,7 +789,8 ＠＠ Display *dpy = DEVICE_X_DISPLAY (d); XFontProp *props = NULL; - /* #### really should hack Xft fonts, too */ + /* #### really should hack Xft fonts, too + Strategy: fontconfig must have an iterator for this purpose. */ if (! FONT_INSTANCE_X_FONT (f)) return result; props = FONT_INSTANCE_X_FONT (f)->properties; ＠＠ -847,7 +873,8 ＠＠ #ifdef MULE static int -x_font_spec_matches_charset (struct device *d, Lisp_Object charset, +x_font_spec_matches_charset (struct device * USED_IF_XFT (d), + Lisp_Object charset, const Ibyte *nonreloc, Lisp_Object reloc, Bytecount offset, Bytecount length, int stage) ＠＠ -922,6 +949,7 ＠＠ ERROR_ME, 0) >= 0); } +#ifdef USE_XFT /* #### debug functions: find a better place for us */ const char *FcResultToString (FcResult r); const char * ＠＠ -976,6 +1004,7 ＠＠ return buffer; } } +#endif /* find a font spec that matches font spec FONT and also matches (the registry of) CHARSET. */ ＠＠ -1002,10 +1031,10 ＠＠ /* #### does Xft permit/require a different encoding? */ LISP_STRING_TO_EXTERNAL (font, patternext, Qx_font_name_encoding); - if (debug_xft > 0) - stderr_out ("confirming charset for font instance %s\n", patternext); #ifdef USE_XFT + if (debug_xft > 0) + stderr_out ("confirming charset for font instance %s\n", patternext); /* #### totally lazy, let's just get something out the door */ waste = FcInit (); if (waste) /* I don't think this can fail */ ＠＠ -1090,14 +1119,15 ＠＠ } else if (debug_xft > 0) stderr_out ("Failed fontconfig initialization\n"); + + if (debug_xft > 0) + stderr_out ("shit happens, try X11 charset match for %s\n", patternext); #endif names = XListFonts (DEVICE_X_DISPLAY (XDEVICE (device)), patternext, MAX_FONT_COUNT, &count); /* #### This code seems awfully bogus -- mrb */ /* #### fontconfig does it better -- sjt */ - if (debug_xft > 0) - stderr_out ("shit happens, try X11 charset match for %s\n", patternext); for (i = 0; i < count; i ++) { const Ibyte *intname; ＠＠ -1152,17 +1182,10 ＠＠ CONSOLE_HAS_METHOD (x, valid_color_name_p); CONSOLE_HAS_METHOD (x, initialize_font_instance); - /* #### both of these #ifndef USE_XFT are pretty bogus - they cause "defined but not used warnings" - one or the other must use x_font_truename, which also warns */ -#ifndef USE_XFT CONSOLE_HAS_METHOD (x, print_font_instance); -#endif CONSOLE_HAS_METHOD (x, finalize_font_instance); CONSOLE_HAS_METHOD (x, font_instance_truename); -#ifndef USE_XFT CONSOLE_HAS_METHOD (x, font_instance_properties); -#endif CONSOLE_HAS_METHOD (x, list_fonts); #ifdef MULE CONSOLE_HAS_METHOD (x, find_charset_font); Index: src/redisplay-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay-x.c,v retrieving revision 1.39.2.1 diff -u -r1.39.2.1 redisplay-x.c --- src/redisplay-x.c 25 Nov 2004 12:44:16 -0000 1.39.2.1 +++ src/redisplay-x.c 10 Dec 2004 03:35:24 -0000 ＠＠ -299,7 +299,8 ＠＠ /****************************************************************************/ static int -x_text_width_single_run (struct frame *f, struct face_cachel *cachel, struct textual_run *run) +x_text_width_single_run (struct frame * USED_IF_XFT (f), + struct face_cachel *cachel, struct textual_run *run) { Lisp_Object font_inst = FACE_CACHEL_FONT (cachel, run->charset); Lisp_Font_Instance *fi = XFONT_INSTANCE (font_ins

1 participants
0 comments

[AC21.5] Document Xft issues for Future Work 19 years, 4 months

Stephen J. Turnbull

APPROVE COMMIT 21.5 Index: man/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v retrieving revision 1.275 diff -u -U0 -r1.275 ChangeLog --- man/ChangeLog 7 Dec 2004 12:52:45 -0000 1.275 +++ man/ChangeLog 10 Dec 2004 06:33:53 -0000 ＠＠ -0,0 +1,5 ＠＠ +2004-12-10 Stephen J. Turnbull <stephen(a)xemacs.org> + + * internals/internals.texi (Better Rendering Support -- + Implementation): Document reasons for Label Widget crash. + ＠＠ -360 +364,0 ＠＠ ->>>>>>> 1.271 Index: man/internals/internals.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/internals/internals.texi,v retrieving revision 1.55 diff -u -r1.55 internals.texi --- man/internals/internals.texi 6 Dec 2004 03:51:35 -0000 1.55 +++ man/internals/internals.texi 10 Dec 2004 06:32:26 -0000 ＠＠ -23137,6 +23137,21 ＠＠ engine interface'' to ``text'' seems like a plausible way to focus this work. +Further evidence for this kind of approach is a bug recently fixed in +the ＠samp{xft-sjt} branch. XEmacs was crashing because the Athena Label +widget tried to access a nonexistent font in its initialization +routine. The font didn't exist because although no core X11 font +corresponding to the spec existed, an Xft font was found. So the XEmacs +font instance existed but it did not specify an X11 core font, only the +Xft font. When this object was used to initialize the font for the +Label widget, None (0) was passed to XtSetArgs, then XtCreateWidget was +called, and the internal initialization routine attempted to access that +(nonexistent) font while computing an X11 graphics context (GC). + +A similar issue applies to colors, but there Xft colors keep the pixel +data internally, so (serendipitously) the X11 color (＠emph{i.e.}, pixel) +member does get updated. + ＠item Colors, fonts, and faces Besides the rendering engine itself, the XEmacs implementations of these objects are poorly supported by current widget implementations, -- Graduate School of Systems and Information Engineering University of Tsukuba http://turnbull.sk.tsukuba.ac.jp/ Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Economics of Information Communication and Computation Systems Experimental Economics, Microeconomic Theory, Game Theory

1 participants
0 comments

[C] xemacsweb: mirror site link mending, commenting failing sites 19 years, 4 months

Adrian Aichner

1 participants
0 comments

[COMMIT (pkgs)] Backward compatibility in texinfo 19 years, 4 months

Norbert Koch

NOTE: This patch has been committed. Hi! This makes the packages compile on my machine using a stable 21.4.15 XEmacs. norbert. ChangeLog addition: 2004-12-08 Norbert Koch <viteno(a)xemacs.org> * texinfmt.el (texinfo-format-region): * texinfmt.el (texinfo-format-buffer-1): * texinfmt.el (texinfo-sort-startkeyfun): line-(beginning|end)-position -> point-at-(b|e)ol. The former are not known in 21.4. texinfo source patch: Diff command: cvs -f -z3 -q diff -u -N Files affected: texinfmt.el Index: texinfmt.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/texinfo/texinfmt.el,v retrieving revision 1.12 diff -u -r1.12 texinfmt.el --- texinfmt.el 7 Dec 2004 10:28:25 -0000 1.12 +++ texinfmt.el 8 Dec 2004 19:16:15 -0000 ＠＠ -282,9 +282,9 ＠＠ (goto-char (point-min)) ;; Remove `＠setfilename' line from included file, if any, ;; so ＠setfilename command not duplicated. - (if (re-search-forward "^＠setfilename" (line-end-position 100) t) - (delete-region (line-beginning-position 1) - (line-beginning-position 2))))))) + (if (re-search-forward "^＠setfilename" (point-at-eol 100) t) + (delete-region (point-at-bol 1) + (point-at-bol 2))))))) ;; Raise or lower level of each section, if necessary. (goto-char (point-min)) ＠＠ -306,7 +306,7 ＠＠ (goto-char (point-min)) (if (looking-at "\\\\input[ \t]+texinfo") - (delete-region (point) (line-beginning-position 2))) + (delete-region (point) (point-at-bol 2))) ;; Insert Info region title text. (goto-char (point-min)) ＠＠ -439,7 +439,7 ＠＠ (let ((filename (concat input-directory (texinfo-parse-line-arg)))) (re-search-backward "^＠include") - (delete-region (point) (line-beginning-position 2)) + (delete-region (point) (point-at-bol 2)) (message "Reading included file: %s" filename) (save-excursion (save-restriction ＠＠ -449,9 +449,9 ＠＠ (goto-char (point-min)) ;; Remove `＠setfilename' line from included file, if any, ;; so ＠setfilename command not duplicated. - (if (re-search-forward "^＠setfilename" (line-end-position 100) t) - (delete-region (line-beginning-position 1) - (line-beginning-position 2))))))) + (if (re-search-forward "^＠setfilename" (point-at-eol 100) t) + (delete-region (point-at-bol 1) + (point-at-bol 2))))))) ;; Raise or lower level of each section, if necessary. (goto-char (point-min)) (texinfo-raise-lower-sections) ＠＠ -3044,7 +3044,7 ＠＠ ;; Subroutine for sorting an index. ;; At start of a line, return a string to sort the line under. (defun texinfo-sort-startkeyfun () - (let ((line (buffer-substring-no-properties (point) (line-end-position)))) + (let ((line (buffer-substring-no-properties (point) (point-at-eol)))) ;; Canonicalize whitespace and eliminate funny chars. (while (string-match "[ \t][ \t]+\\|[^a-z0-9 ]+" line) (setq line (concat (substring line 0 (match-beginning 0))

1 participants
0 comments

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

XEmacs-Patches December 2004