VARCem/PDCurses
1
0
Fork 0
mirror of https://github.com/VARCem/PDCurses.git synced 2026-09-24 15:55:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced instances of "colour" with "color" for consistency.

Browse Source
This commit is contained in:
William McBrine
2006-09-22 15:39:30 +00:00
parent 041e4cd01c
commit 4cec25a407
9 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@@ -864,7 +864,7 @@ OTHER NOTES:
This will then use cause PDCurses to write directly to the CGA video
memory.
Added System V colour support.
Added System V color support.
COMPILER-SPECIFIC NOTES:

18
curses.h
View File

@@ -15,7 +15,7 @@
* See the file maintain.er for details of the current maintainer. *
************************************************************************/
/* $Id: curses.h,v 1.227 2006/09/21 16:09:33 wmcbrine Exp $ */
/* $Id: curses.h,v 1.228 2006/09/22 15:39:30 wmcbrine Exp $ */
/*----------------------------------------------------------------------*
* PDCurses *
@@ -609,9 +609,9 @@ PDCEX int TABSIZE;
PDCurses Text Attributes:
Originally, PDCurses used a short (16 bits) for its chtype. To include
colour, a number of things had to be sacrificed from the strict Unix and
color, a number of things had to be sacrificed from the strict Unix and
System V support. The main problem was fitting all character attributes
and colour into an unsigned char (all 8 bits!).
and color into an unsigned char (all 8 bits!).
Today, PDCurses by default uses a long (32 bits) for its chtype, as in
System V. The short chtype is still available, by undefining CHTYPE_LONG
@@ -624,12 +624,12 @@ short form:
-------------------------------------------------
|15|14|13|12|11|10| 9| 8| 7| 6| 5| 4| 3| 2| 1| 0|
-------------------------------------------------
colour number | attrs | character eg 'a'
color number | attrs | character eg 'a'
The available attribute enhancers are bold, reverse and blink. All other
Unix attributes have no effect. The high order char is an index into an
array of physical colours (defined in INITPAIR.c). 32 (5 bits)
foreground/background colour combinations combined with 8 (3 bits)
array of physical colors (defined in INITPAIR.c). 32 (5 bits)
foreground/background color combinations combined with 8 (3 bits)
attribute modifiers are available.
long form:
@@ -637,12 +637,12 @@ long form:
----------------------------------------------------------------------------
|31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16|15|14|13|12|..| 3| 2| 1| 0|
----------------------------------------------------------------------------
colour number | modifiers | character eg 'a'
color number | modifiers | character eg 'a'
(potential for DBCS)
The available attribute modifiers are bold, underline, invisible,
protect, reverse and blink. 256 (8 bits) colour pairs, 8 bits for
modifiers, and 16 bits for character data. (In practice, only 64 colour
protect, reverse and blink. 256 (8 bits) color pairs, 8 bits for
modifiers, and 16 bits for character data. (In practice, only 64 color
pairs are available, and only the lower 8 bits of character data are
currently used.)

16
demos/firework.c
View File

@@ -1,4 +1,4 @@
/* $Id: firework.c,v 1.22 2006/07/02 04:59:41 wmcbrine Exp $ */
/* $Id: firework.c,v 1.23 2006/09/22 15:39:30 wmcbrine Exp $ */
#include <stdio.h>
#include <signal.h>
@@ -11,7 +11,7 @@
#define DELAYSIZE 200
void myrefresh(void);
void get_colour(void);
void get_color(void);
void explode(int, int);
int main(int argc, char **argv)
@@ -84,7 +84,7 @@ void explode(int row, int col)
--col;
get_colour();
get_color();
mvaddstr(row - 1, col, " - ");
mvaddstr(row, col, "-+-");
mvaddstr(row + 1, col, " - ");
@@ -92,7 +92,7 @@ void explode(int row, int col)
--col;
get_colour();
get_color();
mvaddstr(row - 2, col, " --- ");
mvaddstr(row - 1, col, "-+++-");
mvaddstr(row, col, "-+#+-");
@@ -100,7 +100,7 @@ void explode(int row, int col)
mvaddstr(row + 2, col, " --- ");
myrefresh();
get_colour();
get_color();
mvaddstr(row - 2, col, " +++ ");
mvaddstr(row - 1, col, "++#++");
mvaddstr(row, col, "+# #+");
@@ -108,7 +108,7 @@ void explode(int row, int col)
mvaddstr(row + 2, col, " +++ ");
myrefresh();
get_colour();
get_color();
mvaddstr(row - 2, col, " # ");
mvaddstr(row - 1, col, "## ##");
mvaddstr(row, col, "# #");
@@ -116,7 +116,7 @@ void explode(int row, int col)
mvaddstr(row + 2, col, " # ");
myrefresh();
get_colour();
get_color();
mvaddstr(row - 2, col, " # # ");
mvaddstr(row - 1, col, "# #");
mvaddstr(row, col, " ");
@@ -132,7 +132,7 @@ void myrefresh(void)
refresh();
}
void get_colour(void)
void get_color(void)
{
static short tbl[] =
{

4
demos/newdemo.c
View File

@@ -1,10 +1,10 @@
/*
* newdemo.c - A demo program using PDCurses. The program
* illustrates the use of colours for text output.
* illustrates the use of colors for text output.
*
* Hacks by jbuhler@cs.washington.edu on 12/29/96
*
* $Id: newdemo.c,v 1.31 2006/07/24 22:37:04 wmcbrine Exp $
* $Id: newdemo.c,v 1.32 2006/09/22 15:39:30 wmcbrine Exp $
*/
#include <stdio.h>

6
doc/x11.man
View File

@@ -102,10 +102,10 @@ italicFont: The name of a fixed width font to be used for
pointer: The name of a valid pointer cursor.
Default: xterm
pointerForeColor: The foreground colour of the pointer.
pointerForeColor: The foreground color of the pointer.
Default: black
pointerBackColor: The background colour of the pointer.
pointerBackColor: The background color of the pointer.
Default: white
textCursor: The alignment of the text cursor; horizontal or vertical.
@@ -215,7 +215,7 @@ shmmin: On most systems, there are two Unix kernel parameters
Default: 0
borderColor: The colour of the border around the screen.
borderColor: The color of the border around the screen.
Default: black
borderWidth: The width in pixels of the border around the screen.

4
dos/pdcdisp.c
View File

@@ -19,7 +19,7 @@
#include <string.h>
RCSID("$Id: pdcdisp.c,v 1.51 2006/08/13 02:11:36 wmcbrine Exp $");
RCSID("$Id: pdcdisp.c,v 1.52 2006/09/22 15:39:30 wmcbrine Exp $");
#ifdef __PACIFIC__
void movedata(unsigned sseg, unsigned soff, unsigned dseg,
@@ -161,7 +161,7 @@ void PDC_transform_line(int lineno, int x, int len, const chtype *srcp)
unsigned short temp_line[256];
/* replace the attribute part of the chtype with the
actual colour value for each chtype in the line */
actual color value for each chtype in the line */
for (j = 0; j < len; j++)
temp_line[j] =

4
os2/pdcdisp.c
View File

@@ -24,7 +24,7 @@
#include <curses.h>
#include <string.h>
RCSID("$Id: pdcdisp.c,v 1.35 2006/08/13 05:36:52 wmcbrine Exp $");
RCSID("$Id: pdcdisp.c,v 1.36 2006/09/22 15:39:30 wmcbrine Exp $");
/*man-start**************************************************************
@@ -79,7 +79,7 @@ void PDC_transform_line(int lineno, int x, int len, const chtype *srcp)
PDC_LOG(("PDC_transform_line() - called: line %d\n", lineno));
/* replace the attribute part of the chtype with the
actual colour value for each chtype in the line */
actual color value for each chtype in the line */
for (j = 0; j < len; j++)
temp_line[j] = (chtype_attr(srcp[j]) << 8) | (srcp[j] & 0xff);

6
pdcurses/border.c
View File

@@ -26,7 +26,7 @@
#undef mvwhline
#undef mvwvline
RCSID("$Id: border.c,v 1.33 2006/08/21 16:42:36 wmcbrine Exp $");
RCSID("$Id: border.c,v 1.34 2006/09/22 15:39:30 wmcbrine Exp $");
/*man-start**************************************************************
@@ -103,9 +103,9 @@ static chtype _attr_passthru(WINDOW *win, chtype ch)
/* If the incoming character doesn't have its own attribute,
then use the current attributes for the window. If the
incoming character has attributes, but not a colour
incoming character has attributes, but not a color
component, OR the attributes to the current attributes for
the window. If the incoming character has a colour component,
the window. If the incoming character has a color component,
use only the attributes from the incoming character. */
if ((ch & A_ATTRIBUTES) == 0)

10
x11/x11.c
View File

@@ -32,7 +32,7 @@
#include <stdlib.h>
#include <string.h>
RCSID("$Id: x11.c,v 1.20 2006/09/11 20:12:03 wmcbrine Exp $");
RCSID("$Id: x11.c,v 1.21 2006/09/22 15:39:30 wmcbrine Exp $");
#ifndef XPOINTER_TYPEDEFED
typedef char * XPointer;
@@ -50,9 +50,9 @@ XCursesAppData xc_app_data;
# define PDC_SCROLLBAR_TYPE float
#endif
#define MAX_COLORS 8 /* maximum of "normal" colours */
#define COLOR_CURSOR 16 /* colour of cursor - 1 more than 2 * MAX_COLORS */
#define COLOR_BORDER 17 /* colour of border - 2 more than 2 * MAX_COLORS */
#define MAX_COLORS 8 /* maximum of "normal" colors */
#define COLOR_CURSOR 16 /* color of cursor - 1 more than 2 * MAX_COLORS */
#define COLOR_BORDER 17 /* color of border - 2 more than 2 * MAX_COLORS */
#define XCURSESDISPLAY (XtDisplay(drawing))
#define XCURSESWIN (XtWindow(drawing))
@@ -754,7 +754,7 @@ static int NewPacket(chtype attr, bool rev, int len, int col, int row,
text[len] = '\0';
#endif
/* Specify the colour table offsets */
/* Specify the color table offsets */
fore += (attr & A_BOLD) ? 8 : 0;
back += (attr & A_BLINK) ? 8 : 0;