diff options
| author | Adrian Robert <Adrian.B.Robert@gmail.com> | 2009-01-25 19:43:31 +0000 |
|---|---|---|
| committer | Adrian Robert <Adrian.B.Robert@gmail.com> | 2009-01-25 19:43:31 +0000 |
| commit | 8612b71a44b34519fe1b047a9f1d6f6b1431d411 (patch) | |
| tree | cc7567046437fef05a5f60a93518c8c8a2b49bcc /src/termhooks.h | |
| parent | 0cb6149297b30250a6dc460ecb700a96bf576ea9 (diff) | |
| download | emacs-8612b71a44b34519fe1b047a9f1d6f6b1431d411.tar.gz | |
Changes to remove Feval calls from GUI under NS.
* nsterm.h: Move KEY_NS_... definitions here from nsterm.m. Add
NS_TOGGLE_TOOLBAR, NS_PUT_WORKING_TEXT, NS_UNPUT_WORKING_TEXT.
Remove NS_INSERT_WORKING_TEXT, NS_DELETE_WORKING_TEXT.
* nsterm.m: Move KEY_NS_... definitions to nsterm.h.
(EmacsView-toggleToolbar:): Use KEY_NS_TOGGLE_TOOLBAR.
(EmacsView-setMarkedText:,-deleteWorkingText:): Use NS_TEXT_EVENT
instead of NON_ASCII_KEYSTROKE_EVENT.
(EmacsApp-terminate:): Use KEY_NS_POWER_OFF instead of Feval.
(EmacsApp-applicationShouldTerminate:): Query user.
(EmacsPreferencesController-runHelp:): Use KEY_NS_INFO_PREFS
instead of Feval.
* termhooks.h (NS_TEXT_EVENT): New event type under HAVE_NS.
* keyboard.c (kbd_buffer_get_event): Check for it.
(keys_of_keyboard): Define lispy keys for
ns-put/unput-working-text.
* nsmenu.m (ns_popup_dialog): Resync window setting with X and W32
versions.
(EmacsDialog-runDialogAt:): Use NSModalPanelRunLoopMode.
Diffstat (limited to 'src/termhooks.h')
| -rw-r--r-- | src/termhooks.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/termhooks.h b/src/termhooks.h index ed15b0f71cf..5dedd487a2a 100644 --- a/src/termhooks.h +++ b/src/termhooks.h @@ -198,6 +198,13 @@ enum event_kind first, so this is not a problem there. */ , MULTIMEDIA_KEY_EVENT #endif + +#ifdef HAVE_NS + /* Generated when native multi-keystroke input method is used to modify + tentative or indicative text display. */ + , NS_TEXT_EVENT +#endif + }; /* If a struct input_event has a kind which is SELECTION_REQUEST_EVENT |