Changeset 4136

Timestamp:

08/05/06 20:40:33 (2 years ago)

Author:

yamazaki

Message:

Fix asymmetric usage of W32_BLOCK_EVENT and W32_UNBLOCK_EVENT.

Files:

• trunk/src/ChangeLog.Meadow (modified) (1 diff)
• trunk/src/keyboard.c (modified) (4 diffs)

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2006-08-05  YAMAZAKI Katsuhiro <yamazaki-k@mwe.biglobe.ne.jp>
+
+        * keyboard.c (kbd_buffer_store_event_hold): Fix asymmetric usage of
+        W32_BLOCK_EVENT and W32_UNBLOCK_EVENT.
+
-2006-08-05  YAMAZAKI Katsuhiro <yamazaki-k@mwe.biglobe.ne.jp>
-

trunk/src/keyboard.c

@@ -3655 +3655 @@
-     struct input_event *hold_quit;
-{
+  if (event->kind == NO_EVENT)
+    abort ();
+
+  if (hold_quit && hold_quit->kind != NO_EVENT)
+    return;
+
-#ifdef MEADOW
-  W32_BLOCK_EVENT;
-#endif
-  if (event->kind == NO_EVENT)
-    abort ();
-
-  if (hold_quit && hold_quit->kind != NO_EVENT)
-    return;
-
-  if (event->kind == ASCII_KEYSTROKE_EVENT)
@@ -3711 +3712 @@
-            {
-              bcopy (event, (char *) hold_quit, sizeof (*event));
+#ifdef MEADOW
+              W32_UNBLOCK_EVENT;
+#endif
-              return;
-            }
@@ -3774 +3778 @@
-    }
-
+#ifdef MEADOW
+  W32_UNBLOCK_EVENT;
+#endif
+
-  /* If we're inside while-no-input, and this event qualifies
-     as input, set quit-flag to cause an interrupt.  */
@@ -3791 +3799 @@
-        }
-    }
-#ifdef MEADOW
-  W32_UNBLOCK_EVENT;
-#endif
-}
-