Imported Upstream version 4.0.2upstream/4.0.2

1 files changed, 29 insertions, 16 deletions

diff --git a/extern.h b/extern.h
index 11663aa..06b8e96 100644
--- a/extern.h
+++ b/extern.h
@@ -41,13 +41,13 @@ extern void  Panic __P((int, char *, ...)) __attribute__((format(printf, 2, 3)))
 extern void  Msg __P(());
 extern void  Panic __P(());
 #endif
-extern void  DisplaySleep __P((int, int));
 extern void  Finit __P((int));
 extern void  MakeNewEnv __P((void));
 extern char *MakeWinMsg __P((char *, struct win *, int));
-extern char *MakeWinMsgEv __P((char *, struct win *, int, int, struct event *));
+extern char *MakeWinMsgEv __P((char *, struct win *, int, int, struct event *, int));
 extern int   PutWinMsg __P((char *, int, int));
 extern void  WindowDied __P((struct win *));
+extern void  setbacktick __P((int, int, int, char **));
 
 /* ansi.c */
 extern void  ResetAnsiState __P((struct win *));
@@ -67,13 +67,15 @@ extern int   MFindUsedLine __P((struct win *, int, int));
 /* fileio.c */
 extern void  StartRc __P((char *));
 extern void  FinishRc __P((char *));
-extern void  RcLine __P((char *));
+extern void  RcLine __P((char *, int));
 extern FILE *secfopen __P((char *, char *));
 extern int   secopen __P((char *, int, int));
 extern void  WriteFile __P((struct acluser *, char *, int));
 extern char *ReadFile __P((char *, int *));
 extern void  KillBuffers __P((void));
 extern int   printpipe __P((struct win *, char *));
+extern int   readpipe __P((char **));
+extern void  RunBlanker __P((char **));
 extern void  do_source __P((char *));
 
 /* tty.c */
@@ -120,9 +122,13 @@ extern void  display_help __P((char *, struct action *));
 extern void  display_copyright __P((void));
 extern void  display_displays __P((void));
 extern void  display_bindkey __P((char *, struct action *));
-extern void  display_wlist __P((int));
+extern void  display_wlist __P((int, int));
 extern int   InWList __P((void));
 extern void  WListUpdatecv __P((struct canvas *, struct win *));
+extern void  WListLinkChanged __P((void));
+#ifdef ZMODEM
+extern void  ZmodemPage __P((void));
+#endif
 
 /* window.c */
 extern int   MakeWindow __P((struct NewWindow *));
@@ -137,7 +143,10 @@ extern int   DoStartLog __P((struct win *, char *, int));
 extern int   ReleaseAutoWritelock __P((struct display *, struct win *));
 extern int   ObtainAutoWritelock __P((struct display *, struct win *));
 extern void  CloseDevice __P((struct win *));
-
+#ifdef ZMODEM
+extern void  zmodem_abort __P((struct win *, struct display *));
+#endif
+extern void  execvpe __P((char *, char **, char **));
 
 /* utmp.c */
 #ifdef UTMPOK
@@ -177,12 +186,12 @@ extern void  ProcessInput2 __P((char *, int));
 extern void  DoProcess __P((struct win *, char **, int *, struct paster *));
 extern void  DoAction  __P((struct action *, int));
 extern int   FindCommnr __P((char *));
-extern void  DoCommand __P((char **));
+extern void  DoCommand __P((char **, int *));
 extern void  Activate __P((int));
 extern void  KillWindow __P((struct win *));
 extern void  SetForeWindow __P((struct win *));
-extern int   Parse __P((char *, char **));
-extern int   ParseEscape __P((struct acluser *, char *));
+extern int   Parse __P((char *, int, char **, int *));
+extern void  SetEscape __P((struct acluser *, int, int));
 extern void  DoScreen __P((char *, char **));
 extern int   IsNumColon __P((char *, int, char *, int));
 extern void  ShowWindows __P((int));
@@ -192,7 +201,7 @@ extern char *AddOtherUsers __P((char *, int, struct win *));
 extern int   WindowByNoN __P((char *));
 extern struct win *FindNiceWindow __P((struct win *, char *));
 #ifdef COPY_PASTE
-extern int   CompileKeys __P((char *, unsigned char *));
+extern int   CompileKeys __P((char *, int, unsigned char *));
 #endif
 #ifdef RXVT_OSC
 extern void  RefreshXtermOSC __P((void));
@@ -203,6 +212,7 @@ extern int   ParseSwitch __P((struct action *, int *));
 extern int   ParseAttrColor __P((char *, char *, int));
 extern void  ApplyAttrColor __P((int, struct mchar *));
 extern void  SwitchWindow __P((int));
+extern int   StuffKey __P((int));
 
 /* termcap.c */
 extern int   InitTermcap __P((int, int));
@@ -294,6 +304,9 @@ extern int   color256to16 __P((int));
 extern int   color256to88 __P((int));
 # endif
 #endif
+extern void  ResetIdle __P((void));
+extern void  KillBlanker __P((void));
+extern void  DisplaySleep1000 __P((int, int));
 
 /* resize.c */
 extern int   ChangeWindowSize __P((struct win *, int, int, int));
@@ -303,6 +316,9 @@ extern char *xrealloc __P((char *, int));
 extern void  ResizeLayersToCanvases __P((void));
 extern void  ResizeLayer __P((struct layer *, int, int, struct display *));
 extern int   MayResizeLayer __P((struct layer *));
+extern void  FreeAltScreen __P((struct win *));
+extern void  EnterAltScreen __P((struct win *));
+extern void  LeaveAltScreen __P((struct win *));
 
 /* sched.c */
 extern void  evenq __P((struct event *));
@@ -322,6 +338,7 @@ extern int   SendErrorMsg __P((char *, char *));
 
 /* misc.c */
 extern char *SaveStr __P((const char *));
+extern char *SaveStrn __P((const char *, int));
 extern char *InStr __P((char *, const char *));
 #ifndef HAVE_STRERROR
 extern char *strerror __P((int));
@@ -351,7 +368,6 @@ extern void  xsetegid  __P((int));
 extern int   AddXChar __P((char *, int));
 extern int   AddXChars __P((char *, int, char *));
 extern void  xsetenv  __P((char *, char *));
-extern char *expand_vars __P((char *, struct display *));
 extern void  sleep1000 __P((int));
 #ifdef DEBUG
 extern void  opendebug __P((int, int));
@@ -448,18 +464,15 @@ extern char *DoNLS __P((char *));
 #ifdef ENCODINGS
 # ifdef UTF8
 extern void  InitBuiltinTabs __P((void));
-extern int   recode_char __P((int, int, int));
-extern int   recode_char_to_encoding __P((int, int));
-#  ifdef DW_CHARS
-extern int   recode_char_dw __P((int, int *, int, int));
-extern int   recode_char_dw_to_encoding __P((int, int *, int));
-#  endif
 extern struct mchar *recode_mchar __P((struct mchar *, int, int));
 extern struct mline *recode_mline __P((struct mline *, int, int, int));
 extern int   FromUtf8 __P((int, int *));
 extern void  AddUtf8 __P((int));
 extern int   ToUtf8 __P((char *, int));
+extern int   ToUtf8_comb __P((char *, int));
 extern int   utf8_isdouble __P((int));
+extern int   utf8_iscomb __P((int));
+extern void  utf8_handle_comb __P((int, struct mchar *));
 extern int   ContainsSpecialDeffont __P((struct mline *, int, int, int));
 extern int   LoadFontTranslation __P((int, char *));
 extern void  LoadFontTranslationsForEncoding __P((int));