merge m17n patch

add libwc

1 files changed, 49 insertions, 28 deletions

diff --git a/proto.h b/proto.h
index e64917e..d5ad27a 100644
--- a/proto.h
+++ b/proto.h
@@ -1,4 +1,4 @@
-/* $Id: proto.h,v 1.95 2003/07/26 17:16:24 ukai Exp $ */
+/* $Id: proto.h,v 1.96 2003/09/22 21:02:20 ukai Exp $ */
 /* 
  *   This file was automatically generated by version 1.7 of cextract.
  *   Manual editing not recommended.
@@ -165,11 +165,20 @@ extern ParsedURL *schemeToProxy(int scheme);
 extern void examineFile(char *path, URLFile *uf);
 extern char *acceptableEncoding();
 extern int dir_exist(char *path);
-extern Str convertLine(URLFile *uf, Str line, char *code, int mode);
+#ifdef USE_M17N
+extern char **get_symbol(wc_ces charset, int *width);
+extern char **set_symbol(int width);
+#else
+#define convertLine(a,b,c,d,e) _convertLine(a,b,c)
+extern char **get_symbol(void);
+#endif
+extern Str convertLine(URLFile *uf, Str line, int mode, wc_ces * charset,
+		       wc_ces doc_charset);
+extern void push_symbol(Str str, char symbol, int width, int n);
 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_boundary(unsigned char *, unsigned char *);
 extern int is_blank_line(char *line, int indent);
 extern void push_render_image(Str str, int width, int limit,
 			      struct html_feed_environ *h_env);
@@ -221,7 +230,10 @@ extern void loadHTMLstream(URLFile *f, Buffer *newBuf, FILE * src,
 			   int internal);
 extern Buffer *loadHTMLString(Str page);
 #ifdef USE_GOPHER
-extern Str loadGopherDir(URLFile *uf, ParsedURL *pu, char *code);
+#ifndef USE_M17N
+#define loadGopherDir(a,b,c) _loadGopherDir(a,b)
+#endif
+extern Str loadGopherDir(URLFile *uf, ParsedURL *pu, wc_ces * charset);
 #endif				/* USE_GOPHER */
 extern Buffer *loadBuffer(URLFile *uf, Buffer *newBuf);
 #ifdef USE_IMAGE
@@ -277,6 +289,9 @@ extern void fmTerm(void);
 extern void fmInit(void);
 extern void displayBuffer(Buffer *buf, int mode);
 extern void addChar(char c, Lineprop mode);
+#ifdef USE_M17N
+extern void addMChar(char *c, Lineprop mode, size_t len);
+#endif
 extern void record_err_message(char *s);
 extern Buffer *message_list_panel(void);
 extern void message(char *s, int return_x, int return_y);
@@ -424,12 +439,10 @@ extern void setlinescols(void);
 extern void setupscreen(void);
 extern pid_t open_pipe_rw(FILE ** fr, FILE ** fw);
 extern int initscr(void);
-extern int write1(char c);
-extern void endline(void);
-extern void switch_ascii(FILE * f);
-extern void switch_wchar(FILE * f);
-extern void putchars(unsigned char c1, unsigned char c2, FILE * f);
 extern void move(int line, int column);
+#ifdef USE_M17N
+extern void addmch(char *p, size_t len);
+#endif
 extern void addch(char c);
 extern void wrap(void);
 extern void touch_line(void);
@@ -481,18 +494,6 @@ extern int sleep_till_anykey(int sec, int purge);
 #ifdef USE_IMAGE
 extern void touch_cursor();
 #endif
-#ifdef JP_CHARSET
-extern char *GetSICode(char key);
-extern char *GetSOCode(char key);
-extern Str conv_str(Str is, char fc, char tc);
-extern Str conv(char *is, char fc, char tc);
-extern char checkShiftCode(Str buf, unsigned char hint);
-extern char str_to_code(char *str);
-extern char *code_to_str(char code);
-extern void put_sjis(Str os, unsigned char ub, unsigned char lb);
-#else
-#define conv_str(is, fc, tc) (is)
-#endif				/* JP_CHARSET */
 extern void initMimeTypes();
 extern void free_ssl_ctx();
 extern ParsedURL *baseURL(Buffer *buf);
@@ -521,12 +522,18 @@ extern char *guessContentType(char *filename);
 extern TextList *make_domain_list(char *domain_list);
 extern int check_no_proxy(char *domain);
 extern InputStream openFTPStream(ParsedURL *pu, URLFile *uf);
-extern Str loadFTPDir(ParsedURL *pu, char *code);
+#ifndef USE_M17N
+#define loadFTPDir(a,b) _loadFTPDir(a)
+#endif
+extern Str loadFTPDir(ParsedURL *pu, wc_ces * charset);
 extern void closeFTP(void);
 extern void disconnectFTP(void);
 #ifdef USE_NNTP
 extern InputStream openNewsStream(ParsedURL *pu);
-extern Str loadNewsgroup(ParsedURL *pu, char *code);
+#ifndef USE_M17N
+#define loadNewsgroup(a,b) _loadNewsgroup(a)
+#endif
+extern Str loadNewsgroup(ParsedURL *pu, wc_ces * charset);
 extern void closeNews(void);
 extern void disconnectNews(void);
 #endif
@@ -562,6 +569,8 @@ extern Anchor *closest_prev_anchor(AnchorList *a, Anchor *an, int x, int y);
 void addMultirowsImg(Buffer *buf, AnchorList *al);
 #endif
 extern HmarkerList *putHmarker(HmarkerList *ml, int line, int pos, int seq);
+extern void shiftAnchorPosition(AnchorList *a, HmarkerList *hl, int line,
+				int pos, int shift);
 extern char *getAnchorText(Buffer *buf, AnchorList *al, Anchor *a);
 extern Buffer *link_list_panel(Buffer *buf);
 
@@ -569,8 +578,12 @@ 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);
+#ifndef USE_M17N
+#define decodeWord(a,b) _decodeWord(a)
+#define decodeMIME(a,b) _decodeMIME(a)
+#endif
+extern Str decodeWord(char **ow, wc_ces * charset);
+extern Str decodeMIME(Str orgstr, wc_ces * charset);
 extern Str encodeB(char *a);
 extern int set_param_option(char *option);
 extern char *get_param_option(char *name);
@@ -606,10 +619,10 @@ extern void mySystem(char *command, int background);
 extern Str myExtCommand(char *cmd, char *arg, int redirect);
 extern Str myEditor(char *cmd, char *file, int line);
 extern char *file_to_url(char *file);
-#ifndef JP_CHARSET
-#define url_unquote_conv(x,y) _url_unquote_conv(x)
+#ifndef USE_M17N
+#define url_unquote_conv(a,b) _url_unquote_conv(a)
 #endif
-extern char *url_unquote_conv(char *url, char code);
+extern char *url_unquote_conv(char *url, wc_ces charset);
 extern char *expandName(char *name);
 extern Str tmpfname(int type, char *ext);
 extern time_t mymktime(char *timestr);
@@ -630,6 +643,14 @@ extern int check_cookie_accept_domain(char *domain);
 #else				/* not USE_COOKIE */
 #define cooLst nulcmd
 #endif				/* not USE_COOKIE */
+#ifdef USE_M17N
+extern void docCSet(void);
+extern void defCSet(void);
+extern void change_charset(struct parsed_tagarg *arg);
+#else
+#define docCSet nulcmd
+#define defCSet nulcmd
+#endif
 
 #ifdef USE_MARK
 extern void _mark(void);