X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fllib-lncursesw;h=7d0dc1baa54255dc2fef3f078dc829d92287df54;hp=be768d716b9cdab3e00ab570c4304119a0c77531;hb=746490c7ab9f66c7521c500684e65eca223c551c;hpb=cc387b11f421650091d84640e05825ea5161ac66;ds=sidebyside diff --git a/ncurses/llib-lncursesw b/ncurses/llib-lncursesw index be768d71..7d0dc1ba 100644 --- a/ncurses/llib-lncursesw +++ b/ncurses/llib-lncursesw @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2001-2011,2013 Free Software Foundation, Inc. * + * Copyright (c) 2001-2017,2018 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -27,14 +27,13 @@ ****************************************************************************/ /**************************************************************************** - * Author: Thomas E. Dickey 2001-on * + * Author: Thomas E. Dickey 2001-on * ****************************************************************************/ /* LINTLIBRARY */ /* ./tty/hardscroll.c */ #include - #undef _nc_oldnums int *_nc_oldnums; @@ -95,8 +94,6 @@ void _nc_scroll_oldhash( /* ./base/lib_addch.c */ -#include - #undef _nc_render cchar_t _nc_render( WINDOW *win, @@ -221,7 +218,7 @@ int wchgat( WINDOW *win, int n, attr_t attr, - short color, + short pair_arg, const void *opts) { return(*(int *)0); } @@ -256,8 +253,6 @@ int wclrtoeol( /* ./base/lib_color.c */ -#include - #undef COLOR_PAIRS int COLOR_PAIRS; #undef COLORS @@ -281,6 +276,26 @@ int start_color_sp( int start_color(void) { return(*(int *)0); } +#undef _nc_change_pair +void _nc_change_pair( + SCREEN *sp, + int pair) + { /* void */ } + +#undef _nc_reserve_pairs +colorpair_t *_nc_reserve_pairs( + SCREEN *sp, + int want) + { return(*(colorpair_t **)0); } + +#undef _nc_init_pair +int _nc_init_pair( + SCREEN *sp, + int pair, + int f, + int b) + { return(*(int *)0); } + #undef init_pair_sp int init_pair_sp( SCREEN *sp, @@ -296,6 +311,15 @@ int init_pair( short b) { return(*(int *)0); } +#undef _nc_init_color +int _nc_init_color( + SCREEN *sp, + int color, + int r, + int g, + int b) + { return(*(int *)0); } + #undef init_color_sp int init_color_sp( SCREEN *sp, @@ -348,6 +372,14 @@ int color_content( short *b) { return(*(int *)0); } +#undef _nc_pair_content +int _nc_pair_content( + SCREEN *sp, + int pair, + int *f, + int *b) + { return(*(int *)0); } + #undef pair_content_sp int pair_content_sp( SCREEN *sp, @@ -380,12 +412,85 @@ void _nc_do_color( NCURSES_OUTC outc) { /* void */ } +#undef init_extended_pair_sp +int init_extended_pair_sp( + SCREEN *sp, + int pair, + int f, + int b) + { return(*(int *)0); } + +#undef init_extended_color_sp +int init_extended_color_sp( + SCREEN *sp, + int color, + int r, + int g, + int b) + { return(*(int *)0); } + +#undef extended_color_content_sp +int extended_color_content_sp( + SCREEN *sp, + int color, + int *r, + int *g, + int *b) + { return(*(int *)0); } + +#undef extended_pair_content_sp +int extended_pair_content_sp( + SCREEN *sp, + int pair, + int *f, + int *b) + { return(*(int *)0); } + +#undef reset_color_pairs_sp +void reset_color_pairs_sp( + SCREEN *sp) + { /* void */ } + +#undef init_extended_pair +int init_extended_pair( + int pair, + int f, + int b) + { return(*(int *)0); } + +#undef init_extended_color +int init_extended_color( + int color, + int r, + int g, + int b) + { return(*(int *)0); } + +#undef extended_color_content +int extended_color_content( + int color, + int *r, + int *g, + int *b) + { return(*(int *)0); } + +#undef extended_pair_content +int extended_pair_content( + int pair, + int *f, + int *b) + { return(*(int *)0); } + +#undef reset_color_pairs +void reset_color_pairs(void) + { /* void */ } + /* ./base/lib_colorset.c */ #undef wcolor_set int wcolor_set( WINDOW *win, - short color_pair_number, + short pair_arg, void *opts) { return(*(int *)0); } @@ -454,8 +559,6 @@ int flash(void) /* ./lib_gen.c */ -#include - #undef addch int (addch)( const chtype z) @@ -485,17 +588,17 @@ int (addstr)( #undef attroff int (attroff)( - int z) + NCURSES_ATTR_T z) { return(*(int *)0); } #undef attron int (attron)( - int z) + NCURSES_ATTR_T z) { return(*(int *)0); } #undef attrset int (attrset)( - int z) + NCURSES_ATTR_T z) { return(*(int *)0); } #undef attr_get @@ -1088,7 +1191,7 @@ int (vw_printw)( #undef vw_scanw int (vw_scanw)( WINDOW *a1, - char *a2, + const char *a2, va_list z) { return(*(int *)0); } @@ -1292,6 +1395,11 @@ NCURSES_BOOL (is_syncok)( const WINDOW *z) { return(*(NCURSES_BOOL *)0); } +#undef wgetdelay +int (wgetdelay)( + const WINDOW *z) + { return(*(int *)0); } + #undef wgetscrreg int (wgetscrreg)( const WINDOW *a1, @@ -1767,8 +1875,6 @@ NCURSES_BOOL (mouse_trafo)( /* ./base/lib_getch.c */ -#include - #undef ESCDELAY int ESCDELAY; @@ -2102,22 +2208,20 @@ void nofilter(void) #undef newterm_sp SCREEN *newterm_sp( SCREEN *sp, - char *name, + const char *name, FILE *ofp, FILE *ifp) { return(*(SCREEN **)0); } #undef newterm SCREEN *newterm( - char *name, + const char *name, FILE *ofp, FILE *ifp) { return(*(SCREEN **)0); } /* ./base/lib_newwin.c */ -#include "/usr/lib/gcc/x86_64-linux-gnu/4.4.5/include/stddef.h" - #undef _nc_freewin int _nc_freewin( WINDOW *win) @@ -2347,14 +2451,14 @@ int wnoutrefresh( #undef restartterm_sp int restartterm_sp( SCREEN *sp, - char *termp, + const char *termp, int filenum, int *errret) { return(*(int *)0); } #undef restartterm int restartterm( - char *termp, + const char *termp, int filenum, int *errret) { return(*(int *)0); } @@ -2364,20 +2468,20 @@ int restartterm( #undef vwscanw int vwscanw( WINDOW *win, - char *fmt, + const char *fmt, va_list argp) { return(*(int *)0); } #undef scanw int scanw( - char *fmt, + const char *fmt, ...) { return(*(int *)0); } #undef wscanw int wscanw( WINDOW *win, - char *fmt, + const char *fmt, ...) { return(*(int *)0); } @@ -2385,7 +2489,7 @@ int wscanw( int mvscanw( int y, int x, - char *fmt, + const char *fmt, ...) { return(*(int *)0); } @@ -2394,7 +2498,7 @@ int mvwscanw( WINDOW *win, int y, int x, - char *fmt, + const char *fmt, ...) { return(*(int *)0); } @@ -2583,14 +2687,14 @@ int slk_restore(void) int slk_attr_set_sp( SCREEN *sp, const attr_t attr, - short color_pair_number, + short pair_arg, void *opts) { return(*(int *)0); } #undef slk_attr_set int slk_attr_set( const attr_t attr, - short color_pair_number, + short pair_arg, void *opts) { return(*(int *)0); } @@ -2660,12 +2764,23 @@ int slk_clear(void) #undef slk_color_sp int slk_color_sp( SCREEN *sp, - short color_pair_number) + short pair_arg) { return(*(int *)0); } #undef slk_color int slk_color( - short color_pair_number) + short pair_arg) + { return(*(int *)0); } + +#undef extended_slk_color_sp +int extended_slk_color_sp( + SCREEN *sp, + int pair_arg) + { return(*(int *)0); } + +#undef extended_slk_color +int extended_slk_color( + int pair_arg) { return(*(int *)0); } /* ./base/lib_slkinit.c */ @@ -2716,8 +2831,6 @@ int slk_refresh(void) /* ./base/lib_slkset.c */ -#include - #undef slk_set_sp int slk_set_sp( SCREEN *sp, @@ -2775,6 +2888,12 @@ void _tracedump( /* ./trace/lib_tracemse.c */ +#undef _nc_trace_mmask_t +char *_nc_trace_mmask_t( + SCREEN *sp, + mmask_t code) + { return(*(char **)0); } + #undef _nc_tracemouse char *_nc_tracemouse( SCREEN *sp, @@ -2794,8 +2913,6 @@ char *_tracemouse( /* ./tty/lib_tstp.c */ -#include - #undef _nc_signal_handler void _nc_signal_handler( int enable) @@ -2956,9 +3073,6 @@ char *_nc_printf_string( /* ./tty/tty_update.c */ -#include -#include - #undef doupdate_sp int doupdate_sp( SCREEN *sp) @@ -3025,10 +3139,6 @@ void _nc_do_xmc_glitch( /* ./trace/varargs.c */ -typedef enum { - atUnknown = 0, atInteger, atFloat, atPoint, atString -} ARGTYPE; - #undef _nc_varargs char *_nc_varargs( const char *fmt, @@ -3111,7 +3221,7 @@ int setcchar( cchar_t *wcval, const wchar_t *wch, const attr_t attrs, - short color_pair, + short pair_arg, const void *opts) { return(*(int *)0); } @@ -3120,7 +3230,7 @@ int getcchar( const cchar_t *wcval, wchar_t *wch, attr_t *attrs, - short *color_pair, + short *pair_arg, void *opts) { return(*(int *)0); } @@ -3218,9 +3328,9 @@ int winwstr( /* ./widechar/lib_key_name.c */ #undef key_name -char *key_name( +const char *key_name( wchar_t c) - { return(*(char **)0); } + { return(*(const char **)0); } /* ./widechar/lib_pecho_wchar.c */ @@ -3265,7 +3375,7 @@ int unget_wch( int vid_puts_sp( SCREEN *sp, attr_t newmode, - short pair, + short pair_arg, void *opts, NCURSES_OUTC_sp outc) { return(*(int *)0); } @@ -3273,7 +3383,7 @@ int vid_puts_sp( #undef vid_puts int vid_puts( attr_t newmode, - short pair, + short pair_arg, void *opts, NCURSES_OUTC outc) { return(*(int *)0); } @@ -3282,14 +3392,14 @@ int vid_puts( int vid_attr_sp( SCREEN *sp, attr_t newmode, - short pair, + short pair_arg, void *opts) { return(*(int *)0); } #undef vid_attr int vid_attr( attr_t newmode, - short pair, + short pair_arg, void *opts) { return(*(int *)0); } @@ -3432,6 +3542,72 @@ int mcprint( int len) { return(*(int *)0); } +/* ./base/new_pair.c */ + +#undef _nc_free_ordered_pairs +void _nc_free_ordered_pairs( + SCREEN *sp) + { /* void */ } + +#undef _nc_reset_color_pair +void _nc_reset_color_pair( + SCREEN *sp, + int pair, + colorpair_t *next) + { /* void */ } + +#undef _nc_set_color_pair +void _nc_set_color_pair( + SCREEN *sp, + int pair, + int mode) + { /* void */ } + +#undef _nc_copy_pairs +void _nc_copy_pairs( + SCREEN *sp, + colorpair_t *target, + colorpair_t *source, + int length) + { /* void */ } + +#undef alloc_pair_sp +int alloc_pair_sp( + SCREEN *sp, + int fg, + int bg) + { return(*(int *)0); } + +#undef find_pair_sp +int find_pair_sp( + SCREEN *sp, + int fg, + int bg) + { return(*(int *)0); } + +#undef free_pair_sp +int free_pair_sp( + SCREEN *sp, + int pair) + { return(*(int *)0); } + +#undef alloc_pair +int alloc_pair( + int f, + int b) + { return(*(int *)0); } + +#undef find_pair +int find_pair( + int f, + int b) + { return(*(int *)0); } + +#undef free_pair +int free_pair( + int pair) + { return(*(int *)0); } + /* ./base/resizeterm.c */ #undef is_term_resized_sp @@ -3562,8 +3738,8 @@ int _nc_add_to_try( #undef _nc_align_termtype void _nc_align_termtype( - TERMTYPE *to, - TERMTYPE *from) + TERMTYPE2 *to, + TERMTYPE2 *from) { /* void */ } #undef _nc_copy_termtype @@ -3572,19 +3748,29 @@ void _nc_copy_termtype( const TERMTYPE *src) { /* void */ } +#undef _nc_copy_termtype2 +void _nc_copy_termtype2( + TERMTYPE2 *dst, + const TERMTYPE2 *src) + { /* void */ } + +#undef _nc_export_termtype2 +void _nc_export_termtype2( + TERMTYPE *dst, + const TERMTYPE2 *src) + { /* void */ } + /* ./codes.c */ #undef boolcodes -char *const boolcodes[] = {0}; +const char *const boolcodes[] = {0}; #undef numcodes -char *const numcodes[] = {0}; +const char *const numcodes[] = {0}; #undef strcodes -char *const strcodes[] = {0}; +const char *const strcodes[] = {0}; /* ./comp_captab.c */ -#include - #undef _nc_get_table const struct name_table_entry *_nc_get_table( NCURSES_BOOL termcap) @@ -3668,8 +3854,6 @@ struct name_table_entry const *_nc_find_type_entry( /* ./tinfo/db_iterator.c */ -#include - #undef _nc_tic_dir const char *_nc_tic_dir( const char *path) @@ -3714,7 +3898,7 @@ ENTRY *_nc_tail; #undef _nc_free_entry void _nc_free_entry( ENTRY *headp, - TERMTYPE *tterm) + TERMTYPE2 *tterm) { /* void */ } #undef _nc_free_entries @@ -3722,18 +3906,17 @@ void _nc_free_entries( ENTRY *headp) { /* void */ } -#undef _nc_delink_entry -ENTRY *_nc_delink_entry( - ENTRY *headp, - TERMTYPE *tterm) - { return(*(ENTRY **)0); } - #undef _nc_leaks_tinfo void _nc_leaks_tinfo(void) { /* void */ } /* ./fallback.c */ +#undef _nc_fallback2 +const TERMTYPE2 *_nc_fallback2( + const char *name) + { return(*(const TERMTYPE2 **)0); } + #undef _nc_fallback const TERMTYPE *_nc_fallback( const char *name) @@ -3746,6 +3929,11 @@ void _nc_free_termtype( TERMTYPE *ptr) { /* void */ } +#undef _nc_free_termtype2 +void _nc_free_termtype2( + TERMTYPE2 *ptr) + { /* void */ } + #undef _nc_user_definable NCURSES_BOOL _nc_user_definable; @@ -3775,15 +3963,6 @@ char *_nc_home_terminfo(void) /* ./tinfo/init_keytry.c */ -#if 0 - -#include - -#undef _nc_tinfo_fkeys -const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0}; - -#endif - #undef _nc_init_keytry void _nc_init_keytry( SCREEN *sp) @@ -3805,11 +3984,9 @@ void _nc_init_acs(void) /* ./tinfo/lib_baudrate.c */ -#include - struct speed { - int s; - int sp; + int given_speed; + int actual_speed; }; #undef _nc_baudrate @@ -3934,18 +4111,23 @@ int flushinp(void) struct kn { short offset; int code; }; #undef keyname_sp -char *keyname_sp( +const char *keyname_sp( SCREEN *sp, int c) - { return(*(char **)0); } + { return(*(const char **)0); } #undef keyname -char *keyname( +const char *keyname( int c) - { return(*(char **)0); } + { return(*(const char **)0); } /* ./tinfo/lib_longname.c */ +#undef longname_sp +char *longname_sp( + SCREEN *sp) + { return(*(char **)0); } + #undef longname char *longname(void) { return(*(char **)0); } @@ -4135,10 +4317,6 @@ int intrflush( /* ./tinfo/lib_setup.c */ -#include -#include -#include - #undef ttytype char ttytype[256]; #undef LINES @@ -4201,7 +4379,7 @@ void _nc_update_screensize( #undef _nc_setup_tinfo int _nc_setup_tinfo( const char *const tn, - TERMTYPE *const tp) + TERMTYPE2 *const tp) { return(*(int *)0); } #undef _nc_tinfo_cmdch @@ -4225,7 +4403,7 @@ int _nc_locale_breaks_acs( #undef _nc_setupterm int _nc_setupterm( - char *tname, + const char *tname, int Filedes, int *errret, int reuse) @@ -4237,7 +4415,7 @@ SCREEN *new_prescr(void) #undef setupterm int setupterm( - char *tname, + const char *tname, int Filedes, int *errret) { return(*(int *)0); } @@ -4256,12 +4434,6 @@ int tgetent_sp( const char *name) { return(*(int *)0); } -#if 0 - -#include - -#endif - #undef tgetent int tgetent( char *bufp, @@ -4271,35 +4443,35 @@ int tgetent( #undef tgetflag_sp int tgetflag_sp( SCREEN *sp, - char *id) + const char *id) { return(*(int *)0); } #undef tgetflag int tgetflag( - char *id) + const char *id) { return(*(int *)0); } #undef tgetnum_sp int tgetnum_sp( SCREEN *sp, - char *id) + const char *id) { return(*(int *)0); } #undef tgetnum int tgetnum( - char *id) + const char *id) { return(*(int *)0); } #undef tgetstr_sp char *tgetstr_sp( SCREEN *sp, - char *id, + const char *id, char **area) { return(*(char **)0); } #undef tgetstr char *tgetstr( - char *id, + const char *id, char **area) { return(*(char **)0); } @@ -4328,34 +4500,34 @@ char *tgoto( #undef tigetflag_sp int tigetflag_sp( SCREEN *sp, - char *str) + const char *str) { return(*(int *)0); } #undef tigetflag int tigetflag( - char *str) + const char *str) { return(*(int *)0); } #undef tigetnum_sp int tigetnum_sp( SCREEN *sp, - char *str) + const char *str) { return(*(int *)0); } #undef tigetnum int tigetnum( - char *str) + const char *str) { return(*(int *)0); } #undef tigetstr_sp char *tigetstr_sp( SCREEN *sp, - char *str) + const char *str) { return(*(char **)0); } #undef tigetstr char *tigetstr( - char *str) + const char *str) { return(*(char **)0); } /* ./tinfo/lib_tparm.c */ @@ -4372,7 +4544,7 @@ int _nc_tparm_analyze( #undef tparm char *tparm( - char *string, + const char *string, ...) { return(*(char **)0); } @@ -4535,9 +4707,9 @@ const char *_nc_retrace_cptr( { return(*(const char **)0); } #undef _nc_retrace_cvoid_ptr -void *_nc_retrace_cvoid_ptr( - void *code) - { return(*(void **)0); } +const void *_nc_retrace_cvoid_ptr( + const void *code) + { return(*(const void **)0); } #undef _nc_retrace_void_ptr void *_nc_retrace_void_ptr( @@ -4612,11 +4784,6 @@ char *_tracecchar_t( /* ./trace/lib_tracebits.c */ -typedef struct { - unsigned int val; - const char *name; -} BITNAMES; - #undef _nc_trace_ttymode char *_nc_trace_ttymode( struct termios *tty) @@ -4744,17 +4911,17 @@ int _nc_name_match( /* ./names.c */ #undef boolnames -char *const boolnames[] = {0}; +const char *const boolnames[] = {0}; #undef boolfnames -char *const boolfnames[] = {0}; +const char *const boolfnames[] = {0}; #undef numnames -char *const numnames[] = {0}; +const char *const numnames[] = {0}; #undef numfnames -char *const numfnames[] = {0}; +const char *const numfnames[] = {0}; #undef strnames -char *const strnames[] = {0}; +const char *const strnames[] = {0}; #undef strfnames -char *const strfnames[] = {0}; +const char *const strfnames[] = {0}; /* ./tinfo/obsolete.c */ @@ -4773,16 +4940,14 @@ void _nc_set_buffer( /* ./tinfo/read_entry.c */ -#include - #undef _nc_init_termtype void _nc_init_termtype( - TERMTYPE *const tp) + TERMTYPE2 *const tp) { /* void */ } #undef _nc_read_termtype int _nc_read_termtype( - TERMTYPE *ptr, + TERMTYPE2 *ptr, char *buffer, int limit) { return(*(int *)0); } @@ -4790,7 +4955,14 @@ int _nc_read_termtype( #undef _nc_read_file_entry int _nc_read_file_entry( const char *const filename, - TERMTYPE *ptr) + TERMTYPE2 *ptr) + { return(*(int *)0); } + +#undef _nc_read_entry2 +int _nc_read_entry2( + const char *const name, + char *const filename, + TERMTYPE2 *const tp) { return(*(int *)0); } #undef _nc_read_entry @@ -4802,11 +4974,11 @@ int _nc_read_entry( /* ./tinfo/read_termcap.c */ -#include - -#undef _nc_read_termcap -void _nc_read_termcap(void) - { /* void */ } +#undef _nc_read_termcap_entry +int _nc_read_termcap_entry( + const char *const tn, + TERMTYPE2 *const tp) + { return(*(int *)0); } /* ./tinfo/strings.c */ @@ -4888,21 +5060,21 @@ int _nc_remove_string( #undef _nc_trim_sgr0 char *_nc_trim_sgr0( - TERMTYPE *tp) + TERMTYPE2 *tp) { return(*(char **)0); } /* ./unctrl.c */ #undef unctrl_sp -char *unctrl_sp( +const char *unctrl_sp( SCREEN *sp, chtype ch) - { return(*(char **)0); } + { return(*(const char **)0); } #undef unctrl -char *unctrl( +const char *unctrl( chtype ch) - { return(*(char **)0); } + { return(*(const char **)0); } /* ./trace/visbuf.c */ @@ -4962,7 +5134,7 @@ const char *_nc_viscbuf( #undef _nc_init_entry void _nc_init_entry( - TERMTYPE *const tp) + ENTRY *const tp) { /* void */ } #undef _nc_copy_entry @@ -4983,8 +5155,8 @@ void _nc_wrap_entry( #undef _nc_merge_entry void _nc_merge_entry( - TERMTYPE *const to, - TERMTYPE *const from) + ENTRY *const target, + ENTRY *const source) { /* void */ } /* ./tinfo/captoinfo.c */ @@ -5016,11 +5188,8 @@ char *_nc_tic_expand( #undef _nc_check_termtype2 void (*_nc_check_termtype2)( - TERMTYPE *p1, + TERMTYPE2 *p1, NCURSES_BOOL p2); -#undef _nc_check_termtype -void (*_nc_check_termtype)( - TERMTYPE *p1); #undef _nc_entry_match NCURSES_BOOL _nc_entry_match( @@ -5044,11 +5213,6 @@ int _nc_resolve_uses2( NCURSES_BOOL literal) { return(*(int *)0); } -#undef _nc_resolve_uses -int _nc_resolve_uses( - NCURSES_BOOL fullresolve) - { return(*(int *)0); } - /* ./tinfo/comp_scan.c */ #undef _nc_syntax @@ -5099,7 +5263,7 @@ void _nc_panic_mode( #undef _nc_parse_entry int _nc_parse_entry( - struct entry *entryp, + ENTRY *entryp, int literal, NCURSES_BOOL silent) { return(*(int *)0); } @@ -5110,23 +5274,26 @@ int _nc_capcmp( const char *t) { return(*(int *)0); } -typedef struct { - const char *from; - const char *to; -} assoc; - /* ./tinfo/write_entry.c */ #undef _nc_set_writedir void _nc_set_writedir( - char *dir) + const char *dir) { /* void */ } #undef _nc_write_entry void _nc_write_entry( - TERMTYPE *const tp) + TERMTYPE2 *const tp) { /* void */ } +#undef _nc_write_object +int _nc_write_object( + TERMTYPE2 *tp, + char *buffer, + unsigned *offset, + unsigned limit) + { return(*(int *)0); } + #undef _nc_tic_written int _nc_tic_written(void) { return(*(int *)0); }