February 2005 - XEmacs-Patches - XEmacs Mailing List Archives

Banned file: siupd02.scr in mail from you 19 years, 10 months

MAILER DAEMON

BANNED FILENAME ALERT Your message to: WMorris(a)gensym.com was blocked by our Spam Firewall. The email you sent with the following subject has NOT BEEN DELIVERED: Subject: Delivery by mail An attachment in that mail was of a file type that the Spam Firewall is set to block.

1 participants
0 comments

[AC web] another category of instant-death spam 19 years, 10 months

Stephen J. Turnbull

APPROVE COMMIT web Some spammers are "obscuring" headers by "encoding" them as "quoted-printable UTF-8" even though they contain only ASCII. This looks like the kind of thing that a brain-dead MUA might do if a user asked it to do so, so I have hesitated, but there have been no false positives in many months, and recently I've been seeing hundreds in a week. Index: Lists/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Lists/ChangeLog,v retrieving revision 1.26 diff -u -U0 -r1.26 ChangeLog --- Lists/ChangeLog 30 Dec 2004 08:44:04 -0000 1.26 +++ Lists/ChangeLog 15 Feb 2005 09:12:00 -0000 ＠＠ -0,0 +1,4 ＠＠ +2005-02-15 Stephen J. Turnbull <stephen(a)xemacs.org> + + * index.content: Add utf8-obfoo to the instant-death list in #spam. + Index: Lists/index.content =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Lists/index.content,v retrieving revision 1.26 diff -u -r1.26 index.content --- Lists/index.content 30 Dec 2004 08:44:05 -0000 1.26 +++ Lists/index.content 15 Feb 2005 09:09:19 -0000 ＠＠ -485,8 +485,7 ＠＠ Due to a dramatic increase in the amount of spam and a near perfect record of like 0.05% false positives, we are discarding near-certain spam without checking as of 2004-04-27. We have - added two more categories as of 2004-05-25. We've added several - more categories as of 2004-12-30. Here are the + added more categories as recently as 2005-02-15. Here are the criteria, any of which qualifies your post for automatic discard: </p> ＠＠ -517,6 +516,10 ＠＠ Have a From or Sender address that procmail thinks is a daemon. Basically that means sendmail and other MTAs, mailing list managers, and root. + </li> + <li> + Have From, To, <em>and</em> Subject headers containing 100% + ASCII text encoded as utf-8 quoted-printable. </li> </ol> -- 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

[PATCH(pkgs)] cc-mode.texi warning fixes 19 years, 10 months

Jerry James

Processing cc-mode.texi with makeinfo generates two warnings, one about a missing '.' or ',' after an ＠xref (with a way wrong line number, must be a makeinfo bug), the other about ＠strong{Note:} generating a spurious cross-reference. This patch fixes both. The first fix looks slightly peculiar, but is correct because the reference is the last item in a footnote, so should be followed by a period. xemacs-packages/cc-mode/ChangeLog addition: 2005-02-11 Jerry James <james(a)xemacs.org> * cc-mode.texi (Text Filling and Line Breaking): Put a . after an ＠xref. * cc-mode.texi (Font Locking): Use warning instead of note to avoid creating a cross-reference. packages source patch: Diff command: cvs -q diff -uN Files affected: xemacs-packages/cc-mode/cc-mode.texi Index: xemacs-packages/cc-mode/cc-mode.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/cc-mode/cc-mode.texi,v retrieving revision 1.13 diff -d -u -r1.13 cc-mode.texi --- xemacs-packages/cc-mode/cc-mode.texi 2004/08/11 16:30:15 1.13 +++ xemacs-packages/cc-mode/cc-mode.texi 2005/02/11 20:19:56 ＠＠ -1397,7 +1397,7 ＠＠＠code{c-block-comment-prefix} typically gets overriden by the default style ＠code{gnu}, which sets it to blank. You can see the line splitting effect described here by setting a different style, -e.g. ＠code{k&r} ＠xref{Choosing a Style}}, which makes a comment +e.g. ＠code{k&r} ＠xref{Choosing a Style}.}, which makes a comment ＠example /* Got O(n^2) here, which is a Bad Thing. */ ＠＠ -1620,7 +1620,7 ＠＠＠cindex font locking ＠comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -＠strong{Note:} The font locking in AWK mode is currently not integrated +＠strong{Warning:} The font locking in AWK mode is currently not integrated with the rest of ＠ccmode{}, so this section does not apply there. ＠xref{AWK Mode Font Locking}, instead. -- Jerry James http://www.ittc.ku.edu/~james/

3 participants
4 comments

[PATCH(pkgs)] VHDL mode update 19 years, 10 months

Jerry James

This patch updates us from VHDL mode 3.32.20 to 3.33.2. We retain only two differences from upstream, already present in CVS: (1) We delete the copy of the speedbar-with-writable macro in the upstream sources, making sure that we load speedbar before compiling instead. (2) We put an auto-mode-alist cookie at the end of the file. xemacs-packages/vhdl/ChangeLog addition: 2005-02-07 Jerry James <james(a)xemacs.org> * vhdl-mode.el: Sync with version 3.33.2. * Makefile (AUTHOR_VERSION): Change to 3.33.2. packages source patch: Diff command: cvs -q diff -uN Files affected: xemacs-packages/vhdl/vhdl-mode.el xemacs-packages/vhdl/Makefile Index: xemacs-packages/vhdl/Makefile =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/vhdl/Makefile,v retrieving revision 1.28 diff -d -u -r1.28 Makefile --- xemacs-packages/vhdl/Makefile 2004/03/18 16:56:20 1.28 +++ xemacs-packages/vhdl/Makefile 2005/02/07 21:48:41 ＠＠ -18,7 +18,7 ＠＠ # Boston, MA 02111-1307, USA. VERSION = 1.19 -AUTHOR_VERSION = 3.32.20 +AUTHOR_VERSION = 3.33.2 MAINTAINER = XEmacs Development Team <xemacs-beta(a)xemacs.org> PACKAGE = vhdl PKG_TYPE = regular Index: xemacs-packages/vhdl/vhdl-mode.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/vhdl/vhdl-mode.el,v retrieving revision 1.7 diff -d -u -r1.7 vhdl-mode.el --- xemacs-packages/vhdl/vhdl-mode.el 2004/03/18 16:25:09 1.7 +++ xemacs-packages/vhdl/vhdl-mode.el 2005/02/07 21:32:36 ＠＠ -1,18 +1,18 ＠＠ ;;; vhdl-mode.el --- major mode for editing VHDL code -;; Copyright (C) 1992-2003 Free Software Foundation, Inc. +;; Copyright (C) 1992-2005 Free Software Foundation, Inc. ;; Authors: Reto Zimmermann <reto(a)gnu.org> ;; Rodney J. Whitby <software.vhdl-mode(a)rwhitby.net> ;; Maintainer: Reto Zimmermann <reto(a)gnu.org> -;; RCS: $Id: vhdl-mode.el,v 1.7 2004/03/18 16:25:09 james Exp $ +;; RCS: $Id: vhdl-mode.el,v 33.5 2005/01/11 21:16:18 reto Exp reto $ ;; Keywords: languages vhdl ;; WWW: http://opensource.ethz.ch/emacs/vhdl-mode.html -(defconst vhdl-version "3.32.20" +(defconst vhdl-version "3.33.2" "VHDL Mode version number.") -(defconst vhdl-time-stamp "2004-02-16" +(defconst vhdl-time-stamp "2005-01-11" "VHDL Mode time stamp for last update.") ;; This file is part of GNU Emacs. ＠＠ -45,6 +45,8 ＠＠ ;; - Insertion of file headers ;; - Insertion of user-specified models ;; - Port translation / testbench generation +;; - Structural composition +;; - Configuration generation ;; - Sensitivity list updating ;; - File browser ;; - Design hierarchy browser ＠＠ -750,9 +752,22 ＠＠ "*Specifies how the architecture file name is obtained. The architecture file name can be obtained by modifying the entity and/or architecture name (e.g. attaching or stripping off a substring). The -string that is matched against the regexp is the concatenation of the entity -and the architecture name separated by a space. This gives access to both -names (see default setting as example)." +file extension is automatically taken from the file name of the current +buffer. The string that is matched against the regexp is the concatenation +of the entity and the architecture name separated by a space. This gives +access to both names (see default setting as example)." + vhdl-name-doc-string) +:type '(cons (regexp :tag "From regexp") + (string :tag "To string ")) +:group 'vhdl-naming +:group 'vhdl-compose) + +(defcustom vhdl-configuration-file-name '(".*" . "\\&") + (concat + "*Specifies how the configuration file name is obtained. +The configuration file name can be obtained by modifying the configuration +name (e.g. attaching or stripping off a substring). The file extension is +automatically taken from the file name of the current buffer." vhdl-name-doc-string) :type '(cons (regexp :tag "From regexp") (string :tag "To string ")) ＠＠ -1082,6 +1097,99 ＠＠ :group 'vhdl-model) +(defgroup vhdl-compose nil + "Customizations for structural composition." +:group 'vhdl) + +(defcustom vhdl-compose-architecture-name '(".*" . "str") + (concat + "*Specifies how the component architecture name is obtained. +The component architecture name can be obtained by modifying the entity name +$e.g. attaching or stripping off a substring). +If TO STRING is empty, the architecture name is queried." + vhdl-name-doc-string) +:type '(cons (regexp :tag "From regexp") + (string :tag "To string ")) +:group 'vhdl-compose) + +(defcustom vhdl-compose-configuration-name + '("\\(.*\$ \$.*\$" . "\\1_\\2_cfg") + (concat + "*Specifies how the configuration name is obtained. +The configuration name can be obtained by modifying the entity and/or +architecture name (e.g. attaching or stripping off a substring). The string +that is matched against the regexp is the concatenation of the entity and the +architecture name separated by a space. This gives access to both names (see +default setting as example)." + vhdl-name-doc-string) +:type '(cons (regexp :tag "From regexp") + (string :tag "To string ")) +:group 'vhdl-compose) + +(defcustom vhdl-components-package-name + '((".*" . "\\&_components") . "components") + (concat + "*Specifies how the name for the components package is obtained. +The components package is a package containing all component declarations for +the current design. It's name can be obtained by modifying the project name +\(e.g. attaching or stripping off a substring). If no project is defined, the +DIRECTORY entry is chosen." + vhdl-name-doc-string) +:type '(cons (cons :tag "Project" :indent 2 + (regexp :tag "From regexp") + (string :tag "To string ")) + (string :tag "Directory:\n String ")) +:group 'vhdl-compose) + +(defcustom vhdl-use-components-package nil + "*Non-nil means use a separate components package for component declarations. +Otherwise, component declarations are inserted and searched for in the +architecture declarative parts." +:type 'boolean +:group 'vhdl-compose) + +(defcustom vhdl-compose-include-header t + "*Non-nil means include a header in automatically generated files." +:type 'boolean +:group 'vhdl-compose) + +(defcustom vhdl-compose-create-files 'single + "*Specifies whether new files should be created for the new component. +The component's entity and architecture are inserted: + None : in current buffer + Single file : in new single file + Separate files: in two separate files +The file names are obtained from variables `vhdl-entity-file-name' and +`vhdl-architecture-file-name'." +:type '(choice (const :tag "None" none) + (const :tag "Single file" single) + (const :tag "Separate files" separate)) +:group 'vhdl-compose) + +(defcustom vhdl-compose-configuration-create-file nil + "*Specifies whether a new file should be created for the configuration. +If non-nil, a new file is created for the configuration. +The file name is obtained from variable `vhdl-configuration-file-name'." +:type 'boolean +:group 'vhdl-compose) + +(defcustom vhdl-compose-configuration-hierarchical t + "*Specifies whether hierarchical configurations should be created. +If non-nil, automatically created configurations are hierarchical and include +the whole hierarchy of subcomponents. Otherwise the configuration only +includes one level of subcomponents." +:type 'boolean +:group 'vhdl-compose) + +(defcustom vhdl-compose-configuration-use-subconfiguration t + "*Specifies whether subconfigurations should be used inside configurations. +If non-nil, automatically created configurations use configurations in binding +indications for subcomponents, if such configurations exist. Otherwise, +entities are used in binding indications for subcomponents." +:type 'boolean +:group 'vhdl-compose) + + (defgroup vhdl-port nil "Customizations for port translation functions." :group 'vhdl ＠＠ -1161,8 +1269,7 ＠＠ (string :tag "To string ")) :group 'vhdl-testbench) -(defcustom vhdl-testbench-configuration-name - '("\$.*\$ \$.*\$" . "\\1_\\2_cfg") +(defcustom vhdl-testbench-configuration-name vhdl-compose-configuration-name (concat "*Specifies how the testbench configuration name is obtained. The configuration name of a testbench can be obtained by modifying the entity ＠＠ -1280,62 +1387,6 ＠＠ :group 'vhdl-testbench) -(defgroup vhdl-compose nil - "Customizations for structural composition." -:group 'vhdl) - -(defcustom vhdl-compose-create-files 'single - "*Specifies whether new files should be created for the new component. -The component's entity and architecture are inserted: - None : in current buffer - Single file : in new single file - Separate files: in two separate files -The file names are obtained from variables `vhdl-entity-file-name' and -`vhdl-architecture-file-name'." -:type '(choice (const :tag "None" none) - (const :tag "Single file" single) - (const :tag "Separate files" separate)) -:group 'vhdl-compose) - -(defcustom vhdl-compose-include-header t - "*Non-nil means include a header in automatically generated files." -:type 'boolean -:group 'vhdl-compose) - -(defcustom vhdl-compose-architecture-name '(".*" . "str") - (concat - "*Specifies how the component architecture name is obtained. -The component architecture name can be obtained by modifying the entity name -\(e.g. attaching or stripping off a substring). -If TO STRING is empty, the architecture name is queried." - vhdl-name-doc-string) -:type '(cons (regexp :tag "From regexp") - (string :tag "To string ")) -:group 'vhdl-compose) - -(defcustom vhdl-components-package-name - '((".*" . "\\&_components") . "components") - (concat - "*Specifies how the name for the components package is obtained. -The components package is a package containing all component declarations for -the current design. Its name can be obtained by modifying the project name -\(e.g. attaching or stripping off a substring). If no project is defined, the -DIRECTORY entry is chosen." - vhdl-name-doc-string) -:type '(cons (cons :tag "Project" :indent 2 - (regexp :tag "From regexp") - (string :tag "To string ")) - (string :tag "Directory:\n String ")) -:group 'vhdl-compose) - -(defcustom vhdl-use-components-package nil - "*Non-nil means use a separate components package for component declarations. -Otherwise, component declarations are inserted and searched for in the -architecture declarative parts." -:type 'boolean -:group 'vhdl-compose) - - (defgroup vhdl-comment nil "Customizations for comments." :group 'vhdl) ＠＠ -1814,6 +1865,7 ＠＠ (defconst vhdl-offsets-alist-default '((string . -1000) + (cpp-macro . -1000) (block-open . 0) (block-close . 0) (statement . 0) ＠＠ -2661,6 +2713,7 ＠＠ (define-key vhdl-mode-map "\C-c\C-c\C-n" 'vhdl-compose-new-component) (define-key vhdl-mode-map "\C-c\C-c\C-p" 'vhdl-compose-place-component) (define-key vhdl-mode-map "\C-c\C-c\C-w" 'vhdl-compose-wire-components) + (define-key vhdl-mode-map "\C-c\C-c\C-f" 'vhdl-compose-configuration) (define-key vhdl-mode-map "\C-c\C-c\C-k" 'vhdl-compose-components-package) (define-key vhdl-mode-map "\C-cc" 'vhdl-comment-uncomment-region) (define-key vhdl-mode-map "\C-c-" 'vhdl-comment-append-inline) ＠＠ -3308,9 +3361,11 ＠＠ :style toggle :selected vhdl-port-reversed-direction :active vhdl-port-list]) ("Compose" ["New Component" vhdl-compose-new-component t] + ["Copy Component" vhdl-port-copy t] ["Place Component" vhdl-compose-place-component vhdl-port-list] ["Wire Components" vhdl-compose-wire-components t] "--" + ["Generate Configuration" vhdl-compose-configuration t] ["Generate Components Package" vhdl-compose-components-package t]) ("Subprogram" ["Copy" vhdl-subprog-copy t] ＠＠ -3554,6 +3609,8 ＠＠ ["Entity File Name..." (customize-option 'vhdl-entity-file-name) t] ["Architecture File Name..." (customize-option 'vhdl-architecture-file-name) t] + ["Configuration File Name..." + (customize-option 'vhdl-configuration-file-name) t] ["Package File Name..." (customize-option 'vhdl-package-file-name) t] ("File Name Case" ["As Is" ＠＠ -3731,7 +3788,21 ＠＠ "--" ["Customize Group..." (customize-group 'vhdl-port) t]) ("Compose" - ("Create Files" + ["Architecture Name..." + (customize-option 'vhdl-compose-architecture-name) t] + ["Configuration Name..." + (customize-option 'vhdl-compose-configuration-name) t] + ["Components Package Name..." + (customize-option 'vhdl-components-package-name) t] + ["Use Components Package" + (customize-set-variable 'vhdl-use-components-package + (not vhdl-use-components-package)) +:style toggle :selected vhdl-use-components-package] + ["Include Header" + (customize-set-variable 'vhdl-compose-include-headera + (not vhdl-compose-include-header)) +:style toggle :selected vhdl-compose-include-header] + ("Create Entity/Architecture Files" ["None" (customize-set-variable 'vhdl-compose-create-files 'none) :style radio :selected (eq 'none vhdl-compose-create-files)] ＠＠ -3741,18 +3812,18 ＠＠ ["Separate" (customize-set-variable 'vhdl-compose-create-files 'separate) :style radio :selected (eq 'separate vhdl-compose-create-files)]) - ["Include Header" - (customize-set-variable 'vhdl-compose-include-header - (not vhdl-compose-include-header)) -:style toggle :selected vhdl-compose-include-header] - ["Architecture Name..." - (customize-option 'vhdl-compose-architecture-name) t] - ["Components Package Name..." - (customize-option 'vhdl-components-package-name) t] - ["Use Components Package" - (customize-set-variable 'vhdl-use-components-package - (not vhdl-use-components-package)) -:style toggle :selected vhdl-use-components-package] + ["Create Configuration File" + (customize-set-variable 'vhdl-compose-configuration-create-file + (not vhdl-compose-configuration-create-file)) +:style toggle :selected vhdl-compose-configuration-create-file] + ["Hierarchical Configuration" + (customize-set-variable 'vhdl-compose-configuration-hierarchical + (not vhdl-compose-configuration-hierarchical)) +:style toggle :selected vhdl-compose-configuration-hierarchical] + ["Use Subconfiguration" + (customize-set-variable 'vhdl-compose-configuration-use-subconfiguration + (not vhdl-compose-configuration-use-subconfiguration)) +:style toggle :selected vhdl-compose-configuration-use-subconfiguration] "--" ["Customize Group..." (customize-group 'vhdl-compose) t]) ("Comment" ＠＠ -4203,13 +4274,13 ＠＠ symbols are surrounded by one space, and multiple spaces are eliminated. -| CODE FILLING: -| Code filling allows to condens code (e.g. sensitivity lists or port -| maps) by removing comments and newlines and re-wrapping so that all -| lines are maximally filled (block filling). `C-c C-f C-f' fills a list -| enclosed by parenthesis, `C-c C-f C-g' a group of lines separated by -| blank lines, `C-c C-f C-i' a block of lines with same indent, and -| `C-c C-f M-f' an entire region. + CODE FILLING: + Code filling allows to condens code (e.g. sensitivity lists or port + maps) by removing comments and newlines and re-wrapping so that all + lines are maximally filled (block filling). `C-c C-f C-f' fills a list + enclosed by parenthesis, `C-c C-f C-g' a group of lines separated by + blank lines, `C-c C-f C-i' a block of lines with same indent, and + `C-c C-f M-f' an entire region. CODE BEAUTIFICATION: ＠＠ -4234,21 +4305,21 ＠＠ A clause with several generic/port names on the same line can be flattened (`C-c C-p C-f') so that only one name per line exists. The -| direction of ports can be reversed (`C-c C-p C-r'), i.e., inputs become -| outputs and vice versa, which can be useful in testbenches. (This -| reversion is done on the internal data structure and is only reflected -| in subsequent paste operations.) + direction of ports can be reversed (`C-c C-p C-r'), i.e., inputs become + outputs and vice versa, which can be useful in testbenches. (This + reversion is done on the internal data structure and is only reflected + in subsequent paste operations.) Names for actual ports, instances, testbenches, and design-under-test instances can be derived from existing names according to options `vhdl-...-name'. See customization group `vhdl-port'. -| SUBPROGRAM TRANSLATION: -| Similar functionality exists for copying/pasting the interface of -| subprograms (function/procedure). A subprogram interface can be copied -| and then pasted as a subprogram declaration, body or call (uses -| association list with formals). + SUBPROGRAM TRANSLATION: + Similar functionality exists for copying/pasting the interface of + subprograms (function/procedure). A subprogram interface can be copied + and then pasted as a subprogram declaration, body or call (uses + association list with formals). TESTBENCH GENERATION: ＠＠ -4304,38 +4375,54 ＠＠ required by secondary units. -| STRUCTURAL COMPOSITION: -| Enables simple structural composition. `C-c C-c C-n' creates a skeleton -| for a new component. Subcomponents (i.e. component declaration and -| instantiation) can be automatically placed from a previously read port -| \(`C-c C-c C-p') or directly from the hierarchy browser (`P'). Finally, -| all subcomponents can be automatically connected using internal signals -| and ports (`C-c C-c C-w') following these rules: -| - subcomponent actual ports with same name are considered to be -| connected by a signal (internal signal or port) -| - signals that are only inputs to subcomponents are considered as -| inputs to this component -> input port created -| - signals that are only outputs from subcomponents are considered as -| outputs from this component -> output port created -| - signals that are inputs to AND outputs from subcomponents are -| considered as internal connections -> internal signal created -| -| Component declarations can be placed in a components package (option -| `vhdl-use-components-package') which can be automatically generated for -| an entire directory or project (`C-c C-c M-p'). The VHDL'93 direct -| component instantiation is also supported (option -| `vhdl-use-direct-instantiation'). -| -| Purpose: With appropriate naming conventions it is possible to -| create higher design levels with only a few mouse clicks or key -| strokes. A new design level can be created by simply generating a new -| component, placing the required subcomponents from the hierarchy -| browser, and wiring everything automatically. -| -| Note: Automatic wiring only works reliably on templates of new -| components and component instantiations that were created by VHDL mode. + STRUCTURAL COMPOSITION: + Enables simple structural composition. `C-c C-c C-n' creates a skeleton + for a new component. Subcomponents (i.e. component declaration and + instantiation) can be automatically placed from a previously read port + \(`C-c C-c C-p') or directly from the hierarchy browser (`P'). Finally, + all subcomponents can be automatically connected using internal signals + and ports (`C-c C-c C-w') following these rules: + - subcomponent actual ports with same name are considered to be + connected by a signal (internal signal or port) + - signals that are only inputs to subcomponents are considered as + inputs to this component -> input port created + - signals that are only outputs from subcomponents are considered as + outputs from this component -> output port created + - signals that are inputs to AND outputs from subcomponents are + considered as internal connections -> internal signal created + + Purpose: With appropriate naming conventions it is possible to + create higher design levels with only a few mouse clicks or key + strokes. A new design level can be created by simply generating a new + component, placing the required subcomponents from the hierarchy + browser, and wiring everything automatically. + + Note: Automatic wiring only works reliably on templates of new + components and component instantiations that were created by VHDL mode. + + Component declarations can be placed in a components package (option + `vhdl-use-components-package') which can be automatically generated for + an entire directory or project (`C-c C-c M-p'). The VHDL'93 direct + component instantiation is also supported (option + `vhdl-use-direct-instantiation'). + +| Configuration declarations can automatically be generated either from +| the menu (`C-c C-c C-f') (for the architecture the cursor is in) or from +| the speedbar menu (for the architecture under the cursor). The +| configurations can optionally be hierarchical (i.e. include all +| component levels of a hierarchical design, option +| `vhdl-compose-configuration-hierarchical') or include subconfigurations +| (option `vhdl-compose-configuration-use-subconfiguration'). For +| subcomponents in hierarchical configurations, the most-recently-analyzed +| (mra) architecture is selected. If another architecture is desired, it +| can be marked as most-recently-analyzed (speedbar menu) before +| generating the configuration. | -| See the options group `vhdl-compose' for all relevant user options. +| Note: Configurations of subcomponents (i.e. hierarchical configuration +| declarations) are currently not considered when displaying +| configurations in speedbar. + + See the options group `vhdl-compose' for all relevant user options. SOURCE FILE COMPILATION: ＠＠ -5266,6 +5353,7 ＠＠ (cond ((nth 3 state) 'string) ((nth 4 state) 'comment) + ((vhdl-beginning-of-macro) 'pound) (t nil))))) (defun vhdl-forward-comment (&optional direction) ＠＠ -5348,14 +5436,19 ＠＠ (defun vhdl-forward-syntactic-ws (&optional lim) "Forward skip of syntactic whitespace." - (save-restriction - (let* ((lim (or lim (point-max))) - (here lim) - (hugenum (point-max))) - (narrow-to-region lim (point)) - (while (/= here (point)) - (setq here (point)) - (vhdl-forward-comment hugenum))))) + (let* ((here (point-max)) + (hugenum (point-max))) + (while (/= here (point)) + (setq here (point)) + (vhdl-forward-comment hugenum) + ;; skip preprocessor directives + (when (and (eq (char-after) ?#) + (= (vhdl-point 'boi) (point))) + (while (and (eq (char-before (vhdl-point 'eol)) ?\\) + (= (forward-line 1) 0))) + (end-of-line))) + (if lim (goto-char (min (point) lim))))) + ;; This is the best we can do in Win-Emacs. (defun vhdl-win-fsws (&optional lim) ＠＠ -5373,18 +5466,28 ＠＠ (and (string-match "Win-Emacs" emacs-version) (fset 'vhdl-forward-syntactic-ws 'vhdl-win-fsws)) +(defun vhdl-beginning-of-macro (&optional lim) + "Go to the beginning of a cpp macro definition (nicked from `cc-engine')." + (let ((here (point))) + (beginning-of-line) + (while (eq (char-before (1- (point))) ?\\) + (forward-line -1)) + (back-to-indentation) + (if (and (<= (point) here) + (eq (char-after) ?#)) + t + (goto-char here) + nil))) + (defun vhdl-backward-syntactic-ws (&optional lim) "Backward skip over syntactic whitespace." - (save-restriction - (let* ((lim (or lim (point-min))) - (here lim) - (hugenum (- (point-max)))) - (if (< lim (point)) - (progn - (narrow-to-region lim (point)) - (while (/= here (point)) - (setq here (point)) - (vhdl-forward-comment hugenum))))))) + (let* ((here (point-min)) + (hugenum (- (point-max)))) + (while (/= here (point)) + (setq here (point)) + (vhdl-forward-comment hugenum) + (vhdl-beginning-of-macro)) + (if lim (goto-char (max (point) lim))))) ;; This is the best we can do in Win-Emacs. (defun vhdl-win-bsws (&optional lim) ＠＠ -6729,6 +6832,8 ＠＠ (skip-chars-forward " \t") (if (looking-at "--") (vhdl-add-syntax 'comment)) + (if (eq literal 'pound) + (vhdl-add-syntax 'cpp-macro)) ;; return the syntax vhdl-syntactic-context)))) ＠＠ -7520,7 +7625,7 ＠＠ (if (match-string 1) (goto-char (match-end 1)) (replace-match "\\3 \\4 \\5") - (goto-char (match-end 4)))) + (goto-char (match-end 2)))) ;; eliminate multiple spaces and spaces at end of line (goto-char beg) (while (or (and (looking-at "--.*\n") (re-search-forward "--.*\n" end t)) ＠＠ -7653,7 +7758,7 ＠＠ (message "Updating sensitivity lists...") (while (re-search-forward "^\\s-*\$\\w+[ \t\n]*:[ \t\n]*\$?process\\>" nil t) (goto-char (match-beginning 0)) - (condition-case nil (vhdl-update-sensitivity-list) (error))) + (condition-case nil (vhdl-update-sensitivity-list) (error ""))) (message "Updating sensitivity lists...done")))) (defun vhdl-update-sensitivity-list () ＠＠ -7697,8 +7802,9 ＠＠ ((re-search-forward "^\\s-*case\\>" proc-end t) (re-search-forward "\\<is\\>" proc-end t)) ;; parameter list of procedure call - ((re-search-forward "^\\s-*\\w+[ \t\n]*(" proc-end t) - (progn (backward-char) (forward-sexp) (point))))) + ((and (re-search-forward "^\\s-*\\w+[ \t\n]*(" proc-end t) + (1- (point))) + (progn (forward-sexp) (point))))) name read-list sens-list signal-list sens-beg sens-end beg end margin) ;; scan for signals in old sensitivity list ＠＠ -9681,11 +9787,14 ＠＠ (match-string 2)))) (equal (downcase library) "work")) (vhdl-insert-keyword "LIBRARY ") - (insert library ";\n") - (indent-to margin)) - (vhdl-insert-keyword "USE ") - (insert library "." package) - (vhdl-insert-keyword ".ALL;")))) + (insert library ";") + (when package + (insert "\n") + (indent-to margin))) + (when package + (vhdl-insert-keyword "USE ") + (insert library "." package) + (vhdl-insert-keyword ".ALL;"))))) (defun vhdl-template-package-math-complex () "Insert specification of `math_complex' package." ＠＠ -10763,6 +10872,7 ＠＠ string) (vhdl-forward-comment (point-max)) (setq string (buffer-substring-no-properties start (point))) + (vhdl-forward-syntactic-ws) ;; strip off leading blanks and first newline (while (string-match "^\$\\s-+\$" string) (setq string (concat (substring string 0 (match-beginning 1)) ＠＠ -10940,7 +11050,7 ＠＠ (while (not end-of-list) ;; parse object (setq object - (and (vhdl-parse-string "\$signal\\|quantity\\|terminal\$[ \t\n]*" t) + (and (vhdl-parse-string "\\<\$signal\\|quantity\\|terminal\$\\>[ \t\n]*" t) (match-string-no-properties 1))) ;; parse names (accept extended identifiers) (vhdl-parse-string "\$\\w+\\|\\\\[^\\]+\\\\\$[ \t\n]*") ＠＠ -10950,7 +11060,7 ＠＠ ;; parse direction (vhdl-parse-string ":[ \t\n]*") (setq direct - (and (vhdl-parse-string "\$in\\|out\\|inout\\|buffer\\|linkage\$[ \t\n]+" t) + (and (vhdl-parse-string "\\<\$in\\|out\\|inout\\|buffer\\|linkage\$\\>[ \t\n]+" t) (match-string-no-properties 1))) ;; parse type (vhdl-parse-string "\$[^();\n]+\$") ＠＠ -11167,7 +11277,10 ＠＠ (car (nth 0 (car generic-list))) (or (nth 2 (car generic-list)) " "))) (setq generic-list (cdr generic-list)) - (insert (if generic-list ", " ")"))) + (insert (if generic-list ", " ")")) + (when (and (not generic-list) secondary + (null (nth 2 vhdl-port-list))) + (insert ";"))) (unless vhdl-argument-list-indent (insert "\n") (indent-to (+ margin vhdl-basic-offset))) (setq list-margin (current-column)) ＠＠ -11183,6 +11296,9 ＠＠ (or (nth 2 generic) ""))) (setq generic-list (cdr generic-list)) (insert (if generic-list "," ")")) + (when (and (not generic-list) secondary + (null (nth 2 vhdl-port-list))) + (insert ";")) ;; paste comment (when (or vhdl-include-type-comments (and vhdl-include-port-comments (nth 3 generic))) ＠＠ -11210,7 +11326,7 ＠＠ (insert (vhdl-replace-string vhdl-actual-port-name (car (nth 0 (car port-list))))) (setq port-list (cdr port-list)) - (insert (if port-list ", " ");"))) + (insert (if port-list ", " ")"))) (unless vhdl-argument-list-indent (insert "\n") (indent-to (+ margin vhdl-basic-offset))) (setq list-margin (current-column)) ＠＠ -11290,6 +11406,8 ＠＠ (when (nth 2 vhdl-port-list) (insert "\n") (indent-to (+ margin vhdl-basic-offset)) (vhdl-port-paste-port-map)) + (unless (or (nth 1 vhdl-port-list) (nth 2 vhdl-port-list)) + (insert ";")) (message "Pasting port as instantiation \"%s\"...done" name)) (setq vhdl-port-list orig-vhdl-port-list)))) ＠＠ -12241,8 +12359,7 ＠＠ (load-file file-name) (when (/= (length (aget vhdl-project-alist vhdl-project t)) 10) (adelete 'vhdl-project-alist vhdl-project) - ;; XEmacs change: we do not support a no-args (error) - (error "Internal VHDL mode error.")) + (error "")) (when not-make-current (setq vhdl-project current-project)) (vhdl-update-mode-menu) ＠＠ -12499,7 +12616,7 ＠＠ "postponed\\|process\\|" (when (vhdl-standard-p 'ams) "procedural\\|") "with\\|while" - "\\)\\>\\|\\w+\\s-*\$([^\n]*)\$*\\s-*<=\\)") + "\\)\\>\\|\\w+\\s-*\$([^\n]*)\\|\\.\\w+\$*\\s-*<=\\)") 1 'font-lock-function-name-face) ;; highlight label and component name of component instantiations ＠＠ -12758,14 +12875,18 ＠＠ (defun vhdl-font-lock-init () "Initialize fontification." - ;; highlight template prompts and directives + ;; highlight template prompts and directives (setq vhdl-font-lock-keywords-0 (list (list (concat "\$^\\|[ \t(.']\$\$<" vhdl-template-prompt-syntax ">\$") 2 'vhdl-font-lock-prompt-face t) (list (concat "--\\s-*" vhdl-directive-keywords-regexp "\\s-+\$.*\$$") - 2 'vhdl-font-lock-directive-face t))) + 2 'vhdl-font-lock-directive-face t) + ;; highlight c-preprocessor directives + (list "^#[ \t]*\$\\w+\$\$[ \t]+\\(\\w+\$\\)?" + '(1 font-lock-builtin-face) + '(3 font-lock-variable-name-face nil t)))) ;; highlight keywords and standardized types, attributes, enumeration ;; values, and subprograms (setq vhdl-font-lock-keywords-1 ＠＠ -12886,9 +13007,9 ＠＠ ;; (ent-key ent-name ent-file ent-line ;; (arch-key arch-name arch-file arch-line ;; (inst-key inst-name inst-file inst-line inst-comp-name inst-ent-key -;; inst-arch-key inst-conf-key inst-lib-key) +;; inst-arch-key inst-conf-key inst-lib-key inst-path) ;; (lib-name pack-key)) -;; (lib-name pack-key)) +;; mra-key (lib-name pack-key)) (defvar vhdl-config-alist nil "Cache with configurations for each project/directory.") ＠＠ -13054,7 +13175,6 ＠＠ (let* ((ent-name (match-string-no-properties 1)) (ent-key (downcase ent-name)) (ent-entry (aget ent-alist ent-key t)) - (arch-alist (nth 3 ent-entry)) (lib-alist (vhdl-scan-context-clause))) (if (nth 1 ent-entry) (vhdl-warning-when-idle ＠＠ -13064,7 +13184,8 ＠＠ (setq ent-list (cons ent-key ent-list)) (aput 'ent-alist ent-key (list ent-name file-name (vhdl-current-line) - arch-alist lib-alist))))) + (nth 3 ent-entry) (nth 4 ent-entry) + lib-alist))))) ;; scan for architectures (goto-char (point-min)) (while (re-search-forward "^[ \t]*architecture[ \t\n]+\$\\w+\$[ \t\n]+of[ \t\n]+\$\\w+\$[ \t\n]+is\\>" nil t) ＠＠ -13090,7 +13211,7 ＠＠ (list (or (nth 0 ent-entry) ent-name) (nth 1 ent-entry) (nth 2 ent-entry) (vhdl-sort-alist arch-alist) - (nth 4 ent-entry)))))) + arch-key (nth 5 ent-entry)))))) ;; scan for configurations (goto-char (point-min)) (while (re-search-forward "^[ \t]*configuration[ \t\n]+\$\\w+\$[ \t\n]+of[ \t\n]+\$\\w+\$[ \t\n]+is\\>" nil t) ＠＠ -13207,41 +13328,55 ＠＠ (beg-of-unit (point)) (end-of-unit (vhdl-get-end-of-unit)) (inst-no 0) - inst-alist) + inst-alist inst-path) ;; scan for contained instantiations (while (and (re-search-forward (concat "^[ \t]*\$\\w+\$[ \t\n]*:[ \t\n]*\$" "\\(\\w+\$[ \t\n]+\$--[^\n]*\n[ \t\n]*\$*\$generic\\|port\$[ \t\n]+map\\>\\|" "component[ \t\n]+\$\\w+\$\\|" - "\$\\(entity\$\\|configuration\\)[ \t\n]+\$\\(\\w+\$\\.\\)?\$\\w+\$\$[ \t\n]*(\\(\\w+\$)\\)?\\)") end-of-unit t) + "\$\\(entity\$\\|configuration\\)[ \t\n]+\$\\(\\w+\$\\.\\)?\$\\w+\$\$[ \t\n]*(\\(\\w+\$)\\)?\\|" + "\$\\(for\\|if\$\\>[^;:]+\\<generate\\>\\|block\\>\\)\\)\\|" + "\$^[ \t]*end[ \t\n]+\\(generate\\|block\$\\>\\)") end-of-unit t) (or (not limit-hier-inst-no) (<= (setq inst-no (1+ inst-no)) limit-hier-inst-no))) - (let* ((inst-name (match-string-no-properties 1)) - (inst-key (downcase inst-name)) - (inst-comp-name - (or (match-string-no-properties 3) - (match-string-no-properties 6))) - (inst-ent-key - (or (and (match-string 8) - (vhdl-match-string-downcase 11)) - (and inst-comp-name - (downcase inst-comp-name)))) - (inst-arch-key (vhdl-match-string-downcase 13)) - (inst-conf-key - (and (not (match-string 8)) - (vhdl-match-string-downcase 11))) - (inst-lib-key (vhdl-match-string-downcase 10))) - (goto-char (match-end 1)) - (setq inst-list (cons inst-key inst-list) - inst-ent-list (cons inst-ent-key inst-ent-list)) - (setq inst-alist - (append - inst-alist - (list (list inst-key inst-name file-name - (vhdl-current-line) inst-comp-name - inst-ent-key inst-arch-key - inst-conf-key inst-lib-key)))))) + (cond + ;; block/generate beginning found + ((match-string 14) + (setq inst-path + (cons (match-string-no-properties 1) inst-path))) + ;; block/generate end found + ((match-string 16) + (setq inst-path (cdr inst-path))) + ;; instantiation found + (t + (let* ((inst-name (match-string-no-properties 1)) + (inst-key (downcase inst-name)) + (inst-comp-name + (or (match-string-no-properties 3) + (match-string-no-properties 6))) + (inst-ent-key + (or (and (match-string 8) + (vhdl-match-string-downcase 11)) + (and inst-comp-name + (downcase inst-comp-name)))) + (inst-arch-key (vhdl-match-string-downcase 13)) + (inst-conf-key + (and (not (match-string 8)) + (vhdl-match-string-downcase 11))) + (inst-lib-key (vhdl-match-string-downcase 10))) + (goto-char (match-end 1)) + (setq inst-list (cons inst-key inst-list) + inst-ent-list + (cons inst-ent-key inst-ent-list)) + (setq inst-alist + (append + inst-alist + (list (list inst-key inst-name file-name + (vhdl-current-line) inst-comp-name + inst-ent-key inst-arch-key + inst-conf-key inst-lib-key + (reverse inst-path))))))))) ;; scan for contained configuration specifications (goto-char beg-of-unit) (while (re-search-forward ＠＠ -13291,7 +13426,7 ＠＠ (aput 'ent-alist ent-key (list (nth 0 ent-entry) (nth 1 ent-entry) (nth 2 ent-entry) (vhdl-sort-alist arch-alist) - (nth 4 ent-entry))) + (nth 4 ent-entry) (nth 5 ent-entry))) (when (and limit-hier-inst-no (> inst-no limit-hier-inst-no)) (message "WARNING: Scan limit (hierarchy: instances per architecture) reached in file:\n \"%s\"" file-name) ＠＠ -13484,7 +13619,7 ＠＠ (if (or (nth 1 entry) arch-alist) (aput 'ent-alist ent-key (list (nth 0 entry) (nth 1 entry) (nth 2 entry) - arch-alist (nth 4 entry))) + arch-alist (nth 4 entry) (nth 5 entry))) (adelete 'ent-alist ent-key))) (setq arch-list (cdr arch-list) arch-ent-list (cdr arch-ent-list))) ＠＠ -13548,6 +13683,7 ＠＠ updated)) (setq file-list (cdr file-list))) (setq vhdl-modified-file-list nil) + (vhdl-speedbar-update-current-unit) (when updated (message "Updating hierarchy...done"))))) ;; structure (parenthesised expression means list of such entries) ＠＠ -13607,7 +13743,8 ＠＠ (nth 6 inst-entry) ; from direct instantiation (nth 4 (aget conf-alist (nth 7 inst-entry))) ; from configuration spec. - (caar (nth 3 inst-ent-entry)))) ; random (simplified MRA) + (nth 4 inst-ent-entry) ; MRA + (caar (nth 3 inst-ent-entry)))) ; first alphabetically (setq inst-arch-entry (aget (nth 3 inst-ent-entry) inst-arch-key t)) ;; set library (setq inst-lib-key ＠＠ -13784,7 +13921,7 ＠＠ (progn (load-file file-dir-name) (string< (mapconcat (lambda (a) (format "%3d" (string-to-int a))) - (split-string "3.31.14" "\\.") "") + (split-string "3.33" "\\.") "") (mapconcat (lambda (a) (format "%3d" (string-to-int a))) (split-string vhdl-cache-version "\\.") ""))) ＠＠ -13844,6 +13981,8 ＠＠ (define-key vhdl-speedbar-key-map "_" 'vhdl-speedbar-contract-all) (define-key vhdl-speedbar-key-map "C" 'vhdl-speedbar-port-copy) (define-key vhdl-speedbar-key-map "P" 'vhdl-speedbar-place-component) + (define-key vhdl-speedbar-key-map "F" 'vhdl-speedbar-configuration) + (define-key vhdl-speedbar-key-map "A" 'vhdl-speedbar-select-mra) (define-key vhdl-speedbar-key-map "K" 'vhdl-speedbar-make-design) (define-key vhdl-speedbar-key-map "R" 'vhdl-speedbar-rescan-hierarchy) (define-key vhdl-speedbar-key-map "S" 'vhdl-save-caches) ＠＠ -13885,6 +14024,10 ＠＠ (vhdl-speedbar-check-unit 'subprogram))] ["Place Component" vhdl-speedbar-place-component (vhdl-speedbar-check-unit 'entity)] + ["Generate Configuration" vhdl-speedbar-configuration + (vhdl-speedbar-check-unit 'architecture)] + ["Select as MRA" vhdl-speedbar-select-mra + (vhdl-speedbar-check-unit 'architecture)] ["Make" vhdl-speedbar-make-design (save-excursion (beginning-of-line) (looking-at "[0-9]+: *[[<]"))] ["Generate Makefile" vhdl-speedbar-generate-makefile ＠＠ -14231,7 +14377,8 ＠＠ (ent-entry (aget ent-alist token t)) (arch-alist (nth 3 ent-entry)) (inst-alist (vhdl-get-instantiations token indent)) - (subpack-alist (nth 4 ent-entry)) + (subpack-alist (nth 5 ent-entry)) + (multiple-arch (> (length arch-alist) 1)) arch-entry inst-entry) (if (not (or arch-alist inst-alist subpack-alist)) (speedbar-change-expand-button-char ??) ＠＠ -14254,6 +14401,9 ＠＠ (nth 1 arch-entry) 'vhdl-speedbar-find-file (cons (nth 2 arch-entry) (nth 3 arch-entry)) 'vhdl-speedbar-architecture-face (1+ indent)) + (when (and multiple-arch + (equal (nth 0 arch-entry) (nth 4 ent-entry))) + (end-of-line 0) (insert " (mra)") (forward-char 1)) (setq arch-alist (cdr arch-alist))) ;; insert instantiations (when inst-alist ＠＠ -14486,7 +14636,8 ＠＠ (setq pack-entry (aget pack-alist pack-key t)) (vhdl-speedbar-make-subpack-line (or (nth 0 pack-entry) pack-key) lib-name - (cons (nth 1 pack-entry) (nth 2 pack-entry)) indent) + (cons (nth 1 pack-entry) (nth 2 pack-entry)) + (cons (nth 6 pack-entry) (nth 7 pack-entry)) indent) (setq subpack-alist (cdr subpack-alist))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ＠＠ -14708,7 +14859,7 ＠＠ (put-text-property visible-start (point) 'invisible nil))) (defun vhdl-speedbar-make-subpack-line (pack-name lib-name pack-file-marker - depth) + pack-body-file-marker depth) "Insert used package entry." (let ((start (point)) visible-start) ＠＠ -14727,6 +14878,14 ＠＠ (speedbar-make-button start (point) 'vhdl-speedbar-package-face 'speedbar-highlight-face 'vhdl-speedbar-find-file pack-file-marker) + (when (car pack-body-file-marker) + (insert " (") + (setq start (point)) + (insert "body") + (speedbar-make-button + start (point) 'vhdl-speedbar-package-face 'speedbar-highlight-face + 'vhdl-speedbar-find-file pack-body-file-marker) + (insert ")")) (setq start (point)) (insert " (" lib-name ")") (put-text-property (+ 2 start) (1- (point)) 'face ＠＠ -14883,6 +15042,18 ＠＠ (set-text-properties 0 (length string) nil string) string)) +(defun vhdl-speedbar-higher-text () + "Get speedbar-line-text of higher level." + (let (depth string) + (save-excursion + (beginning-of-line) + (looking-at "^\$[0-9]+\$:") + (setq depth (string-to-int (match-string 1))) + (when (re-search-backward (format "^%d: *[[<{][-+?][]>}] \$[^ \n]+\$" (1- depth)) nil t) + (setq string (match-string 1)) + (set-text-properties 0 (length string) nil string) + string)))) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Help functions ＠＠ -15007,6 +15178,31 ＠＠ (vhdl-compose-place-component) (select-frame speedbar-frame))) +(defun vhdl-speedbar-configuration () + "Generate configuration for the architecture under the cursor." + (interactive) + (if (not (vhdl-speedbar-check-unit 'architecture)) + (error "ERROR: No architecture under cursor.") + (let ((arch-name (vhdl-speedbar-line-text)) + (ent-name (vhdl-speedbar-higher-text))) + (if (fboundp 'speedbar-select-attached-frame) + (speedbar-select-attached-frame) + (select-frame speedbar-attached-frame)) + (vhdl-compose-configuration ent-name arch-name)))) + +(defun vhdl-speedbar-select-mra () + "Select the architecture under the cursor as MRA." + (interactive) + (if (not (vhdl-speedbar-check-unit 'architecture)) + (error "ERROR: No architecture under cursor.") + (let* ((arch-key (downcase (vhdl-speedbar-line-text))) + (ent-key (downcase (vhdl-speedbar-higher-text))) + (ent-alist (aget vhdl-entity-alist + (or (vhdl-project-p) default-directory) t)) + (ent-entry (aget ent-alist ent-key t))) + (setcar (cddr (cddr ent-entry)) arch-key) ; (nth 4 ent-entry) + (speedbar-refresh)))) + (defun vhdl-speedbar-make-design () "Make (compile) design unit or directory/project under the cursor." (interactive) ＠＠ -15041,6 +15237,10 ＠＠ (memq (get-text-property (match-end 0) 'face) '(vhdl-speedbar-entity-face vhdl-speedbar-entity-selected-face))) + ((eq design-unit 'architecture) + (memq (get-text-property (match-end 0) 'face) + '(vhdl-speedbar-architecture-face + vhdl-speedbar-architecture-selected-face))) ((eq design-unit 'subprogram) (eq (get-text-property (match-end 0) 'face) 'vhdl-speedbar-subprogram-face)) ＠＠ -15254,7 +15454,7 ＠＠ (vhdl-insert-keyword "END ") (unless (vhdl-standard-p '87) (vhdl-insert-keyword "ARCHITECTURE ")) (insert arch-name ";\n\n") - ;; insert footer + ;; insert footer and save (if (and vhdl-compose-include-header (not (equal vhdl-file-footer ""))) (vhdl-template-footer) (vhdl-comment-display-line) (insert "\n")) ＠＠ -15388,7 +15588,8 ＠＠ (vhdl-port-copy)))) (vhdl-port-flatten t) (setq generic-alist (nth 1 vhdl-port-list) - port-alist (nth 2 vhdl-port-list)) + port-alist (nth 2 vhdl-port-list) + vhdl-port-list nil) (setq constant-alist nil signal-alist nil) (when has-generic ＠＠ -15716,6 +15917,178 ＠＠ (message "Generating components package \"%s\"...done\n File created: \"%s\"" pack-name pack-file-name))) +(defun vhdl-compose-configuration-architecture (ent-name arch-name inst-alist + &optional insert-conf) + "Generate block configuration for architecture." + (let ((margin (current-indentation)) + (beg (save-excursion (beginning-of-line) (point))) + ent-entry inst-entry inst-path inst-prev-path cons-key tmp-alist) + ;; insert block configuration (for architecture) + (vhdl-insert-keyword "FOR ") (insert arch-name "\n") + (setq margin (+ margin vhdl-basic-offset)) + ;; process all instances + (while inst-alist + (setq inst-entry (car inst-alist)) + ;; is component? + (when (nth 4 inst-entry) + (setq insert-conf t) + (setq inst-path (nth 9 inst-entry)) + ;; skip common path with previous instance + (while (and inst-path (equal (car inst-path) (car inst-prev-path))) + (setq inst-path (cdr inst-path) + inst-prev-path (cdr inst-prev-path))) + ;; insert block configuration end (for previous block/generate) + (while inst-prev-path + (setq margin (- margin vhdl-basic-offset)) + (indent-to margin) + (vhdl-insert-keyword "END FOR;\n") + (setq inst-prev-path (cdr inst-prev-path))) + ;; insert block configuration beginning (for current block/generate) + (indent-to margin) + (while inst-path + (setq margin (+ margin vhdl-basic-offset)) + (vhdl-insert-keyword "FOR ") + (insert (car inst-path) "\n") + (indent-to margin) + (setq inst-path (cdr inst-path))) + ;; insert component configuration beginning + (vhdl-insert-keyword "FOR ") + (insert (nth 1 inst-entry) " : " (nth 4 inst-entry) "\n") + ;; find subconfiguration + (setq conf-key (nth 7 inst-entry)) + (setq tmp-alist conf-alist) + ;; use first configuration found for instance's entity + (while (and tmp-alist (null conf-key)) + (when (equal (nth 5 inst-entry) (nth 4 (car tmp-alist))) + (setq conf-key (nth 0 (car tmp-alist)))) + (setq tmp-alist (cdr tmp-alist))) + (setq conf-entry (aget conf-alist conf-key t)) + ;; insert binding indication ... + ;; ... with subconfiguration (if exists) + (if (and vhdl-compose-configuration-use-subconfiguration conf-entry) + (progn + (indent-to (+ margin vhdl-basic-offset)) + (vhdl-insert-keyword "USE CONFIGURATION ") + (insert (vhdl-work-library) "." (nth 0 conf-entry)) + (insert ";\n")) + ;; ... with entity (if exists) + (setq ent-entry (aget ent-alist (nth 5 inst-entry) t)) + (when ent-entry + (indent-to (+ margin vhdl-basic-offset)) + (vhdl-insert-keyword "USE ENTITY ") + (insert (vhdl-work-library) "." (nth 0 ent-entry)) + ;; insert architecture name (if architecture exists) + (when (nth 3 ent-entry) + (setq arch-name + ;; choose architecture name a) from configuration, + ;; b) from mra, or c) from first architecture + (or (nth 0 (aget (nth 3 ent-entry) + (or (nth 6 inst-entry) + (nth 4 ent-entry)) t)) + (nth 1 (car (nth 3 ent-entry))))) + (insert "(" arch-name ")")) + (insert ";\n") + ;; insert block configuration (for architecture of subcomponent) + (when (and vhdl-compose-configuration-hierarchical + (nth 3 ent-entry)) + (indent-to (+ margin vhdl-basic-offset)) + (vhdl-compose-configuration-architecture + (nth 0 ent-entry) arch-name + (nth 3 (aget (nth 3 ent-entry) (downcase arch-name) t)))))) + ;; insert component configuration end + (indent-to margin) + (vhdl-insert-keyword "END FOR;\n") + (setq inst-prev-path (nth 9 inst-entry))) + (setq inst-alist (cdr inst-alist))) + ;; insert block configuration end (for block/generate) + (while inst-prev-path + (setq margin (- margin vhdl-basic-offset)) + (indent-to margin) + (vhdl-insert-keyword "END FOR;\n") + (setq inst-prev-path (cdr inst-prev-path))) + (indent-to (- margin vhdl-basic-offset)) + ;; insert block configuration end or remove beginning (for architecture) + (if insert-conf + (vhdl-insert-keyword "END FOR;\n") + (delete-region beg (point))))) + +(defun vhdl-compose-configuration (&optional ent-name arch-name) + "Generate configuration declaration." + (interactive) + (vhdl-require-hierarchy-info) + (let ((ent-alist (aget vhdl-entity-alist + (or (vhdl-project-p) default-directory) t)) + (conf-alist (aget vhdl-config-alist + (or (vhdl-project-p) default-directory) t)) + (from-speedbar ent-name) + inst-alist conf-name conf-file-name pos) + (vhdl-prepare-search-2 + ;; get entity and architecture name + (unless ent-name + (save-excursion + (unless (and (re-search-backward "^\$architecture\\s-+\\(\\w+\$\\s-+of\\s-+\$\\w+\$\\|end\\)\\>" nil t) + (not (equal "END" (upcase (match-string 1)))) + (setq ent-name (match-string-no-properties 3)) + (setq arch-name (match-string-no-properties 2))) + (error "ERROR: Not within an architecture")))) + (setq conf-name (vhdl-replace-string + vhdl-compose-configuration-name + (concat ent-name " " arch-name))) + (setq inst-alist + (nth 3 (aget (nth 3 (aget ent-alist (downcase ent-name) t)) + (downcase arch-name) t)))) + (message "Generating configuration \"%s\"..." conf-name) + (if vhdl-compose-configuration-create-file + ;; open configuration file + (progn + (setq conf-file-name + (concat (vhdl-replace-string vhdl-configuration-file-name + conf-name t) + "." (file-name-extension (buffer-file-name)))) + (when (and (file-exists-p conf-file-name) + (not (y-or-n-p (concat "File \"" conf-file-name + "\" exists; overwrite? ")))) + (error "ERROR: Creating configuration...aborted")) + (find-file conf-file-name) + (erase-buffer) + (set-buffer-modified-p nil) + ;; insert header + (if vhdl-compose-include-header + (progn (vhdl-template-header + (concat "Configuration declaration for design \"" + ent-name "(" arch-name ")\"")) + (goto-char (point-max))) + (vhdl-comment-display-line) (insert "\n\n"))) + ;; goto end of architecture + (unless from-speedbar + (re-search-forward "^end\\>" nil) + (end-of-line) (insert "\n\n") + (vhdl-comment-display-line) (insert "\n\n"))) + ;; insert library clause + (setq pos (point)) + (vhdl-template-standard-package (vhdl-work-library) nil) + (when (/= pos (point)) + (insert "\n\n")) + ;; insert configuration + (vhdl-insert-keyword "CONFIGURATION ") (insert conf-name) + (vhdl-insert-keyword " OF ") (insert ent-name) + (vhdl-insert-keyword " IS\n") + (indent-to vhdl-basic-offset) + ;; insert block configuration (for architecture) + (vhdl-compose-configuration-architecture ent-name arch-name inst-alist t) + (vhdl-insert-keyword "END ") (insert conf-name ";") + (when conf-file-name + ;; insert footer and save + (insert "\n\n") + (if (and vhdl-compose-include-header (not (equal vhdl-file-footer ""))) + (vhdl-template-footer) + (vhdl-comment-display-line) (insert "\n")) + (save-buffer)) + (message + (concat (format "Generating configuration \"%s\"...done" conf-name) + (and conf-file-name + (format "\n File created: \"%s\"" conf-file-name)))))) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Compilation / Makefile generation ＠＠ -15991,7 +16364,7 ＠＠ (setq ent-file-name (file-relative-name (nth 2 ent-entry) compile-directory) arch-alist (nth 4 ent-entry) - lib-alist (nth 5 ent-entry) + lib-alist (nth 6 ent-entry) rule (aget rule-alist ent-file-name) target-list (nth 0 rule) depend-list (nth 1 rule) ＠＠ -16261,7 +16634,8 ＠＠ (insert " \\\n\t\t$(UNIT-" work-library "-" (car second-list) ")") (setq second-list (cdr second-list))) (while subcomp-list - (when (assoc (car subcomp-list) unit-list) + (when (and (assoc (car subcomp-list) unit-list) + (not (equal unit-key (car subcomp-list)))) (insert " \\\n\t\t" (car subcomp-list))) (setq subcomp-list (cdr subcomp-list))) (insert "\n") ＠＠ -16366,8 +16740,10 ＠＠ 'vhdl-upper-case-enum-values 'vhdl-upper-case-constants 'vhdl-use-direct-instantiation + 'vhdl-compose-configuration-name 'vhdl-entity-file-name 'vhdl-architecture-file-name + 'vhdl-configuration-file-name 'vhdl-package-file-name 'vhdl-file-name-case 'vhdl-electric-keywords ＠＠ -16413,6 +16789,9 ＠＠ 'vhdl-testbench-entity-file-name 'vhdl-testbench-architecture-file-name 'vhdl-compose-create-files + 'vhdl-compose-configuration-create-file + 'vhdl-compose-configuration-hierarchical + 'vhdl-compose-configuration-use-subconfiguration 'vhdl-compose-include-header 'vhdl-compose-architecture-name 'vhdl-components-package-name ＠＠ -16475,106 +16854,34 ＠＠ (defconst vhdl-doc-release-notes nil "\ -Release Notes for VHDL Mode 3.32 +Release Notes for VHDL Mode 3.33 ================================ - New Features - - Enhanced Features - User Options - - Remarks New Features ------------ - -STRUCTURAL COMPOSITION: - - Enables simple structural composition similar to graphical editors. - Simplifies the creation of higher design levels where subcomponents - are simply sticked together: - 1. Create a skeleton for a new component - 2. Place subcomponents in it directly from the hierarchy browser - 3. Automatically connect all subcomponents and create the ports - for the new component (based on names of actual ports) - - Automatic generation of a components package (package containing - component declarations for all entities). - - Find more information in the online documentation (`C-c C-h'). - -PORT TRANSLATION: - - Reverse direction of ports (useful for testbenches). -SUBPROGRAM TRANSLATION: - - Copy/paste of subprogram interfaces (similar to port translation). - -CODE FILLING: - - Condense code using code-sensitive block filling. - -CODE STATISTICS: - - Calculate number of code lines and statements in a buffer. - - -Enhanced Features ------------------ - -TESTBENCH GENERATION: - - Enhanced templates and user option default values. - -Emacs 21 compatibility/enhancements: - - `lazy-lock-mode' is not used anymore (built-in `jit-lock-mode' is faster). - -And many other minor fixes and enhancements. +CONFIGURATION DECLARATION GENERATION: + - Automatic generation of a configuration declaration for a design. + (See documentation (`C-c C-h') in section on STRUCTURAL COMPOSITION.) User Options ------------ - -`vhdl-project-file-name': (enhanced) - Include user name in project setup file name. -`vhdl-speedbar-cache-file-name': (enhanced, changed default) - Include user name in cache file name. -`vhdl-default-library': (new) - Default working library if no project is active. -`vhdl-architecture-file-name': (new) - Specify how the architecture file name is obtained. -`vhdl-package-file-name': (new) - Specify how the package file name is obtained. -`vhdl-file-name-case': (new) - Allows to change case when deriving file names. -`vhdl-compose-create-files': (new) - Specify whether new files should be created for a new component. -`vhdl-compose-include-header': (new) - Specify whether a header is included in a new component's file. -`vhdl-compose-architecture-name': (new) - Specify how a new component's architecture name is obtained. -`vhdl-components-package-name': (new) - Specify how the name for the components package is obtained. -`vhdl-use-components-package': (new) - Specify whether component declarations go in a components package. -`vhdl-use-direct-instantiation': (new) - Specify whether to use VHDL'93 direct component instantiation. -`vhdl-instance-name': (changed default) - Allows insertion of a running number to generate unique instance names. -`vhdl-testbench-entity-header', `vhdl-testbench-architecture-header':(obsolete) - Headers are now automatically derived from the standard header. -`vhdl-testbench-include-header': (new) - Specify whether a header is included in testbench files. -`vhdl-testbench-declaration', `vhdl-testbench-statements': (changed default) - Non-empty default values for more complete testbench templates. -`vhdl-testbench-entity-file-name': (new) - Specify how the testbench entity file name is obtained. -`vhdl-testbench-architecture-file-name': (new) - Specify how the testbench architecture file name is obtained. - - -Remarks -------- - -- Changed key binding for `vhdl-comment-uncomment-region': `C-c c' - (`C-c C-c ...' is now used for structural composition). -- Automatic buffer highlighting (font-lock) is now controlled by option - `global-font-lock-mode' in GNU Emacs (`font-lock-auto-fontify' in XEmacs). - \(Important: You MUST customize this option in order to turn automatic - buffer highlighting on.) +`vhdl-configuration-file-name': (new) + Specify how the configuration file name is obtained. +`vhdl-compose-configuration-name': (new) + Specify how the configuration name is optained. +`vhdl-compose-configuration-create-file': (new) + Specify whether a new file should be created for a configuration. +`vhdl-compose-configuration-hierarchical': (new) + Specify whether hierarchical configurations should be created. +`vhdl-compose-configuration-use-subconfiguration': (new) + Specify whether subconfigurations should be used inside configurations. ") -- Jerry James http://www.ittc.ku.edu/~james/

1 participants
1 comments

[AC21.4] Oxymorons 19 years, 10 months

Vin Shelton

This patch has been committed. ChangeLog addition: 2005-02-12 Vin Shelton <acs(a)xemacs.org> * etc/OXYMORONS: New list. 21.4 source patch: Diff command: cvs -q diff -u Files affected: etc/OXYMORONS Index: etc/OXYMORONS =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/Attic/OXYMORONS,v retrieving revision 1.2.2.8 diff -a -u -u -r1.2.2.8 OXYMORONS --- etc/OXYMORONS 2004/02/16 14:25:16 1.2.2.8 +++ etc/OXYMORONS 2005/02/14 04:09:47 ＠＠ -14,12 +14,7 ＠＠ prospect of such a big win, I could not have justified trying to coordinate a release myself. -The rest of the codenames are in alphabetical order. -N.B. I expect that the Stable Release Maintainer will choose a new -theme for the releases following the promotion of 21.4 from "gamma" to -"stable". So 15 or so should be enough.... - 21.4.0: Solid Vapor 21.4.1: Copyleft 21.4.2: Developer-Friendly Unix APIs ＠＠ -38,14 +33,14 ＠＠ 21.4.15: Security Through Obscurity 21.4.16: Corporate Culture 21.4.17: Jumbo Shrimp -21.4.18: Social Property -21.4.19: Stable Release Maintainer -21.4.20: Standard C -21.4.21: Successful IPO -21.4.22: Sufficiently Smart Compiler -21.4.23: The Gift Economy +21.4.18: Constant Variable +21.4.19: Double Solitaire +21.4.20: Educational Television +21.4.21: Instant Classic +21.4.22: Moral Moajority +21.4.23: Standard C 21.4.24: Too Much Mozart -21.4.25: UTF-8 BOM +21.4.25: Working Vacation + -N.B. Only incredibly redeeming suggestions can be accepted now.

2 participants
2 comments

[AC21.4] Ask users to send crash mail to xemacs-beta 19 years, 10 months

Vin Shelton

This patch has been committed and will appear in XEmacs 21.4.18, "Constant Variable". - Vin src/ChangeLog addition: 2005-02-12 Vin Shelton <acs(a)xemacs.org> * emacs.c (shut_down_emacs): Advise users to send email to the xemacs-beta list instead of crashes(a)xemacs.org. 21.4 source patch: Diff command: cvs -q diff -u Files affected: src/emacs.c Index: src/emacs.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v retrieving revision 1.97.2.10 diff -a -u -u -r1.97.2.10 emacs.c --- src/emacs.c 2005/02/01 03:55:01 1.97.2.10 +++ src/emacs.c 2005/02/14 04:12:44 ＠＠ -3070,7 +3070,7 ＠＠ #else "Please report this bug by invoking M-x report-emacs-bug,\n" "or by selecting `Send Bug Report' from the Help menu. If necessary, send\n" - "ordinary email to `crashes(a)xemacs.org'. *MAKE SURE* to include the XEmacs\n" + "ordinary email to `xemacs-beta(a)xemacs.org'. *MAKE SURE* to include the XEmacs\n" "configuration from M-x describe-installation, or equivalently the file\n" "Installation in the top of the build tree.\n" #endif

1 participants
0 comments

[AC21.5] Movemail fix 19 years, 10 months

Vin Shelton

This patch has been committed. ../xemacs-no-rsync/xemacs-21.5/lib-src/ChangeLog addition: 2005-01-29 Vin Shelton <acs(a)xemacs.org> * movemail.c (popmail): Pass error string as format parameter instead of as part of format string. Security fixes for CAN-2005-0100. 21.5 source patch: Diff command: cvs -q diff -u Files affected: lib-src/movemail.c Index: lib-src/movemail.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/movemail.c,v retrieving revision 1.20 diff -a -u -u -r1.20 movemail.c --- lib-src/movemail.c 2002/03/13 08:51:59 1.20 +++ lib-src/movemail.c 2005/02/14 03:37:21 ＠＠ -746,14 +746,14 ＠＠ server = pop_open (0, user, password, POP_NO_GETPASS); if (! server) { - error (pop_error, NULL, NULL); + error ("%s", pop_error, NULL); return (1); } VERBOSE(("stat'ing messages\n")); if (pop_stat (server, &nmsgs, &nbytes)) { - error (pop_error, NULL, NULL); + error ("%s", pop_error, NULL); return (1); } ＠＠ -801,7 +801,7 ＠＠ mbx_delimit_begin (mbf); if (pop_retr (server, i, mbx_write, mbf) != POP_RETRIEVED) { - error (Errmsg, NULL, NULL); + error ("%s", Errmsg, NULL); close (mbfi); return (1); } ＠＠ -849,7 +849,7 ＠＠ VERBOSE(("deleting message %d \n", i)); if (pop_delete (server, i)) { - error (pop_error, NULL, NULL); + error ("%s", pop_error, NULL); pop_close (server); return (1); } ＠＠ -860,7 +860,7 ＠＠ VERBOSE(("closing server \n")); if (pop_quit (server)) { - error (pop_error, NULL, NULL); + error ("%s", pop_error, NULL); return (1); }

1 participants
0 comments

[AC sjt-xft] Further autoconf.ac improvements. 19 years, 11 months

Malcolm Purvis

APPROVE COMMIT This adds a new set of macros for options that require a value from a set of keywords (eg --enable-menubars, etc) and converts a whole lot of options to use these macros and the complex option ones. It also documents that complex options can be assigned a default value of "" (maybe) which means 'yes, if the libraries can be found'. This is the final patch before I move autoconf 2.59 support over to the main line. ChangeLog addition: 2005-02-11 Malcolm Purvis <malcolmp(a)xemacs.org> * configure.ac: Added keyword option support. Converted database, sound, athena, xim, bignum, error-checking, menubars, scrollbars, dialogs and widgets command line arguments to use keyword option and complex option macros. xemacs-xft-bugfixes source patch: Diff command: cvs -q diff -u Files affected: configure.ac Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.1.14.3 diff -u -r1.1.14.3 configure.ac --- configure.ac 2005/02/09 03:40:30 1.1.14.3 +++ configure.ac 2005/02/11 05:04:37 ＠＠ -227,7 +227,86 ＠＠ $1="$T" ])dnl XE_SPACE +dnl XEmacs keyword option support +dnl ============================= +dnl +dnl A "keyword" option is one that accepts one of a number of pre-defined +dnl values (if more than one value is needed see "complex options" below). +dnl For example --with-mail-locking=flock. +dnl +dnl Complex options used an expanded forms of AC_ARG_[WITH|ENABLE] called +dnl XE_KEYWORD_ARG_[WITH|ENABLE] both taking 5 parameters. The first 4 +dnl parameters of these macros are the same as original macros with the +dnl exception that all four paramaters are REQUIRED. The ACTION-IF-TRUE code +dnl is run after the argument list has been parsed. +dnl +dnl The 5th parameter is a list keywords. The list must be quoted but the +dnl individual macros should not. +dnl +dnl If the option value is a not a valid keyword then an error message is +dnl generated, otherwise rthe value is left untouched. +dnl +dnl XE_PARSE_KEYWORD_OPTION(prefix, cmdline-flag) +dnl --------------------------------------------- +dnl +dnl Internal macro to parse the option values. If an undeclared option is +dnl found then an error is generated. +dnl +define([XE_PARSE_KEYWORD_OPTION], +[[$1]_bogus=yes + for x in XE_KEYWORD_LIST ; do + if test $x = $[$1] ; then + [$1]_bogus=no + fi + done + if test "$[$1]_bogus" = "yes" ; then + USAGE_ERROR(["The [$2] option must have one of these values: m4_translit(XE_KEYWORD_VALUES,[:],[,])."]) + fi +unset [$1]_bogus +undefine([XE_KEYWORD_LIST])dnl +undefine([XE_KEYWORD_VALUES])]) +dnl +dnl XE_KEYWORD(keyword) +dnl -------------------------------- +dnl +dnl +define([XE_KEYWORD], +[m4_append([XE_KEYWORD_LIST],[$1],[ ])dnl +dnl Separate with a ':' instead of a ',' (see the parsing code above) to avoid +dnl confusion with marco parameter lists. +m4_append([XE_KEYWORD_VALUES],[\`$1'],[:])dnl +]) +dnl +dnl XE_KEYWORD_ARG_WITH(PACKAGE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE, +dnl [XE_KEYWORD(keyword), ....]) +dnl -------------------------------------------------------------------------- +dnl +dnl Expanded version of AC_ARG_WITH for keyword options. All the parameters +dnl are required. +dnl +define([XE_KEYWORD_ARG_WITH], +[m4_map([XE_KEYWORD],m4_shiftn(4, $＠)) +AC_ARG_WITH([$1],[$2], +[XE_PARSE_KEYWORD_OPTION([with_]patsubst([$1], -, _), [--with-$1]) +$3 +],[$4])]) +dnl +dnl XE_KEYWORD_ARG_ENABLE(FEATURE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE, +dnl [XE_KEYWORD(keyword), ....]) +dnl -------------------------------------------------------------------------- +dnl +dnl Expanded version of AC_ARG_ENABLE for keyword options. All the parameters +dnl are required. +dnl +define([XE_KEYWORD_ARG_ENABLE], +[m4_map([XE_KEYWORD],m4_shiftn(4, $＠)) +AC_ARG_ENABLE([$1],[$2], +[XE_PARSE_KEYWORD_OPTION([enable_]patsubst([$1], -, _), [--enable-$1]) +$3 +],[$4])]) +dnl dnl XEmacs complex option support +dnl ============================= dnl dnl A "complex option" is one that takes a number of related values. dnl For example, we might use "--with-xft=all,nomenubars" for compatibility ＠＠ -245,7 +324,14 ＠＠ dnl the individual macros should not. dnl dnl Option values are stored in the variables with_<package>_<component> or -dnl enable_<feature>_<component> (eg with_xft_menubars) +dnl enable_<feature>_<component> (eg with_xft_menubars). +dnl +dnl Option values are either 'yes' which means that the option must be used +dnl and an error must occur if there is a configuration problems (such as a +dnl missing library) or 'no' which means that the option must not be used. +dnl The default value can also be "", meaning maybe, which means 'yes' if the +dnl configuration is present otherwise no. Users cannot specify 'maybe' from +dnl the command line. dnl dnl There are two possible uses in XEmacs for this kind of facility. One is dnl exemplified by sound: there are alternative protocols (native, ESD, NAS) ＠＠ -254,7 +340,7 ＠＠ dnl XEmacs, as exemplified by Xft. This latter usage may be more common dnl during development of a feature. Perhaps specialized APIs should be dnl provided, see comment on XE_COMPLEX_OPTION_HELP_STRING below. - +dnl dnl XE_COMPLEX_OPTION_DEFAULT(prefix, component, yesno) dnl --------------------------------------------------- dnl ＠＠ -268,7 +354,7 ＠＠ dnl confusion with marco parameter lists. m4_append([XE_COMPONENT_DEFAULT],[m4_if([$3],no,no)[$2]],[:]) ]) - +dnl dnl XE_EXPAND_COMPLEX_OPTIONS(prefix, option_list) dnl ---------------------------------------------- dnl ＠＠ -353,7 +439,7 ＠＠ dnl -------------------------------- dnl dnl Declare a complex option and its default value. The value MUST be either -dnl yes or no. +dnl yes or no or "" (which means maybe). dnl define([XE_COMPLEX_OPTION],[[$1,$2]]) ＠＠ -379,8 +465,7 ＠＠ AC_ARG_WITH([$1],[$2], [XE_PARSE_COMPLEX_OPTION([with_]patsubst([$1], -, _), [--with-$1]) $3 -],[$4]) -]) +],[$4])]) dnl XE_COMPLEX_ARG_ENABLE(FEATURE, HELP-STRING, ACTION-IF-TRUE, ACTION-IF-FALSE, dnl [XE_COMPLEX_OPTION, ....]) ＠＠ -394,9 +479,8 ＠＠ AC_ARG_ENABLE([$1],[$2], [XE_PARSE_COMPLEX_OPTION([enable_]patsubst([$1], -, _), [--enable-$1]) $3 -],[$4]) -]) - +],[$4])]) +dnl dnl ------------------------------------------------------------------------- XE_APPEND(lib-src, MAKE_SUBDIR) XE_APPEND(lib-src, INSTALL_ARCH_DEP_SUBDIR) ＠＠ -504,8 +588,7 ＠＠ [XE_COMPLEX_OPTION([emacs],[yes]), XE_COMPLEX_OPTION([menubars],[yes]), XE_COMPLEX_OPTION([tabs],[yes]), - XE_COMPLEX_OPTION([gauges],[yes])] -) + XE_COMPLEX_OPTION([gauges],[yes])]) dnl sanity checking dnl #### Maybe we should XE_DIE here instead? Or fix the UI so that dnl emacs is always implicit? (I worry that --without-xft would be weird.) ＠＠ -753,32 +836,22 ＠＠ #Enable code. -AC_ARG_ENABLE([database], +XE_COMPLEX_ARG_ENABLE([database], AC_HELP_STRING([--enable-database],[Compile with database support. Valid types are `no' or a comma-separated list of one or more of `berkdb' and either `dbm' or `gnudbm'.]), [ -with_database_berkdb=no -with_database_dbm=no -with_database_gdbm=no -for x in `echo "$enable_database" | sed -e 's/,/ /g'` ; do - case "$x" in - no ) ;; - b | be | ber | berk | berkd | berkdb ) with_database_berkdb=yes ;; - d | db | dbm ) with_database_dbm=yes ;; - g | gn | gnu | gnud | gnudb | gnudbm | gdbm) with_database_gdbm=yes ;; - * ) USAGE_ERROR(["The \`--$optname' option value -must be either \`no' or a comma-separated list -of one or more of \`berkdb' and either \`dbm' or \`gnudbm'."]) ;; - esac -done -if test "$with_database_dbm" = "yes" -a "$with_database_gdbm" = "yes"; then +if test "$enable_database_dbm" = "yes" -a "$enable_database_gdbm" = "yes"; then USAGE_ERROR("Only one of \`dbm' and \`gnudbm' may be specified with the \`--$optname' option.") fi -], []) +], +[], +[XE_COMPLEX_OPTION([berkdb],[""]), + XE_COMPLEX_OPTION([dbm],[""]), + XE_COMPLEX_OPTION([gdbm],[""])]) -AC_ARG_ENABLE([sound], +XE_COMPLEX_ARG_ENABLE([sound], AC_HELP_STRING([--enable-sound],[Compile with sound support. Valid types are `native', `nas' and `esd'. Prefix a type with 'no' to disable. ＠＠ -787,254 +860,70 ＠＠ Later options override earlier ones for the same TYPE. The default is to autodetect all sound support except for ESD which defaults to off.]), - [ -dnl values is a subset of all,native,nas,esd -dnl or their negatives: none,nonative,nonas,noesd -for x in `echo "$enable_sound" | 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_sdefault=no ;; - a | al | all | both ) new_sdefault=yes ;; - - native ) with_native_sound=yes ;; - nonative ) with_native_sound=no ;; - - nas ) with_nas_sound=yes ;; - nonas ) with_nas_sound=no ;; - - esd ) with_esd_sound=yes ;; - noesd ) with_esd_sound=no ;; - - * ) bogus_sound=yes ;; - esac - if test "$bogus_sound" -o \ - $ -n "$new_sdefault" -a -n "$sound_notfirst" $ ; then - types="\`all', \`none', \`(no)native', \`no(nas)', \`(no)esd'." - USAGE_ERROR(["Valid types for the \`--$optname' option are: -$types. -Option \`all' or \`none' must be first in the list. -The default is to autodetect native and NAS sound support."]) - elif test -n "$new_sdefault" ; then - with_native_sound=$new_sdefault - with_nas_sound=$new_sdefault - with_esd_sound=$new_sdefault - new_sdefault= # reset this - fi - sound_notfirst=true -done -], [with_esd_sound=no]) + [], + [enable_sound_nas=""], + [XE_COMPLEX_OPTION([native],[""]), + XE_COMPLEX_OPTION([nas],[""]), + XE_COMPLEX_OPTION([esd],[no])]) -AC_ARG_WITH([athena], +XE_KEYWORD_ARG_WITH([athena], AC_HELP_STRING([--with-athena],[Use TYPE Athena widgets (xaw, 3d, next, 95, or xpm).]), -[case "$with_athena" in - xa | xaw ) val=xaw ;; - 3 | 3d | xaw3d ) val=3d ;; - dnl No `n' for next, someone may try `no' - ne | nex | next | naxtaw) val=next ;; - dnl Have not tested the next two... - 9 | 95 | xaw95 ) val=95 ;; - xp | xpm | xawxpm ) val=xpm ;; - * ) USAGE_ERROR(["The \`--with-athena' option must have one of these values: - \`xaw', \`3d', \`next', \`95', or \`xpm'."]) ;; - esac -dnl #### I don't think this needs to be an `eval' -eval "with_athena=\"$val\"" -] -)dnl +[],[],[xaw,xaw3d,next,95,xpm])dnl -AC_ARG_WITH([xim], - AC_HELP_STRING([--with-xim],[]), - [ -case "$with_xim" in - y | ye | yes ) val=yes ;; - n | no | non | none ) val=no ;; - x | xl | xli | xlib ) val=xlib ;; - m | mo | mot | moti | motif ) val=motif ;; - * ) USAGE_ERROR(["The \`--$optname' option must have one of these values: - \`motif', \`xlib', \`yes', or \`no'."]) ;; -esac -eval "with_xim=\"$val\"" -], []) +XE_KEYWORD_ARG_WITH([xim],[],[],[],[yes,no,xlib,motif])dnl -AC_ARG_WITH([mail-locking], +XE_KEYWORD_ARG_WITH([mail-locking], AC_HELP_STRING([--with-mail-locking],[Specify the locking to be used by movemail to prevent concurrent updates of mail spool files. Valid types are `lockf', `flock', `dot', `locking' or `mmdf'.]), - [ -case "$with_mail_locking" in - lockf ) val=lockf ;; - flock ) val=flock ;; - file | dot ) val=file ;; - locking ) val=locking ;; - mmdf ) val=mmdf ;; - pop ) val=pop ;; - * ) USAGE_ERROR(["The \`--$optname' option must have one of these values: - \`lockf', \`flock', \`file', \`dot', \`locking', \`mmdf', or \`pop'."]) ;; -esac -eval "with_mail_locking=\"$val\"" -], []) +[],[],[lockf,flock,file,locking,mmdf,pop])dnl + -AC_ARG_ENABLE([bignum], +XE_KEYWORD_ARG_ENABLE([bignum], AC_HELP_STRING([--enable-bignum=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).]), - [ -case "$enable_bignum" in - gmp ) val=gmp ;; - mp ) val=mp ;; - no|non|none ) val=no ;; - * ) USAGE_ERROR(["The \`--$optname' option must have one of these values: -\`gmp', \`mp', or \`no'."]) ;; -esac -eval "enable_bignum=\"$val\"" -], [enable_bignum="no"]) + [], [enable_bignum="no"],[no,gmp,mp]) -AC_ARG_ENABLE([error-checking], +XE_COMPLEX_ARG_ENABLE([error-checking], AC_HELP_STRING([--enable-error-checking],[Compile with internal error-checking added. Causes noticeable loss of speed. Valid types are extents, bufpos, malloc, gc, types, text, byte_code, glyphs, display, structures.]), - [ -dnl value can be all, none, and/or a list of categories to check. -dnl Example: --enable-error-checking=all,noextents,nocharbpos -dnl Example: --enable-error-checking=none,malloc,gc - -for x in `echo "$enable_error_checking" | 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_default=no ;; - a | al | all ) new_default=yes ;; - - extents ) error_check_extents=yes ;; - noextents ) error_check_extents=no ;; - - types ) error_check_types=yes ;; - notypes ) error_check_types=no ;; - - text ) error_check_text=yes ;; - notext ) error_check_text=no ;; - - gc ) error_check_gc=yes ;; - nogc ) error_check_gc=no ;; - - malloc ) error_check_malloc=yes ;; - nomalloc ) error_check_malloc=no ;; - - byte_code ) error_check_byte_code=yes ;; - nobyte_code ) error_check_byte_code=no ;; - - glyphs ) error_check_glyphs=yes ;; - noglyphs ) error_check_glyphs=no ;; + [], [], +[XE_COMPLEX_OPTION([extents],[""]), + XE_COMPLEX_OPTION([types],[""]), + XE_COMPLEX_OPTION([text],[""]), + XE_COMPLEX_OPTION([gc],[""]), + XE_COMPLEX_OPTION([malloc],[""]), + XE_COMPLEX_OPTION([byte_code],[""]), + XE_COMPLEX_OPTION([glyphs],[""]), + XE_COMPLEX_OPTION([display],[""]), + XE_COMPLEX_OPTION([structures],[""])]) - display ) error_check_display=yes ;; - nodisplay ) error_check_display=no ;; - - structures ) error_check_structures=yes ;; - nostructures ) error_check_structures=no ;; - - * ) bogus_error_check=yes ;; - esac - - if test "$bogus_error_check" -o \ - $ -n "$new_default" -a -n "$echeck_notfirst" $ ; then - if test "$error_check_default" = yes ; then - types="\`all' (default), \`none', \`noextents', \`notypes', \`notext', \`nogc', \`nomalloc', \`noglyphs', \`nobyte-code', \`nodisplay', \`nostructures'." - else - types="\`all', \`none' (default), \`extents', \`types', \`text', \`gc', \`malloc', \`glyphs', \`byte-code', \`display', \`structures'." - fi - USAGE_ERROR(["Valid types for the \`--$optname' option are: -$types."]) - elif test -n "$new_default" ; then - error_check_extents=$new_default - error_check_types=$new_default - error_check_text=$new_default - error_check_gc=$new_default - error_check_malloc=$new_default - error_check_byte_code=$new_default - error_check_glyphs=$new_default - error_check_display=$new_default - error_check_structures=$new_default - new_default= # reset this - fi - echeck_notfirst=true - done -], []) - -AC_ARG_ENABLE([menubars], +XE_KEYWORD_ARG_ENABLE([menubars], AC_HELP_STRING([--enable-menubars=TYPE],[Use TYPE menubars (lucid, motif, or no). The Lucid widgets emulate Motif (mostly) but are faster. *WARNING* The Motif menubar is currently broken. Lucid menubars are the default.]), - [ -case "$enable_menubars" in - l | lu | luc | luci | lucid ) val=lucid ;; - mo | mot | moti | motif ) val=motif ;; - a | at | ath | athe | athen | athena ) val=athena ;; - n | no | non | none ) val=no ;; - y | ye | yes ) val=yes ;; - g | gt | gtk ) val=gtk ;; - ms | msw ) val=msw ;; - * ) USAGE_ERROR(["The \`--$optname' option must have one of these values: - \`gtk', \`lucid', \`motif', \`athena', \`yes', or \`no'."]) ;; -esac -eval "enable_menubars=\"$val\"" -], []) + [], [],[yes,no,lucid,motif,athena,gtk,msw]) -AC_ARG_ENABLE([scrollbars], +XE_KEYWORD_ARG_ENABLE([scrollbars], AC_HELP_STRING([--enable-scrollbars=TYPE],[Use TYPE scrollbars (lucid, motif, athena, or no). Lucid scrollbars are the default.]), - [ -case "$enable_scrollbars" in - l | lu | luc | luci | lucid ) val=lucid ;; - mo | mot | moti | motif ) val=motif ;; - a | at | ath | athe | athen | athena ) val=athena ;; - n | no | non | none ) val=no ;; - y | ye | yes ) val=yes ;; - g | gt | gtk ) val=gtk ;; - ms | msw ) val=msw ;; - * ) USAGE_ERROR(["The \`--$optname' option must have one of these values: - \`gtk', \`lucid', \`motif', \`athena', \`yes', or \`no'."]) ;; -esac -eval "enable_scrollbars=\"$val\"" -], []) + [], [],[yes,no,lucid,motif,athena,gtk,msw]) -AC_ARG_ENABLE([dialogs], +XE_KEYWORD_ARG_ENABLE([dialogs], AC_HELP_STRING([--enable-dialogs=TYPE],[Use TYPE dialog boxes (lucid, motif, athena, or no). There are no true Lucid dialogs; Motif dialogs will be used if Motif can be found, else Athena is used.]), - [ -case "$enable_dialogs" in - l | lu | luc | luci | lucid ) val=lucid ;; - mo | mot | moti | motif ) val=motif ;; - a | at | ath | athe | athen | athena ) val=athena ;; - n | no | non | none ) val=no ;; - y | ye | yes ) val=yes ;; - g | gt | gtk ) val=gtk ;; - ms | msw ) val=msw ;; - * ) USAGE_ERROR(["The \`--$optname' option must have one of these values: - \`gtk', \`lucid', \`motif', \`athena', \`yes', or \`no'."]) ;; -esac -eval "enable_dialogs=\"$val\"" -], []) + [], [],[yes,no,lucid,motif,athena,gtk,msw]) -AC_ARG_ENABLE([widgets], +XE_KEYWORD_ARG_ENABLE([widgets], AC_HELP_STRING([--enable-widgets],[Use TYPE native widgets (lucid, motif, athena, or no). Other widget types are currently unsupported. There are no true Lucid widgets; Motif widgets will be used if Motif can be found, else Athena is used.]), - [ -case "$enable_widgets" in - l | lu | luc | luci | lucid ) val=lucid ;; - mo | mot | moti | motif ) val=motif ;; - a | at | ath | athe | athen | athena ) val=athena ;; - n | no | non | none ) val=no ;; - y | ye | yes ) val=yes ;; - g | gt | gtk ) val=gtk ;; - ms | msw ) val=msw ;; - * ) USAGE_ERROR(["The \`--$optname' option must have one of these values: - \`gtk', \`lucid', \`motif', \`athena', \`yes', or \`no'."]) ;; -esac -eval "enable_widgets=\"$val\"" -], []) + [], [],[yes,no,lucid,motif,athena,gtk,msw]) dnl ------------------------------------------------------------------------- dnl Final command line argument checks. ＠＠ -1205,15 +1094,15 ＠＠ dnl Error checking default to "yes" in beta versions, to "no" in releases. dnl Same goes for --enable-debug and --extra-verbosity. if test -n "$emacs_is_beta"; then beta=yes; else beta=no; fi -test "${error_check_extents=$beta}" = yes && AC_DEFINE(ERROR_CHECK_EXTENTS) -test "${error_check_types=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TYPES) -test "${error_check_text=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TEXT) -test "${error_check_gc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GC) -test "${error_check_malloc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_MALLOC) -test "${error_check_byte_code=$beta}" = yes && AC_DEFINE(ERROR_CHECK_BYTE_CODE) -test "${error_check_glyphs=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GLYPHS) -test "${error_check_display=$beta}" = yes && AC_DEFINE(ERROR_CHECK_DISPLAY) -test "${error_check_structures=$beta}" = yes && AC_DEFINE(ERROR_CHECK_STRUCTURES) +test "${enable_error_checking_extents=$beta}" = yes && AC_DEFINE(ERROR_CHECK_EXTENTS) +test "${enable_error_checking_types=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TYPES) +test "${enable_error_checking_text=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TEXT) +test "${enable_error_checking_gc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GC) +test "${enable_error_checking_malloc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_MALLOC) +test "${enable_error_checking_byte_code=$beta}" = yes && AC_DEFINE(ERROR_CHECK_BYTE_CODE) +test "${enable_error_checking_glyphs=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GLYPHS) +test "${enable_error_checking_display=$beta}" = yes && AC_DEFINE(ERROR_CHECK_DISPLAY) +test "${enable_error_checking_structures=$beta}" = yes && AC_DEFINE(ERROR_CHECK_STRUCTURES) dnl enable_debug=yes must be set when error checking is present. This should be dnl fixed up. dnl enable_debug implies other options ＠＠ -2263,7 +2152,7 ＠＠ elif test "$CC" = "xlc"; then with_cflags_warning="-qinfo" elif test "$GCC" = "yes"; then - with_cflags_warning="-Wall -Wno-switch -Wmissing-prototypes" + with_cflags_warning="-Wall -Wno-switch -Wundef" dnl This is not very useful, as it issues warnings that may appear dnl or disappear rather randomly, cannot easily be fixed, and are dnl not a big deal. If you want it, add it yourself. ＠＠ -2273,7 +2162,6 ＠＠ dnl Warnings about char subscripts are pretty pointless, though, dnl and we use them in various places. with_cflags_warning="$with_cflags_warning -Wsign-compare -Wno-char-subscripts" - with_cflags_warning="$with_cflags_warning -Wundef -Wstrict-prototypes" test "$__GCC3" = "yes" && with_cflags_warning="$with_cflags_warning -Wpacked" dnl glibc is intentionally not `-Wpointer-arith'-clean. dnl Ulrich Drepper has rejected patches to fix the glibc header files. ＠＠ -2294,6 +2182,7 ＠＠ xe_cflags_warning="$with_cflags_warning -Wunused-parameter" fi with_cflags_warning="$with_cflags_warning -Wshadow -Wmissing-declarations" + with_cflags_warning="$with_cflags_warning -Wmissing-prototypes -Wstrict-prototypes" dnl **** If more gcc/g++ flags are added, from here on must handle dnl **** with_cflags_warning and xe_cflags_warning in parallel elif test "$__ICC" = "yes"; then ＠＠ -2785,7 +2674,7 ＠＠ dnl Try this again when 2.1 hits the streets. dnl Avoid using free-hook.c if support exists for malloc debugging in libc dnl have_libmcheck=no -dnl if test "$error_check_malloc" = "yes" -a \ +dnl if test "$enable_error_checking_malloc" = "yes" -a \ dnl "$have_glibc" = "yes" -a \ dnl "$doug_lea_malloc" = "yes"; then dnl AC_CHECK_HEADERS(mcheck.h) ＠＠ -3508,12 +3397,12 ＠＠ dnl if test "$with_tty" = "no" ; then dnl AC_MSG_ERROR([No window system support and no TTY support - Unable to proceed.]) dnl fi - for feature in tooltalk cde offix wmcommand xim xmu nas_sound + for feature in with_tooltalk with_cde with_offix with_wmcommand with_xim with_xmu enable_sound_nas do - if eval "test -n \"\$with_${feature}\" -a \"\$with_${feature}\" != no" ; then - AC_MSG_WARN([--with-$feature ignored: Not valid without X support]) + if eval "test -n \"\${feature}\" -a \"\${feature}\" != no" ; then + AC_MSG_WARN([--$feature ignored: Not valid without X support]) fi - eval "with_${feature}=no" + eval "${feature}=no" done fi ＠＠ -4846,9 +4735,9 ＠＠ dnl Autodetect native sound AC_CHECKING("for sound support") -test -z "$with_native_sound" -a -n "$with_native_sound_lib" && with_native_sound=yes +test -n "$with_native_sound_lib" && enable_sound_native=yes -if test "$with_native_sound" != "no"; then +if test "$enable_sound_native" != "no"; then dnl Maybe sound is already on include path... if test -n "$with_native_sound_lib"; then AC_CHECK_HEADER(multimedia/audio_device.h, ＠＠ -4928,7 +4817,7 ＠＠ fi if test "$sound_found" = "yes"; then - with_native_sound=yes + enable_sound_native=yes dnl NetBSD can use Linux's sound API, but it needs an extra library at dnl link time to do so. (OpenBSD apparently needs the same; not written ＠＠ -4936,20 +4825,25 ＠＠ if test "$opsys" = "netbsd" ; then AC_CHECK_LIB(ossaudio, _oss_ioctl, native_sound_lib="-lossaudio") fi + else + if test "$enable_sound_native" = "yes" ; then + AC_MSG_WARN([No native libraries found. Disabling native sound support.]) + fi + enable_sound_native=no fi fi -if test "$with_native_sound" = "yes"; then +if test "$enable_sound_native" = "yes"; then AC_DEFINE(HAVE_NATIVE_SOUND) test -n "$with_native_sound_lib" && XE_PREPEND($with_native_sound_lib, LIBS) fi dnl NAS Sound support -if test "$with_nas_sound" != "no"; then +if test "$enable_sound_nas" != "no"; then AC_CHECK_HEADER(audio/audiolib.h, [ AC_CHECK_LIB(audio, AuOpenServer, have_nas_sound=yes)]) if test "$have_nas_sound" = "yes"; then - with_nas_sound=yes + enable_sound_nas=yes AC_DEFINE(HAVE_NAS_SOUND) XE_ADD_OBJS(nas.o) XE_PREPEND(-laudio, libs_x) ＠＠ -4957,14 +4851,14 ＠＠ dnl then we force safer behavior. AC_EGREP_HEADER(AuXtErrorJump,audio/Xtutil.h,,[old_nas=yes; AC_DEFINE(NAS_NO_ERROR_JUMP)]) else - test "$with_nas_sound" = "yes" && \ + test "$enable_sound_nas" = "yes" && \ XE_DIE("Required NAS sound support cannot be provided.") - with_nas_sound=no + enable_sound_nas=no fi fi dnl ESD Sound support -if test "$with_esd_sound" != "no"; then +if test "$enable_sound_esd" != "no"; then AC_CHECK_PROG(have_esd_config, esd-config, yes, no) if test "$have_esd_config" = "yes"; then save_c_switch_site="$c_switch_site" save_LIBS="$LIBS" ＠＠ -4976,14 +4870,14 ＠＠ fi if test "$have_esd_sound" = "yes"; then - with_esd_sound=yes + enable_sound_esd=yes need_miscplay=yes XE_ADD_OBJS(esd.o) AC_DEFINE(HAVE_ESD_SOUND) else - test "$with_esd_sound" = "yes" && \ + test "$enable_sound_esd" = "yes" && \ XE_DIE("Required ESD sound support cannot be provided.") - with_esd_sound=no + enable_sound_esd=no fi fi ＠＠ -5080,45 +4974,45 ＠＠ dnl On FreeBSD, both DB and DBM are part of libc. dnl By default, we check for DBM support in libgdbm, then libc, then libdbm. -test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \ +test "$enable_database_gdbm $enable_database_dbm $enable_database_berkdb" \ != "no no no" && AC_CHECKING(for database support) dnl Check for ndbm.h, required for either kind of DBM support. -if test "$with_database_gdbm $with_database_dbm" != "no no"; then +if test "$enable_database_gdbm $enable_database_dbm" != "no no"; then AC_CHECK_HEADER(ndbm.h, [:], [ - test "$with_database_gdbm" = "yes" -o \ - "$with_database_dbm" = "yes" && \ + test "$enable_database_gdbm" = "yes" -o \ + "$enable_database_dbm" = "yes" && \ XE_DIE("Required DBM support cannot be provided.") - with_database_gdbm=no with_database_dbm=no]) + enable_database_gdbm=no enable_database_dbm=no]) fi dnl Check for DBM support in libgdbm. -if test "$with_database_gdbm" != "no"; then +if test "$enable_database_gdbm" != "no"; then AC_CHECK_LIB(gdbm, dbm_open, [ - with_database_gdbm=yes with_database_dbm=no libdbm=-lgdbm], [ - if test "$with_database_gdbm" = "yes"; then + enable_database_gdbm=yes enable_database_dbm=no libdbm=-lgdbm], [ + if test "$enable_database_gdbm" = "yes"; then XE_DIE("Required GNU DBM support cannot be provided.") fi - with_database_gdbm=no]) + enable_database_gdbm=no]) fi dnl Check for DBM support in libc and libdbm. -if test "$with_database_dbm" != "no"; then - AC_CHECK_FUNC(dbm_open, [with_database_dbm=yes libdbm=], [ - AC_CHECK_LIB(dbm, dbm_open, [with_database_dbm=yes libdbm=-ldbm], [ - test "$with_database_dbm" = "yes" && \ +if test "$enable_database_dbm" != "no"; then + AC_CHECK_FUNC(dbm_open, [enable_database_dbm=yes libdbm=], [ + AC_CHECK_LIB(dbm, dbm_open, [enable_database_dbm=yes libdbm=-ldbm], [ + test "$enable_database_dbm" = "yes" && \ XE_DIE("Required DBM support cannot be provided.") - with_database_dbm=no])]) + enable_database_dbm=no])]) fi dnl Tell make about the DBM support we detected. test -n "$libdbm" && XE_PREPEND("$libdbm", LIBS) -test "$with_database_gdbm" = "yes" -o \ - "$with_database_dbm" = "yes" && \ +test "$enable_database_gdbm" = "yes" -o \ + "$enable_database_dbm" = "yes" && \ AC_DEFINE(HAVE_DBM) dnl Check for Berkeley DB. -if test "$with_database_berkdb" != "no"; then +if test "$enable_database_berkdb" != "no"; then AC_MSG_CHECKING(for Berkeley db.h) for header in "db/db.h" "db.h"; do AC_TRY_COMPILE([ ＠＠ -5139,11 +5033,11 ＠＠ ],[], db_h_file="$header"; break) done if test -z "$db_h_file" - then AC_MSG_RESULT(no); with_database_berkdb=no + then AC_MSG_RESULT(no); enable_database_berkdb=no else AC_MSG_RESULT($db_h_file) fi - if test "$with_database_berkdb" != "no"; then + if test "$enable_database_berkdb" != "no"; then AC_MSG_CHECKING(for Berkeley DB version) AC_EGREP_CPP(yes, [#include <$db_h_file> ＠＠ -5164,12 +5058,12 ＠＠ AC_MSG_RESULT(3); dbfunc=db_create; dbver=3])],[ AC_MSG_RESULT(2); dbfunc=db_open; dbver=2])],[ AC_MSG_RESULT(1); dbfunc=dbopen; dbver=1]) - AC_CHECK_FUNC($dbfunc, with_database_berkdb=yes need_libdb=no, [ - AC_CHECK_LIB(db, $dbfunc, with_database_berkdb=yes need_libdb=yes)]) + AC_CHECK_FUNC($dbfunc, enable_database_berkdb=yes need_libdb=no, [ + AC_CHECK_LIB(db, $dbfunc, enable_database_berkdb=yes need_libdb=yes)]) fi dnl Berk db 4.1 decorates public functions with version information - if test "$with_database_berkdb" != "yes" -a "$dbver" = "4"; then + if test "$enable_database_berkdb" != "yes" -a "$dbver" = "4"; then rm -f $tempcname echo "#include <$db_h_file>" > $tempcname echo "configure___ dbfunc=db_create" >> $tempcname ＠＠ -5178,18 +5072,18 ＠＠ | sed -n -e "s/[[ TAB]]*=[[ TAB\"]]*/='/" -e "s/[[ TAB\"]]*\$/'/" -e "s/^configure___//p"` rm -f $tempcname AC_MSG_WARN("db_create is really $dbfunc") - AC_CHECK_LIB(db, $dbfunc, with_database_berkdb=yes need_libdb=yes) + AC_CHECK_LIB(db, $dbfunc, enable_database_berkdb=yes need_libdb=yes) fi - if test "$with_database_berkdb" = "yes"; then + if test "$enable_database_berkdb" = "yes"; then AC_DEFINE_UNQUOTED(DB_H_FILE, "$db_h_file") AC_DEFINE(HAVE_BERKELEY_DB) test "$need_libdb" = "yes" && XE_PREPEND(-ldb, LIBS) - else with_database_berkdb=no + else enable_database_berkdb=no fi fi -if test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \ +if test "$enable_database_gdbm $enable_database_dbm $enable_database_berkdb" \ != "no no no"; then AC_DEFINE(HAVE_DATABASE) fi ＠＠ -5830,16 +5724,16 ＠＠ echo " Sound:" -test "$with_native_sound" = yes && echo " Compiling in support for sound (native)." -test "$with_nas_sound" = yes && echo " Compiling in support for NAS (network audio system)." +test "$enable_sound_native" = yes && echo " Compiling in support for sound (native)." +test "$enable_sound_nas" = yes && echo " Compiling in support for NAS (network audio system)." test "$old_nas" = yes && echo " - NAS library lacks error trapping; will play synchronously." -test "$with_esd_sound" = yes && echo " Compiling in support for ESD (Enlightened Sound Daemon)." +test "$enable_sound_esd" = yes && echo " Compiling in support for ESD (Enlightened Sound Daemon)." echo " Databases:" -test "$with_database_berkdb" = yes && echo " Compiling in support for Berkeley database." -test "$with_database_dbm" = yes && echo " Compiling in support for DBM." -test "$with_database_gdbm" = yes && echo " Compiling in support for GNU DBM." +test "$enable_database_berkdb" = yes && echo " Compiling in support for Berkeley database." +test "$enable_database_dbm" = yes && echo " Compiling in support for DBM." +test "$enable_database_gdbm" = yes && echo " Compiling in support for GNU DBM." test "$with_ldap" = yes && echo " Compiling in support for LDAP." if test "$with_postgresql" = yes; then echo " Compiling in support for PostgreSQL." ＠＠ -5891,7 +5785,7 ＠＠ test "$enable_pdump" = yes && echo " Using the new portable dumper." test "$enable_debug" = yes && echo " Compiling in support for extra debugging code." test "$usage_tracking" = yes && echo " Compiling in support for active usage tracking (Sun internal)." -if test "$error_check_extents $error_check_types $error_check_text $error_check_gc $error_check_malloc $error_check_glyphs $error_check_byte_code $error_check_display $error_check_structures" \ +if test "$enable_error_checking_extents $enable_error_checking_types $enable_error_checking_text $enable_error_checking_gc $enable_error_checking_malloc $enable_error_checking_glyphs $enable_error_checking_byte_code $enable_error_checking_display $enable_error_checking_structures" \ != "no no no no no no no no no"; then echo " Compiling in support for runtime error checking." echo " WARNING: ---------------------------------------------------------" -- Malcolm Purvis <malcolmp(a)xemacs.org>

2 participants
1 comments

[AC] Fix ispell problem 19 years, 11 months

Michael Sperber

2005-02-13 Michael Sperber <mike(a)xemacs.org> * ispell.el (ispell-command-loop): Don't rely on `save-window-excursion' to preserve window identity. This makes r)eplace work on XEmacs 21.5. Index: ispell.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/ispell/ispell.el,v retrieving revision 1.21 diff -u -r1.21 ispell.el --- ispell.el 23 Jan 2005 13:50:55 -0000 1.21 +++ ispell.el 13 Feb 2005 13:38:23 -0000 ＠＠ -1600,7 +1600,7 ＠＠ (command-characters '( ? ?i ?a ?A ?r ?R ?? ?x ?X ?q ?l ?u ?m )) (dedicated (window-dedicated-p (selected-window))) (skipped 0) - char num result textwin dedicated-win) + char num result dedicated-win) ;; setup the *Choices* buffer with valid data. (save-excursion ＠＠ -1658,7 +1658,7 ＠＠ ;; Display choices for misspelled word. (ispell-show-choices line end) - (select-window (setq textwin (next-window))) + (select-window (next-window)) ;; highlight word, protecting current buffer status (unwind-protect ＠＠ -1848,7 +1848,7 ＠＠ ;; protected (and ispell-highlight-p ; unhighlight (save-window-excursion - (select-window textwin) + (select-window (get-buffer-window ispell-choices-buffer)) (ispell-highlight-spelling-error start end))) (if dedicated (set-window-dedicated-p dedicated-win t))))) -- Cheers =8-} Mike Friede, Völkerverständigung und überhaupt blabla

1 participants
0 comments

[COMMIT] throw away original code from xft reloaded #3 19 years, 11 months

Eric Knauel

NOTE: This patch has been committed. APPROVE COMMIT sjt-xft 2005-02-11 Eric Knauel <eric(a)xemacs.org> * xft-fonts.c: throw away old code that was wrapped inside comments XEmacs Xft branch source patch: Diff command: cvs -q diff -u Files affected: src/xft-fonts.c Index: src/xft-fonts.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Attic/xft-fonts.c,v retrieving revision 1.1.2.5 diff -u -p -u -r1.1.2.5 xft-fonts.c --- src/xft-fonts.c 2005/02/11 15:39:07 1.1.2.5 +++ src/xft-fonts.c 2005/02/11 15:49:47 ＠＠ -1106,844 +1106,3 ＠＠ The regular expression used to match XLF ); Vxlfd_font_name_regexp = make_xlfd_font_regexp(); } - - -/* Original code from xft reloaded #3 */ -/* #### throw this away soon */ -#if 0 -#include "xft-fonts.h" - -Lisp_Object Qfc_patternp; /* Do I really have to do this ??? */ -Lisp_Object Qfc_objectsetp; -Lisp_Object Qfc_fontsetp; -Lisp_Object Qfc_result_no_match; /* XftResultNoMatch */ -Lisp_Object Qfc_result_no_id; /* XftResultNoId */ -Lisp_Object Qfc_internal_error; -Lisp_Object Qfc_unimplemented; -Lisp_Object Vxft_xlfd_font_regexp; - -Lisp_Object Vxft_version; - -static const struct memory_description xftpattern_description [] = { - { XD_LISP_OBJECT, offsetof (struct fc_pattern, fontset) }, - { XD_END } -}; - -DEFINE_LRECORD_IMPLEMENTATION("xft-pattern", fc_pattern, - 0, 0, 0, 0, 0, 0, - xftpattern_description, - struct fc_pattern); - -static const struct memory_description xftobjset_description [] = { - { XD_END } -}; - -DEFINE_LRECORD_IMPLEMENTATION("xft-objectset", fc_objectset, - 0, 0, 0, 0, 0, 0, - xftobjset_description, - struct fc_objectset); - -static const struct memory_description xftfontset_description [] = { - { XD_END } -}; - -DEFINE_LRECORD_IMPLEMENTATION("xft-fontset", fc_fontset, - 0, 0, 0, 0, 0, 0, - xftfontset_description, - struct fc_fontset); - -DEFUN("xft-pattern-p", Fxft_pattern_p, 1, 1, 0, /* -Returns t if OBJECT is of type xft-pattern, nil otherwise. - */ - (object)) -{ - return XFTPATTERNP(object) ? Qt : Qnil; -} - -DEFUN("xft-objectset-p", Fxft_objectset_p, 1, 1, 0, /* -Returns t if OBJECT is of type xft-objectset, nil otherwise. - */ - (object)) -{ - return XFTOBJECTSETP(object) ? Qt : Qnil; -} - -DEFUN("xft-fontset-p", Fxft_fontset_p, 1, 1, 0, /* -Returns t if OBJECT is of type xft-fontset, nil otherwise. - */ - (object)) -{ - return XFTFONTSETP(object) ? Qt : Qnil; -} - -DEFUN("xft-pattern-create", Fxft_pattern_create, 0, 0, 0, /* - Create a fresh and empty xft-pattern object. - */ - ()) -{ - fc_pattern *xftpat = - alloc_lcrecord_type (struct fc_pattern, &lrecord_fc_pattern); - - xftpat->xftpatPtr = XftPatternCreate(); - xftpat->fontset = Qnil; - return wrap_fcpattern(xftpat); -} - -DEFUN("xft-name-parse", Fxft_name_parse, 1, 1, 0, /* -Parse an Xft font name an return its representation as a xft pattern object. - */ - (name)) -{ - struct fc_pattern *xftpat = - alloc_lcrecord_type (struct fc_pattern, &lrecord_fc_pattern); - - CHECK_STRING(name); - - xftpat->xftpatPtr = XftNameParse(XSTRING_DATA(name)); - xftpat->fontset = Qnil; - return wrap_fcpattern(xftpat); -} - -DEFUN("xft-name-unparse", Fxft_name_unparse, 1, 1, 0, /* -Unparse an xft pattern object to a string. - */ - (xftpat)) - { - char temp[XFTSTRLEN]; - Bool res; - - CHECK_XFTPATTERN(xftpat); - res = XftNameUnparse(XXFTPATTERN(xftpat)->xftpatPtr, temp, XFTSTRLEN-1); - return res ? make_string(temp, strlen(temp)) : Qnil; - } - -DEFUN("xft-pattern-duplicate", Fxft_pattern_duplicate, 1, 1, 0, /* -Make a copy of the xft pattern object XFTPAT an return it. - */ - (xftpat)) -{ - struct fc_pattern *copy = NULL; - CHECK_XFTPATTERN(xftpat); - - copy = alloc_lcrecord_type (struct fc_pattern, &lrecord_fc_pattern); - copy->xftpatPtr = XftPatternDuplicate(XXFTPATTERN(xftpat)->xftpatPtr); - XXFTPATTERN(xftpat)->fontset = Qnil; - return wrap_fcpattern(copy); -} - -DEFUN("xft-pattern-add", Fxft_pattern_add, 3, 3, 0, /* -Add attributes to the xft pattern object XFTPAT. OBJECT is the name -of the attribute to add, VALUE the value for this attribute. - */ - (xftpat, object, value)) -{ - Bool res; - - CHECK_XFTPATTERN(xftpat); - CHECK_STRING(object); - - if (STRINGP(value)) - { - res = XftPatternAddString(XXFTPATTERN(xftpat)->xftpatPtr, - XSTRING_DATA(object), - XSTRING_DATA(value)); - return res ? Qt : Qnil; - } - - if (INTP(value)) - { - res = XftPatternAddInteger(XXFTPATTERN(xftpat)->xftpatPtr, - XSTRING_DATA(object), - XINT(value)); - return res ? Qt : Qnil; - } - - if (FLOATP(value)) - { - res = XftPatternAddDouble(XXFTPATTERN(xftpat)->xftpatPtr, - XSTRING_DATA(object), - (double) XFLOAT_DATA(value)); - return res ? Qt : Qnil; - } - - if (SYMBOLP(value)) - { - res = XftPatternAddBool(XXFTPATTERN(xftpat)->xftpatPtr, - XSTRING_DATA(object), - !NILP(value)); - return res ? Qt : Qnil; - } - - return Qnil; -} - -DEFUN("xft-pattern-del", Fxft_pattern_del, 2, 2, 0, /* -Remove attribute OBJECT from xft pattern object OBJECT. - */ - (xftpat, object)) -{ - Bool res; - - CHECK_XFTPATTERN(xftpat); - CHECK_STRING(object); - - res = XftPatternDel(XXFTPATTERN(xftpat)->xftpatPtr, XSTRING_DATA(object)); - return res ? Qt : Qnil; -} - -/**************************************************************************** - * generic property access for Lisp Xft pattern objects * - ****************************************************************************/ - -/* primitives for XftPatternGet() -- returning strings */ -static Lisp_Object -xft_get_pattern_string(Lisp_Object xftpat, Lisp_Object id, const char* objid) -{ - char *temp; - XftResult res; - - CHECK_XFTPATTERN(xftpat); - - res = XftPatternGetString(XXFTPATTERN(xftpat)->xftpatPtr, - objid, XINT(id), &temp); - switch (res) { - case XE_XFT_RESULT_MATCH: - return make_string(temp, strlen(temp)); - case XE_XFT_RESULT_NOMATCH: - return Qfc_result_no_match; - case XE_XFT_RESULT_NOID: - return Qfc_result_no_id; - default: - return Qfc_internal_error; - } -} - -/* primitives for XftPatternGet() -- returning doubles */ -static Lisp_Object -xft_get_pattern_double(Lisp_Object xftpat, Lisp_Object id, const char* objid) -{ - double d; - XftResult res; - - CHECK_XFTPATTERN(xftpat); - CHECK_INT(id); - -#if XFT_VERSION > 1 - res = FcPatternGetDouble(XXFTPATTERN(xftpat)->xftpatPtr, objid, XINT(id), &d); -#else - res = XftPatternGetDouble(XXFTPATTERN(xftpat)->xftpatPtr, objid, XINT(id), &d); -#endif - - switch (res) { - case XE_XFT_RESULT_MATCH: - return make_float(d); - case XE_XFT_RESULT_NOMATCH: - return Qfc_result_no_match; - case XE_XFT_RESULT_NOID: - return Qfc_result_no_id; - default: - return Qfc_internal_error; - } -} - -/* primitives for XftPatternGet() -- returning integers */ -static Lisp_Object -xft_get_pattern_integer(Lisp_Object xftpat, Lisp_Object id, const char* objid) -{ - int i; - XftResult res; - - CHECK_XFTPATTERN(xftpat); - CHECK_INT(id); - -#if XFT_VERSION > 1 - res = FcPatternGetInteger(XXFTPATTERN(xftpat)->xftpatPtr, objid, XINT(id), &i); -#else - res = XftPatternGetInteger(XXFTPATTERN(xftpat)->xftpatPtr, objid, XINT(id), &i); -#endif - - switch (res) { - case XE_XFT_RESULT_MATCH: - return make_int(i); - case XE_XFT_RESULT_NOMATCH: - return Qfc_result_no_match; - case XE_XFT_RESULT_NOID: - return Qfc_result_no_id; - default: - return Qfc_internal_error; - } -} - -/* primitives for XftPatternGet() -- returning bools */ -static Lisp_Object -xft_get_pattern_bool(Lisp_Object xftpat, Lisp_Object id, const char* objid) -{ - Bool b; - XftResult res; - - CHECK_XFTPATTERN(xftpat); - CHECK_INT(id); - - res = XftPatternGetBool(XXFTPATTERN(xftpat)->xftpatPtr, objid, XINT(id), &b); - switch (res) { - case XE_XFT_RESULT_MATCH: - return b ? Qt : Qnil; - case XE_XFT_RESULT_NOMATCH: - return Qfc_result_no_match; - case XE_XFT_RESULT_NOID: - return Qfc_result_no_id; - default: - /* FIXME */ - return Fsignal(Qwrong_type_argument, Qnil); - } -} - -enum xft_pattern_get_return_type { - XE_XFT_INVALID, - XE_XFT_UNIMPLEMENTED, - XE_XFT_STRING, - XE_XFT_DOUBLE, - XE_XFT_INTEGER, - XE_XFT_BOOLEAN -}; - -struct xft_pattern_property { - char *name; - Lisp_Object symbol; - enum xft_pattern_get_return_type type; -}; - -/* #### should these be updated for use of fontconfig? */ -static struct xft_pattern_property xft_pattern_property_tbl [] = { - { XFT_FAMILY, (Lisp_Object) 0, XE_XFT_STRING }, - { XFT_STYLE, (Lisp_Object) 0, XE_XFT_STRING }, -#if XFT_VERSION < 2 - { XFT_ENCODING, (Lisp_Object) 0, XE_XFT_STRING }, -#else - { XFT_ENCODING, (Lisp_Object) 0, XE_XFT_UNIMPLEMENTED }, -#endif - { XFT_FOUNDRY, (Lisp_Object) 0, XE_XFT_STRING }, - { XFT_XLFD, (Lisp_Object) 0, XE_XFT_STRING }, - { XFT_FILE, (Lisp_Object) 0, XE_XFT_STRING }, - { XFT_RASTERIZER, (Lisp_Object) 0, XE_XFT_STRING }, - { XFT_SIZE, (Lisp_Object) 0, XE_XFT_DOUBLE }, - { XFT_PIXEL_SIZE, (Lisp_Object) 0, XE_XFT_DOUBLE }, - { XFT_SCALE, (Lisp_Object) 0, XE_XFT_DOUBLE }, - { XFT_DPI, (Lisp_Object) 0, XE_XFT_DOUBLE }, - { XFT_SLANT, (Lisp_Object) 0, XE_XFT_INTEGER }, - { XFT_WEIGHT, (Lisp_Object) 0, XE_XFT_INTEGER }, - { XFT_SPACING, (Lisp_Object) 0, XE_XFT_INTEGER }, - { XFT_INDEX, (Lisp_Object) 0, XE_XFT_INTEGER }, - { XFT_RGBA, (Lisp_Object) 0, XE_XFT_INTEGER }, -#if XFT_VERSION < 2 - { XFT_CHAR_WIDTH, (Lisp_Object) 0, XE_XFT_INTEGER }, - { XFT_CHAR_HEIGHT,(Lisp_Object) 0, XE_XFT_INTEGER }, - { XFT_CORE, (Lisp_Object) 0, XE_XFT_BOOLEAN }, -#else - { XFT_CHAR_WIDTH, (Lisp_Object) 0, XE_XFT_UNIMPLEMENTED }, - { XFT_CHAR_HEIGHT,(Lisp_Object) 0, XE_XFT_UNIMPLEMENTED }, - { XFT_CORE, (Lisp_Object) 0, XE_XFT_UNIMPLEMENTED }, -#endif - { XFT_ANTIALIAS, (Lisp_Object) 0, XE_XFT_BOOLEAN }, - { XFT_OUTLINE, (Lisp_Object) 0, XE_XFT_BOOLEAN }, - { XFT_SCALABLE, (Lisp_Object) 0, XE_XFT_BOOLEAN }, -#if XFT_VERSION < 2 - { XFT_RENDER, (Lisp_Object) 0, XE_XFT_BOOLEAN }, -#else - { XFT_RENDER, (Lisp_Object) 0, XE_XFT_UNIMPLEMENTED }, -#endif - { XFT_MINSPACE, (Lisp_Object) 0, XE_XFT_BOOLEAN }, - { NULL, (Lisp_Object) 0, XE_XFT_INVALID } -}; - -static char *xft_pattern_property_names[] = { - "family", "style", "encoding", "foundry", "xlfd", "file", "rasterizer", - "size", "pixelsize", "scale", "dpi", "slant", "weight", "spacing", - "index", "rgba", "charwidth", "charheight", "core", "antialias", - "outline", "scalable", "render", "minspace", NULL}; - -DEFUN("xft-pattern-get", Fxft_pattern_get, 3, 3, 0, /* -Return Xft pattern object XFTPAT's value in slot ID of PROPERTY. - -Normal returns are strings, floats, integers, or Boolean values, depending -on the property. - -Error codes are symbols: `x-xft-result-no-match' if there is no such -attribute associated with XFTPAT, `x-xft-result-no-id' if there is no -value with number ID for this attribute, or `x-xft-internal-error' if -Xft returns an unexpected value. (The value `x-xft-unimplemented' may -be added for properties not implemented in all versions of Xft.) - -Implemented properties and their types are: - - family string - style string - encoding string (Xft1 only) - foundry string - xlfd string - file string - rasterizer string - size double - pixelsize double - scale double - dpi double - slant integer - weight integer - spacing integer - index integer - rgba integer - charwidth integer (Xft1 only) - charheight integer (Xft1 only) - core boolean (Xft1 only) - antialias boolean - outline boolean - scalable boolean - render boolean (Xft1 only) - minspace boolean" */ - (xftpat, id, property)) -{ - struct xft_pattern_property *tbl; - char *str = "Xft pattern property"; - int i; - - CHECK_XFTPATTERN(xftpat); - CHECK_INT(id); - CHECK_SYMBOL(property); - - /* FIXME: move me to a better place!!! */ - for (i = 0; xft_pattern_property_names[i] != NULL; i++) - xft_pattern_property_tbl[i].symbol = - Fintern(make_string(xft_pattern_property_names[i], strlen(xft_pattern_property_names[i])), Qnil); - - for (tbl = &xft_pattern_property_tbl[0]; tbl->type != XE_XFT_INVALID; tbl++) - { - assert (tbl - xft_pattern_property_tbl - < (ptrdiff_t) (sizeof(xft_pattern_property_tbl) - / sizeof(struct xft_pattern_property))); - if (EQ(tbl->symbol,property)) break; - } - - switch (tbl->type) { - case XE_XFT_STRING: - return xft_get_pattern_string (xftpat, id, tbl->name); - case XE_XFT_DOUBLE: - return xft_get_pattern_double (xftpat, id, tbl->name); - case XE_XFT_INTEGER: - return xft_get_pattern_integer (xftpat, id, tbl->name); - case XE_XFT_BOOLEAN: - return xft_get_pattern_bool (xftpat, id, tbl->name); - case XE_XFT_UNIMPLEMENTED: - return Qfc_unimplemented; - default: - args_out_of_range (make_string (str, sizeof(str)), property); - } -} - -DEFUN("xft-pattern-destroy", Fxft_pattern_destroy, 1, 1, 0, /* -This function is used internally to deallocate a xft pattern -object. */ - (xftpat)) -{ - CHECK_XFTPATTERN(xftpat); - XXFTPATTERN(xftpat)->fontset = Qnil; - - XftPatternDestroy(XXFTPATTERN(xftpat)->xftpatPtr); - return Qnil; -} - -DEFUN("xft-font-match", Fxft_font_match, 2, 2, 0, /* -Check whether there are fonts available that match the xft pattern -XFTPAT. DEVICE is X Windows device. Returns a xft pattern object -representing the closest match to the given pattern or an error -code. Error codes are `x-xft-result-no-match' and -`x-xft-result-no-id'. */ - (device, xftpat)) -{ - Display *dpy; - XftResult res; - - struct fc_pattern *res_xftpat = - alloc_lcrecord_type (struct fc_pattern, &lrecord_fc_pattern); - - CHECK_XFTPATTERN(xftpat); - if (NILP(device)) - return Qnil; - CHECK_X_DEVICE(device); - if (!DEVICE_LIVE_P(XDEVICE(device))) - return Qnil; - - res_xftpat->fontset = Qnil; - dpy = DEVICE_X_DISPLAY(XDEVICE(device)); - res_xftpat->xftpatPtr = XftFontMatch(dpy, DefaultScreen (dpy), - XXFTPATTERN(xftpat)->xftpatPtr, - &res); - - if (res_xftpat->xftpatPtr == NULL) - switch (res) { - case XE_XFT_RESULT_NOMATCH: - return Qfc_result_no_match; - case XE_XFT_RESULT_NOID: - return Qfc_result_no_id; - default: - return Qfc_internal_error; - } - else - return wrap_fcpattern(res_xftpat); -} - -DEFUN("xft-objectset-create", Fxft_objectset_create, 0, 0, 0, /* -Create a fresh and empty xft object set object. */ - ()) -{ - struct fc_objectset *objset = - alloc_lcrecord_type(struct fc_objectset, &lrecord_fc_objectset); - - objset->objsetPtr = XftObjectSetCreate(); - return wrap_fcobjset(objset); -} - -DEFUN("xft-objectset-add", Fxft_objectset_add, 2, 2, 0, /* -Add OBJECT (a string) to the xft object set XFTOBJECTSET. Returns t on -success, nil on failure. */ - (xftobjset, object)) -{ - Bool r; - - CHECK_XFTOBJECTSET(xftobjset); - CHECK_STRING(object); - - r = XftObjectSetAdd(XXFTOBJECTSET(xftobjset)->objsetPtr, - XSTRING_DATA(object)); - return r ? Qt : Qnil; -} - -DEFUN("xft-objectset-destroy", Fxft_objectset_destroy, 1, 1, 0, /* -Used internally to deallocate xft objectset objects. */ - (xftobjset)) -{ - CHECK_XFTOBJECTSET(xftobjset); - - XftObjectSetDestroy(XXFTOBJECTSET(xftobjset)->objsetPtr); - return Qnil; -} - -DEFUN("xft-list-fonts-pattern-objects", Fxft_list_fonts_pattern_objects, - 3, 3, 0, /* -Given a xft pattern object XFTPAT, a xft object set object XFTOBJSET -and an X Windows device find all fonts that match XFTPAT. The result -is a xft fontset object. */ - (device, xftpat, xftobjset)) -{ - Display *dpy; - int screen; - struct fc_fontset *fontset = - alloc_lcrecord_type(struct fc_fontset, &lrecord_fc_fontset); - -#if XFT_VERSION > 1 - FcConfig *fcc; -#endif - - CHECK_XFTPATTERN(xftpat); - CHECK_XFTOBJECTSET(xftobjset); - if (NILP(device)) - return Qnil; - CHECK_X_DEVICE(device); - if (!DEVICE_LIVE_P(XDEVICE(device))) - return Qnil; - -#if XFT_VERSION > 1 - FcInit(); - fcc = FcConfigGetCurrent(); - - fontset->fontsetPtr = - FcFontList(fcc, - XXFTPATTERN(xftpat)->xftpatPtr, - XXFTOBJECTSET(xftobjset)->objsetPtr); -#else - dpy = DEVICE_X_DISPLAY(XDEVICE(device)); - screen = DefaultScreen(dpy); - - fontset->fontsetPtr = - XftListFontsPatternObjects(dpy, screen, - XXFTPATTERN(xftpat)->xftpatPtr, - XXFTOBJECTSET(xftobjset)->objsetPtr); -#endif - return wrap_fcfontset(fontset); -} - -DEFUN("xft-fontset-count", Fxft_fontset_count, 1, 1, 0, /* -Counts the number of xft pattern objects stored in the xft fontset -object XFTFONTSET. */ - (xftfontset)) -{ - CHECK_XFTFONTSET(xftfontset); - return make_int(XXFTFONTSET(xftfontset)->fontsetPtr->nfont); -} - -DEFUN("xft-fontset-ref", Fxft_fontset_ref, 2, 2, 0, /* -Return the xft pattern object at index I in xft fontset object -XFTFONTSET. Return nil if the index exceeds the bounds of -XFTFONTSET. */ - (xftfontset, i)) -{ - int idx; - fc_pattern *xftpat = - alloc_lcrecord_type (struct fc_pattern, &lrecord_fc_pattern); - - CHECK_XFTFONTSET(xftfontset); - CHECK_INT(i); - - idx = XINT(i); - if ((idx >= 0) && (idx < XXFTFONTSET(xftfontset)->fontsetPtr->nfont)) - { - xftpat->xftpatPtr = XXFTFONTSET(xftfontset)->fontsetPtr->fonts[idx]; - xftpat->fontset = xftfontset; - return wrap_fcpattern(xftpat); - } - else - return Qnil; -} - -DEFUN("xft-fontset-destroy", Fxft_fontset_destroy, 1, 1, 0, /* -Used internally to deallocate xft fontset objects. */ - (xftfontset)) -{ - CHECK_XFTFONTSET(xftfontset); - - XftFontSetDestroy(XXFTFONTSET(xftfontset)->fontsetPtr); - return Qnil; -} - -DEFUN("xft-font-real-pattern", Fxft_font_real_pattern, 2, 2, 0, /* -Open the fontname (a string) FONTNAME testwise an return the actual -xft pattern matched by the Xft library. */ - (fontname, xdevice)) -{ - XftPattern *copy; - Display *dpy; - XftFont *font; - struct fc_pattern *xftpat = - alloc_lcrecord_type (struct fc_pattern, &lrecord_fc_pattern); - - CHECK_STRING (fontname); - if (NILP(xdevice)) - return Qnil; - CHECK_X_DEVICE (xdevice); - if (!DEVICE_LIVE_P(XDEVICE(xdevice))) - return Qnil; - - dpy = DEVICE_X_DISPLAY (XDEVICE (xdevice)); - font = XftFontOpenName (dpy, DefaultScreen(dpy), - XSTRING_DATA(fontname)); - if (font == NULL) - return Qnil; - copy = XftPatternDuplicate(font->pattern); - XftFontClose(dpy, font); - if (copy == NULL) - return Qnil; - xftpat->xftpatPtr = copy; - xftpat->fontset = Qnil; - return wrap_fcpattern(xftpat); -} - - -DEFUN("xft-xlfd-font-name-p", Fxft_xlfd_font_name_p, 1, 1, 0, /* -Check whether the string FONTNAME is a XLFD font name. */ - (fontname)) -{ - CHECK_STRING(fontname); - return Fstring_match(Vxft_xlfd_font_regexp, fontname, Qnil, Qnil); -} - -Lisp_Object make_xlfd_font_regexp (void) -{ - struct gcpro gcpro1; - int i; - Lisp_Object reg = Qnil; - const char re[XFT_XLFD_RE_COUNT][XFTSTRLEN] = - { XFT_XLFD_RE_PREFIX, - XFT_XLFD_RE_FOUNDRY, - XFT_XLFD_RE_MINUS, - XFT_XLFD_RE_FAMILY, - XFT_XLFD_RE_MINUS, - XFT_XLFD_RE_WEIGHT, - XFT_XLFD_RE_MINUS, - XFT_XLFD_RE_SLANT, - XFT_XLFD_RE_MINUS, - XFT_XLFD_RE_SWIDTH, - XFT_XLFD_RE_MINUS, - XFT_XLFD_RE_ADSTYLE, - XFT_XLFD_RE_MINUS, - XFT_XLFD_RE_PIXELSIZE, - XFT_XLFD_RE_MINUS, - XFT_XLFD_RE_POINTSIZE, - XFT_XLFD_RE_MINUS, - XFT_XLFD_RE_RESX, - XFT_XLFD_RE_MINUS, - XFT_XLFD_RE_RESY, - XFT_XLFD_RE_MINUS, - XFT_XLFD_RE_SPACING, - XFT_XLFD_RE_MINUS, - XFT_XLFD_RE_AVGWIDTH, - XFT_XLFD_RE_MINUS, - XFT_XLFD_RE_REGISTRY, - XFT_XLFD_RE_MINUS, - XFT_XLFD_RE_ENCODING - }; - - GCPRO1 (reg); - for (i = 0; i <= XFT_XLFD_RE_COUNT; i++) - reg = concat2(reg, make_string(re[i], strlen((char *) re[i]))); - - RETURN_UNGCPRO (reg); -} - -/* for debugging purposes only */ -DEFUN("xft-pattern-print", Fxft_pattern_print, 1, 1, 0, /* -Print a xft pattern object to stdout. For debugging only. */ - (xftpat)) -{ - CHECK_XFTPATTERN(xftpat); - -#if XFT_VERSION > 1 - FcPatternPrint(XXFTPATTERN(xftpat)->xftpatPtr); -#else - XftPatternPrint(XXFTPATTERN(xftpat)->xftpatPtr); -#endif - return Qnil; -} - -/* #### NB the guts of this have moved to lwlib-fonts.c */ -/* helper function to correctly open Xft/core fonts by name */ -XftFont* -xft_font_open_name (Display *dpy, char *name) -{ - XftFont *res; - - if (NILP (Fxft_xlfd_font_name_p (make_string (name, strlen (name))))) - res = XftFontOpenName (dpy, DefaultScreen (dpy), name); - else - { - XftPattern *pat = XftPatternCreate (); - /* This is the magic pattern to open core fonts ... */ - /* Dudes, I love Xft!!! */ - XftPatternAddString (pat, XFT_XLFD, name); - XftPatternAddBool (pat, XFT_CORE, True); - XftPatternAddBool (pat, XFT_SCALABLE, False); - res = XftFontOpenPattern (dpy, pat); - } - - if (res) - return res; - else - { - /* this is out last try ... */ - res = XftFontOpenName (dpy, DefaultScreen (dpy), ""); - - if (res) - return res; - else - { - /* sorry folks ... */ - abort (); - return 0; - } - } -} - -/* color conversion to xft colors */ -/* XXX: is this the right place */ -#define MINL(x,y) ((((unsigned long) (x)) < ((unsigned long) (y))) \ - ? ((unsigned long) (x)) : ((unsigned long) (y))) - -XftColor -xft_convert_color (Display *dpy, Colormap cmap, int c, int dim) -{ - static XColor color; - XftColor result; - - color.pixel = c; - XQueryColor(dpy, cmap, &color); - - if (dim) - { - Screen *screen = DefaultScreenOfDisplay (dpy); /* XXX */ - Visual *visual = DefaultVisualOfScreen (screen); - color.red = MINL (65535, color.red * 1.5); - color.green = MINL (65535, color.green * 1.5); - color.blue = MINL (65535, color.blue * 1.5); - x_allocate_nearest_color (dpy, cmap, visual, &color); - } - - result.pixel = color.pixel; - result.color.red = color.red; - result.color.green = color.green; - result.color.blue = color.blue; - result.color.alpha = 0xffff; - - return result; -} - -XftColor -xft_get_color (Display *dpy, Colormap cmap, Lisp_Object c, int dim) -{ - if (COLOR_INSTANCEP (c)) - return COLOR_INSTANCE_FC_COLOR (XCOLOR_INSTANCE (c)); - else - return xft_convert_color (dpy, cmap, XINT (c), dim); -} - -void -syms_of_xft_fonts (void) -{ - INIT_LRECORD_IMPLEMENTATION(fc_pattern); - INIT_LRECORD_IMPLEMENTATION(fc_objectset); - INIT_LRECORD_IMPLEMENTATION(fc_fontset); - - DEFSYMBOL_MULTIWORD_PREDICATE(Qfc_patternp); - DEFSYMBOL_MULTIWORD_PREDICATE(Qfc_objectsetp); - DEFSYMBOL_MULTIWORD_PREDICATE(Qfc_fontsetp); - - DEFSYMBOL(Qfc_result_no_match); - DEFSYMBOL(Qfc_result_no_id); - DEFSYMBOL(Qfc_internal_error); - DEFSYMBOL(Qfc_unimplemented); - - DEFSUBR(Fxft_pattern_p); - DEFSUBR(Fxft_objectset_p); - DEFSUBR(Fxft_fontset_p); - DEFSUBR(Fxft_pattern_create); - DEFSUBR(Fxft_name_parse); - DEFSUBR(Fxft_name_unparse); - DEFSUBR(Fxft_pattern_duplicate); - DEFSUBR(Fxft_pattern_add); - DEFSUBR(Fxft_pattern_del); - DEFSUBR(Fxft_pattern_get); - DEFSUBR(Fxft_pattern_destroy); - DEFSUBR(Fxft_objectset_create); - DEFSUBR(Fxft_objectset_add); - DEFSUBR(Fxft_objectset_destroy); - DEFSUBR(Fxft_list_fonts_pattern_objects); - DEFSUBR(Fxft_fontset_count); - DEFSUBR(Fxft_fontset_ref); - DEFSUBR(Fxft_fontset_destroy); - DEFSUBR(Fxft_font_match); - DEFSUBR(Fxft_font_real_pattern); - DEFSUBR(Fxft_pattern_print); - DEFSUBR(Fxft_xlfd_font_name_p); -} - -void -vars_of_xft_fonts (void) -{ - DEFVAR_LISP("xft-xlfd-font-regexp", &Vxft_xlfd_font_regexp /* -The regular expression used to match XLFD font names. */ - ); - Vxft_xlfd_font_regexp = make_xlfd_font_regexp(); - - DEFVAR_LISP("xft-version", &Vxft_version /* -The major version number of the Xft library being used */ - ); - Vxft_version = make_int(XFT_VERSION); -} -#endif -Eric -- "Excuse me --- Di Du Du Duuuuh Di Dii --- Huh Weeeheeee" (Albert King)

1 participants
0 comments

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

XEmacs-Patches February 2005