emacs: src/macterm.c comparison

comparison src/macterm.c @ 83164:e8df1878cfd1

Merged in changes from CVS trunk. Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-427 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-428 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-429 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-430 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-431 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-432 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-433 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-434 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-435 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-436 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-204

author	Karoly Lorentey <lorentey@elte.hu>
date	Sat, 03 Jul 2004 17:01:39 +0000
parents	dbcd0af66869 3d525d0266de
children	09bbf2fc80da

comparison

equal deleted inserted replaced

-:8e4ea1e2c254
+:e8df1878cfd1
 mac_get_emulated_btn ( UInt32 modifiers )
 {
 int result = 0;
 if (!NILP (Vmac_emulate_three_button_mouse)) {
 int cmdIs3 = !EQ (Vmac_emulate_three_button_mouse, Qreverse);
-if (modifiers & controlKey)
+if (modifiers & cmdKey)
 result = cmdIs3 ? 2 : 1;
 else if (modifiers & optionKey)
 result = cmdIs3 ? 1 : 2;
 }
 return result;
 GetEventParameter (eventRef, kEventParamKeyModifiers, typeUInt32, NULL,
 		    sizeof (UInt32), NULL, &mods);
 if (!NILP (Vmac_emulate_three_button_mouse) &&
 GetEventClass(eventRef) == kEventClassMouse)
 {
-mods &= ~(optionKey & cmdKey);
+mods &= ~(optionKey | cmdKey);
 }
 return mac_to_emacs_modifiers (mods);
 }
 /* Given an event ref, return the code to use for the mouse button
 if (FRAME_MAC_P (XFRAME (frame)))
 if (FRAME_MAC_WINDOW (XFRAME (frame)) == win)
 	return 1;
 return 0;
-}
-static void
-do_window_activate (WindowPtr win)
-{
-struct frame *f;
-if (is_emacs_window (win))
-{
-f = mac_window_to_frame (win);
-if (f)
-	{
-	  x_new_focus_frame (FRAME_MAC_DISPLAY_INFO (f), f);
-	  activate_scroll_bars (f);
-	}
-}
-}
-static void
-do_window_deactivate (WindowPtr win)
-{
-struct frame *f;
-if (is_emacs_window (win))
-{
-f = mac_window_to_frame (win);
-if (f == FRAME_MAC_DISPLAY_INFO (f)->x_focus_frame)
-	{
-	  x_new_focus_frame (FRAME_MAC_DISPLAY_INFO (f), 0);
-	  deactivate_scroll_bars (f);
-	}
-}
 }
 static void
 do_app_resume ()
 {
 #if USE_CARBON_EVENTS
 /* Handle new events */
 if (!mac_convert_event_ref (eventRef, &er))
 	switch (GetEventClass (eventRef))
 	  {
+	  case kEventClassWindow:
+	    if (GetEventKind (eventRef) == kEventWindowBoundsChanged)
+	      {
+		WindowPtr window_ptr;
+		GetEventParameter(eventRef, kEventParamDirectObject,
+				  typeWindowRef, NULL, sizeof(WindowPtr),
+				  NULL, &window_ptr);
+		f = mac_window_to_frame (window_ptr);
+		if (f && !f->async_iconified)
+		  {
+		    int x, y;
+		    x_real_positions (f, &x, &y);
+		    f->left_pos = x;
+		    f->top_pos = y;
+		  }
+		SendEventToEventTarget (eventRef, toolbox_dispatcher);
+	      }
+	    break;
 	  case kEventClassMouse:
 	    if (GetEventKind (eventRef) == kEventMouseWheelMoved)
 	      {
 		SInt32 delta;
 		Point point;
 	  {
 	    WindowPtr window_ptr;
 	    SInt16 part_code;
 	    int tool_bar_p = 0;
+#if USE_CARBON_EVENTS
+	    /* This is needed to send mouse events like aqua window
+	       buttons to the correct handler.  */
+	    if (SendEventToEventTarget (eventRef, toolbox_dispatcher)
+		!= eventNotHandledErr)
+	      break;
+#endif
 	    if (dpyinfo->grabbed && last_mouse_frame
 		&& FRAME_LIVE_P (last_mouse_frame))
 	      {
 		window_ptr = FRAME_MAC_WINDOW (last_mouse_frame);
 		part_code = inContent;
 		  {
 		    HideWindow (tip_window);
 		    window_ptr = FrontWindow ();
 		  }
-#if USE_CARBON_EVENTS
-		/* This is needed to send mouse events like aqua
-		   window buttons to the correct handler.  */
-		if (SendEventToEventTarget (eventRef, toolbox_dispatcher)
-		    != eventNotHandledErr)
-		  break;
 		if (!is_emacs_window (window_ptr))
 		  break;
-#endif
 		part_code = FindWindow (er.where, &window_ptr);
 	      }
 	    switch (part_code)
 	      {
 		    DragWindow (window_ptr, er.where, &bm.bounds);
 		  }
 #else /* not TARGET_API_MAC_CARBON */
 		DragWindow (window_ptr, er.where, &qd.screenBits.bounds);
 #endif /* not TARGET_API_MAC_CARBON */
+		/* Update the frame parameters.  */
+		{
+		  struct frame *f = mac_window_to_frame (window_ptr);
+		  if (f && !f->async_iconified)
+		    {
+		      int x, y;
+		      x_real_positions (f, &x, &y);
+		      f->left_pos = x;
+		      f->top_pos = y;
+		    }
+		}
 		break;
 	      case inGoAway:
 		if (TrackGoAway (window_ptr, er.where))
 		  {
 	      {
 		HideWindow (tip_window);
 		break;
 	      }
+	    if (!is_emacs_window (window_ptr))
+	      break;
+	    f = mac_window_to_frame (window_ptr);
 	    if ((er.modifiers & activeFlag) != 0)
 	      {
+		/* A window has been activated */
 		Point mouse_loc = er.where;
-		do_window_activate (window_ptr);
+		x_new_focus_frame (dpyinfo, f);
+		activate_scroll_bars (f);
 		SetPortWindowPort (window_ptr);
 		GlobalToLocal (&mouse_loc);
-		/* activateEvt counts as mouse movement,
+		/* Window-activated event counts as mouse movement,
 		   so update things that depend on mouse position.  */
 		note_mouse_movement (mac_window_to_frame (window_ptr),
 				     &mouse_loc);
 	      }
 	    else
 	      {
-		do_window_deactivate (window_ptr);
+		/* A window has been deactivated */
+		dpyinfo->grabbed = 0;
-		f = mac_window_to_frame (window_ptr);
+		if (f == dpyinfo->x_focus_frame)
+		  {
+		    x_new_focus_frame (dpyinfo, 0);
+		    deactivate_scroll_bars (f);
+		  }
 		if (f == dpyinfo->mouse_face_mouse_frame)
 		  {
 		    /* If we move outside the frame, then we're
 		       certainly no longer on any text in the
 		       frame.  */

Mercurial > emacs

comparison src/macterm.c @ 83164:e8df1878cfd1