Mercurial > hg > xemacs-beta
view lisp/toolbar-items.el @ 665:fdefd0186b75
[xemacs-hg @ 2001-09-20 06:28:42 by ben]
The great integral types renaming.
The purpose of this is to rationalize the names used for various
integral types, so that they match their intended uses and follow
consist conventions, and eliminate types that were not semantically
different from each other.
The conventions are:
-- All integral types that measure quantities of anything are
signed. Some people disagree vociferously with this, but their
arguments are mostly theoretical, and are vastly outweighed by
the practical headaches of mixing signed and unsigned values,
and more importantly by the far increased likelihood of
inadvertent bugs: Because of the broken "viral" nature of
unsigned quantities in C (operations involving mixed
signed/unsigned are done unsigned, when exactly the opposite is
nearly always wanted), even a single error in declaring a
quantity unsigned that should be signed, or even the even more
subtle error of comparing signed and unsigned values and
forgetting the necessary cast, can be catastrophic, as
comparisons will yield wrong results. -Wsign-compare is turned
on specifically to catch this, but this tends to result in a
great number of warnings when mixing signed and unsigned, and
the casts are annoying. More has been written on this
elsewhere.
-- All such quantity types just mentioned boil down to EMACS_INT,
which is 32 bits on 32-bit machines and 64 bits on 64-bit
machines. This is guaranteed to be the same size as Lisp
objects of type `int', and (as far as I can tell) of size_t
(unsigned!) and ssize_t. The only type below that is not an
EMACS_INT is Hashcode, which is an unsigned value of the same
size as EMACS_INT.
-- Type names should be relatively short (no more than 10
characters or so), with the first letter capitalized and no
underscores if they can at all be avoided.
-- "count" == a zero-based measurement of some quantity. Includes
sizes, offsets, and indexes.
-- "bpos" == a one-based measurement of a position in a buffer.
"Charbpos" and "Bytebpos" count text in the buffer, rather than
bytes in memory; thus Bytebpos does not directly correspond to
the memory representation. Use "Membpos" for this.
-- "Char" refers to internal-format characters, not to the C type
"char", which is really a byte.
-- For the actual name changes, see the script below.
I ran the following script to do the conversion. (NOTE: This script
is idempotent. You can safely run it multiple times and it will
not screw up previous results -- in fact, it will do nothing if
nothing has changed. Thus, it can be run repeatedly as necessary
to handle patches coming in from old workspaces, or old branches.)
There are two tags, just before and just after the change:
`pre-integral-type-rename' and `post-integral-type-rename'. When
merging code from the main trunk into a branch, the best thing to
do is first merge up to `pre-integral-type-rename', then apply the
script and associated changes, then merge from
`post-integral-type-change' to the present. (Alternatively, just do
the merging in one operation; but you may then have a lot of
conflicts needing to be resolved by hand.)
Script `fixtypes.sh' follows:
----------------------------------- cut ------------------------------------
files="*.[ch] s/*.h m/*.h config.h.in ../configure.in Makefile.in.in ../lib-src/*.[ch] ../lwlib/*.[ch]"
gr Memory_Count Bytecount $files
gr Lstream_Data_Count Bytecount $files
gr Element_Count Elemcount $files
gr Hash_Code Hashcode $files
gr extcount bytecount $files
gr bufpos charbpos $files
gr bytind bytebpos $files
gr memind membpos $files
gr bufbyte intbyte $files
gr Extcount Bytecount $files
gr Bufpos Charbpos $files
gr Bytind Bytebpos $files
gr Memind Membpos $files
gr Bufbyte Intbyte $files
gr EXTCOUNT BYTECOUNT $files
gr BUFPOS CHARBPOS $files
gr BYTIND BYTEBPOS $files
gr MEMIND MEMBPOS $files
gr BUFBYTE INTBYTE $files
gr MEMORY_COUNT BYTECOUNT $files
gr LSTREAM_DATA_COUNT BYTECOUNT $files
gr ELEMENT_COUNT ELEMCOUNT $files
gr HASH_CODE HASHCODE $files
----------------------------------- cut ------------------------------------
`fixtypes.sh' is a Bourne-shell script; it uses 'gr':
----------------------------------- cut ------------------------------------
#!/bin/sh
# Usage is like this:
# gr FROM TO FILES ...
# globally replace FROM with TO in FILES. FROM and TO are regular expressions.
# backup files are stored in the `backup' directory.
from="$1"
to="$2"
shift 2
echo ${1+"$@"} | xargs global-replace "s/$from/$to/g"
----------------------------------- cut ------------------------------------
`gr' in turn uses a Perl script to do its real work,
`global-replace', which follows:
----------------------------------- cut ------------------------------------
: #-*- Perl -*-
### global-modify --- modify the contents of a file by a Perl expression
## Copyright (C) 1999 Martin Buchholz.
## Copyright (C) 2001 Ben Wing.
## Authors: Martin Buchholz <martin@xemacs.org>, Ben Wing <ben@xemacs.org>
## Maintainer: Ben Wing <ben@xemacs.org>
## Current Version: 1.0, May 5, 2001
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with XEmacs; see the file COPYING. If not, write to the Free
# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
eval 'exec perl -w -S $0 ${1+"$@"}'
if 0;
use strict;
use FileHandle;
use Carp;
use Getopt::Long;
use File::Basename;
(my $myName = $0) =~ s@.*/@@; my $usage="
Usage: $myName [--help] [--backup-dir=DIR] [--line-mode] [--hunk-mode]
PERLEXPR FILE ...
Globally modify a file, either line by line or in one big hunk.
Typical usage is like this:
[with GNU print, GNU xargs: guaranteed to handle spaces, quotes, etc.
in file names]
find . -name '*.[ch]' -print0 | xargs -0 $0 's/\bCONST\b/const/g'\n
[with non-GNU print, xargs]
find . -name '*.[ch]' -print | xargs $0 's/\bCONST\b/const/g'\n
The file is read in, either line by line (with --line-mode specified)
or in one big hunk (with --hunk-mode specified; it's the default), and
the Perl expression is then evalled with \$_ set to the line or hunk of
text, including the terminating newline if there is one. It should
destructively modify the value there, storing the changed result in \$_.
Files in which any modifications are made are backed up to the directory
specified using --backup-dir, or to `backup' by default. To disable this,
use --backup-dir= with no argument.
Hunk mode is the default because it is MUCH MUCH faster than line-by-line.
Use line-by-line only when it matters, e.g. you want to do a replacement
only once per line (the default without the `g' argument). Conversely,
when using hunk mode, *ALWAYS* use `g'; otherwise, you will only make one
replacement in the entire file!
";
my %options = ();
$Getopt::Long::ignorecase = 0;
&GetOptions (
\%options,
'help', 'backup-dir=s', 'line-mode', 'hunk-mode',
);
die $usage if $options{"help"} or @ARGV <= 1;
my $code = shift;
die $usage if grep (-d || ! -w, @ARGV);
sub SafeOpen {
open ((my $fh = new FileHandle), $_[0]);
confess "Can't open $_[0]: $!" if ! defined $fh;
return $fh;
}
sub SafeClose {
close $_[0] or confess "Can't close $_[0]: $!";
}
sub FileContents {
my $fh = SafeOpen ("< $_[0]");
my $olddollarslash = $/;
local $/ = undef;
my $contents = <$fh>;
$/ = $olddollarslash;
return $contents;
}
sub WriteStringToFile {
my $fh = SafeOpen ("> $_[0]");
binmode $fh;
print $fh $_[1] or confess "$_[0]: $!\n";
SafeClose $fh;
}
foreach my $file (@ARGV) {
my $changed_p = 0;
my $new_contents = "";
if ($options{"line-mode"}) {
my $fh = SafeOpen $file;
while (<$fh>) {
my $save_line = $_;
eval $code;
$changed_p = 1 if $save_line ne $_;
$new_contents .= $_;
}
} else {
my $orig_contents = $_ = FileContents $file;
eval $code;
if ($_ ne $orig_contents) {
$changed_p = 1;
$new_contents = $_;
}
}
if ($changed_p) {
my $backdir = $options{"backup-dir"};
$backdir = "backup" if !defined ($backdir);
if ($backdir) {
my ($name, $path, $suffix) = fileparse ($file, "");
my $backfulldir = $path . $backdir;
my $backfile = "$backfulldir/$name";
mkdir $backfulldir, 0755 unless -d $backfulldir;
print "modifying $file (original saved in $backfile)\n";
rename $file, $backfile;
}
WriteStringToFile ($file, $new_contents);
}
}
----------------------------------- cut ------------------------------------
In addition to those programs, I needed to fix up a few other
things, particularly relating to the duplicate definitions of
types, now that some types merged with others. Specifically:
1. in lisp.h, removed duplicate declarations of Bytecount. The
changed code should now look like this: (In each code snippet
below, the first and last lines are the same as the original, as
are all lines outside of those lines. That allows you to locate
the section to be replaced, and replace the stuff in that
section, verifying that there isn't anything new added that
would need to be kept.)
--------------------------------- snip -------------------------------------
/* Counts of bytes or chars */
typedef EMACS_INT Bytecount;
typedef EMACS_INT Charcount;
/* Counts of elements */
typedef EMACS_INT Elemcount;
/* Hash codes */
typedef unsigned long Hashcode;
/* ------------------------ dynamic arrays ------------------- */
--------------------------------- snip -------------------------------------
2. in lstream.h, removed duplicate declaration of Bytecount.
Rewrote the comment about this type. The changed code should
now look like this:
--------------------------------- snip -------------------------------------
#endif
/* The have been some arguments over the what the type should be that
specifies a count of bytes in a data block to be written out or read in,
using Lstream_read(), Lstream_write(), and related functions.
Originally it was long, which worked fine; Martin "corrected" these to
size_t and ssize_t on the grounds that this is theoretically cleaner and
is in keeping with the C standards. Unfortunately, this practice is
horribly error-prone due to design flaws in the way that mixed
signed/unsigned arithmetic happens. In fact, by doing this change,
Martin introduced a subtle but fatal error that caused the operation of
sending large mail messages to the SMTP server under Windows to fail.
By putting all values back to be signed, avoiding any signed/unsigned
mixing, the bug immediately went away. The type then in use was
Lstream_Data_Count, so that it be reverted cleanly if a vote came to
that. Now it is Bytecount.
Some earlier comments about why the type must be signed: This MUST BE
SIGNED, since it also is used in functions that return the number of
bytes actually read to or written from in an operation, and these
functions can return -1 to signal error.
Note that the standard Unix read() and write() functions define the
count going in as a size_t, which is UNSIGNED, and the count going
out as an ssize_t, which is SIGNED. This is a horrible design
flaw. Not only is it highly likely to lead to logic errors when a
-1 gets interpreted as a large positive number, but operations are
bound to fail in all sorts of horrible ways when a number in the
upper-half of the size_t range is passed in -- this number is
unrepresentable as an ssize_t, so code that checks to see how many
bytes are actually written (which is mandatory if you are dealing
with certain types of devices) will get completely screwed up.
--ben
*/
typedef enum lstream_buffering
--------------------------------- snip -------------------------------------
3. in dumper.c, there are four places, all inside of switch()
statements, where XD_BYTECOUNT appears twice as a case tag. In
each case, the two case blocks contain identical code, and you
should *REMOVE THE SECOND* and leave the first.
| author | ben |
|---|---|
| date | Thu, 20 Sep 2001 06:31:11 +0000 |
| parents | 7039e6323819 |
| children | 685b588e92d8 |
line wrap: on
line source
;;; toolbar-items.el -- Static initialization of XEmacs toolbar ;; Copyright (C) 1997 Free Software Foundation, Inc. ;; Copyright (C) 1994 Andy Piper <andyp@parallax.demon.co.uk> ;; Copyright (C) 1995 Board of Trustees, University of Illinois ;; Copyright (C) 1996 Ben Wing <ben@xemacs.org> ;; Maintainer: XEmacs development team ;; Keywords: frames, dumped ;; This file is part of XEmacs. ;; XEmacs is free software; you can redistribute it and/or modify it ;; under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. ;; XEmacs is distributed in the hope that it will be useful, but ;; WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ;; General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with XEmacs; see the file COPYING. If not, write to the ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up: Not in FSF ;;; Commentary: ;; This file is dumped with XEmacs (when window system and toolbar support ;; is compiled in). ;; Miscellaneous toolbar functions, useful for users to redefine, in ;; order to get different behavior. ;;; Code: (defgroup toolbar nil "Configure XEmacs Toolbar functions and properties" :group 'environment) ;; #### The following function is slightly obnoxious as it stands. I ;; think it should print a message like "Toolbar not configured; press ;; me again to configure it", and when the button is pressed again ;; (within a reasonable period of time), `customize-variable' should ;; be invoked for the appropriate variable. (defun toolbar-not-configured () (interactive) ;; Note: we don't use `susbtitute-command-keys' here, because ;; Customize is bound to `C-h C' by default, and that binding is not ;; familiar to people. This is more descriptive. (error "Configure the item via `M-x customize RET toolbar RET'")) (defcustom toolbar-open-function 'find-file "*Function to call when the open icon is selected." :type '(radio (function-item find-file) (function :tag "Other")) :group 'toolbar) (defun toolbar-open () (interactive) (call-interactively toolbar-open-function)) (defcustom toolbar-dired-function 'dired "*Function to call when the dired icon is selected." :type '(radio (function-item dired) (function :tag "Other")) :group 'toolbar) (defun toolbar-dired () (interactive) (call-interactively toolbar-dired-function)) (defcustom toolbar-save-function 'save-buffer "*Function to call when the save icon is selected." :type '(radio (function-item save-buffer) (function :tag "Other")) :group 'toolbar) (defun toolbar-save () (interactive) (call-interactively toolbar-save-function)) (defcustom toolbar-print-function 'lpr-buffer "*Function to call when the print icon is selected." :type '(radio (function-item lpr-buffer) (function :tag "Other")) :group 'toolbar) (defun toolbar-print () (interactive) (call-interactively toolbar-print-function)) (defcustom toolbar-cut-function 'kill-primary-selection "*Function to call when the cut icon is selected." :type '(radio (function-item kill-primary-selection) (function :tag "Other")) :group 'toolbar) (defun toolbar-cut () (interactive) (call-interactively toolbar-cut-function)) (defcustom toolbar-copy-function 'copy-primary-selection "*Function to call when the copy icon is selected." :type '(radio (function-item copy-primary-selection) (function :tag "Other")) :group 'toolbar) (defun toolbar-copy () (interactive) (call-interactively toolbar-copy-function)) (defcustom toolbar-paste-function 'yank-clipboard-selection "*Function to call when the paste icon is selected." :type '(radio (function-item yank-clipboard-selection) (function :tag "Other")) :group 'toolbar) (defun toolbar-paste () (interactive) ;; This horrible kludge is for pending-delete to work correctly. (and (boundp 'pending-delete-mode) (declare-boundp pending-delete-mode) (let ((this-command toolbar-paste-function)) (declare-fboundp (pending-delete-pre-hook)))) (call-interactively toolbar-paste-function)) (defcustom toolbar-undo-function 'undo "*Function to call when the undo icon is selected." :type '(radio (function-item undo) (function :tag "Other")) :group 'toolbar) (defun toolbar-undo () (interactive) (call-interactively toolbar-undo-function)) (defcustom toolbar-replace-function 'query-replace "*Function to call when the replace icon is selected." :type '(radio (function-item query-replace) (function :tag "Other")) :group 'toolbar) (defun toolbar-replace () (interactive) (call-interactively toolbar-replace-function)) ;; ;; toolbar ispell variables and defuns ;; (defun toolbar-ispell-internal () (interactive) (cond ((region-active-p) (ispell-region (region-beginning) (region-end))) ((eq major-mode 'mail-mode) (ispell-message)) ((eq major-mode 'message-mode) (ispell-message)) (t (ispell-buffer)))) (defcustom toolbar-ispell-function 'toolbar-ispell-internal "*Function to call when the ispell icon is selected." :type '(radio (function-item toolbar-ispell-internal) (function :tag "Other")) :group 'toolbar) (defun toolbar-ispell () "Intelligently spell the region or buffer." (interactive) (call-interactively toolbar-ispell-function)) ;; ;; toolbar mail variables and defuns ;; ;; This used to be a macro that expanded its arguments to a form that ;; called `call-process'. With the advent of customize, it's better ;; to have it as a defun, to make customization easier. (defun toolbar-external (process &rest args) (interactive) (apply 'call-process process nil 0 nil args)) (defcustom toolbar-mail-commands-alist `((not-configured . toolbar-not-configured) (vm . vm) (gnus . gnus-no-server) (rmail . rmail) (mh . mh-rmail) (pine . (toolbar-external "xterm" "-e" "pine")) ; *gag* (elm . (toolbar-external "xterm" "-e" "elm")) (mutt . (toolbar-external "xterm" "-e" "mutt")) (exmh . (toolbar-external "exmh")) (netscape . (toolbar-external "netscape" "mailbox:")) (send . mail)) "*Alist of mail readers and their commands. The car of each alist element is the mail reader, and the cdr is the form used to start it." :type '(repeat (cons :format "%v" (symbol :tag "Mailer") (function :tag "Start with"))) :group 'toolbar) (defcustom toolbar-mail-reader 'not-configured "*Mail reader toolbar will invoke. The legal values are the keys from `toolbar-mail-command-alist', which should be used to add new mail readers. Mail readers known by default are vm, gnus, rmail, mh, pine, elm, mutt, exmh, netscape and send." :type '(choice (const :tag "Not Configured" not-configured) (const vm) (const gnus) (const rmail) (const mh) (const pine) (const elm) (const mutt) (const exmh) (const netscape) (const send) (symbol :tag "Other" :validate (lambda (wid) (if (assq (widget-value wid) toolbar-mail-commands-alist) nil (widget-put wid :error "Unknown mail reader") wid)))) :group 'toolbar) (defun toolbar-mail () "Run mail in a separate frame." (interactive) (let ((command (cdr (assq toolbar-mail-reader toolbar-mail-commands-alist)))) (or command (error "Uknown mail reader %s" toolbar-mail-reader)) (if (symbolp command) (call-interactively command) (eval command)))) ;; ;; toolbar info variables and defuns ;; (defcustom toolbar-info-use-separate-frame t "*Whether Info is invoked in a separate frame." :type 'boolean :group 'toolbar) (defcustom toolbar-info-frame-plist ;; Info pages are 80 characters wide, so it makes a good default. `(width 80 ,@(let ((h (plist-get default-frame-plist 'height))) (and h `(height ,h)))) "*The properties of the frame in which news is displayed." :type 'plist :group 'info) (define-obsolete-variable-alias 'Info-frame-plist 'toolbar-info-frame-plist) (defvar toolbar-info-frame nil "The frame in which info is displayed.") (defun toolbar-info () "Run info in a separate frame." (interactive) (when toolbar-info-use-separate-frame (cond ((or (not toolbar-info-frame) (not (frame-live-p toolbar-info-frame))) ;; We used to raise frame here, but it's a bad idea, ;; because raising is a matter of WM policy. However, we ;; *must* select it, to ensure that the info buffer goes to ;; the right frame. (setq toolbar-info-frame (make-frame toolbar-info-frame-plist)) (select-frame toolbar-info-frame)) (t ;; However, if the frame already exists, and the user ;; clicks on info, it's OK to raise it. (select-frame toolbar-info-frame) (raise-frame toolbar-info-frame))) (when (frame-iconified-p toolbar-info-frame) (deiconify-frame toolbar-info-frame))) (info)) ;; ;; toolbar debug variables and defuns ;; (defun toolbar-debug () (interactive) (if (featurep 'eos-debugger) (call-interactively 'eos::start-debugger) (require 'gdbsrc) (call-interactively 'gdbsrc))) (defun toolbar-compile () "Run compile without having to touch the keyboard." (interactive) (declare (special compile-command toolbar-compile-already-run)) (require 'compile) (if (boundp 'toolbar-compile-already-run) (compile compile-command) (setq toolbar-compile-already-run t) (if (should-use-dialog-box-p) (make-dialog-box 'question :question (concat "Compile:\n " compile-command) :buttons '(["Compile" (compile compile-command) t] ["Edit command" compile t] nil ["Cancel" (message "Quit") t])) (compile compile-command)))) ;; ;; toolbar news variables and defuns ;; (defcustom toolbar-news-commands-alist `((not-configured . toolbar-not-configured) (gnus . toolbar-gnus) ; M-x all-hail-gnus (rn . (toolbar-external "xterm" "-e" "rn")) (nn . (toolbar-external "xterm" "-e" "nn")) (trn . (toolbar-external "xterm" "-e" "trn")) (xrn . (toolbar-external "xrn")) (slrn . (toolbar-external "xterm" "-e" "slrn")) (pine . (toolbar-external "xterm" "-e" "pine")) ; *gag* (tin . (toolbar-external "xterm" "-e" "tin")) ; *gag* (netscape . (toolbar-external "netscape" "news:"))) "*Alist of news readers and their commands. The car of each alist element the pair is the news reader, and the cdr is the form used to start it." :type '(repeat (cons :format "%v" (symbol :tag "Reader") (sexp :tag "Start with"))) :group 'toolbar) (defcustom toolbar-news-reader 'gnus "*News reader toolbar will invoke. The legal values are the keys from `toolbar-news-command-alist', which should be used to add new news readers. Newsreaders known by default are gnus, rn, nn, trn, xrn, slrn, pine and netscape." :type '(choice (const :tag "Not Configured" not-configured) (const gnus) (const rn) (const nn) (const trn) (const xrn) (const slrn) (const pine) (const tin) (const netscape) (symbol :tag "Other" :validate (lambda (wid) (if (assq (widget-value wid) toolbar-news-commands-alist) nil (widget-put wid :error "Unknown news reader") wid)))) :group 'toolbar) (defcustom toolbar-news-use-separate-frame t "*Whether Gnus is invoked in a separate frame." :type 'boolean :group 'toolbar) (defvar toolbar-news-frame nil "The frame in which news is displayed.") (defcustom toolbar-news-frame-plist nil "*The properties of the frame in which news is displayed." :type 'plist :group 'toolbar) (define-obsolete-variable-alias 'toolbar-news-frame-properties 'toolbar-news-frame-plist) (defun toolbar-gnus () "Run Gnus in a separate frame." (interactive) (if (not toolbar-news-use-separate-frame) (gnus) (unless (frame-live-p toolbar-news-frame) (setq toolbar-news-frame (make-frame toolbar-news-frame-plist)) (add-hook 'gnus-exit-gnus-hook (lambda () (when (frame-live-p toolbar-news-frame) (if (cdr (frame-list)) (delete-frame toolbar-news-frame)) (setq toolbar-news-frame nil)))) (select-frame toolbar-news-frame) (gnus)) (when (framep toolbar-news-frame) (when (frame-iconified-p toolbar-news-frame) (deiconify-frame toolbar-news-frame)) (select-frame toolbar-news-frame) (raise-frame toolbar-news-frame)))) (defun toolbar-news () "Run News." (interactive) (let ((command (cdr-safe (assq toolbar-news-reader toolbar-news-commands-alist)))) (or command (error "Unkown news reader %s" toolbar-news-reader)) (if (symbolp command) (call-interactively command) (eval command)))) (defvar toolbar-last-win-icon nil "A `last-win' icon set.") (defvar toolbar-next-win-icon nil "A `next-win' icon set.") (defvar toolbar-file-icon nil "A `file' icon set.") (defvar toolbar-folder-icon nil "A `folder' icon set") (defvar toolbar-disk-icon nil "A `disk' icon set.") (defvar toolbar-printer-icon nil "A `printer' icon set.") (defvar toolbar-cut-icon nil "A `cut' icon set.") (defvar toolbar-copy-icon nil "A `copy' icon set.") (defvar toolbar-paste-icon nil "A `paste' icon set.") (defvar toolbar-undo-icon nil "An `undo' icon set.") (defvar toolbar-spell-icon nil "A `spell' icon set.") (defvar toolbar-replace-icon nil "A `replace' icon set.") (defvar toolbar-mail-icon nil "A `mail' icon set.") (defvar toolbar-info-icon nil "An `info' icon set.") (defvar toolbar-compile-icon nil "A `compile' icon set.") (defvar toolbar-debug-icon nil "A `debugger' icon set.") (defvar toolbar-news-icon nil "A `news' icon set.") ;;; each entry maps a variable to the prefix used. (defvar init-toolbar-list '((toolbar-last-win-icon . "last-win") (toolbar-next-win-icon . "next-win") (toolbar-file-icon . "file") (toolbar-folder-icon . "folder") (toolbar-disk-icon . "disk") (toolbar-printer-icon . "printer") (toolbar-cut-icon . "cut") (toolbar-copy-icon . "copy") (toolbar-paste-icon . "paste") (toolbar-undo-icon . "undo") (toolbar-spell-icon . "spell") (toolbar-replace-icon . "replace") (toolbar-mail-icon . "mail") (toolbar-info-icon . "info-def") (toolbar-compile-icon . "compile") (toolbar-debug-icon . "debug") (toolbar-news-icon . "news"))) (defun init-toolbar () (toolbar-add-item-data init-toolbar-list) ;; do this now because errors will occur if the icon symbols ;; are not initted (set-specifier default-toolbar initial-toolbar-spec)) (defun toolbar-add-item-data (icon-list &optional icon-dir) (if (eq icon-dir nil) (setq icon-dir toolbar-icon-directory)) (mapcar (lambda (cons) (let ((prefix (expand-file-name (cdr cons) icon-dir))) ;; #### This should use a better mechanism for finding the ;; glyphs, allowing for formats other than x[pb]m. Look at ;; `widget-glyph-find' for an example how it might be done. (set (car cons) (if (featurep 'xpm) (toolbar-make-button-list (concat prefix "-up.xpm") nil (concat prefix "-xx.xpm") (concat prefix "-cap-up.xpm") nil (concat prefix "-cap-xx.xpm")) (toolbar-make-button-list (concat prefix "-up.xbm") (concat prefix "-dn.xbm") (concat prefix "-xx.xbm")))))) icon-list)) (defvar toolbar-vector-open [toolbar-file-icon toolbar-open t "Open a file"] "Define the vector for the \"Open\" toolbar button") (defvar toolbar-vector-dired [toolbar-folder-icon toolbar-dired t "Edit a directory"] "Define the vector for the \"Dired\" toolbar button") (defvar toolbar-vector-save [toolbar-disk-icon toolbar-save t "Save buffer"] "Define the vector for the \"Save\" toolbar button") (defvar toolbar-vector-print [toolbar-printer-icon toolbar-print t "Print buffer"] "Define the vector for the \"Printer\" toolbar button") (defvar toolbar-vector-cut [toolbar-cut-icon toolbar-cut t "Kill region"] "Define the vector for the \"Cut\" toolbar button") (defvar toolbar-vector-copy [toolbar-copy-icon toolbar-copy t "Copy region"] "Define the vector for the \"Copy\" toolbar button") (defvar toolbar-vector-paste [toolbar-paste-icon toolbar-paste t "Paste from clipboard"] "Define the vector for the \"Paste\" toolbar button") (defvar toolbar-vector-undo [toolbar-undo-icon toolbar-undo t "Undo edit"] "Define the vector for the \"Undo\" toolbar button") (defvar toolbar-vector-spell [toolbar-spell-icon toolbar-ispell t "Check spelling"] "Define the vector for the \"Spell\" toolbar button") (defvar toolbar-vector-replace [toolbar-replace-icon toolbar-replace t "Search & Replace"] "Define the vector for the \"Replace\" toolbar button") (defvar toolbar-vector-mail [toolbar-mail-icon toolbar-mail t "Read mail"] "Define the vector for the \"Mail\" toolbar button") (defvar toolbar-vector-info [toolbar-info-icon toolbar-info t "Info documentation"] "Define the vector for the \"Info\" toolbar button") (defvar toolbar-vector-compile [toolbar-compile-icon toolbar-compile t "Start a compilation"] "Define the vector for the \"Compile\" toolbar button") (defvar toolbar-vector-debug [toolbar-debug-icon toolbar-debug t "Start a debugger"] "Define the vector for the \"Debug\" toolbar button") (defvar toolbar-vector-news [toolbar-news-icon toolbar-news t "Read news"] "Define the vector for the \"News\" toolbar button") (defvar initial-toolbar-spec (list ;;[toolbar-last-win-icon pop-window-configuration ;;(frame-property (selected-frame) ;; 'window-config-stack) t "Most recent window config"] ;; #### Illicit knowledge? ;; #### These don't work right - not consistent! ;; I don't know what's wrong; perhaps `selected-frame' is wrong ;; sometimes when this is evaluated. Note that I even tried to ;; kludge-fix this by calls to `set-specifier-dirty-flag' in ;; pop-window-configuration and such. ;;[toolbar-next-win-icon unpop-window-configuration ;;(frame-property (selected-frame) ;; 'window-config-unpop-stack) t "Undo \"Most recent window config\""] ;; #### Illicit knowledge? toolbar-vector-open toolbar-vector-dired toolbar-vector-save toolbar-vector-print toolbar-vector-cut toolbar-vector-copy toolbar-vector-paste toolbar-vector-undo toolbar-vector-spell toolbar-vector-replace toolbar-vector-mail toolbar-vector-info toolbar-vector-compile toolbar-vector-debug toolbar-vector-news ) "The initial toolbar for a buffer.") ;;; toolbar-items.el ends here