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

[Andrew Choi]

Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.701 emacs/src/keyboard.c:1.702
*** emacs/src/keyboard.c:1.701  Sun Jul 28 21:55:43 2002
--- emacs/src/keyboard.c        Sat Aug  3 18:21:09 2002
***************
*** 550,557 ****
  /* Symbols to denote kinds of events.  */
  Lisp_Object Qfunction_key;
  Lisp_Object Qmouse_click;
! #ifdef WINDOWSNT
  Lisp_Object Qmouse_wheel;
  Lisp_Object Qlanguage_change;
  #endif
  Lisp_Object Qdrag_n_drop;
--- 550,559 ----
  /* Symbols to denote kinds of events.  */
  Lisp_Object Qfunction_key;
  Lisp_Object Qmouse_click;
! #if defined(WINDOWSNT) || defined(MAC_OSX)
  Lisp_Object Qmouse_wheel;
+ #endif
+ #ifdef WINDOWSNT
  Lisp_Object Qlanguage_change;
  #endif
  Lisp_Object Qdrag_n_drop;
***************
*** 644,650 ****
  
  /* If we support a window system, turn on the code to poll periodically
     to detect C-g.  It isn't actually used when doing interrupt input.  */
! #ifdef HAVE_WINDOW_SYSTEM
  #define POLL_FOR_INPUT
  #endif
  
--- 646,652 ----
  
  /* If we support a window system, turn on the code to poll periodically
     to detect C-g.  It isn't actually used when doing interrupt input.  */
! #if defined(HAVE_WINDOW_SYSTEM) && !defined(USE_ASYNC_EVENTS)
  #define POLL_FOR_INPUT
  #endif
  
***************
*** 3881,3887 ****
            {
              obj = make_lispy_event (event);
              
! #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI)
              /* If this was a menu selection, then set the flag to inhibit
                 writing to last_nonmenu_event.  Don't do this if the event
                 we're returning is (menu-bar), though; that indicates the
--- 3883,3889 ----
            {
              obj = make_lispy_event (event);
              
! #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined(MAC_OS)
              /* If this was a menu selection, then set the flag to inhibit
                 writing to last_nonmenu_event.  Don't do this if the event
                 we're returning is (menu-bar), though; that indicates the
***************
*** 4260,4266 ****
  static Lisp_Object accent_key_syms;
  static Lisp_Object func_key_syms;
  static Lisp_Object mouse_syms;
! #ifdef WINDOWSNT
  static Lisp_Object mouse_wheel_syms;
  #endif
  static Lisp_Object drag_n_drop_syms;
--- 4262,4268 ----
  static Lisp_Object accent_key_syms;
  static Lisp_Object func_key_syms;
  static Lisp_Object mouse_syms;
! #if defined(WINDOWSNT) || defined(MAC_OSX)
  static Lisp_Object mouse_wheel_syms;
  #endif
  static Lisp_Object drag_n_drop_syms;
***************
*** 4669,4675 ****
  
  Lisp_Object Vlispy_mouse_stem;
  
! #ifdef WINDOWSNT
  /* mouse-wheel events are generated by the wheel on devices such as
     the MS Intellimouse.  The wheel sits in between the left and right
     mouse buttons, and is typically used to scroll or zoom the window
--- 4671,4677 ----
  
  Lisp_Object Vlispy_mouse_stem;
  
! #if defined(WINDOWSNT) || defined(MAC_OSX)
  /* mouse-wheel events are generated by the wheel on devices such as
     the MS Intellimouse.  The wheel sits in between the left and right
     mouse buttons, and is typically used to scroll or zoom the window
***************
*** 5279,5284 ****
--- 5281,5288 ----
                               Qnil));
        }
        }
+ #endif /* WINDOWS_NT */
+ #if defined(WINDOWS_NT) || defined(MAC_OSX)
      case MOUSE_WHEEL_EVENT:
        {
        int part;
***************
*** 5350,5356 ****
                                             Qnil))));
        }
        }
! #endif /* WINDOWSNT */
  
      case DRAG_N_DROP_EVENT:
        {
--- 5354,5360 ----
                                             Qnil))));
        }
        }
! #endif /* WINDOWSNT || MAC_OSX */
  
      case DRAG_N_DROP_EVENT:
        {
***************
*** 10433,10441 ****
    staticpro (&Qfunction_key);
    Qmouse_click = intern ("mouse-click");
    staticpro (&Qmouse_click);
! #ifdef WINDOWSNT
    Qmouse_wheel = intern ("mouse-wheel");
    staticpro (&Qmouse_wheel);
    Qlanguage_change = intern ("language-change");
    staticpro (&Qlanguage_change);
  #endif
--- 10437,10447 ----
    staticpro (&Qfunction_key);
    Qmouse_click = intern ("mouse-click");
    staticpro (&Qmouse_click);
! #if defined(WINDOWSNT) || defined(MAC_OSX)
    Qmouse_wheel = intern ("mouse-wheel");
    staticpro (&Qmouse_wheel);
+ #endif
+ #ifdef WINDOWSNT
    Qlanguage_change = intern ("language-change");
    staticpro (&Qlanguage_change);
  #endif
***************
*** 10583,10592 ****
    func_key_syms = Qnil;
    staticpro (&func_key_syms);
  
! #ifdef WINDOWSNT
    mouse_wheel_syms = Qnil;
    staticpro (&mouse_wheel_syms);
-   
    drag_n_drop_syms = Qnil;
    staticpro (&drag_n_drop_syms);
  #endif
--- 10589,10597 ----
    func_key_syms = Qnil;
    staticpro (&func_key_syms);
  
! #if defined(WINDOWSNT) || defined(MAC_OSX)
    mouse_wheel_syms = Qnil;
    staticpro (&mouse_wheel_syms);
    drag_n_drop_syms = Qnil;
    staticpro (&drag_n_drop_syms);
  #endif