[BACK]Return to curses_private.h CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / lib / libcurses

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/lib/libcurses/curses_private.h between version 1.41 and 1.44

version 1.41, 2007/12/08 18:38:11 version 1.44, 2010/02/03 15:34:40
Line 39 
Line 39 
  *   character input (used in get_wch())   *   character input (used in get_wch())
  */   */
   
   #include <term.h>
 #include <termios.h>  #include <termios.h>
   
 /* Private structure definitions for curses. */  /* Private structure definitions for curses. */
   
 /* Termcap capabilities. */  /* Termcap capabilities. */
 extern char     __tc_am, __tc_bs, __tc_cc, __tc_da, __tc_eo,  
                 __tc_hc, __tc_hl, __tc_in, __tc_mi, __tc_ms,  
                 __tc_nc, __tc_ns, __tc_os, __tc_ul, __tc_ut,  
                 __tc_xb, __tc_xn, __tc_xt, __tc_xs, __tc_xx;  
 extern char     __CA;  
 extern int      __tc_pa, __tc_Co, __tc_NC;  
 extern char     *__tc_ac, *__tc_AB, *__tc_ae, *__tc_AF, *__tc_AL,  
                 *__tc_al, *__tc_as, *__tc_bc, *__tc_bl, *__tc_bt,  
                 *__tc_cd, *__tc_ce, *__tc_cl, *__tc_cm, *__tc_cr,  
                 *__tc_cs, *__tc_dc, *__tc_DL, *__tc_dl, *__tc_dm,  
                 *__tc_DO, *__tc_do, *__tc_eA, *__tc_ed, *__tc_ei,  
                 *__tc_ho, *__tc_Ic, *__tc_ic, *__tc_im, *__tc_Ip,  
                 *__tc_ip, *__tc_k0, *__tc_k1, *__tc_k2, *__tc_k3,  
                 *__tc_k4, *__tc_k5, *__tc_k6, *__tc_k7, *__tc_k8,  
                 *__tc_k9, *__tc_kd, *__tc_ke, *__tc_kh, *__tc_kl,  
                 *__tc_kr, *__tc_ks, *__tc_ku, *__tc_LE, *__tc_ll,  
                 *__tc_ma, *__tc_mb, *__tc_md, *__tc_me, *__tc_mh,  
                 *__tc_mk, *__tc_mm, *__tc_mo, *__tc_mp, *__tc_mr,  
                 *__tc_nd, *__tc_nl, *__tc_oc, *__tc_op,  
                 *__tc_rc, *__tc_RI, *__tc_Sb, *__tc_sc, *__tc_se,  
                 *__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,  
                 *__tc_vb, *__tc_ve, *__tc_vi, *__tc_vs;  
   
 #ifdef HAVE_WCHAR  #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   * Add a list of non-spacing characters to each spacing
  * character in a singly linked list   * character in a singly linked list
Line 83  typedef struct nschar_t {
Line 57  typedef struct nschar_t {
 #endif /* HAVE_WCHAR */  #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.   * 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   * IMPORTANT: the __LDATA structure must NOT induce any padding, so if new
Line 139  struct __window {  /* Window structure. 
Line 113  struct __window {  /* Window structure. 
         int maxy, maxx;                 /* Maximum values for curx, cury. */          int maxy, maxx;                 /* Maximum values for curx, cury. */
         int reqy, reqx;                 /* Size requested when created */          int reqy, reqx;                 /* Size requested when created */
         int ch_off;                     /* x offset for firstch/lastch. */          int ch_off;                     /* x offset for firstch/lastch. */
         __LINE **lines;                 /* Array of pointers to the lines */          __LINE **alines;                /* Array of pointers to the lines */
         __LINE  *lspace;                /* line space (for cleanup) */          __LINE  *lspace;                /* line space (for cleanup) */
         __LDATA *wspace;                /* window space (for cleanup) */          __LDATA *wspace;                /* window space (for cleanup) */
   
Line 226  struct __screen {
Line 200  struct __screen {
         char     NONL;          /* Term can't hack LF doing a CR. */          char     NONL;          /* Term can't hack LF doing a CR. */
         char     UPPERCASE;     /* Terminal is uppercase only. */          char     UPPERCASE;     /* Terminal is uppercase only. */
   
         /* BEWARE!!! The order of the following terminal capabilities */  
         /* (tc_foo) is important - do not update without fixing the zap */  
         /* function in setterm.c */  
         char    tc_am, tc_bs, tc_cc, tc_da, tc_eo, tc_hc, tc_hl, tc_in, tc_mi,  
                 tc_ms, tc_nc, tc_ns, tc_os, tc_ul, tc_ut, tc_xb, tc_xn, tc_xt,  
                 tc_xs, tc_xx;  
         int     flag_count;  
         int     tc_pa, tc_Co, tc_NC;  
         int     int_count;  
         char    *tc_AB, *tc_ac, *tc_ae, *tc_AF, *tc_AL,  
                 *tc_al, *tc_as, *tc_bc, *tc_bl, *tc_bt,  
                 *tc_cd, *tc_ce, *tc_cl, *tc_cm, *tc_cr,  
                 *tc_cs, *tc_dc, *tc_DL, *tc_dl, *tc_dm,  
                 *tc_DO, *tc_do, *tc_eA, *tc_ed, *tc_ei,  
                 *tc_ho, *tc_Ic, *tc_ic, *tc_im, *tc_Ip,  
                 *tc_ip, *tc_k0, *tc_k1, *tc_k2, *tc_k3,  
                 *tc_k4, *tc_k5, *tc_k6, *tc_k7, *tc_k8,  
                 *tc_k9, *tc_kd, *tc_ke, *tc_kh, *tc_kl,  
                 *tc_kr, *tc_ks, *tc_ku, *tc_LE, *tc_ll,  
                 *tc_ma, *tc_mb, *tc_md, *tc_me, *tc_mh,  
                 *tc_mk, *tc_mm, *tc_mo, *tc_mp, *tc_mr,  
                 *tc_nd, *tc_nl, *tc_oc, *tc_op, *tc_pc,  
                 *tc_rc, *tc_RI, *tc_Sb, *tc_sc, *tc_se,  
                 *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];          chtype acs_char[NUM_ACS];
 #ifdef HAVE_WCHAR  #ifdef HAVE_WCHAR
         cchar_t wacs_char[ NUM_ACS ];          cchar_t wacs_char[ NUM_ACS ];
Line 280  struct __screen {
Line 220  struct __screen {
         attr_t mask_me;          attr_t mask_me;
         attr_t mask_ue;          attr_t mask_ue;
         attr_t mask_se;          attr_t mask_se;
         struct tinfo *cursesi_genbuf;          TERMINAL *term;
         int old_mode; /* old cursor visibility state for terminal */          int old_mode; /* old cursor visibility state for terminal */
         keymap_t *base_keymap;          keymap_t *base_keymap;
         int echoit;          int echoit;
Line 298  struct __screen {
Line 238  struct __screen {
         char *stdbuf;          char *stdbuf;
         unsigned int len;          unsigned int len;
         int meta_state;          int meta_state;
         char pad_char;          char padchar;
         char ttytype[128];          char ttytype[128];
         int endwin;          int endwin;
         int notty;          int notty;
Line 339  extern SCREEN   *_cursesi_screen;       
Line 279  extern SCREEN   *_cursesi_screen;       
 #define __CTRACE_LINE           0x00000200  #define __CTRACE_LINE           0x00000200
 #define __CTRACE_ATTR           0x00000400  #define __CTRACE_ATTR           0x00000400
 #define __CTRACE_ERASE          0x00000800  #define __CTRACE_ERASE          0x00000800
   #define __CTRACE_FILEIO         0x00001000
 #define __CTRACE_ALL            0x7fffffff  #define __CTRACE_ALL            0x7fffffff
 void     __CTRACE_init(void);  void     __CTRACE_init(void);
 void     __CTRACE(int, const char *, ...) __attribute__((__format__(__printf__, 2, 3)));  void     __CTRACE(int, const char *, ...) __attribute__((__format__(__printf__, 2, 3)));
 #endif  #endif
   
 /* Private functions. */  /* Private functions. */
 void     __cputchar_args(char, void *);  int     __cputchar_args(int, void *);
 void     _cursesi_free_keymap(keymap_t *);  void     _cursesi_free_keymap(keymap_t *);
 int      _cursesi_gettmode(SCREEN *);  int      _cursesi_gettmode(SCREEN *);
 void     _cursesi_reset_acs(SCREEN *);  void     _cursesi_reset_acs(SCREEN *);
Line 365  void  __init_acs(SCREEN *);
Line 306  void  __init_acs(SCREEN *);
 #ifdef HAVE_WCHAR  #ifdef HAVE_WCHAR
 void     __init_get_wch(SCREEN *);  void     __init_get_wch(SCREEN *);
 void     __init_wacs(SCREEN *);  void     __init_wacs(SCREEN *);
 void    __cputwchar_args( wchar_t, void * );  int     __cputwchar_args( wchar_t, void * );
 int     _cursesi_copy_nsp(nschar_t *, struct __ldata *);  int     _cursesi_copy_nsp(nschar_t *, struct __ldata *);
 void    __cursesi_free_nsp(nschar_t *);  void    __cursesi_free_nsp(nschar_t *);
 void    __cursesi_win_free_nsp(WINDOW *);  void    __cursesi_win_free_nsp(WINDOW *);
Line 377  int  __mvcur(int, int, int, int, int);
Line 318  int  __mvcur(int, int, int, int, int);
 WINDOW  *__newwin(SCREEN *, int, int, int, int, int);  WINDOW  *__newwin(SCREEN *, int, int, int, int, int);
 int      __nodelay(void);  int      __nodelay(void);
 int      __notimeout(void);  int      __notimeout(void);
 char    *__parse_cap(const char *, ...);  
 void     __restartwin(void);  void     __restartwin(void);
 void     __restore_colors(void);  void     __restore_colors(void);
 void     __restore_cursor_vis(void);  void     __restore_cursor_vis(void);
Line 397  void  __swflags(WINDOW *);
Line 337  void  __swflags(WINDOW *);
 int      __timeout(int);  int      __timeout(int);
 int      __touchline(WINDOW *, int, int, int);  int      __touchline(WINDOW *, int, int, int);
 int      __touchwin(WINDOW *);  int      __touchwin(WINDOW *);
 char    *__tscroll(const char *, int, int);  
 void     __unsetattr(int);  void     __unsetattr(int);
 void     __unset_color(WINDOW *win);  void     __unset_color(WINDOW *win);
 int      __waddch(WINDOW *, __LDATA *);  int      __waddch(WINDOW *, __LDATA *);
 int      __wgetnstr(WINDOW *, char *, int);  int      __wgetnstr(WINDOW *, char *, int);
 #ifdef HAVE_WCHAR  
 int  __wgetn_wstr(WINDOW *, wchar_t *, int);  
 #endif /* HAVE_WCHAR */  
 void     __winch_signal_handler(int);  void     __winch_signal_handler(int);
   
 /* Private #defines. */  /* Private #defines. */

Legend:
Removed from v.1.41  
changed lines
  Added in v.1.44

CVSweb <webmaster@jp.NetBSD.org>