emacs: src/nsterm.m comparison

comparison src/nsterm.m @ 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	fd15717d12c3
children	c32306216562

comparison

equal deleted inserted replaced

-:d98a233b0396
+:cfaf6934d659
 /* ==========================================================================
 Local declarations
 ========================================================================== */
-/* Special keycodes that we pass down the event chain */
-#define KEY_NS_POWER_OFF               ((1<<28)|(0<<16)|1)
-#define KEY_NS_OPEN_FILE               ((1<<28)|(0<<16)|2)
-#define KEY_NS_OPEN_TEMP_FILE          ((1<<28)|(0<<16)|3)
-#define KEY_NS_DRAG_FILE               ((1<<28)|(0<<16)|4)
-#define KEY_NS_DRAG_COLOR              ((1<<28)|(0<<16)|5)
-#define KEY_NS_DRAG_TEXT               ((1<<28)|(0<<16)|6)
-#define KEY_NS_CHANGE_FONT             ((1<<28)|(0<<16)|7)
-#define KEY_NS_OPEN_FILE_LINE          ((1<<28)|(0<<16)|8)
-#define KEY_NS_INSERT_WORKING_TEXT     ((1<<28)|(0<<16)|9)
-#define KEY_NS_DELETE_WORKING_TEXT     ((1<<28)|(0<<16)|10)
-#define KEY_NS_SPI_SERVICE_CALL        ((1<<28)|(0<<16)|11)
-#define KEY_NS_NEW_FRAME               ((1<<28)|(0<<16)|12)
 /* Convert a symbol indexed with an NSxxx value to a value as defined
 in keyboard.c (lispy_function_key). I hope this is a correct way
 of doing things... */
 static unsigned convert_ns_to_X_keysym[] =
 -------------------------------------------------------------------------- */
 {
 int type = [theEvent type];
 NSWindow *window = [theEvent window];
 /*  NSTRACE (sendEvent); */
-/*fprintf (stderr, "received event of type %d\n", [theEvent type]); */
+/*fprintf (stderr, "received event of type %d\t%d\n", type);*/
 if (type == NSCursorUpdate && window == nil)
 {
 fprintf (stderr, "Dropping external cursor update event.\n");
 return;
 [NSApp setServicesProvider: NSApp];
 ns_send_appdefined (-2);
 }
+/* Termination sequences (ns_shutdown_properly):
+C-x C-c:
+Cmd-Q:
+MenuBar | File | Exit:
+ns_term_shutdown: 0
+received -terminate: 1
+received -appShouldTerminate: 1
+Select Quit from App menubar:
+received -terminate: 0
+ns_term_shutdown: 0
+received -terminate: 1
+received -appShouldTerminate: 1
+Select Quit from Dock menu:
+Logout attempt:
+received -appShouldTerminate: 0
+Cancel -> Nothing else
+Accept ->
+received -terminate: 0
+ns_term_shutdown: 0
+received -terminate: 1
+received -appShouldTerminate: 1
+*/
 - (void) terminate: (id)sender
 {
-BLOCK_INPUT;
 if (ns_shutdown_properly)
 [super terminate: sender];
 else
 {
-/*    Fkill_emacs (Qnil); */
+struct frame *emacsframe = SELECTED_FRAME ();
+if (!emacs_event)
+return;
 ns_shutdown_properly = YES;
-Feval (Fcons (intern ("save-buffers-kill-emacs"), Qnil));
+emacs_event->kind = NON_ASCII_KEYSTROKE_EVENT;
-}
+emacs_event->code = KEY_NS_POWER_OFF;
-UNBLOCK_INPUT;
+EV_TRAILER ((id)nil);
+}
 }
 - (NSApplicationTerminateReply)applicationShouldTerminate: (id)sender
 {
+int ret;
 if (ns_shutdown_properly)
 return NSTerminateNow;
-Lisp_Object contents = list3 (build_string ("Exit requested.  Would you like to Save Buffers and Exit, or Cancel the request?"),
+/* XXX: This while() loop is needed because if the user switches to another
-Fcons (build_string ("Cancel"), Qnil),
+application while the panel is up, it is taken down w/a return value
-Fcons (build_string ("Save and Exit"), Qt));
+of -1000, and the event queue gets messed up.  In this case resend
-Lisp_Object res = ns_popup_dialog (Qt, contents, Qnil);
+the appdefined and put up the window again. */
-fprintf (stderr, "res = %d\n", EQ (res, Qt)); /* FIXME */
+while (1) {
-if (EQ (res, Qt))
+ret = NSRunAlertPanel([[NSProcessInfo processInfo] processName],
-{
+[NSString stringWithUTF8String:"Exit requested.  Would you like to Save Buffers and Exit, or Cancel the request?"],
-Feval (Fcons (intern ("save-buffers-kill-emacs"), Qnil));
+@"Save Buffers and Exit", @"Cancel", nil);
-return NSTerminateNow;
-}
+if (ret == NSAlertDefaultReturn)
-return NSTerminateCancel;
+{
+send_appdefined = YES;
+ns_send_appdefined(-1);
+return NSTerminateNow;
+}
+else if (ret == NSAlertAlternateReturn)
+{
+send_appdefined = YES;
+ns_send_appdefined(-1);
+return NSTerminateCancel;
+}
+}
 }
 /*   Notification from the Workspace to open a file */
 - (BOOL)application: sender openFile: (NSString *)file
 /* <NSTextInput> implementation (called through super interpretKeyEvents:]). */
-/* <NSTextInput>: called through when done composing */
+/* <NSTextInput>: called when done composing;
+NOTE: also called when we delete over working text, followed immed.
+by doCommandBySelector: deleteBackward: */
 - (void)insertText: (id)aString
 {
 int code;
 int len = [(NSString *)aString length];
 int i;
 processingCompose = YES;
 workingText = [str copy];
 ns_working_text = build_string ([workingText UTF8String]);
-/* if in "echo area", not true minibuffer, can't show chars in interactive
+emacs_event->kind = NS_TEXT_EVENT;
-mode, so call using eval; otherwise we send a key event, which was the
+emacs_event->code = KEY_NS_PUT_WORKING_TEXT;
-original way this was done */
+EV_TRAILER ((id)nil);
-if (!EQ (Feval (Fcons (intern ("ns-in-echo-area"), Qnil)), Qnil))
-{
-Feval (Fcons (intern ("ns-echo-working-text"), Qnil));
-ns_send_appdefined (-1);
-}
-else
-{
-emacs_event->kind = NON_ASCII_KEYSTROKE_EVENT;
-emacs_event->code = KEY_NS_INSERT_WORKING_TEXT;
-EV_TRAILER ((id)nil);
-}
 }
 /* delete display of composing characters [not in <NSTextInput>] */
 - (void)deleteWorkingText
 {
 if (workingText == nil)
 return;
 if (NS_KEYLOG)
-fprintf (stderr, "deleteWorkingText len =%d\n", [workingText length]);
+NSLog(@"deleteWorkingText len =%d\n", [workingText length]);
 [workingText release];
 workingText = nil;
 processingCompose = NO;
 if (!emacs_event)
 return;
-if (!EQ (Feval (Fcons (intern ("ns-in-echo-area"), Qnil)), Qnil))
+emacs_event->kind = NS_TEXT_EVENT;
-{
+emacs_event->code = KEY_NS_UNPUT_WORKING_TEXT;
-Feval (Fcons (intern ("ns-unecho-working-text"), Qnil));
+EV_TRAILER ((id)nil);
-ns_send_appdefined (-1);
+}
-}
-else
-{
-emacs_event->kind = NON_ASCII_KEYSTROKE_EVENT;
-emacs_event->code = KEY_NS_DELETE_WORKING_TEXT;
-EV_TRAILER ((id)nil);
-}
-}
 - (BOOL)hasMarkedText
 {
 return workingText != nil;
 }
 - (NSRange)markedRange
 {
 NSRange rng = workingText != nil
 ? NSMakeRange (0, [workingText length]) : NSMakeRange (NSNotFound, 0);
 if (NS_KEYLOG)
 NSLog (@"markedRange request");
 return rng;
 }
 - (void)unmarkText
 {
 if (NS_KEYLOG)
 NSLog (@"unmark (accept) text");
 [self deleteWorkingText];
 processingCompose = NO;
 }
 /* used to position char selection windows, etc. */
 - (NSRect)firstRectForCharacterRange: (NSRange)theRange
 {
 NSRect rect;
 pt = [[self window] convertBaseToScreen: pt];
 rect.origin = pt;
 return rect;
 }
 - (NSInteger)conversationIdentifier
 {
 return (NSInteger)self;
 }
-/* TODO: below here not yet implemented correctly, but may not be needed */
 - (void)doCommandBySelector: (SEL)aSelector
 {
 if (NS_KEYLOG)
 NSLog (@"doCommandBySelector: %@", NSStringFromSelector (aSelector));
 if (!emacs_event)
 return self;
 /* send first event (for some reason two needed) */
-theEvent =[[self window] currentEvent];
+theEvent = [[self window] currentEvent];
 emacs_event->kind = TOOL_BAR_EVENT;
 XSETFRAME (emacs_event->arg, emacsframe);
 EV_TRAILER (theEvent);
 emacs_event->kind = TOOL_BAR_EVENT;
 }
 - toggleToolbar: (id)sender
 {
-Lisp_Object lispFrame;
+if (!emacs_event)
-XSETFRAME (lispFrame, emacsframe);
+return self;
-Feval (Fcons (intern ("ns-toggle-toolbar"), Fcons (lispFrame, Qnil)));
-SET_FRAME_GARBAGED (emacsframe);
+emacs_event->kind = NON_ASCII_KEYSTROKE_EVENT;
-ns_send_appdefined (-1);
+emacs_event->code = KEY_NS_TOGGLE_TOOLBAR;
+EV_TRAILER ((id)nil);
+return self;
 }
 - (void)drawRect: (NSRect)rect
 {
 }
 - (IBAction)runHelp: (id)sender
 {
-Feval (Fcons (intern ("info"),
+struct frame *emacsframe = frame;
-Fcons (build_string ("(emacs)Mac / GNUstep Customization"),
+if (!emacs_event)
-Qnil)));
+return;
-SET_FRAME_GARBAGED (frame);
+ns_raise_frame(frame);
-ns_send_appdefined (-1);
+emacs_event->kind = NON_ASCII_KEYSTROKE_EVENT;
+emacs_event->code = KEY_NS_INFO_PREFS;
+EV_TRAILER ((id)nil);
 }
 - (IBAction)setColors: (id)sender
 {

Mercurial > emacs

comparison src/nsterm.m @ 101490:cfaf6934d659