[patch] Curses.i diff

curses.i.diff (text/plain), 7.69 KB, created by Eli Schwartz on 2024-04-10 00:58:53 UTC

diff --git a/tmp/Curses-oldgood.i b/tmp/Curses-newbad.i
index a466899..5997b63 100644
--- a/tmp/Curses-oldgood.i
+++ b/tmp/Curses-newbad.i
@@ -3046,9 +3046,9 @@ __attribute__ ((__nothrow__ , __leaf__)) strlcat (char *__restrict __dest, const
 
 # 54 "Curses.c" 2
 # 1 "/usr/include/curses.h" 1 3 4
-# 89 "/usr/include/curses.h" 3 4
+# 90 "/usr/include/curses.h" 3 4
 # 1 "/usr/include/ncurses_dll.h" 1 3 4
-# 90 "/usr/include/curses.h" 2 3 4
+# 91 "/usr/include/curses.h" 2 3 4
 
 
 
@@ -3119,87 +3119,30 @@ typedef unsigned long int uintptr_t;
 typedef __intmax_t intmax_t;
 typedef __uintmax_t uintmax_t;
 # 10 "/usr/lib/gcc/x86_64-pc-linux-gnu/13/include/stdint.h" 2 3 4
-# 96 "/usr/include/curses.h" 2 3 4
-# 222 "/usr/include/curses.h" 3 4
+# 97 "/usr/include/curses.h" 2 3 4
+# 236 "/usr/include/curses.h" 3 4
 typedef unsigned chtype;
 typedef unsigned mmask_t;
-# 249 "/usr/include/curses.h" 3 4
+# 263 "/usr/include/curses.h" 3 4
 # 1 "/usr/lib/gcc/x86_64-pc-linux-gnu/13/include/stdarg.h" 1 3 4
-# 250 "/usr/include/curses.h" 2 3 4
-# 272 "/usr/include/curses.h" 3 4
+# 264 "/usr/include/curses.h" 2 3 4
+# 286 "/usr/include/curses.h" 3 4
 typedef unsigned char NCURSES_BOOL;
-# 282 "/usr/include/curses.h" 3 4
+# 296 "/usr/include/curses.h" 3 4
 # 1 "/usr/lib/gcc/x86_64-pc-linux-gnu/13/include/stdbool.h" 1 3 4
-# 283 "/usr/include/curses.h" 2 3 4
-# 344 "/usr/include/curses.h" 3 4
+# 297 "/usr/include/curses.h" 2 3 4
+# 358 "/usr/include/curses.h" 3 4
 extern chtype acs_map[];
-# 439 "/usr/include/curses.h" 3 4
+# 453 "/usr/include/curses.h" 3 4
 typedef struct screen SCREEN;
 
 
 typedef struct _win_st WINDOW;
 
 typedef chtype attr_t;
-# 489 "/usr/include/curses.h" 3 4
-struct ldat;
-
-struct _win_st
-{
- short _cury, _curx;
-
-
- short _maxy, _maxx;
- short _begy, _begx;
-
- short _flags;
-
-
- attr_t _attrs;
- chtype _bkgd;
-
-
- _Bool _notimeout;
- _Bool _clear;
- _Bool _leaveok;
- _Bool _scroll;
- _Bool _idlok;
- _Bool _idcok;
- _Bool _immed;
- _Bool _sync;
- _Bool _use_keypad;
- int _delay;
-
- struct ldat *_line;
-
-
- short _regtop;
- short _regbottom;
-
-
- int _parx;
- int _pary;
- WINDOW *_parent;
-
-
- struct pdat
- {
-     short _pad_y, _pad_x;
-     short _pad_top, _pad_left;
-     short _pad_bottom, _pad_right;
- } _pad;
-
- short _yoffset;
-
-
-
-
-
-
-
-};
-# 597 "/usr/include/curses.h" 3 4
+# 611 "/usr/include/curses.h" 3 4
 typedef int (*NCURSES_OUTC)(int);
-# 606 "/usr/include/curses.h" 3 4
+# 620 "/usr/include/curses.h" 3 4
 extern int addch (const chtype);
 extern int addchnstr (const chtype *, int);
 extern int addchstr (const chtype *);
@@ -3493,6 +3436,8 @@ extern char * tparm (const char *, ...);
 
 
 extern char * tiparm (const char *, ...);
+extern char * tiparm_s (int, int, const char *, ...);
+extern int tiscan_s (int *, int *, const char *);
 
 
 
@@ -3506,14 +3451,12 @@ extern int getmaxx (const WINDOW *);
 extern int getmaxy (const WINDOW *);
 extern int getparx (const WINDOW *);
 extern int getpary (const WINDOW *);
-# 926 "/usr/include/curses.h" 3 4
+# 942 "/usr/include/curses.h" 3 4
 typedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);
 typedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);
-extern _Bool is_term_resized (int, int);
-extern char * keybound (int, int);
-extern const char * curses_version (void);
 extern int alloc_pair (int, int);
 extern int assume_default_colors (int, int);
+extern const char * curses_version (void);
 extern int define_key (const char *, int);
 extern int extended_color_content(int, int *, int *, int *);
 extern int extended_pair_content(int, int *, int *);
@@ -3523,20 +3466,31 @@ extern int free_pair (int);
 extern int get_escdelay (void);
 extern int init_extended_color(int, int, int, int);
 extern int init_extended_pair(int, int, int);
+extern int is_cbreak(void);
+extern int is_echo(void);
+extern int is_nl(void);
+extern int is_raw(void);
+extern _Bool is_term_resized (int, int);
 extern int key_defined (const char *);
+extern char * keybound (int, int);
 extern int keyok (int, _Bool);
+extern void nofilter(void);
 extern void reset_color_pairs (void);
 extern int resize_term (int, int);
 extern int resizeterm (int, int);
 extern int set_escdelay (int);
 extern int set_tabsize (int);
 extern int use_default_colors (void);
-extern int use_extended_names (_Bool);
 extern int use_legacy_coding (int);
 extern int use_screen (SCREEN *, NCURSES_SCREEN_CB, void *);
 extern int use_window (WINDOW *, NCURSES_WINDOW_CB, void *);
 extern int wresize (WINDOW *, int, int);
-extern void nofilter(void);
+
+
+
+
+extern int use_extended_names (_Bool);
+
 
 
 
@@ -3557,7 +3511,7 @@ extern _Bool is_subwin (const WINDOW *);
 extern _Bool is_syncok (const WINDOW *);
 extern int wgetdelay (const WINDOW *);
 extern int wgetscrreg (const WINDOW *, int *, int *);
-# 992 "/usr/include/curses.h" 3 4
+# 1017 "/usr/include/curses.h" 3 4
 typedef int (*NCURSES_OUTC_sp)(SCREEN*, int);
 
 extern SCREEN * new_prescr (void);
@@ -3636,20 +3590,24 @@ extern void use_tioctl_sp (SCREEN*, _Bool);
 extern int vidattr_sp (SCREEN*, chtype);
 extern int vidputs_sp (SCREEN*, chtype, NCURSES_OUTC_sp);
 
-extern char * keybound_sp (SCREEN*, int, int);
 extern int alloc_pair_sp (SCREEN*, int, int);
 extern int assume_default_colors_sp (SCREEN*, int, int);
 extern int define_key_sp (SCREEN*, const char *, int);
 extern int extended_color_content_sp (SCREEN*, int, int *, int *, int *);
 extern int extended_pair_content_sp (SCREEN*, int, int *, int *);
 extern int extended_slk_color_sp (SCREEN*, int);
-extern int get_escdelay_sp (SCREEN*);
 extern int find_pair_sp (SCREEN*, int, int);
 extern int free_pair_sp (SCREEN*, int);
+extern int get_escdelay_sp (SCREEN*);
 extern int init_extended_color_sp (SCREEN*, int, int, int, int);
 extern int init_extended_pair_sp (SCREEN*, int, int, int);
+extern int is_cbreak_sp (SCREEN*);
+extern int is_echo_sp (SCREEN*);
+extern int is_nl_sp (SCREEN*);
+extern int is_raw_sp (SCREEN*);
 extern _Bool is_term_resized_sp (SCREEN*, int, int);
 extern int key_defined_sp (SCREEN*, const char *);
+extern char * keybound_sp (SCREEN*, int, int);
 extern int keyok_sp (SCREEN*, int, _Bool);
 extern void nofilter_sp (SCREEN*);
 extern void reset_color_pairs_sp (SCREEN*);
@@ -3659,7 +3617,7 @@ extern int set_escdelay_sp (SCREEN*, int);
 extern int set_tabsize_sp (SCREEN*, int);
 extern int use_default_colors_sp (SCREEN*);
 extern int use_legacy_coding_sp (SCREEN*, int);
-# 1477 "/usr/include/curses.h" 3 4
+# 1506 "/usr/include/curses.h" 3 4
 extern WINDOW * curscr;
 extern WINDOW * newscr;
 extern WINDOW * stdscr;
@@ -3670,7 +3628,7 @@ extern int COLS;
 extern int ESCDELAY;
 extern int LINES;
 extern int TABSIZE;
-# 1692 "/usr/include/curses.h" 3 4
+# 1721 "/usr/include/curses.h" 3 4
 typedef struct
 {
     short id;
@@ -3694,7 +3652,7 @@ extern int getmouse_sp (SCREEN*, MEVENT *);
 extern int ungetmouse_sp (SCREEN*,MEVENT *);
 extern mmask_t mousemask_sp (SCREEN*, mmask_t, mmask_t *);
 extern int mouseinterval_sp (SCREEN*, int);
-# 1723 "/usr/include/curses.h" 3 4
+# 1752 "/usr/include/curses.h" 3 4
 extern int mcprint (char *, int);
 extern int has_key (int);
 
@@ -3711,10 +3669,10 @@ extern char * _traceattr2 (int, chtype);
 extern char * _tracechar (int);
 extern char * _tracechtype (chtype);
 extern char * _tracechtype2 (int, chtype);
-# 1748 "/usr/include/curses.h" 3 4
+# 1777 "/usr/include/curses.h" 3 4
 extern void trace (const unsigned) __attribute__((deprecated));
 extern unsigned curses_trace (const unsigned);
-# 1780 "/usr/include/curses.h" 3 4
+# 1809 "/usr/include/curses.h" 3 4
 extern void exit_curses (int);
 
 # 1 "/usr/include/unctrl.h" 1 3 4
@@ -3727,7 +3685,7 @@ extern void exit_curses (int);
 
 
  const char * unctrl_sp (SCREEN*, chtype);
-# 1783 "/usr/include/curses.h" 2 3 4
+# 1812 "/usr/include/curses.h" 2 3 4
 # 55 "Curses.c" 2
 
 # 1 "../../../CUnit/Headers/CUnit.h" 1