Updates from 0.2.1 into 0.2.1-inu-1.5release-0-2-1-inu-1-5

1 files changed, 45 insertions, 18 deletions

diff --git a/proto.h b/proto.h
index a2af3c8..42cf1f9 100644
--- a/proto.h
+++ b/proto.h
@@ -1,4 +1,4 @@
-/* $Id: proto.h,v 1.1 2001/11/08 05:15:28 a-ito Exp $ */
+/* $Id: proto.h,v 1.2 2001/11/09 04:59:18 a-ito Exp $ */
 /* 
  *   This file was automatically generated by version 1.7 of cextract.
  *   Manual editing not recommended.
@@ -25,15 +25,21 @@ extern void shiftl(void);
 extern void shiftr(void);
 extern void col1R(void);
 extern void col1L(void);
+extern void setEnv(void);
+extern void pipeBuf(void);
 extern void pipesh(void);
 extern void readsh(void);
 extern void execsh(void);
 extern void ldfile(void);
 extern void ldhelp(void);
 extern void movL(void);
+extern void movL1(void);
 extern void movD(void);
+extern void movD1(void);
 extern void movU(void);
+extern void movU1(void);
 extern void movR(void);
+extern void movR1(void);
 extern void movLW(void);
 extern void movRW(void);
 extern void qquitfm(void);
@@ -50,6 +56,7 @@ extern void editScr(void);
 extern void followA(void);
 extern void bufferA(void);
 extern void followI(void);
+extern void submitForm(void);
 extern void followForm(void);
 extern void topA(void);
 extern void lastA(void);
@@ -57,12 +64,19 @@ extern void onA(void);
 
 extern void nextA(void);
 extern void prevA(void);
+extern void nextL(void);
+extern void nextLU(void);
+extern void nextR(void);
+extern void nextRD(void);
+extern void nextD(void);
+extern void nextU(void);
 extern void backBf(void);
 extern void deletePrevBuf(void);
 extern void goURL(void);
 extern void ldBmark(void);
 extern void adBmark(void);
 extern void ldOpt(void);
+extern void setOpt(void);
 extern void pginfo(void);
 extern void msgs(void);
 extern void svA(void);
@@ -94,7 +108,7 @@ extern Buffer *loadFile(char *path);
 extern Buffer *loadGeneralFile(char *path, ParsedURL * current, char *referer, int flag, FormList * request);
 extern int is_boundary(int, int);
 extern int is_blank_line(char *line, int indent);
-extern void push_render_image(Str str, int width, struct html_feed_environ *h_env);
+extern void push_render_image(Str str, int width, int limit, struct html_feed_environ *h_env);
 extern void flushline(struct html_feed_environ *h_env, struct readbuffer *obuf, int indent, int force, int width);
 extern void do_blankline(struct html_feed_environ *h_env, struct readbuffer *obuf, int indent, int indent_incr, int width);
 extern void purgeline(struct html_feed_environ *h_env);
@@ -112,10 +126,8 @@ extern void process_option(void);
 extern Str process_textarea(struct parsed_tag *tag, int width);
 extern Str process_n_textarea(void);
 extern void feed_textarea(char *str);
-#ifdef NEW_FORM
 extern Str process_form(struct parsed_tag *tag);
 extern Str process_n_form(void);
-#endif				/* NEW_FORM */
 extern int HTMLtagproc1(struct parsed_tag *tag, struct html_feed_environ *h_env);
 extern void HTMLlineproc2(Buffer * buf, TextLineList * tl);
 extern void HTMLlineproc0(char *istr, struct html_feed_environ *h_env, int internal);
@@ -146,6 +158,8 @@ extern void doFileSave(URLFile uf, char *defstr);
 extern int checkCopyFile(char *path1, char *path2);
 extern int checkSaveFile(InputStream stream, char *path);
 extern int checkOverWrite(char *path);
+extern int matchattr(char *p, char *attr, int len, Str *value);
+extern char *checkHeader(Buffer * buf, char *field);
 extern Buffer *newBuffer(int width);
 extern Buffer *nullBuffer(void);
 extern void clearBuffer(Buffer * buf);
@@ -164,7 +178,6 @@ extern int writeBufferCache(Buffer *buf);
 extern int readBufferCache(Buffer *buf);
 extern void fmTerm(void);
 extern void fmInit(void);
-extern void deleteFiles(void);
 extern void displayBuffer(Buffer * buf, int mode);
 extern void redrawBuffer(Buffer * buf);
 extern void redrawNLine(Buffer * buf, int n);
@@ -187,11 +200,11 @@ extern void disp_message_nomouse(char *s, int redraw_current);
 #else
 #define disp_message_nomouse disp_message
 #endif
-extern void cursorUp(Buffer * buf);
-extern void cursorDown(Buffer * buf);
+extern void cursorUp(Buffer * buf, int n);
+extern void cursorDown(Buffer * buf, int n);
 extern void cursorUpDown(Buffer * buf, int n);
-extern void cursorRight(Buffer * buf);
-extern void cursorLeft(Buffer * buf);
+extern void cursorRight(Buffer * buf, int n);
+extern void cursorLeft(Buffer * buf, int n);
 extern void cursorHome(Buffer * buf);
 extern void arrangeCursor(Buffer * buf);
 extern void arrangeLine(Buffer * buf);
@@ -246,18 +259,18 @@ extern int minimum_length(char *line);
 extern int feed_table(struct table *tbl, char *line, struct table_mode *mode, int width, int internal);
 extern void feed_table1(struct table *tbl, Str tok, struct table_mode *mode, int width);
 extern void pushTable(struct table *, struct table *);
-extern struct form_list *newFormList(char *action, char *method, char *charset, char *enctype, char *target, struct form_list *_next);
+extern struct form_list *newFormList(char *action, char *method, char *charset, char *enctype, char *target, char *name, struct form_list *_next);
 extern struct form_item_list *formList_addInput(struct form_list *fl, struct parsed_tag *tag);
 extern char *form2str(FormItemList * fi);
 extern int formtype(char *typestr);
-extern void form_recheck_radio(FormItemList * fi, void *data, void (*update_hook) (FormItemList *, void *));
+extern void formRecheckRadio(Anchor * a, Buffer * buf, FormItemList * form);
 extern void formResetBuffer(Buffer * buf, AnchorList * formitem);
 extern void formUpdateBuffer(Anchor * a, Buffer * buf, FormItemList * form);
 extern Str textfieldrep(Str s, int width);
 extern void input_textarea(FormItemList * fi);
 extern void do_internal(char *action, char *data);
 extern void form_write_data(FILE * f, char *boundary, char *name, char *value);
-extern void form_write_form_file(FILE * f, char *boundary, char *name, char *file);
+extern void form_write_from_file(FILE * f, char *boundary, char *name, char *filename, char *file);
 extern void follow_map(struct parsed_tagarg *arg);
 #ifdef MENU_MAP
 extern char *follow_map_menu(Buffer * buf, struct parsed_tagarg *arg, int x, int y);
@@ -265,15 +278,15 @@ extern char *follow_map_menu(Buffer * buf, struct parsed_tagarg *arg, int x, int
 extern Buffer *follow_map_panel(Buffer * buf, struct parsed_tagarg *arg);
 #endif
 extern Buffer *page_info_panel(Buffer * buf);
-extern struct frame_body *newFrame(struct parsed_tag *tag, ParsedURL * baseURL);
+extern struct frame_body *newFrame(struct parsed_tag *tag, Buffer *buf);
 extern struct frameset *newFrameSet(struct parsed_tag *tag);
 extern void addFrameSetElement(struct frameset *f, union frameset_element element);
 extern void deleteFrame(struct frame_body *b);
 extern void deleteFrameSet(struct frameset *f);
 extern void deleteFrameSetElement(union frameset_element e);
 extern struct frameset *copyFrameSet(struct frameset *of);
-extern void pushFrameTree(struct frameset_queue **fqpp, struct frameset *fs, long linenumber, short pos);
-extern struct frameset *popFrameTree(struct frameset_queue **fqpp, long *linenumber, short *pos);
+extern void pushFrameTree(struct frameset_queue **fqpp, struct frameset *fs, Buffer *buf);
+extern struct frameset *popFrameTree(struct frameset_queue **fqpp);
 extern void resetFrameElement(union frameset_element *f_element, Buffer * buf, char *referer, FormList * request);
 extern Buffer *renderFrame(Buffer * Cbuf, int force_reload);
 extern union frameset_element *search_frame(struct frameset *fset, char *name);
@@ -361,7 +374,7 @@ extern struct mailcap *loadMailcap(char *filename);
 extern struct mailcap *searchMailcap(struct mailcap *table, char *type);
 extern void initMailcap();
 extern struct mailcap *searchExtViewer(char *type);
-extern Str unquote_mailcap(char *qstr, char *type, char *name, int *stat);
+extern Str unquote_mailcap(char *qstr, char *type, char *name, char *attr, int *stat);
 extern char *guessContentTypeFromTable(struct table2 *table, char *filename);
 extern char *guessContentType(char *filename);
 extern TextList *make_domain_list(char *domain_list);
@@ -385,20 +398,24 @@ extern char *reAnchor(Buffer * buf, char *re);
 #ifdef USE_NNTP
 extern char *reAnchorNews(Buffer * buf, char *re);
 #endif				/* USE_NNTP */
+extern void addMultirowsForm(Buffer *buf, AnchorList *al);
 extern Anchor *closest_next_anchor(AnchorList * a, Anchor * an, int x, int y);
 extern Anchor *closest_prev_anchor(AnchorList * a, Anchor * an, int x, int y);
 extern HmarkerList *putHmarker(HmarkerList * ml, int line, int pos, int seq);
 extern Str decodeB(char **ww);
 extern Str decodeQ(char **ww);
 extern Str decodeQP(char **ww);
+extern Str decodeU(char **ww);
 extern Str decodeWord(char **ow);
 extern Str decodeMIME(char *orgstr);
 extern Str encodeB(char *a);
 extern int set_param_option(char *option);
+extern char *get_param_option(char *name);
 extern void create_option_search_table();
 extern void init_rc(char *config_file);
 extern Buffer *load_option_panel(void);
 extern void panel_set_option(struct parsed_tagarg *);
+extern void sync_with_option(void);
 extern char *rcFile(char *base);
 extern char *libFile(char *base);
 extern char *helpFile(char *base);
@@ -411,8 +428,8 @@ extern void add_auth_cookie(char *host, char *realm, Str cookie);
 extern char *last_modified(Buffer * buf);
 extern Str romanNumeral(int n);
 extern Str romanAlphabet(int n);
-extern Str quoteShell(char *command);
 extern void mySystem(char *command, int background);
+extern char *file_to_url(char *file);
 extern char *expandName(char *name);
 extern Str tmpfname(int type, char *ext);
 #ifdef USE_COOKIE
@@ -490,10 +507,12 @@ extern int getMenuN(MenuList * list, char *id);
 extern void popupMenu(int x, int y, Menu *menu);
 extern void mainMenu(int x, int y);
 extern void mainMn(void);
+extern void selMn(void);
 extern void optionMenu(int x, int y, char **label, int *variable, int initial, void (*func) ());
 extern void initMenu(void);
 #else				/* not MENU */
 #define mainMn nulcmd
+#define selMn selBuf
 #endif				/* not MENU */
 
 #ifdef DICT
@@ -506,9 +525,17 @@ extern void dictwordat(void);
 
 extern void reloadBuffer(Buffer * buf);
 
-extern char *guess_save_name(char *file);
+extern char *guess_save_name(Buffer *buf, char *file);
 
 extern void wrapToggle(void);
 extern void saveBufferInfo(void);
 extern char*get_os2_dft(const char*,char*);
+
+extern void dispVer(void);
+
+#ifdef USE_INCLUDED_SRAND48
+void srand48(long);
+long lrand48(void);
+#endif
+
 #include "indep.h"