From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Tue, 5 Sep 2006 01:03:33 +0000 (+0000)
Subject: (install_window_handler, mac_handle_window_event)
X-Git-Tag: emacs-pretest-22.0.90~763
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=750a6cf4b21da81c1b451b8f4dc898127954c133;p=emacs.git

(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 e21593fbd45..d5f766025be 100644
--- 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,Ad(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 a5369eb1667..90ef7a2774a 100644
--- 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