(install_window_handler, mac_handle_window_event)

[USE_CARBON_EVENTS]: Handle kEventWindowClose.
[USE_MAC_TSM] (mac_handle_text_input_event): Set modifiers for
ASCII keystroke event.

diff --git a/src/ChangeLog b/src/ChangeLog
index e21593fbd45f5c6c06aaeb5245414e732d17b6d2..d5f766025be2090554c34c1fcd2f2b546cefa11d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2006-09-05  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * macterm.c (install_window_handler, mac_handle_window_event)
+       [USE_CARBON_EVENTS]: Handle kEventWindowClose.
+       [USE_MAC_TSM] (mac_handle_text_input_event): Set modifiers for
+       ASCII keystroke event.
+
 2006-09-04  Jan Dj\e,Ad\e(Brv  <jan.h.d@swipnet.se>
 
        * gtkutil.c (xg_get_file_with_chooser): Don't mention specific keys in

diff --git a/src/macterm.c b/src/macterm.c
index a5369eb16675f8b9e4d03a75705f63f823b2d3a4..90ef7a2774afdcba7e24d39f93f82bc2b3cd2d46 100644 (file)
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -9486,6 +9486,18 @@ mac_handle_window_event (next_handler, event, data)
 
       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 @@ mac_handle_text_input_event (next_handler, event, data)
                        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 @@ install_window_handler (window)
      {kEventClassWindow, kEventWindowHidden},
      {kEventClassWindow, kEventWindowExpanded},
      {kEventClassWindow, kEventWindowCollapsed},
+     {kEventClassWindow, kEventWindowClose},
 #ifdef MAC_OSX
      {kEventClassWindow, kEventWindowToolbarSwitchMode},
 #endif