diff src/termhooks.h @ 83408:39bb10ce301a

Merged in changes from CVS trunk. Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-667 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-668 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-669 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-670 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-157 Merge from emacs--cvs-trunk--0 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-158 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-159 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-160 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-161 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-162 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-163 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-164 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-165 Update from CVS: texi/message.texi: Fix default values. * [e-mail]--gnu-2005/gnus--rel--5.10--patch-166 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-167 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-168 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-448

--- a/src/termhooks.h	Sat Dec 10 21:18:28 2005 +0000
+++ b/src/termhooks.h	Sun Dec 11 22:42:40 2005 +0000
@@ -129,7 +129,7 @@
 				   by MS-Windows scroll bar controls. */
 #endif
   SELECTION_REQUEST_EVENT,	/* Another X client wants a selection from us.
-				   See `struct selection_event'.  */
+				   See `struct selection_input_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".  */
@@ -177,12 +177,22 @@
 
   /* Queued from XTread_socket when session manager sends
      save yourself before shutdown. */
-  SAVE_SESSION_EVENT
+  SAVE_SESSION_EVENT,
+
+#ifdef MAC_OS
+  /* Generated when an Apple event, a HICommand event, or a Services
+     menu event is received and the corresponding handler is
+     registered.  Members `x' and `y' are for the event class and ID
+     symbols, respectively.  Member `code' points to the Apple event
+     descriptor.  Parameters for Non-Apple events are converted to
+     those in Apple events.  */
+  MAC_APPLE_EVENT
+#endif
 };
 
 /* 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.  */
+   by `struct selection_input_event'; see xterm.h.  */
 
 /* The keyboard input buffer is an array of these structures.  Each one
    represents some sort of input event - a keystroke, a mouse click, or
@@ -208,7 +218,7 @@
   unsigned long timestamp;
 
   /* This is padding just to put the frame_or_window field
-     past the size of struct selection_event.  */
+     past the size of struct selection_input_event.  */
   int *padding[2];
 
   /* This field is copied into a vector while the event is in the queue,