From 8612b71a44b34519fe1b047a9f1d6f6b1431d411 Mon Sep 17 00:00:00 2001 From: Adrian Robert Date: Sun, 25 Jan 2009 19:43:31 +0000 Subject: 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. --- src/termhooks.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/termhooks.h') 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 -- cgit v1.2.1