Mercurial > hg > xemacs-beta
view lisp/toolbar.el @ 1314:15a91d7ae2d1
[xemacs-hg @ 2003-02-20 08:16:21 by ben]
check in makefile fixes et al
Makefile.in.in: Major surgery. Move all stuff related to building anything in the
src/ directory into src/. Simplify the dependencies -- everything
in src/ is dependent on the single entry `src' in MAKE_SUBDIRS.
Remove weirdo targets like `all-elc[s]', dump-elc[s], etc.
mule/mule-msw-init.el: Removed.
Delete this file.
mule/mule-win32-init.el: New file, with stuff from mule-msw-init.el -- not just for MS Windows
native, boys and girls!
bytecomp.el: Change code inserted to catch trying to load a Mule-only .elc
file in a non-Mule XEmacs. Formerly you got the rather cryptic
"The required feature `mule' cannot be provided". Now you get
"Loading this file requires Mule support".
finder.el: Remove dependency on which directory this function is invoked
from.
update-elc.el: Don't mess around with ../src/BYTECOMPILE_CHANGE. Now that
Makefile.in.in and xemacs.mak are in sync, both of them use
NEEDTODUMP and the other one isn't used.
dumped-lisp.el: Rewrite in terms of `list' and `nconc' instead of assemble-list, so
we can have arbitrary forms, not just `when-feature'.
very-early-lisp.el: Nuke this file.
finder-inf.el, packages.el, update-elc.el, update-elc-2.el, loadup.el, make-docfile.el: Eliminate references to very-early-lisp.
msw-glyphs.el: Comment clarification.
xemacs.mak: Add macros DO_TEMACS, DO_XEMACS, and a few others; this macro
section is now completely in sync with src/Makefile.in.in. Copy
check-features, load-shadows, and rebuilding finder-inf.el from
src/Makefile.in.in. The main build/dump/recompile process is now
synchronized with src/Makefile.in.in. Change `WARNING' to `NOTE'
and `error checking' to `error-checking' TO avoid tripping
faux warnings and errors in the VC++ IDE.
Makefile.in.in: Major surgery. Move all stuff related to building anything in the
src/ directory from top-level Makefile.in.in to here. Simplify
the dependencies. Rearrange into logical subsections.
Synchronize the main compile/dump/build-elcs section with
xemacs.mak, which is already clean and in good working order.
Remove weirdo targets like `all-elc[s]', dump-elc[s], etc. Add
additional levels of macros \(e.g. DO_TEMACS, DO_XEMACS,
TEMACS_BATCH, XEMACS_BATCH, XEMACS_BATCH_PACKAGES) to factor out
duplicated stuff. Clean up handling of "HEAP_IN_DATA" (Cygwin) so
it doesn't need to ignore the return value from dumping. Add
.NO_PARALLEL since various aspects of building and dumping must be
serialized but do not always have dependencies between them
(this is impossible in some cases). Everything related to src/
now gets built in one pass in this directory by just running
`make' (except the Makefiles themselves and config.h, paths.h,
Emacs.ad.h, and other generated .h files).
console.c: Update list of possibly valid console types.
emacs.c: Rationalize the specifying and handling of the type of the first
frame. This was originally prompted by a workspace in which I got
GTK to compile under C++ and in the process fixed it so it could
coexist with X in the same build -- hence, a combined
TTY/X/MS-Windows/GTK build is now possible under Cygwin. (However,
you can't simultaneously *display* more than one kind of device
connection -- but getting that to work is not that difficult.
Perhaps a project for a bored grad student. I (ben) would do it
but don't see the use.) To make sense of this, I added new
switches that can be used to specifically indicate the window
system: -x [aka --use-x], -tty \[aka --use-tty], -msw [aka
--use-ms-windows], -gtk [aka --use-gtk], and -gnome [aka
--use-gnome, same as --use-gtk]. -nw continues as an alias for
-tty. When none have been given, XEmacs checks for other
parameters implying particular device types (-t -> tty, -display
-> x [or should it have same treatment as DISPLAY below?]), and
has ad-hoc logic afterwards: if env var DISPLAY is set, use x (or
gtk? perhaps should check whether gnome is running), else MS
Windows if it exsits, else TTY if it exists, else stream, and you
must be running in batch mode. This also fixes an existing bug
whereby compiling with no x, no mswin, no tty, when running non-
interactively (e.g. to dump) I get "sorry, must have TTY support".
emacs.c: Turn on Vstack_trace_on_error so that errors are debuggable even
when occurring extremely early in reinitialization.
emacs.c: Try to make sure that the user can see message output under
Windows (i.e. it doesn't just disappear right away) regardless of
when it occurs, e.g. in the middle of creating the first frame.
emacs.c: Define new function `emacs-run-status', indicating whether XEmacs
is noninteractive or interactive, whether raw,
post-dump/pdump-load or run-temacs, whether we are dumping,
whether pdump is in effect.
event-stream.c: It's "mommas are fat", not "momas are fat".
Fix other typo.
event-stream.c: Conditionalize in_menu_callback check on HAVE_MENUBARS,
because it won't exist on w/o menubar support,
lisp.h: More hackery on RETURN_NOT_REACHED. Cygwin v3.2 DOES complain here
if RETURN_NOT_REACHED() is blank, as it is for GCC 2.5+. So make it
blank only for GCC 2.5 through 2.999999999999999.
Declare Vstack_trace_on_error.
profile.c: Need to include "profile.h" to fix warnings.
sheap.c: Don't fatal() when need to rerun Make, just stderr_out() and exit(0).
That way we can distinguish between a dumping failing expectedly
(due to lack of stack space, triggering another dump) and unexpectedly,
in which case, we want to stop building. (or go on, if -K is given)
syntax.c, syntax.h: Use ints where they belong, and enum syntaxcode's where they belong,
and fix warnings thereby.
syntax.h: Fix crash caused by an edge condition in the syntax-cache macros.
text.h: Spacing fixes.
xmotif.h: New file, to get around shadowing warnings.
EmacsManager.c, event-Xt.c, glyphs-x.c, gui-x.c, input-method-motif.c, xmmanagerp.h, xmprimitivep.h: Include xmotif.h.
alloc.c: Conditionalize in_malloc on ERROR_CHECK_MALLOC.
config.h.in, file-coding.h, fileio.c, getloadavg.c, select-x.c, signal.c, sysdep.c, sysfile.h, systime.h, text.c, unicode.c: Eliminate HAVE_WIN32_CODING_SYSTEMS, use WIN32_ANY instead.
Replace defined (WIN32_NATIVE) || defined (CYGWIN) with WIN32_ANY.
lisp.h: More futile attempts to walk and chew gum at the same time when
dealing with subr's that don't return.
author | ben |
---|---|
date | Thu, 20 Feb 2003 08:16:21 +0000 |
parents | 943eaba38521 |
children | fd1acd2f457a |
line wrap: on
line source
;;; toolbar.el --- Toolbar support for XEmacs ;; Copyright (C) 1995, 1997 Free Software Foundation, Inc. ;; Copyright (C) 2002 Ben Wing. ;; Maintainer: XEmacs Development Team ;; Keywords: extensions, internal, 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, 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;;; Synched up with: Not in FSF. ;;; Commentary: ;; This file is dumped with XEmacs (when toolbar support is compiled in). ;;; Code: (defcustom toolbar-visible-p ;; added for the options menu - dverna apr. 98 (specifier-instance default-toolbar-visible-p) "*Whether the default toolbar is globally visible. This option only has an effect when set using `customize-set-variable', or through the Options menu." :group 'display :type 'boolean :set #'(lambda (var val) (set-specifier default-toolbar-visible-p val) (setq toolbar-visible-p val)) ) (defcustom toolbar-captioned-p ;; added for the options menu - dverna apr. 98 (specifier-instance toolbar-buttons-captioned-p) "*Whether the toolbars buttons are globally captioned. This option only has an effect when set using `customize-set-variable', or through the Options menu." :group 'display :type 'boolean :set #'(lambda (var val) (set-specifier toolbar-buttons-captioned-p val) (setq toolbar-captioned-p val)) ) (defcustom default-toolbar-position ;; added for the options menu - dverna (default-toolbar-position) "*The location of the default toolbar: 'top, 'bottom, 'left or 'right. This option only has an effect when set using `customize-set-variable', or through the Options menu." :group 'display :type '(choice (const :tag "top" top) (const :tag "bottom" bottom) (const :tag "left" left) (const :tag "right" right)) :set #'(lambda (var val) (let* ((height (window-height)) (hdiff (- (frame-height) height)) (width (window-width))) (set-default-toolbar-position val) (setq default-toolbar-position val) ;; needed or dimensions don't update? (redisplay-frame) ;; This probably only works correctly if there is only one ;; Emacs window. If windows are split, it probably results in ;; small adjustments in their sizes. (set-frame-size (selected-frame) width (+ height hdiff)) ))) (defvar toolbar-help-enabled t "If non-nil help is echoed for toolbar buttons.") (defvar toolbar-icon-directory nil "Location of standard toolbar icon bitmaps.") (defun toolbar-make-button-list (up &optional down disabled cap-up cap-down cap-disabled) "Call make-glyph on each arg and return a list of the results." (let ((up-glyph (make-glyph up)) (down-glyph (and down (make-glyph down))) (disabled-glyph (and disabled (make-glyph disabled))) (cap-up-glyph (and cap-up (make-glyph cap-up))) (cap-down-glyph (and cap-down (make-glyph cap-down))) (cap-disabled-glyph (and cap-disabled (make-glyph cap-disabled)))) (if cap-disabled (list up-glyph down-glyph disabled-glyph cap-up-glyph cap-down-glyph cap-disabled-glyph) (if cap-down (list up-glyph down-glyph disabled-glyph cap-up-glyph cap-down-glyph) (if cap-up (list up-glyph down-glyph disabled-glyph cap-up-glyph) (if disabled-glyph (list up-glyph down-glyph disabled-glyph) (if down-glyph (list up-glyph down-glyph) (list up-glyph)))))))) (defun init-toolbar-location () (if (not toolbar-icon-directory) (let ((name (locate-data-directory "toolbar"))) (if name (setq toolbar-icon-directory (file-name-as-directory name)))))) ;; called from toolbar.c during device and frame initialization (defun init-toolbar-from-resources (locale) (if (and (featurep 'x) (not (featurep 'infodock)) (or (eq locale 'global) (eq 'x (device-or-frame-type locale)))) (declare-fboundp (x-init-toolbar-from-resources locale)))) ;; #### Is this actually needed or will the code in ;; default-mouse-motion-handler suffice? (define-key global-map 'button1up 'release-toolbar-button) (defvar toolbar-map (let ((m (make-sparse-keymap))) (set-keymap-name m 'toolbar-map) m) "Keymap consulted for mouse-clicks over a toolbar.") (define-key toolbar-map 'button1 'press-toolbar-button) (define-key toolbar-map 'button1up 'release-and-activate-toolbar-button) (defvar last-pressed-toolbar-button nil) (defvar toolbar-active nil) (defvar toolbar-blank-press-function nil "Function to call if a blank area of the toolbar is pressed.") ;; ;; It really sucks that we also have to tie onto ;; default-mouse-motion-handler to make sliding buttons work right. ;; (defun press-toolbar-button (event) "Press a toolbar button. This only changes its appearance. Call function stored in `toolbar-blank-press-function,' if any, with EVENT as an argument if press is over a blank area of the toolbar." (interactive "_e") (setq this-command last-command) (let ((button (event-toolbar-button event))) ;; We silently ignore non-buttons. This most likely means we are ;; over a blank part of the toolbar. (setq toolbar-active t) (if (toolbar-button-p button) (progn (set-toolbar-button-down-flag button t) (setq last-pressed-toolbar-button button)) ;; Added by Bob Weiner, Motorola Inc., 10/6/95, to handle ;; presses on blank portions of toolbars. (when (functionp toolbar-blank-press-function) (funcall toolbar-blank-press-function event))))) (defun release-and-activate-toolbar-button (event) "Release a toolbar button and activate its callback. Call function stored in `toolbar-blank-release-function,' if any, with EVENT as an argument if release is over a blank area of the toolbar." (interactive "_e") (or (button-release-event-p event) (error "%s must be invoked by a mouse-release" this-command)) (release-toolbar-button event) (let ((button (event-toolbar-button event))) (if (and (toolbar-button-p button) (toolbar-button-enabled-p button) (toolbar-button-callback button)) (let ((callback (toolbar-button-callback button))) (setq this-command callback) ;; Handle arbitrary functions. (if (functionp callback) (if (commandp callback) (call-interactively callback) (funcall callback)) (eval callback)))))) ;; If current is not t, then only release the toolbar button stored in ;; last-pressed-toolbar-button (defun release-toolbar-button-internal (event current) (let ((button (event-toolbar-button event))) (setq zmacs-region-stays t) (if (and last-pressed-toolbar-button (not (eq last-pressed-toolbar-button button)) (toolbar-button-p last-pressed-toolbar-button)) (progn (set-toolbar-button-down-flag last-pressed-toolbar-button nil) (setq last-pressed-toolbar-button nil))) (if (and current (toolbar-button-p button)) (set-toolbar-button-down-flag button nil)))) (defun release-toolbar-button (event) "Release all pressed toolbar buttons." (interactive "_e") (or (button-release-event-p event) (error "%s must be invoked by a mouse-release" this-command)) (release-toolbar-button-internal event t) ;; Don't set this-command if we're being called ;; from release-and-activate-toolbar-button. (if (interactive-p) (setq this-command last-command)) (setq toolbar-active nil)) (defun release-previous-toolbar-button (event) (setq zmacs-region-stays t) (release-toolbar-button-internal event nil)) (defun make-toolbar-specifier (spec-list) "Return a new `toolbar' specifier object with the given specification list. SPEC-LIST can be a list of specifications (each of which is a cons of a locale and a list of instantiators), a single instantiator, or a list of instantiators. See `make-specifier' for more information about specifiers. Toolbar specifiers are used to specify the format of a toolbar. The values of the variables `default-toolbar', `top-toolbar', `left-toolbar', `right-toolbar', and `bottom-toolbar' are always toolbar specifiers. Valid toolbar instantiators are called \"toolbar descriptors\" and are lists of vectors. See `default-toolbar' for a description of the exact format." (make-specifier-and-init 'toolbar spec-list)) ;;; toolbar.el ends here