[rogueclone-cvs] rogue/src curses.c, 1.11.2.3, 1.11.2.4 invent.c, 1.8.2.1, 1.8.2.2 machdep.c, 1.7.2
Brought to you by:
mlehotay
Menu
▾
▴
[rogueclone-cvs] rogue/src curses.c, 1.11.2.3, 1.11.2.4 invent.c, 1.8.2.1, 1.8.2.2 machdep.c, 1.7.2.1, 1.7.2.2 message.c, 1.7.2.2, 1.7.2.3 object.c, 1.8.2.1, 1.8.2.2 rogue.h, 1.9.2.3, 1.9.2.4
|
From: Michael L. <mle...@us...> - 2008-08-17 23:19:09
|
Update of /cvsroot/rogueclone/rogue/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv9151/src Modified Files: Tag: curses curses.c invent.c machdep.c message.c object.c rogue.h Log Message: fixed curses colour, now links with pdcurses Index: message.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/message.c,v retrieving revision 1.7.2.2 retrieving revision 1.7.2.3 diff -C2 -d -r1.7.2.2 -r1.7.2.3 *** message.c 19 Jun 2008 04:32:13 -0000 1.7.2.2 --- message.c 17 Aug 2008 23:19:05 -0000 1.7.2.3 *************** *** 344,347 **** --- 344,361 ---- + /* Turns a dull B&W string into a vibrant color one. :-) + */ + + void colorize(char *str, attr_t color, chtype *cstr) + { + while (*str != '\0') { + (*cstr) = *str | color; + str++; + cstr++; + } + (*cstr) = 0; + } + + /* NS: We convert to ASCII characters before saving, if necessary. */ Index: invent.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/invent.c,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -C2 -d -r1.8.2.1 -r1.8.2.2 *** invent.c 18 Jun 2008 03:16:13 -0000 1.8.2.1 --- invent.c 17 Aug 2008 23:19:05 -0000 1.8.2.2 *************** *** 224,238 **** static int pr_motion_char(int ch); /* only used within this file */ - colorize(char *str, attr_t color, chtype *cstr) - { - while (*str != '\0') { - (*cstr) = *str | color; - str++; - cstr++; - } - (*cstr) = 0; - } - - void inventory(object *pack, const unsigned short mask) { --- 224,227 ---- *************** *** 273,277 **** get_desc(obj, bwdesc); ! (void) colorize(bwdesc, item_color, descs[i]+4); if ((n = (short) (strlen(bwdesc)+4) ) > maxlen) { maxlen = n; --- 262,266 ---- get_desc(obj, bwdesc); ! colorize(bwdesc, item_color, descs[i]+4); if ((n = (short) (strlen(bwdesc)+4) ) > maxlen) { maxlen = n; *************** *** 281,285 **** obj = obj->next_object; } ! (void) colorize(press_space, COLOR_PAIR(COLOR_WHITE), descs[i++]); if (maxlen < 27) maxlen = 27; col = DCOLS - (maxlen + 2); --- 270,274 ---- obj = obj->next_object; } ! colorize(press_space, COLOR_PAIR(COLOR_WHITE), descs[i++]); if (maxlen < 27) maxlen = 27; col = DCOLS - (maxlen + 2); Index: rogue.h =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/rogue.h,v retrieving revision 1.9.2.3 retrieving revision 1.9.2.4 diff -C2 -d -r1.9.2.3 -r1.9.2.4 *** rogue.h 19 Jun 2008 04:32:15 -0000 1.9.2.3 --- rogue.h 17 Aug 2008 23:19:05 -0000 1.9.2.4 *************** *** 49,55 **** *****************************************************************************/ ! /* #define ROGUECURSES */ ! /* #define DISCOVERY */ ! #define KNOWN_ITEMS /* #define ONE_SCORE */ --- 49,55 ---- *****************************************************************************/ ! /* #define ROGUECURSES */ /* instead of linking with pdcurses, ncurses, etc */ ! /* #define DISCOVERY */ /* D command to list discovered items -NS */ ! #define KNOWN_ITEMS /* \ command to list known items -steve_ued */ /* #define ONE_SCORE */ *************** *** 247,258 **** /* Support for color GUI... */ ! #define BLACK 0x00 ! #define BLUE 0x01 ! #define GREEN 0x02 ! #define CYAN 0x03 ! #define RED 0x04 ! #define MAGENTA 0x05 ! #define YELLOW 0x06 ! #define WHITE 0x07 #define GRAY 0x08 #define BRIGHT_BLUE 0x09 --- 247,274 ---- /* Support for color GUI... */ ! #define COLOR_BLACK 0x00 ! #define COLOR_BLUE 0x01 ! #define COLOR_GREEN 0x02 ! #define COLOR_CYAN 0x03 ! #define COLOR_RED 0x04 ! #define COLOR_MAGENTA 0x05 ! #define COLOR_YELLOW 0x06 ! #define COLOR_WHITE 0x07 ! ! #define A_ATTRIBUTES (chtype)0xff00 /* X/Open */ ! #define A_CHARTEXT (chtype)0x00ff /* X/Open */ ! #define A_COLOR (chtype)0xf800 /* System V */ ! ! #define A_ALTCHARSET A_NORMAL /* X/Open */ ! ! #define A_NORMAL (chtype)0 ! #define A_BOLD (chtype)0x0100 /* X/Open */ ! #define A_BLINK (chtype)0x0400 /* X/Open */ ! ! #define PDC_COLOR_SHIFT 11 ! ! #define COLOR_PAIR(n) (((chtype)(n) << PDC_COLOR_SHIFT) & A_COLOR) ! ! /* #define GRAY 0x08 #define BRIGHT_BLUE 0x09 *************** *** 271,275 **** unsigned short b16; }; ! /* typedef union _colorChar color_char; */ #define MAKE_COLOR(fg,bg) (byte)(((fg) & 0x0F) | (((bg) & 0x0F) << 4)) --- 287,291 ---- unsigned short b16; }; ! //typedef union _colorChar color_char; #define MAKE_COLOR(fg,bg) (byte)(((fg) & 0x0F) | (((bg) & 0x0F) << 4)) *************** *** 281,284 **** --- 297,301 ---- #define BGCOLOR_OF(col) (byte)(((col) >> 4) & 0x0F) #define FGCOLOR_OF(col) (byte)((col) & 0x0F) + */ #else /* link with pdcurses. maybe other curses would work too? */ *************** *** 289,296 **** #include "curses.h" - #define COLOR_STAIRS COLOR_WHITE+1 - #endif /* ROGUECURSES */ /* The following #defines provide more meaningful names for some of the --- 306,313 ---- #include "curses.h" #endif /* ROGUECURSES */ + #define COLOR_STAIRS COLOR_WHITE+1 + /* The following #defines provide more meaningful names for some of the *************** *** 605,609 **** /* curses.c */ #ifdef ROGUECURSES ! char getch(void); void initscr(void); void move(const short row, const short col); --- 622,630 ---- /* curses.c */ #ifdef ROGUECURSES ! int has_colors(void); ! int start_color(void); ! int init_pair(short pair, short f, short b); ! int mvaddchnstr(int y, int x, const chtype *chstr, int n); ! int getch(void); void initscr(void); void move(const short row, const short col); *************** *** 616,620 **** void addcch(const chtype cc); void mvaddcch(const short row, const short col, const chtype cc); - void colorize(char *str, const byte color, chtype *cstr); void refresh(void); void redraw(void); --- 637,640 ---- *************** *** 689,693 **** void show_average_hp(void); - /* machdep.c */ void md_slurp(void); --- 709,712 ---- *************** *** 720,723 **** --- 739,743 ---- char rgetchar(void); void print_stats(const int stat_mask); + void colorize(char *str, attr_t color, chtype *cstr); void save_screen(void); void sound_bell(void); Index: curses.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/curses.c,v retrieving revision 1.11.2.3 retrieving revision 1.11.2.4 diff -C2 -d -r1.11.2.3 -r1.11.2.4 *** curses.c 19 Jun 2008 04:32:13 -0000 1.11.2.3 --- curses.c 17 Aug 2008 23:19:05 -0000 1.11.2.4 *************** *** 93,98 **** #define intr_fn(N,R) __dpmi_int(N,R) - #else - #error curses.c only compiles with Open Watcom, Microsoft C, or DJGPP #endif --- 93,96 ---- *************** *** 109,114 **** #define BLANKCH MAKE_COLOR_CHAR(WHITE,BLACK,' ') - - /* ================== GLOBAL VARIABLES ================== */ --- 107,110 ---- *************** *** 148,155 **** /* ================== PUBLIC FUNCTIONS ================== */ ! /* Returns a keystroke, translated into a Rogue command. */ ! char getch(void) { char ch; --- 144,169 ---- /* ================== PUBLIC FUNCTIONS ================== */ ! ! int has_colors(void) { ! return 0; ! } ! ! int start_color(void) { ! return 0; ! } ! ! int init_pair(short pair, short f, short b) { ! return 0; ! } ! ! int mvaddchnstr(int y, int x, const chtype *chstr, int n) { ! return 0; ! } ! ! ! /* Returns a keystroke. */ ! int getch(void) { char ch; *************** *** 372,393 **** } - - - /* Turns a dull B&W string into a vibrant color one. :-) - */ - - void colorize(char *str, const byte color, chtype *cstr) - { - while (*str != '\0') { - (*cstr).b8.color = color; - (*cstr).b8.ch = *str; - str++; - cstr++; - } - (*cstr).b16 = 0; - } - - - /* These functions redraw the whole screen (redraw) or just the dirty lines * of the current screen (refresh) --- 386,389 ---- Index: object.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/object.c,v retrieving revision 1.8.2.1 retrieving revision 1.8.2.2 diff -C2 -d -r1.8.2.1 -r1.8.2.2 *** object.c 18 Jun 2008 03:16:13 -0000 1.8.2.1 --- object.c 17 Aug 2008 23:19:05 -0000 1.8.2.2 *************** *** 857,861 **** get_desc(obj, bwdesc); ! (void) colorize(bwdesc, item_color, descs[i]+4); if ((n = (short) strlen(bwdesc)+4) > maxlen) { maxlen = n; --- 857,861 ---- get_desc(obj, bwdesc); ! colorize(bwdesc, item_color, descs[i]+4); if ((n = (short) strlen(bwdesc)+4) > maxlen) { maxlen = n; *************** *** 865,869 **** obj = obj->next_object; } ! (void) colorize(press_space, COLOR_PAIR(COLOR_WHITE), descs[i++]); /* (void) strcpy(descs[i++], press_space); */ if (maxlen < 27) maxlen = 27; --- 865,869 ---- obj = obj->next_object; } ! colorize(press_space, COLOR_PAIR(COLOR_WHITE), descs[i++]); /* (void) strcpy(descs[i++], press_space); */ if (maxlen < 27) maxlen = 27; Index: machdep.c =================================================================== RCS file: /cvsroot/rogueclone/rogue/src/machdep.c,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -C2 -d -r1.7.2.1 -r1.7.2.2 *** machdep.c 18 Jun 2008 03:16:13 -0000 1.7.2.1 --- machdep.c 17 Aug 2008 23:19:05 -0000 1.7.2.2 *************** *** 80,85 **** */ #include <stdio.h> ! #include <conio.h> #include <time.h> #include <io.h> --- 80,86 ---- */ + #include "rogue.h" #include <stdio.h> ! /* #include <conio.h> */ #include <time.h> #include <io.h> *************** *** 87,91 **** #include <signal.h> #include <process.h> - #include "rogue.h" #include "paths.h" #include "version.h" --- 88,91 ---- |