2002-12-02 Andrew Choi <akochoi@shaw.ca>

        * macmenu.c (add_menu_item, fill_menubar): Truncate menu item
        names to 255 characters.

        * macterm.c (XTread_socket): If all frames have been collapsed,
        expand the first one before handling drag-and-drop events.

        * s/darwin.h (GETPGRP_NO_ARG): Delete.  Replaced by GETPGRP_VOID,
        which is detected by autoconf.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3275ca3759db3e69b58b6a617a4a92a8cb1da3b4..5b4eed74cf6e2917f41b66c1944ece3c5fae63b2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,14 @@
+2002-12-02  Andrew Choi  <akochoi@shaw.ca>
+
+       * macmenu.c (add_menu_item, fill_menubar): Truncate menu item
+       names to 255 characters.
+
+       * macterm.c (XTread_socket): If all frames have been collapsed,
+       expand the first one before handling drag-and-drop events.
+
+       * s/darwin.h (GETPGRP_NO_ARG): Delete.  Replaced by GETPGRP_VOID,
+       which is detected by autoconf.
+
 2002-12-01  Steven Tamm  <steventamm@mac.com>
 
        * unexmacosx.c (copy_twolevelhints, dump_it):  Now corrects the

diff --git a/src/macmenu.c b/src/macmenu.c
index 128235c027b3a07884c3e9785770b62343ac8693..05424ead2fa728889183fbdc5d92767c0ef0e560 100644 (file)
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -2226,13 +2226,14 @@ add_menu_item (MenuHandle menu, widget_value *wv, int submenu, int indent,
 
       strcpy (item_name, "");
       for (i = 0; i < indent; i++)
-        strcat (item_name, "    ");
-      strcat (item_name, wv->name);
+       strncat (item_name, "    ", 255);
+      strncat (item_name, wv->name, 255);
       if (wv->key != NULL)
        {
-         strcat (item_name, " ");
-         strcat (item_name, wv->key);
+         strncat (item_name, " ", 255);
+         strncat (item_name, wv->key, 255);
        }
+      item_name[255] = 0;
       c2pstr (item_name);
       SetMenuItemText (menu, pos, item_name);
 
@@ -2316,7 +2317,8 @@ fill_menubar (widget_value *wv)
       MenuHandle menu;
       Str255 title;
         
-      strcpy (title, wv->name);
+      strncpy (title, wv->name, 255);
+      title[255] = 0;
       c2pstr (title);
       menu = NewMenu (id, title);
 

diff --git a/src/macterm.c b/src/macterm.c
index 2646b28618dd88c7949f6b7e6df7fbd7b1ba784d..a0997c4e061de64d60541056a8f63583fa18e410 100644 (file)
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -13046,6 +13046,14 @@ XTread_socket (int sd, struct input_event *bufp, int numchars, int expected)
             Lisp_Object frame;
 
             wp = FrontNonFloatingWindow ();
+           
+           if (!wp)
+             {
+               struct frame *f = XFRAME (XCAR (Vframe_list));
+               CollapseWindow (FRAME_MAC_WINDOW (f), false);
+               wp = FrontNonFloatingWindow ();
+             }
+
             if (wp && is_emacs_window(wp))
                f = ((mac_output *) GetWRefCon (wp))->mFP;            
 

diff --git a/src/s/darwin.h b/src/s/darwin.h
index b5a358549da91ad28ee3674c4f3acb996b1c9616..21b11d9554a7d8a2a2d66ee28cff6cb258cc471d 100644 (file)
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -209,9 +209,6 @@ Boston, MA 02111-1307, USA.  */
 /* Used in dispnew.c.  Copied from freebsd.h. */
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
 
-/* Darwin provides POSIX-style getpgrp.  */
-#define GETPGRP_NO_ARG
-
 /* System uses OXTABS instead of the expected TAB3.  (Copied from
    bsd386.h.)  */
 #define TAB3 OXTABS