(inhibit_pre_post_conversion): Removed (unused).

[bpt/emacs.git] / src / blockinput.h

diff --git a/src/blockinput.h b/src/blockinput.h
index da20e7f..c5485fa 100644 (file)
--- a/src/blockinput.h
+++ b/src/blockinput.h
@@ -15,8 +15,13 @@ GNU General Public License for more details.
 
 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
@@ -37,7 +42,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    BLOCK_INPUT and UNBLOCK_INPUT may be nested.
 
    * Any complicated interrupt handling code should test
-   interrupt_input_blocked, and put off its work until later.  
+   interrupt_input_blocked, and put off its work until later.
 
    * If the interrupt handling code wishes, it may set
    interrupt_input_pending to a non-zero value.  If that flag is set
@@ -49,6 +54,12 @@ extern int interrupt_input_blocked;
    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++)
 
@@ -66,12 +77,28 @@ extern int interrupt_input_pending;
 
    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 */