emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/src/termhooks.h


From: Pavel Janík
Subject: [Emacs-diffs] Changes to emacs/src/termhooks.h
Date: Thu, 13 Jun 2002 10:59:38 -0400

Index: emacs/src/termhooks.h
diff -c emacs/src/termhooks.h:1.58 emacs/src/termhooks.h:1.59
*** emacs/src/termhooks.h:1.58  Mon Apr  1 08:41:03 2002
--- emacs/src/termhooks.h       Thu Jun 13 10:59:38 2002
***************
*** 201,210 ****
  
  enum event_kind
  {
!   no_event,                   /* nothing happened.  This should never
                                   actually appear in the event queue.  */
  
!   ascii_keystroke,            /* The ASCII code is in .code, perhaps
                                   with modifiers applied.
                                   .modifiers holds the state of the
                                   modifier keys.
--- 201,210 ----
  
  enum event_kind
  {
!   NO_EVENT,                   /* nothing happened.  This should never
                                   actually appear in the event queue.  */
  
!   ASCII_KEYSTROKE_EVENT,      /* The ASCII code is in .code, perhaps
                                   with modifiers applied.
                                   .modifiers holds the state of the
                                   modifier keys.
***************
*** 212,224 ****
                                   which the key was typed.
                                   .timestamp gives a timestamp (in
                                   milliseconds) for the keystroke.  */
!   multibyte_char_keystroke,   /* The multibye char code is in .code,
                                   perhaps with modifiers applied.
                                   The others are the same as
!                                  ascii_keystroke.  This type of event
                                   is generated only when we are using
                                   XIM on X window.  */
!   non_ascii_keystroke,                /* .code is a number identifying the
                                   function key.  A code N represents
                                   a key whose name is
                                   function_key_names[N]; function_key_names
--- 212,224 ----
                                   which the key was typed.
                                   .timestamp gives a timestamp (in
                                   milliseconds) for the keystroke.  */
!   MULTIBYTE_CHAR_KEYSTROKE_EVENT,     /* The multibyte char code is in .code,
                                   perhaps with modifiers applied.
                                   The others are the same as
!                                  ASCII_KEYSTROKE_EVENT.  This type of event
                                   is generated only when we are using
                                   XIM on X window.  */
!   NON_ASCII_KEYSTROKE_EVENT,  /* .code is a number identifying the
                                   function key.  A code N represents
                                   a key whose name is
                                   function_key_names[N]; function_key_names
***************
*** 230,237 ****
                                   which the key was typed.
                                   .timestamp gives a timestamp (in
                                   milliseconds) for the keystroke.  */
!   timer_event,                  /* A timer fired.  */
!   mouse_click,                        /* The button number is in .code; it 
must
                                   be >= 0 and < NUM_MOUSE_BUTTONS, defined
                                   below.
                                   .modifiers holds the state of the
--- 230,237 ----
                                   which the key was typed.
                                   .timestamp gives a timestamp (in
                                   milliseconds) for the keystroke.  */
!   TIMER_EVENT,                  /* A timer fired.  */
!   MOUSE_CLICK_EVENT,          /* The button number is in .code; it must
                                   be >= 0 and < NUM_MOUSE_BUTTONS, defined
                                   below.
                                   .modifiers holds the state of the
***************
*** 243,249 ****
                                   .timestamp gives a timestamp (in
                                   milliseconds) for the click.  */
  #ifdef WINDOWSNT
!   mouse_wheel,                        /* A mouse-wheel event is generated 
                                   on WINDOWSNT by a 
                                   wheel on a mouse (e.g., MS Intellimouse).
                                   The event contains a delta that corresponds
--- 243,249 ----
                                   .timestamp gives a timestamp (in
                                   milliseconds) for the click.  */
  #ifdef WINDOWSNT
!   MOUSE_WHEEL_EVENT,          /* A mouse-wheel event is generated 
                                   on WINDOWSNT by a 
                                   wheel on a mouse (e.g., MS Intellimouse).
                                   The event contains a delta that corresponds
***************
*** 259,270 ****
                                   the wheel event occurred in.
                                   .timestamp gives a timestamp (in
                                   milliseconds) for the wheel event.  */
!   language_change_event,      /* A language_change event is generated
                                   on WINDOWSNT when the keyboard layout
                                   or input language is changed by the
                                   user.  */
  #endif
!   scroll_bar_click,           /* .code gives the number of the mouse button
                                   that was clicked.
                                   .modifiers holds the state of the modifier
                                   keys.
--- 259,270 ----
                                   the wheel event occurred in.
                                   .timestamp gives a timestamp (in
                                   milliseconds) for the wheel event.  */
!   LANGUAGE_CHANGE_EVENT,      /* A LANGUAGE_CHANGE_EVENT is generated
                                   on WINDOWSNT when the keyboard layout
                                   or input language is changed by the
                                   user.  */
  #endif
!   SCROLL_BAR_CLICK_EVENT,     /* .code gives the number of the mouse button
                                   that was clicked.
                                   .modifiers holds the state of the modifier
                                   keys.
***************
*** 278,300 ****
                                   .timestamp gives a timestamp (in
                                   milliseconds) for the click.  */
  #ifdef WINDOWSNT
!   w32_scroll_bar_click,       /* as for scroll_bar_click, but only generated
                                   by MS-Windows scroll bar controls. */
  #endif
!   selection_request_event,    /* Another X client wants a selection from us.
                                   See `struct selection_event'.  */
!   selection_clear_event,      /* Another X client cleared our selection.  */
!   buffer_switch_event,                /* A process filter has switched 
buffers.  */
!   delete_window_event,                /* An X client said "delete this 
window".  */
    MENU_BAR_EVENT,             /* An event generated by the menu bar.
                                   The frame_or_window field's cdr holds the
                                   Lisp-level event value.
                                   (Only the toolkit version uses these.)  */
!   iconify_event,              /* An X client iconified this window.  */
!   deiconify_event,            /* An X client deiconified this window.  */
!   menu_bar_activate_event,      /* A button press in the menu bar
                                   (toolkit version only).  */
!   drag_n_drop,                        /* A drag-n-drop event is generated when
                                   files selected outside of Emacs are dropped
                                   onto an Emacs window.
                                   Currently used only on Windows NT.
--- 278,300 ----
                                   .timestamp gives a timestamp (in
                                   milliseconds) for the click.  */
  #ifdef WINDOWSNT
!   W32_SCROLL_BAR_CLICK_EVENT, /* as for SCROLL_BAR_CLICK, but only generated
                                   by MS-Windows scroll bar controls. */
  #endif
!   SELECTION_REQUEST_EVENT,    /* Another X client wants a selection from us.
                                   See `struct selection_event'.  */
!   SELECTION_CLEAR_EVENT,      /* Another X client cleared our selection.  */
!   BUFFER_SWITCH_EVENT,                /* A process filter has switched 
buffers.  */
!   DELETE_WINDOW_EVENT,                /* An X client said "delete this 
window".  */
    MENU_BAR_EVENT,             /* An event generated by the menu bar.
                                   The frame_or_window field's cdr holds the
                                   Lisp-level event value.
                                   (Only the toolkit version uses these.)  */
!   ICONIFY_EVENT,              /* An X client iconified this window.  */
!   DEICONIFY_EVENT,            /* An X client deiconified this window.  */
!   MENU_BAR_ACTIVATE_EVENT,      /* A button press in the menu bar
                                   (toolkit version only).  */
!   DRAG_N_DROP_EVENT,          /* A drag-n-drop event is generated when
                                   files selected outside of Emacs are dropped
                                   onto an Emacs window.
                                   Currently used only on Windows NT.
***************
*** 330,340 ****
  
    /* Queued from XTread_socket when session manager sends
       save yourself before shutdown. */
!   save_session_event
  };
  
! /* If a struct input_event has a kind which is selection_request_event
!    or selection_clear_event, then its contents are really described
     by `struct selection_event'; see xterm.h.  */
  
  /* The keyboard input buffer is an array of these structures.  Each one
--- 330,340 ----
  
    /* Queued from XTread_socket when session manager sends
       save yourself before shutdown. */
!   SAVE_SESSION_EVENT
  };
  
! /* If a struct input_event has a kind which is SELECTION_REQUEST_EVENT
!    or SELECTION_CLEAR_EVENT, then its contents are really described
     by `struct selection_event'; see xterm.h.  */
  
  /* The keyboard input buffer is an array of these structures.  Each one
***************
*** 347,355 ****
    /* What kind of event was this?  */
    enum event_kind kind;
    
!   /* For an ascii_keystroke and multibyte_char_keystroke, this is the
!      character.
!      For a non_ascii_keystroke, this is the keysym code.
       For a mouse event, this is the button number.  */
    /* In WindowsNT, for a mouse wheel event, this is the delta.  */
    int code;
--- 347,355 ----
    /* What kind of event was this?  */
    enum event_kind kind;
    
!   /* For an ASCII_KEYSTROKE_EVENT and MULTIBYTE_CHAR_KEYSTROKE_EVENT,
!      this is the character.
!      For a NON_ASCII_KEYSTROKE_EVENT, this is the keysym code.
       For a mouse event, this is the button number.  */
    /* In WindowsNT, for a mouse wheel event, this is the delta.  */
    int code;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]