Mercurial > emacs
comparison src/keyboard.c @ 74748:8a37dd687f38
(kbd_buffer_store_event_hold): Undo 2006-12-04 change.
(make_lispy_event): Don't generate Qsignal prefix for code 0.
Abort if signal code is unknown.
(store_user_signal_events): Don't make Qsignal prefix (code 0).
(Qsignal): Move declaration back to process.c.
(syms_of_keyboard): Don't intern or staticpro it here.
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Tue, 19 Dec 2006 15:37:20 +0000 |
parents | 130738a27be7 |
children | 3db81fa14de8 |
comparison
equal
deleted
inserted
replaced
74747:53804f26b67e | 74748:8a37dd687f38 |
---|---|
3797 /* If we're inside while-no-input, and this event qualifies | 3797 /* If we're inside while-no-input, and this event qualifies |
3798 as input, set quit-flag to cause an interrupt. */ | 3798 as input, set quit-flag to cause an interrupt. */ |
3799 if (!NILP (Vthrow_on_input) | 3799 if (!NILP (Vthrow_on_input) |
3800 && event->kind != FOCUS_IN_EVENT | 3800 && event->kind != FOCUS_IN_EVENT |
3801 && event->kind != HELP_EVENT | 3801 && event->kind != HELP_EVENT |
3802 && event->kind != DEICONIFY_EVENT | 3802 && event->kind != DEICONIFY_EVENT) |
3803 && !(event->kind == USER_SIGNAL_EVENT && event->code == 0)) | |
3804 { | 3803 { |
3805 Vquit_flag = Vthrow_on_input; | 3804 Vquit_flag = Vthrow_on_input; |
3806 /* If we're inside a function that wants immediate quits, | 3805 /* If we're inside a function that wants immediate quits, |
3807 do it now. */ | 3806 do it now. */ |
3808 if (immediate_quit && NILP (Vinhibit_quit)) | 3807 if (immediate_quit && NILP (Vinhibit_quit)) |
5086 Lisp_Object *scroll_bar_parts[] = { | 5085 Lisp_Object *scroll_bar_parts[] = { |
5087 &Qabove_handle, &Qhandle, &Qbelow_handle, | 5086 &Qabove_handle, &Qhandle, &Qbelow_handle, |
5088 &Qup, &Qdown, &Qtop, &Qbottom, &Qend_scroll, &Qratio | 5087 &Qup, &Qdown, &Qtop, &Qbottom, &Qend_scroll, &Qratio |
5089 }; | 5088 }; |
5090 | 5089 |
5091 /* User signal events. */ | |
5092 Lisp_Object Qsignal; | |
5093 | |
5094 /* A vector, indexed by button number, giving the down-going location | 5090 /* A vector, indexed by button number, giving the down-going location |
5095 of currently depressed buttons, both scroll bar and non-scroll bar. | 5091 of currently depressed buttons, both scroll bar and non-scroll bar. |
5096 | 5092 |
5097 The elements have the form | 5093 The elements have the form |
5098 (BUTTON-NUMBER MODIFIER-MASK . REST) | 5094 (BUTTON-NUMBER MODIFIER-MASK . REST) |
5967 return apply_modifiers (event->modifiers, event->arg); | 5963 return apply_modifiers (event->modifiers, event->arg); |
5968 return event->arg; | 5964 return event->arg; |
5969 | 5965 |
5970 case USER_SIGNAL_EVENT: | 5966 case USER_SIGNAL_EVENT: |
5971 /* A user signal. */ | 5967 /* A user signal. */ |
5972 if (event->code == 0) | 5968 { |
5973 return Qsignal; | 5969 char *name = find_user_signal_name (event->code); |
5974 else | 5970 if (!name) |
5975 { | 5971 abort (); |
5976 char *name = find_user_signal_name (event->code); | 5972 return intern (name); |
5977 | 5973 } |
5978 if (name) | |
5979 return intern (name); | |
5980 else | |
5981 return make_number (event->code); | |
5982 } | |
5983 | 5974 |
5984 case SAVE_SESSION_EVENT: | 5975 case SAVE_SESSION_EVENT: |
5985 return Qsave_session; | 5976 return Qsave_session; |
5986 | 5977 |
5987 #ifdef MAC_OS | 5978 #ifdef MAC_OS |
7154 nstored += p->npending; | 7145 nstored += p->npending; |
7155 | 7146 |
7156 mask = sigblock (sigmask (p->sig)); | 7147 mask = sigblock (sigmask (p->sig)); |
7157 do | 7148 do |
7158 { | 7149 { |
7159 buf.code = 0; | |
7160 kbd_buffer_store_event (&buf); | |
7161 buf.code = p->sig; | 7150 buf.code = p->sig; |
7162 kbd_buffer_store_event (&buf); | 7151 kbd_buffer_store_event (&buf); |
7163 p->npending--; | 7152 p->npending--; |
7164 } | 7153 } |
7165 while (p->npending > 0); | 7154 while (p->npending > 0); |
11181 #ifdef MAC_OS | 11170 #ifdef MAC_OS |
11182 Qmac_apple_event = intern ("mac-apple-event"); | 11171 Qmac_apple_event = intern ("mac-apple-event"); |
11183 staticpro (&Qmac_apple_event); | 11172 staticpro (&Qmac_apple_event); |
11184 #endif | 11173 #endif |
11185 | 11174 |
11186 Qsignal = intern ("signal"); | |
11187 staticpro (&Qsignal); | |
11188 | |
11189 Qmenu_enable = intern ("menu-enable"); | 11175 Qmenu_enable = intern ("menu-enable"); |
11190 staticpro (&Qmenu_enable); | 11176 staticpro (&Qmenu_enable); |
11191 Qmenu_alias = intern ("menu-alias"); | 11177 Qmenu_alias = intern ("menu-alias"); |
11192 staticpro (&Qmenu_alias); | 11178 staticpro (&Qmenu_alias); |
11193 QCenable = intern (":enable"); | 11179 QCenable = intern (":enable"); |