emacs: src/macmenu.c comparison

comparison src/macmenu.c @ 81560:3ce0ebdd2017

(mac_dialog_modal_filter, Fx_popup_dialog) [MAC_OSX]: Put special treatment for Fmessage_box, Fyes_or_no_p, and Fy_or_n_p in #if 0 as it is not compatible with y-or-n-p-with-timeout. (timer_check) [TARGET_API_MAC_CARBON]: Add extern. [TARGET_API_MAC_CARBON] (mac_handle_dialog_event): Use QuitEventLoop instead of QuitAppModalLoopForWindow. Consolidate QuitEventLoop calls. (pop_down_dialog) [TARGET_API_MAC_CARBON]: New function. [TARGET_API_MAC_CARBON] (create_and_show_dialog): Use it for unwind. Run timers during dialog popup. (Fmenu_or_popup_active_p) [TARGET_API_MAC_CARBON]: Use popup_activated.

author	YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
date	Fri, 22 Jun 2007 09:05:35 +0000
parents	ffe8cf8ef14e
children	b98604865ea0 0ece58f6e0aa 988f1edc9674

comparison

equal deleted inserted replaced

-:0e17f76d05e4
+:3ce0ebdd2017
 #ifdef HAVE_MENUS
 /* Regard ESC and C-g as Cancel even without the Cancel button.  */
-#ifdef MAC_OSX
+#if 0 /* defined (MAC_OSX) */
 static Boolean
 mac_dialog_modal_filter (dialog, event, item_hit)
 DialogRef dialog;
 EventRecord *event;
 DialogItemIndex *item_hit;
 else
 /* ??? Not really clean; should be CHECK_WINDOW_OR_FRAME,
 but I don't want to make one now.  */
 CHECK_WINDOW (window);
-#ifdef MAC_OSX
+#if 0 /* defined (MAC_OSX) */
 /* Special treatment for Fmessage_box, Fyes_or_no_p, and Fy_or_n_p.  */
 if (EQ (position, Qt)
 && STRINGP (Fcar (contents))
 && ((!NILP (Fequal (XCDR (contents),
 			  Fcons (Fcons (build_string ("OK"), Qt), Qnil)))
 #define DIALOG_BUTTON_COMMAND_ID_VALUE(id)	\
 ((id) - DIALOG_BUTTON_COMMAND_ID_OFFSET)
 #define DIALOG_BUTTON_MAKE_COMMAND_ID(value)	\
 ((value) + DIALOG_BUTTON_COMMAND_ID_OFFSET)
+extern EMACS_TIME timer_check P_ ((int));
 static pascal OSStatus
 mac_handle_dialog_event (next_handler, event, data)
 EventHandlerCallRef next_handler;
 EventRef event;
 void *data;
 {
-OSStatus err;
+OSStatus err, result = eventNotHandledErr;
 WindowRef window = (WindowRef) data;
+int quit_event_loop_p = 0;
 switch (GetEventClass (event))
 {
 case kEventClassCommand:
 {
 				 NULL, &command);
 	if (err == noErr)
 	  if (DIALOG_BUTTON_COMMAND_ID_P (command.commandID))
 	    {
 	      SetWRefCon (window, command.commandID);
-	      err = QuitAppModalLoopForWindow (window);
+	      quit_event_loop_p = 1;
+	      break;
-	      return err == noErr ? noErr : eventNotHandledErr;
+	    }
-	    }
+	result = CallNextEventHandler (next_handler, event);
-	return CallNextEventHandler (next_handler, event);
 }
 break;
 case kEventClassKeyboard:
 {
 	OSStatus result;
 	char char_code;
 	result = CallNextEventHandler (next_handler, event);
-	if (result == noErr)
+	if (result != eventNotHandledErr)
-	  return noErr;
+	  break;
 	err = GetEventParameter (event, kEventParamKeyMacCharCodes,
 				 typeChar, NULL, sizeof (char),
 				 NULL, &char_code);
 	if (err == noErr)
 	  switch (char_code)
 	    {
 	    case kEscapeCharCode:
-	      err = QuitAppModalLoopForWindow (window);
+	      quit_event_loop_p = 1;
 	      break;
 	    default:
 	      {
 		UInt32 modifiers, key_code;
 		if (err == noErr)
 		  err = GetEventParameter (event, kEventParamKeyCode,
 					   typeUInt32, NULL, sizeof (UInt32),
 					   NULL, &key_code);
 		if (err == noErr)
-		  {
+		  if (mac_quit_char_key_p (modifiers, key_code))
-		    if (mac_quit_char_key_p (modifiers, key_code))
+		    quit_event_loop_p = 1;
-		      err = QuitAppModalLoopForWindow (window);
-		    else
-		      err = eventNotHandledErr;
-		  }
 	      }
 	      break;
 	    }
-	if (err == noErr)
-	  result = noErr;
-	return result;
 }
 break;
 default:
 abort ();
 }
+if (quit_event_loop_p)
+{
+err = QuitEventLoop (GetCurrentEventLoop ());
+if (err == noErr)
+	result = noErr;
+}
+return result;
 }
 static OSStatus
 install_dialog_event_handler (window)
 WindowRef window;
 #define DIALOG_ICON_WIDTH (64)
 #define DIALOG_ICON_HEIGHT (64)
 #define DIALOG_ICON_LEFT_MARGIN (24)
 #define DIALOG_ICON_TOP_MARGIN (15)
+static Lisp_Object
+pop_down_dialog (arg)
+Lisp_Object arg;
+{
+struct Lisp_Save_Value *p = XSAVE_VALUE (arg);
+WindowRef window = p->pointer;
+BLOCK_INPUT;
+if (popup_activated_flag)
+EndAppModalStateForWindow (window);
+DisposeWindow (window);
+popup_activated_flag = 0;
+UNBLOCK_INPUT;
+return Qnil;
+}
 static int
 create_and_show_dialog (f, first_wv)
 FRAME_PTR f;
 widget_value *first_wv;
 {
 widget_value *wv;
 short buttons_height, text_height, inner_width, inner_height;
 Rect empty_rect, *rects;
 WindowRef window = NULL;
 ControlRef *buttons, default_button = NULL, text;
+int specpdl_count = SPECPDL_INDEX ();
 dialog_name = first_wv->name;
 nb_buttons = dialog_name[1] - '0';
 first_group_count = nb_buttons - (dialog_name[4] - '0');
 /* Create dialog window.  */
 err = CreateNewWindow (kMovableModalWindowClass,
 			 kWindowStandardHandlerAttribute,
 			 &empty_rect, &window);
 if (err == noErr)
-err = SetThemeWindowBackground (window, kThemeBrushMovableModalBackground,
+{
-				    true);
+record_unwind_protect (pop_down_dialog, make_save_value (window, 0));
+err = SetThemeWindowBackground (window, kThemeBrushMovableModalBackground,
+				      true);
+}
 if (err == noErr)
 err = SetWindowTitleWithCFString (window, (dialog_name[0] == 'Q'
 					       ? CFSTR ("Question")
 					       : CFSTR ("Information")));
 if (err == noErr)
 {
 SetWRefCon (window, 0);
 ShowWindow (window);
 BringToFront (window);
-err = RunAppModalLoopForWindow (window);
+popup_activated_flag = 1;
+err = BeginAppModalStateForWindow (window);
+}
+if (err == noErr)
+{
+EventTargetRef toolbox_dispatcher = GetEventDispatcherTarget ();
+while (1)
+	{
+	  EMACS_TIME next_time = timer_check (1);
+	  long secs = EMACS_SECS (next_time);
+	  long usecs = EMACS_USECS (next_time);
+	  EventTimeout timeout;
+	  EventRef event;
+	  if (secs < 0 || (secs == 0 && usecs == 0))
+	    {
+	      /* Sometimes timer_check returns -1 (no timers) even if
+		 there are timers.  So do a timeout anyway.  */
+	      secs = 1;
+	      usecs = 0;
+	    }
+	  timeout = (secs * kEventDurationSecond
+		     + usecs * kEventDurationMicrosecond);
+	  err = ReceiveNextEvent (0, NULL, timeout, kEventRemoveFromQueue,
+				  &event);
+	  if (err == noErr)
+	    {
+	      SendEventToEventTarget (event, toolbox_dispatcher);
+	      ReleaseEvent (event);
+	    }
+	  else if (err != eventLoopTimedOutErr)
+	    {
+	      if (err == eventLoopQuitErr)
+		err = noErr;
+	      break;
+	    }
+	}
 }
 if (err == noErr)
 {
 UInt32 command_id = GetWRefCon (window);
 if (DIALOG_BUTTON_COMMAND_ID_P (command_id))
 	result = DIALOG_BUTTON_COMMAND_ID_VALUE (command_id);
 }
-if (window)
+unbind_to (specpdl_count, Qnil);
-DisposeWindow (window);
 return result;
 }
 #else  /* not TARGET_API_MAC_CARBON */
 static int
 DEFUN ("menu-or-popup-active-p", Fmenu_or_popup_active_p, Smenu_or_popup_active_p, 0, 0, 0,
 doc: /* Return t if a menu or popup dialog is active.  */)
 ()
 {
+#if TARGET_API_MAC_CARBON
+return (popup_activated ()) ? Qt : Qnil;
+#else
 /* Always return Qnil since menu selection functions do not return
 until a selection has been made or cancelled.  */
 return Qnil;
+#endif
 }
 void
 syms_of_macmenu ()
 {

Mercurial > emacs

comparison src/macmenu.c @ 81560:3ce0ebdd2017