aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2005-12-10 01:49:24 +0000
committerYAMAMOTO Mitsuharu2005-12-10 01:49:24 +0000
commitf66c49cc1cae94b545762ad789f214d5bf459c20 (patch)
tree6c157eb4032703265eed76fe836fbb48ab51f1b0 /src
parentdac5344bda6212378fe93780d27a00c840d87068 (diff)
downloademacs-f66c49cc1cae94b545762ad789f214d5bf459c20.tar.gz
emacs-f66c49cc1cae94b545762ad789f214d5bf459c20.zip
(Qmac_apple_event) [MAC_OS]: New variable.
(syms_of_keyboard) [MAC_OS]: Initialize it. (make_lispy_event) [MAC_OS]: Build lisp event for MAC_APPLE_EVENT.
Diffstat (limited to 'src')
-rw-r--r--src/keyboard.c22
1 files changed, 22 insertions, 0 deletions
diff --git a/src/keyboard.c b/src/keyboard.c
index 833a96ca874..a09bebf6089 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -527,6 +527,9 @@ Lisp_Object Qlanguage_change;
527#endif 527#endif
528Lisp_Object Qdrag_n_drop; 528Lisp_Object Qdrag_n_drop;
529Lisp_Object Qsave_session; 529Lisp_Object Qsave_session;
530#ifdef MAC_OS
531Lisp_Object Qmac_apple_event;
532#endif
530 533
531/* Lisp_Object Qmouse_movement; - also an event header */ 534/* Lisp_Object Qmouse_movement; - also an event header */
532 535
@@ -5864,6 +5867,20 @@ make_lispy_event (event)
5864 case SAVE_SESSION_EVENT: 5867 case SAVE_SESSION_EVENT:
5865 return Qsave_session; 5868 return Qsave_session;
5866 5869
5870#ifdef MAC_OS
5871 case MAC_APPLE_EVENT:
5872 {
5873 Lisp_Object spec[2];
5874
5875 spec[0] = event->x;
5876 spec[1] = event->y;
5877 return Fcons (Qmac_apple_event,
5878 Fcons (Fvector (2, spec),
5879 Fcons (mac_make_lispy_event_code (event->code),
5880 Qnil)));
5881 }
5882#endif
5883
5867 /* The 'kind' field of the event is something we don't recognize. */ 5884 /* The 'kind' field of the event is something we don't recognize. */
5868 default: 5885 default:
5869 abort (); 5886 abort ();
@@ -10879,6 +10896,11 @@ syms_of_keyboard ()
10879 Qsave_session = intern ("save-session"); 10896 Qsave_session = intern ("save-session");
10880 staticpro (&Qsave_session); 10897 staticpro (&Qsave_session);
10881 10898
10899#ifdef MAC_OS
10900 Qmac_apple_event = intern ("mac-apple-event");
10901 staticpro (&Qmac_apple_event);
10902#endif
10903
10882 Qusr1_signal = intern ("usr1-signal"); 10904 Qusr1_signal = intern ("usr1-signal");
10883 staticpro (&Qusr1_signal); 10905 staticpro (&Qusr1_signal);
10884 Qusr2_signal = intern ("usr2-signal"); 10906 Qusr2_signal = intern ("usr2-signal");