Mercurial > hg > xemacs-beta
annotate src/toolbar-gtk.c @ 5679:a81a739181dc
Add command remapping, a more robust alternative to #'substitute-key-definition
src/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* keymap.c:
Add command remapping, a more robust equivalent to
#'substitute-key-definition.
* keymap.c (CHECK_REMAPPING_POSITION): New.
* keymap.c (keymap_equal): Correct a comment here.
* keymap.c (Fdefine_key): Document the command remapping syntax.
* keymap.c (Fremap_command): New.
* keymap.c (command_remapping): New.
* keymap.c (Fcommand_remapping): New.
* keymap.c (commands_remapped_to_mapper): New.
* keymap.c (commands_remapped_to_traverser): New.
* keymap.c (Fcommands_remapped_to): New.
* keymap.c (get_relevant_keymaps): Take a new POSITION argument.
* keymap.c (Fcurrent_keymaps, event_binding):
Supply the new POSITION argument to get_relevant_keymaps.
* keymap.c (Fkey_binding):
Add new arguments, NO-REMAP and POSITION.
* keymap.c (map_keymap_mapper):
* keymap.c (Fwhere_is_internal):
* keymap.c (where_is_to_char):
* keymap.c (where_is_recursive_mapper):
Don't expose the key remapping in these functions. This conflicts
with GNU, but is more sane for our callers. Access to command
remapping is with the functions #'command-remapping,
#'commands-remapped-to, and #'remap-command, not with the general
keymap functions, apart from the compatibility hack in #'define-key.
* keymap.c (syms_of_keymap):
* keymap.c (vars_of_keymap):
* keymap.c (complex_vars_of_keymap):
* lisp.h: New CHECK_COMMAND macro.
man/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* lispref/keymaps.texi (Keymaps):
* lispref/keymaps.texi (Changing Key Bindings):
* lispref/keymaps.texi (Scanning Keymaps):
* lispref/keymaps.texi (Remapping commands):
* lispref/keymaps.texi (XEmacs): New.
* lispref/keymaps.texi (Other Keymap Functions):
Document the new command remapping functionality in this file.
lisp/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* help.el (describe-function-1):
Document any command remapping that has been done in this function.
tests/ChangeLog addition:
2012-09-02 Aidan Kehoe <kehoea@parhasard.net>
* automated/keymap-tests.el:
Test the new command remapping functionality.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 02 Sep 2012 14:31:40 +0100 |
| parents | 308d34e9f07d |
| children |
| rev | line source |
|---|---|
| 714 | 1 /* toolbar implementation -- GTK interface. |
| 462 | 2 Copyright (C) 1995 Board of Trustees, University of Illinois. |
| 3 Copyright (C) 1995 Sun Microsystems, Inc. | |
| 4 Copyright (C) 1995, 1996 Ben Wing. | |
| 5 Copyright (C) 1996 Chuck Thompson. | |
| 6 | |
| 7 This file is part of XEmacs. | |
| 8 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4917
diff
changeset
|
9 XEmacs is free software: you can redistribute it and/or modify it |
| 462 | 10 under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4917
diff
changeset
|
11 Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4917
diff
changeset
|
12 option) any later version. |
| 462 | 13 |
| 14 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 for more details. | |
| 18 | |
| 19 You should have received a copy of the GNU General Public License | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4917
diff
changeset
|
20 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 462 | 21 |
| 22 /* Synched up with: Not in FSF. */ | |
| 23 | |
| 24 #include <config.h> | |
| 25 #include "lisp.h" | |
| 872 | 26 |
| 714 | 27 #include "frame.h" |
| 872 | 28 |
| 4917 | 29 #include "toolbar-xlike.h" |
| 872 | 30 |
| 31 #include "console-gtk-impl.h" | |
| 462 | 32 |
| 4917 | 33 /* We should really create a 'xlike' console type and fill it with |
| 714 | 34 ** all the shared code. We would then just use |
| 4917 | 35 ** CONSOLE_INHERITS_METHOD(x,xlike,blah) |
| 714 | 36 */ |
| 4917 | 37 #define gtk_output_frame_toolbars xlike_output_frame_toolbars |
| 38 #define gtk_output_toolbar_button xlike_output_toolbar_button | |
| 39 #define gtk_redraw_exposed_toolbars xlike_redraw_exposed_toolbars | |
| 40 #define gtk_redraw_frame_toolbars xlike_redraw_frame_toolbars | |
| 41 #define gtk_clear_frame_toolbars xlike_clear_frame_toolbars | |
| 462 | 42 |
| 43 | |
| 44 static void | |
| 2286 | 45 gtk_initialize_frame_toolbars (struct frame *UNUSED (f)) |
| 462 | 46 { |
| 47 } | |
| 48 | |
| 49 /* This only calls one function but we go ahead and create this in | |
| 50 case we ever do decide that we need to do more work. */ | |
| 51 static void | |
| 2286 | 52 gtk_free_frame_toolbars (struct frame *UNUSED (f)) |
| 462 | 53 { |
| 54 } | |
| 55 | |
| 56 | |
| 57 /************************************************************************/ | |
| 58 /* initialization */ | |
| 59 /************************************************************************/ | |
| 60 | |
| 61 void | |
| 62 console_type_create_toolbar_gtk (void) | |
| 63 { | |
| 64 CONSOLE_HAS_METHOD (gtk, output_frame_toolbars); | |
| 905 | 65 CONSOLE_HAS_METHOD (gtk, clear_frame_toolbars); |
| 462 | 66 CONSOLE_HAS_METHOD (gtk, initialize_frame_toolbars); |
| 67 CONSOLE_HAS_METHOD (gtk, free_frame_toolbars); | |
| 68 CONSOLE_HAS_METHOD (gtk, output_toolbar_button); | |
| 69 CONSOLE_HAS_METHOD (gtk, redraw_exposed_toolbars); | |
| 70 CONSOLE_HAS_METHOD (gtk, redraw_frame_toolbars); | |
| 71 } |