Changeset 867

Timestamp:

04/29/08 21:48:03 (3 months ago)

Author:

takkaria

Message:

A little further tweaking:

• Move curs_attrs[][] into ui-menu.c, and merely extern it in ui-menu.h
  
• Remove two curious and undocumented variables from ui-menu.c
  
• Remove a misleading extern in ui-menu.h
  

Files:

• trunk/src/ui-menu.c (modified) (3 diffs)
• trunk/src/ui-menu.h (modified) (1 diff)

trunk/src/ui-menu.c

@@ -20 +20 @@
-#include "ui-menu.h"
-
+/* Cursor colours */
+const byte curs_attrs[2][2] =
+{
+        { TERM_SLATE, TERM_BLUE },      /* Greyed row */
+        { TERM_WHITE, TERM_L_BLUE }     /* Valid row */
+};
+
-/* Some useful constants */
-const char lower_case[] = "abcdefghijklmnopqrstuvwxyz";
-const char upper_case[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
-int jumpscroll = 0;
-int menu_width = 23;
-
-/* forward declarations */
@@ -208 +212 @@
-        /* Keep a certain distance from the top when possible */
-        if ((cursor <= *top) && (*top > 0))
-jumpscroll - 
+
-
-        /* Keep a certain distance from the bottom when possible */
-        if (cursor >= *top + (rows_per_page - 1))
- + jumpscroll
+
-
-        /* Limit the top to legal places */
@@ -270 +274 @@
-        int rows_per_page = loc->page_rows;
-        int cols = (n + rows_per_page - 1) / rows_per_page;
-menu_width
+23
-
-        Term_get_size(&w, &h);

trunk/src/ui-menu.h

@@ -13 +13 @@
-
-/* Colors for interactive menus */
-
+
+
-        CURS_UNKNOWN = 0,               /* Use gray; dark blue for cursor */
-        CURS_KNOWN = 1                  /* Use white; light blue for cursor */
-};
-
-
-
-
-
+
+
+
-
-/* Standard menu orderings */
-extern const char default_choice[];             /* 1234567890A-Za-z */
-extern const char lower_case[];                 /* abc..z */
-extern const char upper_case[];                 /* ABC..Z */