[Emacs-diffs] Changes to emacs/src/macterm.c,v

[YAMAMOTO Mitsuharu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     YAMAMOTO Mitsuharu <mituharu>   06/09/05 01:03:09

Index: macterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/macterm.c,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -b -r1.186 -r1.187
--- macterm.c   27 Aug 2006 07:09:52 -0000      1.186
+++ macterm.c   5 Sep 2006 01:03:09 -0000       1.187
@@ -9486,6 +9486,18 @@
 
       break;
 
+    case kEventWindowClose:
+      {
+       struct input_event buf;
+
+       EVENT_INIT (buf);
+       buf.kind = DELETE_WINDOW_EVENT;
+       XSETFRAME (buf.frame_or_window, mac_window_to_frame (wp));
+       buf.arg = Qnil;
+       kbd_buffer_store_event (&buf);
+      }
+      return noErr;
+
 #ifdef MAC_OSX
     case kEventWindowToolbarSwitchMode:
       result = CallNextEventHandler (next_handler, event);
@@ -9775,6 +9787,8 @@
                        read_socket_inev->kind = ASCII_KEYSTROKE_EVENT;
                        read_socket_inev->code = code;
                        read_socket_inev->modifiers =
+                         mac_to_emacs_modifiers (modifiers);
+                       read_socket_inev->modifiers |=
                          (extra_keyboard_modifiers
                           & (meta_modifier | alt_modifier
                              | hyper_modifier | super_modifier));
@@ -9899,6 +9913,7 @@
      {kEventClassWindow, kEventWindowHidden},
      {kEventClassWindow, kEventWindowExpanded},
      {kEventClassWindow, kEventWindowCollapsed},
+     {kEventClassWindow, kEventWindowClose},
 #ifdef MAC_OSX
      {kEventClassWindow, kEventWindowToolbarSwitchMode},
 #endif