Dock menu customization, based on a patch by Ken Raeburn, plus some other fixes.

5 files changed, 51 insertions, 8 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4b157961e80..ed88f0c45d2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,20 @@
+2008-08-04  Adrian Robert  <Adrian.B.Robert@gmail.com>
+
+        Dock menu customization, based on a patch by Ken Raeburn, plus some
+        other fixes.
+        * nsmenu.m (dockMenu): New variable.
+        (EmacsDialog -clicked:): Fix mistake in change of 2008-07-17.
+
+        * nsterm.h (dockMenu): Declare.
+
+        * nsterm.m (KEY_NS_NEW_FRAME): New definition.
+        (ns_term_init): Initialize dockMenu.
+        (EmacsApp -newFrame:, -applicationDockMenu:): New methods.
+        (EmacsView -windowShouldClose:): Don't behave specially if <= 1 frame
+        left.
+
+        * lisp.h (LSB_TAG): Use on DARWIN_OS, not NS_IMPL_COCOA.
+
 2008-08-04  Chong Yidong  <cyd@stupidchicken.com>
 
         * nsterm.h: Test directly for NS_HAVE_INTEGER before defining it.
@@ -30,7 +47,7 @@
         when popup done.
         (ns_popup_dialog): Set popup_activated_flag.
 
-        * nsterm.m (EmacsView -converstationIdentifier): Use NSInteger
+        * nsterm.m (EmacsView -conversationIdentifier): Use NSInteger
         version for GNUstep (handled by conditional typedef in nsterm.m).
         (ns_get_color): Remove special-casing for "darkblue", "dark blue" (now
         in rgb.txt).
diff --git a/src/lisp.h b/src/lisp.h
index 0e9c8b7c799..d013a04553e 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -157,7 +157,7 @@ extern void die P_((const char *, const char *, int)) NO_RETURN;
 #endif
 
 /* Let's USE_LSB_TAG on systems where we know malloc returns mult-of-8.  */
-#if defined GNU_MALLOC || defined DOUG_LEA_MALLOC || defined __GLIBC__ || defined(NS_IMPL_COCOA)
+#if defined GNU_MALLOC || defined DOUG_LEA_MALLOC || defined __GLIBC__ || defined DARWIN_OS
 /* We also need to be able to specify mult-of-8 alignment on static vars.  */
 # if defined DECL_ALIGN
 /* We currently do not support USE_LSB_TAG with a union Lisp_Object.  */
diff --git a/src/nsmenu.m b/src/nsmenu.m
index b4e8dbc9143..825568f6557 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -63,7 +63,7 @@ extern Lisp_Object Voverriding_local_map, Voverriding_local_map_menu_flag,
                    Qoverriding_local_map, Qoverriding_terminal_local_map;
 
 extern long context_menu_value;
-EmacsMenu *mainMenu, *svcsMenu;
+EmacsMenu *mainMenu, *svcsMenu, *dockMenu;
 
 /* Nonzero means a menu is currently active.  */
 static int popup_activated_flag;
@@ -1747,7 +1747,7 @@ void process_dialog (id window, Lisp_Object list)
     return self;
 
   seltag = [[sellist objectAtIndex: 0] tag];
-  if (seltag == XHASH (Qundefined)) // FIXME: BIG UGLY HACK!!
+  if (seltag != XHASH (Qundefined)) // FIXME: BIG UGLY HACK!!
     [NSApp stopModalWithCode: seltag];
   return self;
 }
diff --git a/src/nsterm.h b/src/nsterm.h
index f0b15b7cdc9..c479b333fd1 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -355,7 +355,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 @end
 
 extern NSArray *ns_send_types, *ns_return_types;
-extern EmacsMenu *mainMenu, *svcsMenu;
+extern EmacsMenu *mainMenu, *svcsMenu, *dockMenu;
 
 /* Apple removed the declaration, but kept the implementation */
 #if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_4
diff --git a/src/nsterm.m b/src/nsterm.m
index fd3757be557..3fb9905e4b7 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -78,6 +78,7 @@ int term_trace_num = 0;
 #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
@@ -3880,6 +3881,7 @@ ns_term_init (Lisp_Object display_name)
     appMenu = [[EmacsMenu alloc] initWithTitle: @"Emacs"];
     [appMenu setAutoenablesItems: NO];
     mainMenu = [[EmacsMenu alloc] initWithTitle: @""];
+    dockMenu = [[EmacsMenu alloc] initWithTitle: @""];
 
     [appMenu insertItemWithTitle: @"About Emacs"
                           action: @selector (orderFrontStandardAboutPanel:)
@@ -3918,6 +3920,10 @@ ns_term_init (Lisp_Object display_name)
                            keyEquivalent: @""
                                  atIndex: 0];
     [mainMenu setSubmenu: appMenu forItem: item];
+    [dockMenu insertItemWithTitle: @"New Frame"
+                           action: @selector (newFrame:)
+                    keyEquivalent: @""
+                          atIndex: 0];
 
     [NSApp setMainMenu: mainMenu];
     [NSApp setAppleMenu: appMenu];
@@ -4026,6 +4032,20 @@ ns_term_shutdown (int sig)
 }
 
 
+- (void)newFrame: (id)sender
+{
+  struct frame *emacsframe = SELECTED_FRAME ();
+  NSEvent *theEvent = [NSApp currentEvent];
+
+  if (!emacs_event)
+    return;
+  emacs_event->kind = NON_ASCII_KEYSTROKE_EVENT;
+  emacs_event->code = KEY_NS_NEW_FRAME;
+  emacs_event->modifiers = 0;
+  EV_TRAILER (theEvent);
+}
+
+
 /* Open a file (used by below, after going into queue read by ns_read_socket) */
 - (BOOL) openFile: (NSString *)fileName
 {
@@ -4137,6 +4157,14 @@ fprintf (stderr, "res = %d\n", EQ (res, Qt)); /* FIXME */
 
 }
 
+
+/* Handle dock menu requests.  */
+- (NSMenu *)applicationDockMenu: (NSApplication *) sender
+{
+  return dockMenu;
+}
+
+
 /* TODO: these may help w/IO switching btwn terminal and NSApp */
 - (void)applicationDidBecomeActive: (NSNotification *)notification
 {
@@ -4834,8 +4862,6 @@ if (NS_KEYLOG) NSLog (@"attributedSubstringFromRange request");
 
   NSTRACE (windowShouldClose);
   windowClosing = YES;
-  if (ns_window_num <= 1)
-    return NO;
   if (!emacs_event)
     return NO;
   emacs_event->kind = DELETE_WINDOW_EVENT;
@@ -4943,7 +4969,7 @@ if (NS_KEYLOG) NSLog (@"attributedSubstringFromRange request");
 
   ns_send_appdefined (-1);
 
-  /* The following line causes a crash on GNUstep.  Adrian Roberts
+  /* The following line causes a crash on GNUstep.  Adrian Robert
      says he doesn't remember why he added this line, but removing it
      doesn't seem to cause problems on OSX, either.  */
 #if 0