Mercurial > hg > xemacs-beta
annotate lisp/toolbar.el @ 4952:19a72041c5ed
Mule-izing, various fixes related to char * arguments
-------------------- ChangeLog entries follow: --------------------
modules/ChangeLog addition:
2010-01-26 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c:
* postgresql/postgresql.c (CHECK_LIVE_CONNECTION):
* postgresql/postgresql.c (print_pgresult):
* postgresql/postgresql.c (Fpq_conn_defaults):
* postgresql/postgresql.c (Fpq_connectdb):
* postgresql/postgresql.c (Fpq_connect_start):
* postgresql/postgresql.c (Fpq_result_status):
* postgresql/postgresql.c (Fpq_res_status):
Mule-ize large parts of it.
2010-01-26 Ben Wing <ben@xemacs.org>
* ldap/eldap.c (print_ldap):
* ldap/eldap.c (allocate_ldap):
Use write_ascstring().
src/ChangeLog addition:
2010-01-26 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (build_ascstring):
* alloc.c (build_msg_cistring):
* alloc.c (staticpro_1):
* alloc.c (staticpro_name):
* alloc.c (staticpro_nodump_1):
* alloc.c (staticpro_nodump_name):
* alloc.c (unstaticpro_nodump_1):
* alloc.c (mcpro_1):
* alloc.c (mcpro_name):
* alloc.c (object_memory_usage_stats):
* alloc.c (common_init_alloc_early):
* alloc.c (init_alloc_once_early):
* buffer.c (print_buffer):
* buffer.c (vars_of_buffer):
* buffer.c (common_init_complex_vars_of_buffer):
* buffer.c (init_initial_directory):
* bytecode.c (invalid_byte_code):
* bytecode.c (print_compiled_function):
* bytecode.c (mark_compiled_function):
* chartab.c (print_table_entry):
* chartab.c (print_char_table):
* config.h.in:
* console-gtk.c:
* console-gtk.c (gtk_device_to_console_connection):
* console-gtk.c (gtk_semi_canonicalize_console_connection):
* console-gtk.c (gtk_canonicalize_console_connection):
* console-gtk.c (gtk_semi_canonicalize_device_connection):
* console-gtk.c (gtk_canonicalize_device_connection):
* console-stream.c (stream_init_frame_1):
* console-stream.c (vars_of_console_stream):
* console-stream.c (init_console_stream):
* console-x.c (x_semi_canonicalize_console_connection):
* console-x.c (x_semi_canonicalize_device_connection):
* console-x.c (x_canonicalize_device_connection):
* console-x.h:
* data.c (eq_with_ebola_notice):
* data.c (Fsubr_interactive):
* data.c (Fnumber_to_string):
* data.c (digit_to_number):
* device-gtk.c (gtk_init_device):
* device-msw.c (print_devmode):
* device-x.c (x_event_name):
* dialog-msw.c (handle_directory_dialog_box):
* dialog-msw.c (handle_file_dialog_box):
* dialog-msw.c (vars_of_dialog_mswindows):
* doc.c (weird_doc):
* doc.c (Fsnarf_documentation):
* doc.c (vars_of_doc):
* dumper.c (pdump):
* dynarr.c:
* dynarr.c (Dynarr_realloc):
* editfns.c (Fuser_real_login_name):
* editfns.c (get_home_directory):
* elhash.c (print_hash_table_data):
* elhash.c (print_hash_table):
* emacs.c (main_1):
* emacs.c (vars_of_emacs):
* emodules.c:
* emodules.c (_emodules_list):
* emodules.c (Fload_module):
* emodules.c (Funload_module):
* emodules.c (Flist_modules):
* emodules.c (find_make_module):
* emodules.c (attempt_module_delete):
* emodules.c (emodules_load):
* emodules.c (emodules_doc_subr):
* emodules.c (emodules_doc_sym):
* emodules.c (syms_of_module):
* emodules.c (vars_of_module):
* emodules.h:
* eval.c (print_subr):
* eval.c (signal_call_debugger):
* eval.c (build_error_data):
* eval.c (signal_error):
* eval.c (maybe_signal_error):
* eval.c (signal_continuable_error):
* eval.c (maybe_signal_continuable_error):
* eval.c (signal_error_2):
* eval.c (maybe_signal_error_2):
* eval.c (signal_continuable_error_2):
* eval.c (maybe_signal_continuable_error_2):
* eval.c (signal_ferror):
* eval.c (maybe_signal_ferror):
* eval.c (signal_continuable_ferror):
* eval.c (maybe_signal_continuable_ferror):
* eval.c (signal_ferror_with_frob):
* eval.c (maybe_signal_ferror_with_frob):
* eval.c (signal_continuable_ferror_with_frob):
* eval.c (maybe_signal_continuable_ferror_with_frob):
* eval.c (syntax_error):
* eval.c (syntax_error_2):
* eval.c (maybe_syntax_error):
* eval.c (sferror):
* eval.c (sferror_2):
* eval.c (maybe_sferror):
* eval.c (invalid_argument):
* eval.c (invalid_argument_2):
* eval.c (maybe_invalid_argument):
* eval.c (invalid_constant):
* eval.c (invalid_constant_2):
* eval.c (maybe_invalid_constant):
* eval.c (invalid_operation):
* eval.c (invalid_operation_2):
* eval.c (maybe_invalid_operation):
* eval.c (invalid_change):
* eval.c (invalid_change_2):
* eval.c (maybe_invalid_change):
* eval.c (invalid_state):
* eval.c (invalid_state_2):
* eval.c (maybe_invalid_state):
* eval.c (wtaerror):
* eval.c (stack_overflow):
* eval.c (out_of_memory):
* eval.c (print_multiple_value):
* eval.c (issue_call_trapping_problems_warning):
* eval.c (backtrace_specials):
* eval.c (backtrace_unevalled_args):
* eval.c (Fbacktrace):
* eval.c (warn_when_safe):
* event-Xt.c (modwarn):
* event-Xt.c (modbarf):
* event-Xt.c (check_modifier):
* event-Xt.c (store_modifier):
* event-Xt.c (emacs_Xt_format_magic_event):
* event-Xt.c (describe_event):
* event-gtk.c (dragndrop_data_received):
* event-gtk.c (store_modifier):
* event-gtk.c (gtk_reset_modifier_mapping):
* event-msw.c (dde_eval_string):
* event-msw.c (Fdde_alloc_advise_item):
* event-msw.c (mswindows_dde_callback):
* event-msw.c (FROB):
* event-msw.c (emacs_mswindows_format_magic_event):
* event-stream.c (external_debugging_print_event):
* event-stream.c (execute_help_form):
* event-stream.c (vars_of_event_stream):
* events.c (print_event_1):
* events.c (print_event):
* events.c (event_equal):
* extents.c (print_extent_1):
* extents.c (print_extent):
* extents.c (vars_of_extents):
* faces.c (print_face):
* faces.c (complex_vars_of_faces):
* file-coding.c:
* file-coding.c (print_coding_system):
* file-coding.c (print_coding_system_in_print_method):
* file-coding.c (default_query_method):
* file-coding.c (find_coding_system):
* file-coding.c (make_coding_system_1):
* file-coding.c (chain_print):
* file-coding.c (undecided_print):
* file-coding.c (gzip_print):
* file-coding.c (vars_of_file_coding):
* file-coding.c (complex_vars_of_file_coding):
* fileio.c:
* fileio.c (report_file_type_error):
* fileio.c (report_error_with_errno):
* fileio.c (report_file_error):
* fileio.c (barf_or_query_if_file_exists):
* fileio.c (vars_of_fileio):
* floatfns.c (matherr):
* fns.c (print_bit_vector):
* fns.c (Fmapconcat):
* fns.c (add_suffix_to_symbol):
* fns.c (add_prefix_to_symbol):
* frame-gtk.c:
* frame-gtk.c (Fgtk_window_id):
* frame-x.c (def):
* frame-x.c (x_cde_transfer_callback):
* frame.c:
* frame.c (Fmake_frame):
* gc.c (show_gc_cursor_and_message):
* gc.c (vars_of_gc):
* glyphs-eimage.c (png_instantiate):
* glyphs-eimage.c (tiff_instantiate):
* glyphs-gtk.c (gtk_print_image_instance):
* glyphs-msw.c (mswindows_print_image_instance):
* glyphs-x.c (x_print_image_instance):
* glyphs-x.c (update_widget_face):
* glyphs.c (make_string_from_file):
* glyphs.c (print_image_instance):
* glyphs.c (signal_image_error):
* glyphs.c (signal_image_error_2):
* glyphs.c (signal_double_image_error):
* glyphs.c (signal_double_image_error_2):
* glyphs.c (xbm_mask_file_munging):
* glyphs.c (pixmap_to_lisp_data):
* glyphs.h:
* gui.c (gui_item_display_flush_left):
* hpplay.c (player_error_internal):
* hpplay.c (myHandler):
* intl-win32.c:
* intl-win32.c (langcode_to_lang):
* intl-win32.c (sublangcode_to_lang):
* intl-win32.c (Fmswindows_get_locale_info):
* intl-win32.c (lcid_to_locale_mule_or_no):
* intl-win32.c (mswindows_multibyte_to_unicode_print):
* intl-win32.c (complex_vars_of_intl_win32):
* keymap.c:
* keymap.c (print_keymap):
* keymap.c (ensure_meta_prefix_char_keymapp):
* keymap.c (Fkey_description):
* keymap.c (Ftext_char_description):
* lisp.h:
* lisp.h (struct):
* lisp.h (DECLARE_INLINE_HEADER):
* lread.c (Fload_internal):
* lread.c (locate_file):
* lread.c (read_escape):
* lread.c (read_raw_string):
* lread.c (read1):
* lread.c (read_list):
* lread.c (read_compiled_function):
* lread.c (init_lread):
* lrecord.h:
* marker.c (print_marker):
* marker.c (marker_equal):
* menubar-msw.c (displayable_menu_item):
* menubar-x.c (command_builder_operate_menu_accelerator):
* menubar.c (vars_of_menubar):
* minibuf.c (reinit_complex_vars_of_minibuf):
* minibuf.c (complex_vars_of_minibuf):
* mule-charset.c (Fmake_charset):
* mule-charset.c (complex_vars_of_mule_charset):
* mule-coding.c (iso2022_print):
* mule-coding.c (fixed_width_query):
* number.c (bignum_print):
* number.c (ratio_print):
* number.c (bigfloat_print):
* number.c (bigfloat_finalize):
* objects-msw.c:
* objects-msw.c (mswindows_color_to_string):
* objects-msw.c (mswindows_color_list):
* objects-tty.c:
* objects-tty.c (tty_font_list):
* objects-tty.c (tty_find_charset_font):
* objects-xlike-inc.c (xft_find_charset_font):
* objects-xlike-inc.c (endif):
* print.c:
* print.c (write_istring):
* print.c (write_ascstring):
* print.c (Fterpri):
* print.c (Fprint):
* print.c (print_error_message):
* print.c (print_vector_internal):
* print.c (print_cons):
* print.c (print_string):
* print.c (printing_unreadable_object):
* print.c (print_internal):
* print.c (print_float):
* print.c (print_symbol):
* process-nt.c (mswindows_report_winsock_error):
* process-nt.c (nt_canonicalize_host_name):
* process-unix.c (unix_canonicalize_host_name):
* process.c (print_process):
* process.c (report_process_error):
* process.c (report_network_error):
* process.c (make_process_internal):
* process.c (Fstart_process_internal):
* process.c (status_message):
* process.c (putenv_internal):
* process.c (vars_of_process):
* process.h:
* profile.c (vars_of_profile):
* rangetab.c (print_range_table):
* realpath.c (vars_of_realpath):
* redisplay.c (vars_of_redisplay):
* search.c (wordify):
* search.c (Freplace_match):
* sheap.c (sheap_adjust_h):
* sound.c (report_sound_error):
* sound.c (Fplay_sound_file):
* specifier.c (print_specifier):
* symbols.c (Fsubr_name):
* symbols.c (do_symval_forwarding):
* symbols.c (set_default_buffer_slot_variable):
* symbols.c (set_default_console_slot_variable):
* symbols.c (store_symval_forwarding):
* symbols.c (default_value):
* symbols.c (defsymbol_massage_name_1):
* symbols.c (defsymbol_massage_name_nodump):
* symbols.c (defsymbol_massage_name):
* symbols.c (defsymbol_massage_multiword_predicate_nodump):
* symbols.c (defsymbol_massage_multiword_predicate):
* symbols.c (defsymbol_nodump):
* symbols.c (defsymbol):
* symbols.c (defkeyword):
* symbols.c (defkeyword_massage_name):
* symbols.c (check_module_subr):
* symbols.c (deferror_1):
* symbols.c (deferror):
* symbols.c (deferror_massage_name):
* symbols.c (deferror_massage_name_and_message):
* symbols.c (defvar_magic):
* symeval.h:
* symeval.h (DEFVAR_SYMVAL_FWD):
* sysdep.c:
* sysdep.c (init_system_name):
* sysdll.c:
* sysdll.c (MAYBE_PREPEND_UNDERSCORE):
* sysdll.c (dll_function):
* sysdll.c (dll_variable):
* sysdll.c (dll_error):
* sysdll.c (dll_open):
* sysdll.c (dll_close):
* sysdll.c (image_for_address):
* sysdll.c (my_find_image):
* sysdll.c (search_linked_libs):
* sysdll.h:
* sysfile.h:
* sysfile.h (DEFAULT_DIRECTORY_FALLBACK):
* syswindows.h:
* tests.c (DFC_CHECK_LENGTH):
* tests.c (DFC_CHECK_CONTENT):
* tests.c (Ftest_hash_tables):
* text.c (vars_of_text):
* text.h:
* tooltalk.c (tt_opnum_string):
* tooltalk.c (tt_message_arg_ival_string):
* tooltalk.c (Ftooltalk_default_procid):
* tooltalk.c (Ftooltalk_default_session):
* tooltalk.c (init_tooltalk):
* tooltalk.c (vars_of_tooltalk):
* ui-gtk.c (Fdll_load):
* ui-gtk.c (type_to_marshaller_type):
* ui-gtk.c (Fgtk_import_function_internal):
* ui-gtk.c (emacs_gtk_object_printer):
* ui-gtk.c (emacs_gtk_boxed_printer):
* unicode.c (unicode_to_ichar):
* unicode.c (unicode_print):
* unicode.c (unicode_query):
* unicode.c (vars_of_unicode):
* unicode.c (complex_vars_of_unicode):
* win32.c:
* win32.c (mswindows_report_process_error):
* window.c (print_window):
* xemacs.def.in.in:
BASIC IDEA: Further fixing up uses of char * and CIbyte *
to reflect their actual semantics; Mule-izing some code;
redoing of the not-yet-working code to handle message translation.
Clean up code to handle message-translation (not yet working).
Create separate versions of build_msg_string() for working with
Ibyte *, CIbyte *, and Ascbyte * arguments. Assert that Ascbyte *
arguments are pure-ASCII. Make build_msg_string() be the same
as build_msg_ascstring(). Create same three versions of GETTEXT()
and DEFER_GETTEXT(). Also create build_defer_string() and
variants for the equivalent of DEFER_GETTEXT() when building a
string. Remove old CGETTEXT(). Clean up code where GETTEXT(),
DEFER_GETTEXT(), build_msg_string(), etc. was being called and
introduce some new calls to build_msg_string(), etc. Remove
GETTEXT() from calls to weird_doc() -- we assume that the
message snarfer knows about weird_doc(). Remove uses of
DEFER_GETTEXT() from error messages in sysdep.c and instead use
special comments /* @@@begin-snarf@@@ */ and /* @@@end-snarf@@@ */
that the message snarfer presumably knows about.
Create build_ascstring() and use it in many instances in place
of build_string(). The purpose of having Ascbyte * variants is
to make the code more self-documenting in terms of what sort of
semantics is expected for char * strings. In fact in the process
of looking for uses of build_string(), much improperly Mule-ized
was discovered.
Mule-ize a lot of code as described in previous paragraph,
e.g. in sysdep.c.
Make the error functions take Ascbyte * strings and fix up a
couple of places where non-pure-ASCII strings were being passed in
(file-coding.c, mule-coding.c, unicode.c). (It's debatable whether
we really need to make the error functions work this way. It
helps catch places where code is written in a way that message
translation won't work, but we may well never implement message
translation.)
Make staticpro() and friends take Ascbyte * strings instead of
raw char * strings. Create a const_Ascbyte_ptr dynarr type
to describe what's held by staticpro_names[] and friends,
create pdump descriptions for const_Ascbyte_ptr dynarrs, and
use them in place of specially-crafted staticpro descriptions.
Mule-ize certain other functions (e.g. x_event_name) by correcting
raw use of char * to Ascbyte *, Rawbyte * or another such type,
and raw use of char[] buffers to another type (usually Ascbyte[]).
Change many uses of write_c_string() to write_msg_string(),
write_ascstring(), etc.
Mule-ize emodules.c, emodules.h, sysdll.h.
Fix some un-Mule-ized code in intl-win32.c.
A comment in event-Xt.c and the limitations of the message
snarfer (make-msgfile or whatever) is presumably incorrect --
it should be smart enough to handle function calls spread over
more than one line. Clean up code in event-Xt.c that was
written awkwardly for this reason.
In config.h.in, instead of NEED_ERROR_CHECK_TYPES_INLINES,
create a more general XEMACS_DEFS_NEEDS_INLINE_DECLS to
indicate when inlined functions need to be declared in
xemacs.defs.in.in, and make use of it in xemacs.defs.in.in.
We need to do this because postgresql.c now calls qxestrdup(),
which is an inline function.
Make nconc2() and other such functions MODULE_API and put
them in xemacs.defs.in.in since postgresql.c now uses them.
Clean up indentation in lread.c and a few other places.
In text.h, document ASSERT_ASCTEXT_ASCII() and
ASSERT_ASCTEXT_ASCII_LEN(), group together the stand-in
encodings and add some more for DLL symbols, function and
variable names, etc.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Tue, 26 Jan 2010 23:22:30 -0600 |
| parents | fd1acd2f457a |
| children | 5efbd1253905 |
| rev | line source |
|---|---|
| 428 | 1 ;;; toolbar.el --- Toolbar support for XEmacs |
| 2 | |
| 3 ;; Copyright (C) 1995, 1997 Free Software Foundation, Inc. | |
| 771 | 4 ;; Copyright (C) 2002 Ben Wing. |
| 428 | 5 |
| 6 ;; Maintainer: XEmacs Development Team | |
| 7 ;; Keywords: extensions, internal, dumped | |
| 8 | |
| 9 ;; This file is part of XEmacs. | |
| 10 | |
| 11 ;; XEmacs is free software; you can redistribute it and/or modify it | |
| 12 ;; under the terms of the GNU General Public License as published by | |
| 13 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 14 ;; any later version. | |
| 15 | |
| 16 ;; XEmacs is distributed in the hope that it will be useful, but | |
| 17 ;; WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 19 ;; General Public License for more details. | |
| 20 | |
| 21 ;; You should have received a copy of the GNU General Public License | |
| 22 ;; along with XEmacs; see the file COPYING. If not, write to the | |
| 23 ;; Free Software Foundation, 59 Temple Place - Suite 330, | |
| 24 ;; Boston, MA 02111-1307, USA. | |
| 25 | |
| 26 ;;; Synched up with: Not in FSF. | |
| 27 | |
| 28 ;;; Commentary: | |
| 29 | |
| 30 ;; This file is dumped with XEmacs (when toolbar support is compiled in). | |
| 31 | |
| 32 ;;; Code: | |
| 33 | |
| 34 (defcustom toolbar-visible-p ;; added for the options menu - dverna apr. 98 | |
| 35 (specifier-instance default-toolbar-visible-p) | |
| 763 | 36 "*Whether the default toolbar is globally visible. |
| 771 | 37 This option only has an effect when set using `customize-set-variable', |
| 38 or through the Options menu." | |
| 428 | 39 :group 'display |
| 40 :type 'boolean | |
| 41 :set #'(lambda (var val) | |
| 42 (set-specifier default-toolbar-visible-p val) | |
| 43 (setq toolbar-visible-p val)) | |
| 44 ) | |
| 45 | |
| 46 (defcustom toolbar-captioned-p ;; added for the options menu - dverna apr. 98 | |
| 47 (specifier-instance toolbar-buttons-captioned-p) | |
| 763 | 48 "*Whether the toolbars buttons are globally captioned. |
| 771 | 49 This option only has an effect when set using `customize-set-variable', |
| 50 or through the Options menu." | |
| 428 | 51 :group 'display |
| 52 :type 'boolean | |
| 53 :set #'(lambda (var val) | |
| 54 (set-specifier toolbar-buttons-captioned-p val) | |
| 55 (setq toolbar-captioned-p val)) | |
| 56 ) | |
| 57 | |
| 58 (defcustom default-toolbar-position ;; added for the options menu - dverna | |
| 59 (default-toolbar-position) | |
| 771 | 60 "*The location of the default toolbar: 'top, 'bottom, 'left or 'right. |
| 61 This option only has an effect when set using `customize-set-variable', | |
| 62 or through the Options menu." | |
| 428 | 63 :group 'display |
| 442 | 64 :type '(choice (const :tag "top" top) |
| 65 (const :tag "bottom" bottom) | |
| 66 (const :tag "left" left) | |
| 67 (const :tag "right" right)) | |
| 428 | 68 :set #'(lambda (var val) |
| 763 | 69 (let* ((height (window-height)) |
| 70 (hdiff (- (frame-height) height)) | |
| 71 (width (window-width))) | |
| 72 (set-default-toolbar-position val) | |
| 73 (setq default-toolbar-position val) | |
| 74 ;; needed or dimensions don't update? | |
| 75 (redisplay-frame) | |
| 76 ;; This probably only works correctly if there is only one | |
| 77 ;; Emacs window. If windows are split, it probably results in | |
| 78 ;; small adjustments in their sizes. | |
| 79 (set-frame-size (selected-frame) width (+ height hdiff)) | |
| 767 | 80 ))) |
| 428 | 81 |
| 82 (defvar toolbar-help-enabled t | |
| 83 "If non-nil help is echoed for toolbar buttons.") | |
| 84 | |
| 85 (defvar toolbar-icon-directory nil | |
| 86 "Location of standard toolbar icon bitmaps.") | |
| 87 | |
| 88 (defun toolbar-make-button-list (up &optional down disabled cap-up cap-down cap-disabled) | |
| 89 "Call make-glyph on each arg and return a list of the results." | |
| 90 (let ((up-glyph (make-glyph up)) | |
| 91 (down-glyph (and down (make-glyph down))) | |
| 92 (disabled-glyph (and disabled (make-glyph disabled))) | |
| 93 (cap-up-glyph (and cap-up (make-glyph cap-up))) | |
| 94 (cap-down-glyph (and cap-down (make-glyph cap-down))) | |
| 95 (cap-disabled-glyph (and cap-disabled (make-glyph cap-disabled)))) | |
| 96 (if cap-disabled | |
| 97 (list up-glyph down-glyph disabled-glyph | |
| 98 cap-up-glyph cap-down-glyph cap-disabled-glyph) | |
| 99 (if cap-down | |
| 100 (list up-glyph down-glyph disabled-glyph | |
| 101 cap-up-glyph cap-down-glyph) | |
| 102 (if cap-up | |
| 103 (list up-glyph down-glyph disabled-glyph cap-up-glyph) | |
| 104 (if disabled-glyph | |
| 105 (list up-glyph down-glyph disabled-glyph) | |
| 106 (if down-glyph | |
| 107 (list up-glyph down-glyph) | |
| 108 (list up-glyph)))))))) | |
| 109 | |
| 110 (defun init-toolbar-location () | |
| 111 (if (not toolbar-icon-directory) | |
| 112 (let ((name (locate-data-directory "toolbar"))) | |
| 113 (if name | |
| 114 (setq toolbar-icon-directory | |
| 115 (file-name-as-directory name)))))) | |
| 116 | |
| 487 | 117 ;; called from toolbar.c during device and frame initialization |
| 428 | 118 (defun init-toolbar-from-resources (locale) |
| 119 (if (and (featurep 'x) | |
| 120 (not (featurep 'infodock)) | |
| 121 (or (eq locale 'global) | |
| 122 (eq 'x (device-or-frame-type locale)))) | |
| 502 | 123 (declare-fboundp (x-init-toolbar-from-resources locale)))) |
| 428 | 124 |
| 125 | |
| 126 ;; #### Is this actually needed or will the code in | |
| 127 ;; default-mouse-motion-handler suffice? | |
| 128 (define-key global-map 'button1up 'release-toolbar-button) | |
| 129 | |
| 130 (defvar toolbar-map (let ((m (make-sparse-keymap))) | |
| 131 (set-keymap-name m 'toolbar-map) | |
| 132 m) | |
| 133 "Keymap consulted for mouse-clicks over a toolbar.") | |
| 134 | |
| 135 (define-key toolbar-map 'button1 'press-toolbar-button) | |
| 136 (define-key toolbar-map 'button1up 'release-and-activate-toolbar-button) | |
| 137 (defvar last-pressed-toolbar-button nil) | |
| 138 (defvar toolbar-active nil) | |
| 139 | |
| 442 | 140 (defvar toolbar-blank-press-function nil |
| 141 "Function to call if a blank area of the toolbar is pressed.") | |
| 142 | |
| 428 | 143 ;; |
| 144 ;; It really sucks that we also have to tie onto | |
| 145 ;; default-mouse-motion-handler to make sliding buttons work right. | |
| 146 ;; | |
| 147 (defun press-toolbar-button (event) | |
| 148 "Press a toolbar button. This only changes its appearance. | |
| 3061 | 149 Call function stored in `toolbar-blank-press-function', if any, with EVENT as |
| 428 | 150 an argument if press is over a blank area of the toolbar." |
| 151 (interactive "_e") | |
| 152 (setq this-command last-command) | |
| 153 (let ((button (event-toolbar-button event))) | |
| 154 ;; We silently ignore non-buttons. This most likely means we are | |
| 155 ;; over a blank part of the toolbar. | |
| 156 (setq toolbar-active t) | |
| 157 (if (toolbar-button-p button) | |
| 158 (progn | |
| 159 (set-toolbar-button-down-flag button t) | |
| 160 (setq last-pressed-toolbar-button button)) | |
| 161 ;; Added by Bob Weiner, Motorola Inc., 10/6/95, to handle | |
| 162 ;; presses on blank portions of toolbars. | |
| 442 | 163 (when (functionp toolbar-blank-press-function) |
| 164 (funcall toolbar-blank-press-function event))))) | |
| 428 | 165 |
| 166 (defun release-and-activate-toolbar-button (event) | |
| 167 "Release a toolbar button and activate its callback. | |
| 3061 | 168 Call function stored in `toolbar-blank-release-function', if any, with EVENT |
| 428 | 169 as an argument if release is over a blank area of the toolbar." |
| 170 (interactive "_e") | |
| 171 (or (button-release-event-p event) | |
| 172 (error "%s must be invoked by a mouse-release" this-command)) | |
| 173 (release-toolbar-button event) | |
| 174 (let ((button (event-toolbar-button event))) | |
| 175 (if (and (toolbar-button-p button) | |
| 176 (toolbar-button-enabled-p button) | |
| 177 (toolbar-button-callback button)) | |
| 178 (let ((callback (toolbar-button-callback button))) | |
| 179 (setq this-command callback) | |
| 180 ;; Handle arbitrary functions. | |
| 181 (if (functionp callback) | |
| 182 (if (commandp callback) | |
| 183 (call-interactively callback) | |
| 184 (funcall callback)) | |
| 185 (eval callback)))))) | |
| 186 | |
| 187 ;; If current is not t, then only release the toolbar button stored in | |
| 188 ;; last-pressed-toolbar-button | |
| 189 (defun release-toolbar-button-internal (event current) | |
| 190 (let ((button (event-toolbar-button event))) | |
| 191 (setq zmacs-region-stays t) | |
| 192 (if (and last-pressed-toolbar-button | |
| 193 (not (eq last-pressed-toolbar-button button)) | |
| 194 (toolbar-button-p last-pressed-toolbar-button)) | |
| 195 (progn | |
| 196 (set-toolbar-button-down-flag last-pressed-toolbar-button nil) | |
| 197 (setq last-pressed-toolbar-button nil))) | |
| 198 (if (and current (toolbar-button-p button)) | |
| 199 (set-toolbar-button-down-flag button nil)))) | |
| 200 | |
| 201 (defun release-toolbar-button (event) | |
| 202 "Release all pressed toolbar buttons." | |
| 203 (interactive "_e") | |
| 204 (or (button-release-event-p event) | |
| 205 (error "%s must be invoked by a mouse-release" this-command)) | |
| 206 (release-toolbar-button-internal event t) | |
| 207 ;; Don't set this-command if we're being called | |
| 208 ;; from release-and-activate-toolbar-button. | |
| 209 (if (interactive-p) | |
| 210 (setq this-command last-command)) | |
| 211 (setq toolbar-active nil)) | |
| 212 | |
| 213 (defun release-previous-toolbar-button (event) | |
| 214 (setq zmacs-region-stays t) | |
| 215 (release-toolbar-button-internal event nil)) | |
| 216 | |
| 442 | 217 (defun make-toolbar-specifier (spec-list) |
| 218 "Return a new `toolbar' specifier object with the given specification list. | |
| 219 SPEC-LIST can be a list of specifications (each of which is a cons of a | |
| 220 locale and a list of instantiators), a single instantiator, or a list | |
| 221 of instantiators. See `make-specifier' for more information about | |
| 222 specifiers. | |
| 223 | |
| 224 Toolbar specifiers are used to specify the format of a toolbar. | |
| 225 The values of the variables `default-toolbar', `top-toolbar', | |
| 226 `left-toolbar', `right-toolbar', and `bottom-toolbar' are always | |
| 227 toolbar specifiers. | |
| 228 | |
| 229 Valid toolbar instantiators are called \"toolbar descriptors\" | |
| 230 and are lists of vectors. See `default-toolbar' for a description | |
| 231 of the exact format." | |
| 232 (make-specifier-and-init 'toolbar spec-list)) | |
| 233 | |
| 428 | 234 ;;; toolbar.el ends here |