X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fllib-lncursesw;h=217ae1b522db9f9213f0364743f98426848ffc7b;hp=be768d716b9cdab3e00ab570c4304119a0c77531;hb=6a530b46563470c2ca73579d1994a0c8e275dd98;hpb=32f9f5f12cd9159261f9db228461049e8c770404 diff --git a/ncurses/llib-lncursesw b/ncurses/llib-lncursesw index be768d71..217ae1b5 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-2013,2015 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,7 +27,7 @@ ****************************************************************************/ /**************************************************************************** - * Author: Thomas E. Dickey 2001-on * + * Author: Thomas E. Dickey 2001-on * ****************************************************************************/ /* LINTLIBRARY */ @@ -95,8 +95,6 @@ void _nc_scroll_oldhash( /* ./base/lib_addch.c */ -#include - #undef _nc_render cchar_t _nc_render( WINDOW *win, @@ -256,8 +254,6 @@ int wclrtoeol( /* ./base/lib_color.c */ -#include - #undef COLOR_PAIRS int COLOR_PAIRS; #undef COLORS @@ -454,8 +450,6 @@ int flash(void) /* ./lib_gen.c */ -#include - #undef addch int (addch)( const chtype z) @@ -485,17 +479,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 +1082,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 +1286,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 +1766,6 @@ NCURSES_BOOL (mouse_trafo)( /* ./base/lib_getch.c */ -#include - #undef ESCDELAY int ESCDELAY; @@ -1907,6 +1904,13 @@ int leaveok( /* ./base/lib_mouse.c */ +typedef struct { + int nerror; + int nparam; + int params[9]; + int final; +} SGR_DATA; + #undef getmouse_sp int getmouse_sp( SCREEN *sp, @@ -2102,22 +2106,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 +2349,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 +2366,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 +2387,7 @@ int wscanw( int mvscanw( int y, int x, - char *fmt, + const char *fmt, ...) { return(*(int *)0); } @@ -2394,12 +2396,34 @@ int mvwscanw( WINDOW *win, int y, int x, - char *fmt, + const char *fmt, ...) { return(*(int *)0); } /* ./base/lib_screen.c */ +typedef enum { + pINT + ,pSHORT + ,pBOOL + ,pATTR + ,pCHAR + ,pSIZE + ,pCCHAR +} PARAM_TYPE; + +typedef struct { + const char name[11]; + attr_t attr; +} SCR_ATTRS; + +typedef struct { + const char name[17]; + PARAM_TYPE type; + size_t size; + size_t offset; +} SCR_PARAMS; + #undef getwin_sp WINDOW *getwin_sp( SCREEN *sp, @@ -2716,8 +2740,6 @@ int slk_refresh(void) /* ./base/lib_slkset.c */ -#include - #undef slk_set_sp int slk_set_sp( SCREEN *sp, @@ -2775,6 +2797,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 +2822,6 @@ char *_tracemouse( /* ./tty/lib_tstp.c */ -#include - #undef _nc_signal_handler void _nc_signal_handler( int enable) @@ -2956,9 +2982,6 @@ char *_nc_printf_string( /* ./tty/tty_update.c */ -#include -#include - #undef doupdate_sp int doupdate_sp( SCREEN *sp) @@ -3218,9 +3241,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 */ @@ -3575,16 +3598,14 @@ void _nc_copy_termtype( /* ./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 +3689,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) @@ -3775,15 +3794,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,10 +3815,8 @@ void _nc_init_acs(void) /* ./tinfo/lib_baudrate.c */ -#include - struct speed { - int s; + short s; int sp; }; @@ -3934,18 +3942,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 +4148,6 @@ int intrflush( /* ./tinfo/lib_setup.c */ -#include -#include -#include - #undef ttytype char ttytype[256]; #undef LINES @@ -4225,7 +4234,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 +4246,7 @@ SCREEN *new_prescr(void) #undef setupterm int setupterm( - char *tname, + const char *tname, int Filedes, int *errret) { return(*(int *)0); } @@ -4256,12 +4265,6 @@ int tgetent_sp( const char *name) { return(*(int *)0); } -#if 0 - -#include - -#endif - #undef tgetent int tgetent( char *bufp, @@ -4271,35 +4274,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 +4331,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 +4375,7 @@ int _nc_tparm_analyze( #undef tparm char *tparm( - char *string, + const char *string, ...) { return(*(char **)0); } @@ -4535,9 +4538,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( @@ -4614,7 +4617,7 @@ char *_tracecchar_t( typedef struct { unsigned int val; - const char *name; + const char name[8]; } BITNAMES; #undef _nc_trace_ttymode @@ -4744,17 +4747,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,8 +4776,6 @@ void _nc_set_buffer( /* ./tinfo/read_entry.c */ -#include - #undef _nc_init_termtype void _nc_init_termtype( TERMTYPE *const tp) @@ -4802,8 +4803,6 @@ int _nc_read_entry( /* ./tinfo/read_termcap.c */ -#include - #undef _nc_read_termcap void _nc_read_termcap(void) { /* void */ } @@ -4894,15 +4893,15 @@ char *_nc_trim_sgr0( /* ./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 */ @@ -5111,15 +5110,15 @@ int _nc_capcmp( { return(*(int *)0); } typedef struct { - const char *from; - const char *to; + const char from[3]; + const char to[6]; } assoc; /* ./tinfo/write_entry.c */ #undef _nc_set_writedir void _nc_set_writedir( - char *dir) + const char *dir) { /* void */ } #undef _nc_write_entry