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

[Pavel Janík]

Index: emacs/src/macterm.c
diff -c emacs/src/macterm.c:1.3 emacs/src/macterm.c:1.4
*** emacs/src/macterm.c:1.3     Wed May  8 17:30:03 2002
--- emacs/src/macterm.c Thu Jun 13 10:57:05 2002
***************
*** 6765,6771 ****
  {
    Point mouseLoc;
  
!   result->kind = mouse_click;
    result->code = 0;  /* only one mouse button */
    result->timestamp = event->when;
    result->modifiers = event->what == mouseDown ? down_modifier : up_modifier;
--- 6765,6771 ----
  {
    Point mouseLoc;
  
!   result->kind = MOUSE_CLICK_EVENT;
    result->code = 0;  /* only one mouse button */
    result->timestamp = event->when;
    result->modifiers = event->what == mouseDown ? down_modifier : up_modifier;
***************
*** 8712,8718 ****
  }
  
  /* Handle a mouse click on the scroll bar BAR.  If *EMACS_EVENT's kind
!    is set to something other than no_event, it is enqueued.
  
     This may be called from a signal handler, so we have to ignore GC
     mark bits.  */
--- 8712,8718 ----
  }
  
  /* Handle a mouse click on the scroll bar BAR.  If *EMACS_EVENT's kind
!    is set to something other than NO_EVENT, it is enqueued.
  
     This may be called from a signal handler, so we have to ignore GC
     mark bits.  */
***************
*** 8727,8733 ****
    if (! GC_WINDOWP (bar->window))
      abort ();
  
!   bufp->kind = scroll_bar_click;
    bufp->frame_or_window = bar->window;
    bufp->arg = Qnil;
  
--- 8727,8733 ----
    if (! GC_WINDOWP (bar->window))
      abort ();
  
!   bufp->kind = SCROLL_BAR_CLICK_EVENT;
    bufp->frame_or_window = bar->window;
    bufp->arg = Qnil;
  
***************
*** 12334,12340 ****
              GlobalToLocal (&mouse_loc);
                  
              bufp->code = 0;  /* only one mouse button */
!               bufp->kind = scroll_bar_click;
                bufp->frame_or_window = tracked_scroll_bar->window;
                bufp->part = scroll_bar_handle;
                bufp->modifiers = up_modifier;
--- 12334,12340 ----
              GlobalToLocal (&mouse_loc);
                  
              bufp->code = 0;  /* only one mouse button */
!               bufp->kind = SCROLL_BAR_CLICK_EVENT;
                bufp->frame_or_window = tracked_scroll_bar->window;
                bufp->part = scroll_bar_handle;
                bufp->modifiers = up_modifier;
***************
*** 12359,12365 ****
                  struct frame *f = ((mac_output *)
                                   GetWRefCon (FrontWindow ()))->mFP;
                  saved_menu_event_location = er.where;
!                 bufp->kind = menu_bar_activate_event;
                  XSETFRAME (bufp->frame_or_window, f);
                  count++;
                }
--- 12359,12365 ----
                  struct frame *f = ((mac_output *)
                                   GetWRefCon (FrontWindow ()))->mFP;
                  saved_menu_event_location = er.where;
!                 bufp->kind = MENU_BAR_ACTIVATE_EVENT;
                  XSETFRAME (bufp->frame_or_window, f);
                  count++;
                }
***************
*** 12421,12427 ****
                    }
                  else
                    {
!                     bufp->kind = mouse_click;
                      XSETFRAME (bufp->frame_or_window, mwp->mFP);
                      if (er.what == mouseDown)
                        mouse_tracking_in_progress
--- 12421,12427 ----
                    }
                  else
                    {
!                     bufp->kind = MOUSE_CLICK_EVENT;
                      XSETFRAME (bufp->frame_or_window, mwp->mFP);
                      if (er.what == mouseDown)
                        mouse_tracking_in_progress
***************
*** 12460,12466 ****
            case inGoAway:
              if (TrackGoAway (window_ptr, er.where))
                {
!                 bufp->kind = delete_window_event;
                  XSETFRAME (bufp->frame_or_window,
                             ((mac_output *) GetWRefCon (window_ptr))->mFP);
                  count++;
--- 12460,12466 ----
            case inGoAway:
              if (TrackGoAway (window_ptr, er.where))
                {
!                 bufp->kind = DELETE_WINDOW_EVENT;
                  XSETFRAME (bufp->frame_or_window,
                             ((mac_output *) GetWRefCon (window_ptr))->mFP);
                  count++;
***************
*** 12502,12513 ****
          if (keycode == 0x33)  /* delete key (charCode translated to 0x8) */
            {
              bufp->code = 0x7f;
!             bufp->kind = ascii_keystroke;
            }
          else if (keycode_to_xkeysym (keycode, &xkeysym))
            {
              bufp->code = 0xff00 | xkeysym;
!             bufp->kind = non_ascii_keystroke;
            }         
          else
            {
--- 12502,12513 ----
          if (keycode == 0x33)  /* delete key (charCode translated to 0x8) */
            {
              bufp->code = 0x7f;
!             bufp->kind = ASCII_KEYSTROKE_EVENT;
            }
          else if (keycode_to_xkeysym (keycode, &xkeysym))
            {
              bufp->code = 0xff00 | xkeysym;
!             bufp->kind = NON_ASCII_KEYSTROKE_EVENT;
            }         
          else
            {
***************
*** 12528,12534 ****
                }
              else
                bufp->code = er.message & charCodeMask;
!             bufp->kind = ascii_keystroke;
            }
        }
  
--- 12528,12534 ----
                }
              else
                bufp->code = er.message & charCodeMask;
!             bufp->kind = ASCII_KEYSTROKE_EVENT;
            }
        }
  
***************
*** 12539,12545 ****
             Mac keyboard to be used to enter non-ASCII iso-latin-1
             characters directly.  */
          if (mac_keyboard_text_encoding != kTextEncodingMacRoman
!           && bufp->kind == ascii_keystroke && bufp->code >= 128)
          {
              static TECObjectRef converter = NULL;
              OSStatus the_err = noErr;
--- 12539,12545 ----
             Mac keyboard to be used to enter non-ASCII iso-latin-1
             characters directly.  */
          if (mac_keyboard_text_encoding != kTextEncodingMacRoman
!           && bufp->kind == ASCII_KEYSTROKE_EVENT && bufp->code >= 128)
          {
              static TECObjectRef converter = NULL;
              OSStatus the_err = noErr;
***************
*** 12610,12616 ****
  
          AEProcessAppleEvent(&er);
          
!         /* Build a drag_n_drop type event as is done in
             constuct_drag_n_drop in w32term.c.  */
          if (!NILP (drag_and_drop_file_list))
            {
--- 12610,12616 ----
  
          AEProcessAppleEvent(&er);
          
!         /* Build a DRAG_N_DROP_EVENT type event as is done in
             constuct_drag_n_drop in w32term.c.  */
          if (!NILP (drag_and_drop_file_list))
            {
***************
*** 12624,12630 ****
              else
                f = ((mac_output *) GetWRefCon (wp))->mFP;            
              
!             bufp->kind = drag_n_drop;
              bufp->code = 0;
              bufp->timestamp = er.when * (1000 / 60);
              /* ticks to milliseconds */
--- 12624,12630 ----
              else
                f = ((mac_output *) GetWRefCon (wp))->mFP;            
              
!             bufp->kind = DRAG_N_DROP_EVENT;
              bufp->code = 0;
              bufp->timestamp = er.when * (1000 / 60);
              /* ticks to milliseconds */