Changeset 17

Show
Ignore:
Timestamp:
03/27/07 14:24:25 (2 years ago)
Author:
takkaria
Message:
  • Remove ChangeLog? file (dunno where it came from)
  • Move some #includes from h-system.h to util.c, the only place they wereuseful
  • SCREEN conflicted with main-gcu. It *is* a bad idea.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/cmd4.c

    r16 r17  
    21012101        { 
    21022102                key_event cx; 
    2103                 cx = menu_select(&menu, opt, n, &cursor_pos, SCREEN); 
     2103                cx = menu_select(&menu, opt, n, &cursor_pos, SCREEN_REGION); 
    21042104                if (ESCAPE == cx.key) break; 
    21052105                if(cx.type == EVT_MOVE) cursor_pos = cx.index; 
    …… 
    33703370                int evt = -1; 
    33713371                Term_clear(); 
    3372                 key = menu_select(&visual_menu, 0, visual_menu.count, &cursor, SCREEN); 
     3372                key = menu_select(&visual_menu, 0, visual_menu.count, &cursor, SCREEN_REGION); 
    33733373                if(key.key == ESCAPE)  
    33743374                        break; 
    …… 
    35513551                int evt; 
    35523552                Term_clear(); 
    3553                 key = menu_select(&color_menu, 0, color_menu.count, &cursor, SCREEN); 
     3553                key = menu_select(&color_menu, 0, color_menu.count, &cursor, SCREEN_REGION); 
    35543554 
    35553555                /* Done */ 
    …… 
    42054205                key_event c; 
    42064206                Term_clear(); 
    4207                 c = menu_select(&option_menu, 0, option_menu.count, &cursor, SCREEN); 
     4207                c = menu_select(&option_menu, 0, option_menu.count, &cursor, SCREEN_REGION); 
    42084208                if(ESCAPE == c.key) break; 
    42094209        } 
    …… 
    42354235                key_event c; 
    42364236                Term_clear(); 
    4237                 c = menu_select(&knowledge_menu, 0, knowledge_menu.count, &cursor, SCREEN); 
     4237                c = menu_select(&knowledge_menu, 0, knowledge_menu.count, &cursor, SCREEN_REGION); 
    42384238                if(ESCAPE == c.key) break; 
    42394239        } 

  • trunk/src/h-system.h

    r16 r17  
    6262#endif 
    6363 
    64  
    65 #ifdef SET_UID 
    66  
    67 # ifndef HAVE_USLEEP 
    68  
    69 /* 
    70  * struct timeval in usleep requires sys/time.h 
    71  * 
    72  * System test removed since Unix systems that neither have usleep nor 
    73  * sys/time.h are screwed anyway, since they have no way of delaying. 
    74  */ 
    75 #  include <sys/time.h> 
    76  
    77 # endif /* HAVE_USLEEP */ 
    78  
    79 #endif /* SET_UID */ 
    80  
    8164#endif /* INCLUDED_H_SYSTEM_H */ 
    8265 

  • trunk/src/ui.h

    r16 r17  
    265265 
    266266/* This is probably a bad idea */ 
    267 static const region SCREEN = {0, 0, 0, 0}; 
    268  
    269  
    270 #endif UI_H 
    271  
     267static const region SCREEN_REGION = {0, 0, 0, 0}; 
     268 
     269 
     270#endif /* UI_H */ 
     271 

  • trunk/src/util.c

    r16 r17  
    1414 
    1515#ifdef SET_UID 
     16 
    1617# ifndef HAVE_USLEEP 
     18 
     19/* 
     20 * struct timeval (used below) requires sys/time.h. 
     21 * 
     22 * Unix systems that neither have usleep nor sys/time.h are screwed, since 
     23 * they have no way of delaying. 
     24 */ 
     25#include <sys/time.h> 
    1726 
    1827/*