Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/lib/libcurses/curses_private.h,v rcsdiff: /ftp/cvs/cvsroot/src/lib/libcurses/curses_private.h,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.18 retrieving revision 1.43 diff -u -p -r1.18 -r1.43 --- src/lib/libcurses/curses_private.h 2001/12/11 11:18:17 1.18 +++ src/lib/libcurses/curses_private.h 2009/07/22 16:57:14 1.43 @@ -1,4 +1,4 @@ -/* $NetBSD: curses_private.h,v 1.18 2001/12/11 11:18:17 blymn Exp $ */ +/* $NetBSD: curses_private.h,v 1.43 2009/07/22 16:57:14 roy Exp $ */ /*- * Copyright (c) 1998-2000 Brett Lymn @@ -29,6 +29,16 @@ * */ +/* Modified by Ruibiao Qiu + * to add support for wide characters + * Changes: + * - Add a compiler variable HAVE_WCHAR for wide character only code + * - Add a pointer to liked list of non-spacing characters in __ldata + * and the macro to access the width field in the attribute field + * - Add a circular input character buffer in __screen to handle wide + * character input (used in get_wch()) + */ + #include /* Private structure definitions for curses. */ @@ -59,8 +69,21 @@ extern char *__tc_ac, *__tc_AB, *__tc_ae *__tc_uc, *__tc_ue, *__tc_UP, *__tc_up, *__tc_us, *__tc_vb, *__tc_ve, *__tc_vi, *__tc_vs; +#ifdef HAVE_WCHAR +extern char *__tc_Xh, *__tc_Xl, *__tc_Xo, *__tc_Xr, *__tc_Xt, + *__tc_Xv; +/* + * Add a list of non-spacing characters to each spacing + * character in a singly linked list + */ +typedef struct nschar_t { + wchar_t ch; /* Non-spacing character */ + struct nschar_t *next; /* Next non-spacing character */ +} nschar_t; +#endif /* HAVE_WCHAR */ + /* - * A window an array of __LINE structures pointed to by the 'lines' pointer. + * A window is an array of __LINE structures pointed to by the 'lines' pointer. * A line is an array of __LDATA structures pointed to by the 'line' pointer. * * IMPORTANT: the __LDATA structure must NOT induce any padding, so if new @@ -73,13 +96,33 @@ extern char *__tc_ac, *__tc_AB, *__tc_ae struct __ldata { wchar_t ch; /* Character */ attr_t attr; /* Attributes */ - wchar_t bch; /* Background character */ - attr_t battr; /* Background attributes */ +#ifdef HAVE_WCHAR + nschar_t *nsp; /* Foreground non-spacing character pointer */ +#endif /* HAVE_WCHAR */ }; +#ifdef HAVE_WCHAR +/* macros to extract the width of a wide character */ +#define __WCWIDTH 0xfc000000 +#define WCW_SHIFT 26 +#define WCOL(wc) ((((unsigned) (wc).attr) >> WCW_SHIFT ) > MB_LEN_MAX ? ((int)(((unsigned) (wc).attr ) >> WCW_SHIFT )) - 64 : ((int)(((unsigned) (wc).attr ) >> WCW_SHIFT))) +#define SET_WCOL(c, w) do { \ + ((c).attr) = ((((c).attr) & WA_ATTRIBUTES ) | ((w) << WCW_SHIFT )); \ +} while(/*CONSTCOND*/0) +#define BGWCOL(wc) ((((wc).battr) >> WCW_SHIFT ) > MB_LEN_MAX ? (((wc).battr ) >> WCW_SHIFT ) - 64 : (((wc).battr ) >> WCW_SHIFT )) +#define SET_BGWCOL(c, w) do { \ + ((c).battr) = ((((c).battr) & WA_ATTRIBUTES ) | ((w) << WCW_SHIFT )); \ +} while(/*CONSTCOND*/0) +#endif /* HAVE_WCHAR */ + #define __LDATASIZE (sizeof(__LDATA)) struct __line { +#ifdef DEBUG +#define SENTINEL_VALUE 0xaac0ffee + + unsigned int sentinel; /* try to catch line overflows */ +#endif #define __ISDIRTY 0x01 /* Line is dirty. */ #define __ISPASTEOL 0x02 /* Cursor is past end of line */ unsigned int flags; @@ -94,8 +137,9 @@ struct __window { /* Window structure. int begy, begx; /* Window home. */ int cury, curx; /* Current x, y coordinates. */ int maxy, maxx; /* Maximum values for curx, cury. */ - short ch_off; /* x offset for firstch/lastch. */ - __LINE **lines; /* Array of pointers to the lines */ + int reqy, reqx; /* Size requested when created */ + int ch_off; /* x offset for firstch/lastch. */ + __LINE **alines; /* Array of pointers to the lines */ __LINE *lspace; /* line space (for cleanup) */ __LDATA *wspace; /* window space (for cleanup) */ @@ -109,17 +153,32 @@ struct __window { /* Window structure. #define __LEAVEOK 0x00000100 /* If cursor left */ #define __KEYPAD 0x00010000 /* If interpreting keypad codes */ #define __NOTIMEOUT 0x00020000 /* Wait indefinitely for func keys */ +#define __IDCHAR 0x00040000 /* insert/delete char sequences */ +#define __ISPAD 0x00080000 /* "window" is a pad */ unsigned int flags; int delay; /* delay for getch() */ attr_t wattr; /* Character attributes */ wchar_t bch; /* Background character */ attr_t battr; /* Background attributes */ int scr_t, scr_b; /* Scrolling region top, bottom */ + SCREEN *screen; /* Screen for this window */ + int pbegy, pbegx, + sbegy, sbegx, + smaxy, smaxx; /* Saved prefresh() values */ +#ifdef HAVE_WCHAR + nschar_t *bnsp; /* Background non-spacing char list */ +#endif /* HAVE_WCHAR */ }; /* Set of attributes unset by 'me' - 'mb', 'md', 'mh', 'mk', 'mp' and 'mr'. */ +#ifndef HAVE_WCHAR #define __TERMATTR \ (__REVERSE | __BLINK | __DIM | __BOLD | __BLANK | __PROTECT) +#else +#define __TERMATTR \ + (__REVERSE | __BLINK | __DIM | __BOLD | __BLANK | __PROTECT \ + | WA_TOP | WA_LOW | WA_LEFT | WA_RIGHT | WA_HORIZONTAL | WA_VERTICAL) +#endif /* HAVE_WCHAR */ struct __winlist { struct __window *winp; /* The window. */ @@ -144,7 +203,7 @@ struct __pair { /* Maximum colours */ #define MAX_COLORS 64 /* Maximum colour pairs - determined by number of colour bits in attr_t */ -#define MAX_PAIRS 64 /* PAIR_NUMBER(__COLOR) + 1 */ +#define MAX_PAIRS PAIR_NUMBER(__COLOR) typedef struct keymap keymap_t; @@ -157,7 +216,7 @@ struct __screen { WINDOW *stdscr; /* Standard screen. */ WINDOW *__virtscr; /* Virtual screen (for doupdate()). */ int curwin; /* current window for refresh */ - short lx, ly; /* loop parameters for refresh */ + int lx, ly; /* loop parameters for refresh */ int COLS; /* Columns on the screen. */ int LINES; /* Lines on the screen. */ int COLORS; /* Maximum colors on the screen */ @@ -193,14 +252,22 @@ struct __screen { *tc_SF, *tc_Sf, *tc_sf, *tc_so, *tc_sp, *tc_SR, *tc_sr, *tc_ta, *tc_te, *tc_ti, *tc_uc, *tc_ue, *tc_UP, *tc_up, *tc_us, +#ifndef HAVE_WCHAR *tc_vb, *tc_ve, *tc_vi, *tc_vs; +#else + *tc_vb, *tc_ve, *tc_vi, *tc_vs, *tc_Xh, + *tc_Xl, *tc_Xo, *tc_Xr, *tc_Xt, *tc_Xv; +#endif /* HAVE_WCHAR */ char CA; int str_count; chtype acs_char[NUM_ACS]; +#ifdef HAVE_WCHAR + cchar_t wacs_char[ NUM_ACS ]; +#endif /* HAVE_WCHAR */ struct __color colours[MAX_COLORS]; struct __pair colour_pairs[MAX_PAIRS]; attr_t nca; - + /* Style of colour manipulation */ #define COLOR_NONE 0 #define COLOR_ANSI 1 /* ANSI/DEC-style colour manipulation */ @@ -208,7 +275,7 @@ struct __screen { #define COLOR_TEK 3 /* Tektronix-style colour manipulation */ #define COLOR_OTHER 4 /* None of the others but can set fore/back */ int color_type; - + attr_t mask_op; attr_t mask_me; attr_t mask_ue; @@ -219,6 +286,7 @@ struct __screen { int echoit; int pfast; int rawmode; + int nl; int noqch; int clearok; int useraw; @@ -230,9 +298,23 @@ struct __screen { char *stdbuf; unsigned int len; int meta_state; - char pad_char; - char ttytype[1024]; + char padchar; + char ttytype[128]; int endwin; + int notty; + int half_delay; + int resized; + wchar_t *unget_list; + int unget_len, unget_pos; +#ifdef HAVE_WCHAR +#define MB_LEN_MAX 8 +#define MAX_CBUF_SIZE MB_LEN_MAX + int cbuf_head; /* header to cbuf */ + int cbuf_tail; /* tail to cbuf */ + int cbuf_cur; /* the current char in cbuf */ + mbstate_t sp; /* wide char processing state */ + char cbuf[ MAX_CBUF_SIZE ]; /* input character buffer */ +#endif /* HAVE_WCHAR */ }; @@ -243,23 +325,57 @@ extern int My_term; /* Use Def_term re extern const char *Def_term; /* Default terminal type. */ extern SCREEN *_cursesi_screen; /* The current screen in use */ -/* Private functions. */ +/* Debugging options/functions. */ #ifdef DEBUG -void __CTRACE(const char *fmt, ...); +#define __CTRACE_TSTAMP 0x00000001 +#define __CTRACE_MISC 0x00000002 +#define __CTRACE_INIT 0x00000004 +#define __CTRACE_SCREEN 0x00000008 +#define __CTRACE_WINDOW 0x00000010 +#define __CTRACE_REFRESH 0x00000020 +#define __CTRACE_COLOR 0x00000040 +#define __CTRACE_INPUT 0x00000080 +#define __CTRACE_OUTPUT 0x00000100 +#define __CTRACE_LINE 0x00000200 +#define __CTRACE_ATTR 0x00000400 +#define __CTRACE_ERASE 0x00000800 +#define __CTRACE_FILEIO 0x00001000 +#define __CTRACE_ALL 0x7fffffff +void __CTRACE_init(void); +void __CTRACE(int, const char *, ...) __attribute__((__format__(__printf__, 2, 3))); #endif -void _cursesi_free_keymap(keymap_t *map); -int _cursesi_gettmode(SCREEN *screen); -void _cursesi_reset_acs(SCREEN *screen); -void _cursesi_resetterm(SCREEN *screen); -int _cursesi_setterm(char *type, SCREEN *screen); + +/* Private functions. */ +void __cputchar_args(char, void *); +void _cursesi_free_keymap(keymap_t *); +int _cursesi_gettmode(SCREEN *); +void _cursesi_reset_acs(SCREEN *); +int _cursesi_addbyte(WINDOW *, __LINE **, int *, int *, int , attr_t); +int _cursesi_addwchar(WINDOW *, __LINE **, int *, int *, const cchar_t *); +#ifdef HAVE_WCHAR +void _cursesi_reset_wacs(SCREEN *); +#endif /* HAVE_WCHAR */ +void _cursesi_resetterm(SCREEN *); +int _cursesi_setterm(char *, SCREEN *); int __delay(void); -unsigned int __hash(char *s, int len); -void __id_subwins(WINDOW *orig); -void __init_getch(SCREEN *screen); -void __init_acs(SCREEN *screen); -char *__longname(char *bp, char *def); /* Original BSD version */ -int __mvcur(int ly, int lx, int y, int x, int in_refresh); -WINDOW *__newwin(SCREEN *screen, int lines, int cols, int y, int x); +u_int __hash_more(const void *, size_t, u_int); +#define __hash(s, len) __hash_more((s), (len), 0u) +void __id_subwins(WINDOW *); +void __init_getch(SCREEN *); +void __init_acs(SCREEN *); +#ifdef HAVE_WCHAR +void __init_get_wch(SCREEN *); +void __init_wacs(SCREEN *); +void __cputwchar_args( wchar_t, void * ); +int _cursesi_copy_nsp(nschar_t *, struct __ldata *); +void __cursesi_free_nsp(nschar_t *); +void __cursesi_win_free_nsp(WINDOW *); +void __cursesi_putnsp(nschar_t *, const int, const int); +#endif /* HAVE_WCHAR */ +int __unget(wint_t); +char *__longname(char *, char *); /* Original BSD version */ +int __mvcur(int, int, int, int, int); +WINDOW *__newwin(SCREEN *, int, int, int, int, int); int __nodelay(void); int __notimeout(void); char *__parse_cap(const char *, ...); @@ -269,25 +385,29 @@ void __restore_cursor_vis(void); void __restore_meta_state(void); void __restore_termios(void); void __restore_stophandler(void); +void __restore_winchhandler(void); void __save_termios(void); -void __set_color(attr_t attr); +void __set_color(WINDOW *win, attr_t attr); void __set_stophandler(void); -void __set_subwin(WINDOW *orig, WINDOW *win); -void __startwin(SCREEN *screen); -void __stop_signal_handler(int signo); +void __set_winchhandler(void); +void __set_subwin(WINDOW *, WINDOW *); +void __startwin(SCREEN *); +void __stop_signal_handler(int); int __stopwin(void); -void __swflags(WINDOW *win); -int __timeout(int delay); -int __touchline(WINDOW *win, int y, int sx, int ex); -int __touchwin(WINDOW *win); -char *__tscroll(const char *cap, int n1, int n2); +void __swflags(WINDOW *); +int __timeout(int); +int __touchline(WINDOW *, int, int, int); +int __touchwin(WINDOW *); +char *__tscroll(const char *, int, int); void __unsetattr(int); -int __waddch(WINDOW *win, __LDATA *dp); +void __unset_color(WINDOW *win); +int __waddch(WINDOW *, __LDATA *); int __wgetnstr(WINDOW *, char *, int); +void __winch_signal_handler(int); /* Private #defines. */ -#define min(a,b) (a < b ? a : b) -#define max(a,b) (a > b ? a : b) +#define min(a,b) ((a) < (b) ? (a) : (b)) +#define max(a,b) ((a) > (b) ? (a ): (b)) /* Private externs. */ extern int __echoit; @@ -295,7 +415,7 @@ extern int __endwin; extern int __pfast; extern int __rawmode; extern int __noqch; -extern attr_t __nca; extern attr_t __mask_op, __mask_me, __mask_ue, __mask_se; -extern struct __winlist *__winlistp; extern WINDOW *__virtscr; +extern int __using_color; +extern attr_t __default_color;