Changeset 249

Timestamp:

07/02/07 11:36:46 (1 year ago)

Author:

ajps

Message:

Fix the inputting of macro triggers to allow, e.g. function keys again. Closes #162.

Files:

• trunk/src/cmd4.c (modified) (2 diffs)
• trunk/src/util.c (modified) (1 diff)

trunk/src/cmd4.c

@@ -2827 +2827 @@
-
-        /* Read the pattern */
-ESCAPE
+0
-        {
-                /* Save the key */
@@ -2836 +2836 @@
-                ascii_to_text(tmp, sizeof(tmp), buf+n-1);
-                text_out(tmp);
-                flush();
-
-
-                /* Do not process macros */

trunk/src/util.c

@@ -1177 +1177 @@
-                if (inkey_base)
-                {
-
-
-
-
-
-
-
+
+
+
+
-                        {
-
+
+
+
+
+
+
+
+
-                                break;
-                        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        break;
-                  }
-
-                  /* Wait */
-                  while (TRUE)
-                  {
-                        /* Check for (and remove) a pending key */
-                        if (0 == Term_inkey(&ke, FALSE, TRUE))
-                        {
-                                /* Done */
-                                break;
-                        }
-
-                        /* No key ready */
-                        else
-                        {
-                                /* Increase "wait" */
-                                w += 10;
-                        
-                                /* Excessive delay */
-                                if (w >= 100) break;
-                        
-                                /* Delay */
-                                Term_xtra(TERM_XTRA_DELAY, w);
-                                }
-                  }
-
-                  /* Done */
-                  break;
-                }
-