Mercurial > emacs
diff src/termhooks.h @ 101490:cfaf6934d659
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.
| author | Adrian Robert <Adrian.B.Robert@gmail.com> |
|---|---|
| date | Sun, 25 Jan 2009 19:43:31 +0000 |
| parents | e038c1a8307c |
| children | 23b9944ae977 |
line wrap: on
line diff
--- a/src/termhooks.h Sun Jan 25 19:40:51 2009 +0000 +++ b/src/termhooks.h Sun Jan 25 19:43:31 2009 +0000 @@ -198,6 +198,13 @@ 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
