You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
+#ifndef EMACS_BLOCKINPUT_H
+#define EMACS_BLOCKINPUT_H
+
+#include "atimer.h"
/* When Emacs is using signal-driven input, the processing of those
input signals can get pretty hairy. For example, when Emacs is
during the current critical section. */
extern int interrupt_input_pending;
+
+/* Non-zero means asynchronous timers should be run when input is
+ unblocked. */
+
+extern int pending_atimers;
+
/* Begin critical section. */
#define BLOCK_INPUT (interrupt_input_blocked++)
So, we always test interrupt_input_pending now; that's not too
expensive, and it'll never get set if we don't need to resignal. */
-#define UNBLOCK_INPUT \
- (interrupt_input_blocked--, \
- (interrupt_input_blocked < 0 ? (abort (), 0) : 0), \
- ((interrupt_input_blocked == 0 && interrupt_input_pending != 0) \
- ? (reinvoke_input_signal (), 0) \
- : 0))
+
+#define UNBLOCK_INPUT \
+ do \
+ { \
+ --interrupt_input_blocked; \
+ if (interrupt_input_blocked == 0) \
+ { \
+ if (interrupt_input_pending) \
+ reinvoke_input_signal (); \
+ if (pending_atimers) \
+ do_pending_atimers (); \
+ } \
+ else if (interrupt_input_blocked < 0) \
+ abort (); \
+ } \
+ while (0)
#define TOTALLY_UNBLOCK_INPUT (interrupt_input_blocked = 0)
#define UNBLOCK_INPUT_RESIGNAL UNBLOCK_INPUT
+
+/* Defined in keyboard.c */
+/* Don't use a prototype here; it causes trouble in some files. */
+extern void reinvoke_input_signal ();
+
+#endif /* EMACS_BLOCKINPUT_H */