Changeset 925

Timestamp:

05/17/08 10:59:02 (4 months ago)

Author:

takkaria

Message:

Sort out whitespace and fix two OS X warnings.

Files:

• trunk/src/util.c (modified) (9 diffs)

trunk/src/util.c

@@ -1058 +1058 @@
-        ui_event_data kk;
-        ui_event_data ke;
-
+
-        bool done = FALSE;
-
+
-        term *old = Term;
-
-
+
-        /* Initialise keypress */
-        ke.key = 0;
-        ke.type = EVT_NONE;
-
+
-        /* Hack -- Use the "inkey_next" pointer */
-        if (inkey_next && *inkey_next && !inkey_xtra)
@@ -1074 +1073 @@
-                ke.key = *inkey_next++;
-                ke.type = EVT_KBRD;
-
+
-                /* Cancel the various "global parameters" */
-
-
+
+
+
-                /* Accept result */
-                return (ke);
-        }
-
+
-        /* Forget pointer */
-        inkey_next = NULL;
-
-
+
-#ifdef ALLOW_BORG
-
+
-        /* Mega-Hack -- Use the special hook */
-        if (inkey_hack && ((ch = (*inkey_hack)(inkey_xtra)) != 0))
-        {
-                /* Cancel the various "global parameters" */
-
+
+
-                ke.type = EVT_KBRD;
-
+
-                /* Accept result */
-                return (ke);
-        }
-
+
-#endif /* ALLOW_BORG */
-
-
+
-        /* Hack -- handle delayed "flush()" */
-        if (inkey_xtra)
@@ -1107 +1106 @@
-                /* End "macro action" */
-                parse_macro = FALSE;
-
+
-                /* End "macro trigger" */
-                parse_under = FALSE;
-
+
-                /* Forget old keypresses */
-                Term_flush();
-        }
-
-
+
+
-        /* Get the cursor state */
-        (void)Term_get_cursor(&cursor_state);
-
+
-        /* Show the cursor if waiting, except sometimes in "command" mode */
-        if (!inkey_scan && (!inkey_flag || hilite_player || character_icky))
@@ -1125 +1124 @@
-                (void)Term_set_cursor(TRUE);
-        }
-
-
+
+
-        /* Hack -- Activate main screen */
-        Term_activate(term_screen);
-
-
+
+
-        /* Get a key */
-        while (ke.type == EVT_NONE)
@@ -1141 +1140 @@
-                        break;
-                }
-
+
-
-                /* Hack -- Flush output once when no key ready */
@@ -1158 +1157 @@
-                        /* Mega-Hack -- reset saved flag */
-                        character_saved = FALSE;
-
+
-                        /* Mega-Hack -- reset signal counter */
-                        signal_count = 0;
-
+
-                        /* Only once */
-                        done = TRUE;
-                }
-
-
+
+
-                /* Hack -- Handle "inkey_base" */
-                if (inkey_base)
@@ -1252 +1251 @@
-                        continue;
-                }
-
-
+
+
-                /* Treat back-quote as escape */
-                if (ke.key == '`') ke.key = ESCAPE;
-
-
+
+
-                /* End "macro trigger" */
-                if (parse_under && (ke.key >=0 && ke.key <= 32))
@@ -1264 +1263 @@
-                        ke.type = EVT_NONE;
-                        ke.key = 0;
-
+
-                        /* End "macro trigger" */
-                        parse_under = FALSE;
@@ -1296 +1295 @@
-                }
-        }
-
-
+
+
-        /* Hack -- restore the term */
-        Term_activate(old);
-
-
+
+
-        /* Restore the cursor */
-        Term_set_cursor(cursor_state);
-
-
+
+
-        /* Cancel the various "global parameters" */
-        inkey_base = inkey_xtra = inkey_flag = inkey_scan = FALSE;
-
-
+
+
-        /* Return the keypress */
-        return (ke);