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

[Miles Bader]

Index: emacs/src/macterm.c
diff -c emacs/src/macterm.c:1.3.2.12 emacs/src/macterm.c:1.3.2.13
*** emacs/src/macterm.c:1.3.2.12        Tue May 11 02:38:27 2004
--- emacs/src/macterm.c Tue Jul  6 09:14:36 2004
***************
*** 1210,1216 ****
        FOR_EACH_FRAME (rest, frame)
        x_flush (XFRAME (frame));
      }
!   else if (FRAME_X_P (f))
      XFlush (FRAME_MAC_DISPLAY (f));
    UNBLOCK_INPUT;
  #endif /* TARGET_API_MAC_CARBON */
--- 1210,1216 ----
        FOR_EACH_FRAME (rest, frame)
        x_flush (XFRAME (frame));
      }
!   else if (FRAME_MAC_P (f))
      XFlush (FRAME_MAC_DISPLAY (f));
    UNBLOCK_INPUT;
  #endif /* TARGET_API_MAC_CARBON */
***************
*** 1410,1416 ****
  XTframe_up_to_date (f)
       struct frame *f;
  {
!   if (FRAME_X_P (f))
      {
        struct mac_display_info *dpyinfo = FRAME_MAC_DISPLAY_INFO (f);
  
--- 1410,1416 ----
  XTframe_up_to_date (f)
       struct frame *f;
  {
!   if (FRAME_MAC_P (f))
      {
        struct mac_display_info *dpyinfo = FRAME_MAC_DISPLAY_INFO (f);
  
***************
*** 7033,7040 ****
  mac_get_emulated_btn ( UInt32 modifiers )
  {
    int result = 0;
!   if (Vmac_emulate_three_button_mouse != Qnil) {
!     int cmdIs3 = (Vmac_emulate_three_button_mouse != Qreverse);
      if (modifiers & controlKey)
        result = cmdIs3 ? 2 : 1;
      else if (modifiers & optionKey)
--- 7033,7040 ----
  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)
        result = cmdIs3 ? 2 : 1;
      else if (modifiers & optionKey)
***************
*** 7052,7058 ****
    UInt32 mods = 0;
    GetEventParameter (eventRef, kEventParamKeyModifiers, typeUInt32, NULL,
                    sizeof (UInt32), NULL, &mods);
!   if (Vmac_emulate_three_button_mouse != Qnil &&
        GetEventClass(eventRef) == kEventClassMouse)
      {
        mods &= ~(optionKey & cmdKey);
--- 7052,7058 ----
    UInt32 mods = 0;
    GetEventParameter (eventRef, kEventParamKeyModifiers, typeUInt32, NULL,
                    sizeof (UInt32), NULL, &mods);
!   if (!NILP (Vmac_emulate_three_button_mouse) &&
        GetEventClass(eventRef) == kEventClassMouse)
      {
        mods &= ~(optionKey & cmdKey);
***************
*** 7071,7077 ****
    switch (result)
      {
      case kEventMouseButtonPrimary:
!       if (Vmac_emulate_three_button_mouse == Qnil)
        return 0;
        else {
        UInt32 mods = 0;
--- 7071,7077 ----
    switch (result)
      {
      case kEventMouseButtonPrimary:
!       if (NILP (Vmac_emulate_three_button_mouse))
        return 0;
        else {
        UInt32 mods = 0;
***************
*** 8227,8233 ****
              inev.timestamp = er.when * (1000 / 60);
                /* ticks to milliseconds */
  
!               XSETINT (inev.x, tracked_scroll_bar->left + 2);
                XSETINT (inev.y, mouse_loc.v - 24);
                tracked_scroll_bar->dragging = Qnil;
                mouse_tracking_in_progress = mouse_tracking_none;
--- 8227,8233 ----
              inev.timestamp = er.when * (1000 / 60);
                /* ticks to milliseconds */
  
!               XSETINT (inev.x, XFASTINT (tracked_scroll_bar->left) + 2);
                XSETINT (inev.y, mouse_loc.v - 24);
                tracked_scroll_bar->dragging = Qnil;
                mouse_tracking_in_progress = mouse_tracking_none;
***************
*** 8312,8317 ****
--- 8312,8319 ----
                  else
                    {
                      Lisp_Object window;
+                     int x = mouse_loc.h;
+                     int y = mouse_loc.v;
  
                      XSETFRAME (inev.frame_or_window, mwp->mFP);
                      if (er.what == mouseDown)
***************
*** 8319,8332 ****
                          = mouse_tracking_mouse_movement;
                      else
                        mouse_tracking_in_progress = mouse_tracking_none;
!                     window = window_from_coordinates (mwp->mFP, inev.x, 
inev.y, 0, 0, 0, 1);
  
                      if (EQ (window, mwp->mFP->tool_bar_window))
                        {
                          if (er.what == mouseDown)
!                           handle_tool_bar_click (mwp->mFP, inev.x, inev.y, 1, 
0);
                          else
!                           handle_tool_bar_click (mwp->mFP, inev.x, inev.y, 0,
  #if USE_CARBON_EVENTS
                                                   mac_event_to_emacs_modifiers 
(eventRef)
  #else
--- 8321,8334 ----
                          = mouse_tracking_mouse_movement;
                      else
                        mouse_tracking_in_progress = mouse_tracking_none;
!                     window = window_from_coordinates (mwp->mFP, x, y, 0, 0, 
0, 1);
  
                      if (EQ (window, mwp->mFP->tool_bar_window))
                        {
                          if (er.what == mouseDown)
!                           handle_tool_bar_click (mwp->mFP, x, y, 1, 0);
                          else
!                           handle_tool_bar_click (mwp->mFP, x, y, 0,
  #if USE_CARBON_EVENTS
                                                   mac_event_to_emacs_modifiers 
(eventRef)
  #else
***************
*** 9024,9030 ****
        EVENT_INIT (e);
        e.kind = ASCII_KEYSTROKE_EVENT;
        e.code = quit_char;
!       e.arg = NULL;
        e.modifiers = NULL;
        e.timestamp = EventTimeToTicks (GetEventTime (event)) * (1000/60);
        XSETFRAME (e.frame_or_window, mwp->mFP);
--- 9026,9032 ----
        EVENT_INIT (e);
        e.kind = ASCII_KEYSTROKE_EVENT;
        e.code = quit_char;
!       e.arg = Qnil;
        e.modifiers = NULL;
        e.timestamp = EventTimeToTicks (GetEventTime (event)) * (1000/60);
        XSETFRAME (e.frame_or_window, mwp->mFP);