storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[w3m-dev 03377] sync_with_option

Browse Source 
* etc.c (loadPassword): reset passwords
* form.c (loadPreForm): reset PreForm
* main.c (option_assigned): deleted
	(parse_proxy): deleted
	(MAIN): move initCookie(), setLocalCookie()
		  after sync_with_option()
		delete parseURL for *_proxy
		s/WrapSearch/WrapDefault/
		move initKeymap(), initMenu() after setupscreen()
		sync_with_option() after init_rc()
* rc.c (pre_form_file): move in params9 (network settting)
	(sync_with_option): initKeymap(), initMenu() is done
			if fmInitialized
	(init_rc): delete sync_with_option()
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2002-11-06 03:26:56 +00:00
parent 8503b2be4e
commit 91b3b8a09b
5 changed files with 56 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rc.c
View File

@@ -1,4 +1,4 @@
/* $Id: rc.c,v 1.58 2002/11/05 17:54:39 ukai Exp $ */
/* $Id: rc.c,v 1.59 2002/11/06 03:27:04 ukai Exp $ */
/*
* Initialization file etc.
*/
@@ -78,7 +78,6 @@ static char *config_file = NULL;
#endif
#define CMT_MULTICOL "<22>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>̾<EFBFBD>Υޥ<CEA5><DEA5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD>"
#define CMT_ALT_ENTITY "<22><><EFBFBD><EFBFBD><EFBFBD>ƥ<EFBFBD><C6A5>ƥ<EFBFBD><C6A5><EFBFBD> ASCII <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD><EFBFBD><EFBFBD>ɽ<EFBFBD><C9BD>"
#define CMT_PRE_FORM_FILE "pre_form<72>ե<EFBFBD><D5A5><EFBFBD><EFBFBD><EFBFBD>"
#define CMT_FOLD_TEXTAREA "TEXTAREA <20>ιԤ<CEB9><D4A4>ޤ<EFBFBD><DEA4>֤<EFBFBD><D6A4><EFBFBD>ɽ<EFBFBD><C9BD>"
#define CMT_COLOR "<22><><EFBFBD>顼ɽ<E9A1BC><C9BD>"
#define CMT_B_COLOR "ʸ<><CAB8><EFBFBD>ο<EFBFBD>"
@@ -132,6 +131,7 @@ static char *config_file = NULL;
#define CMT_EXTBRZ3 "<22><><EFBFBD><EFBFBD><EFBFBD>֥饦<D6A5><E9A5A6><EFBFBD><EFBFBD><EFBFBD><EFBFBD>3"
#define CMT_DISABLE_SECRET_SECURITY_CHECK "<22>ѥ<EFBFBD><D1A5><EFBFBD>ɥե<C9A5><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Υѡ<CEA5><D1A1>ߥå<DFA5><C3A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>å<EFBFBD><C3A5><EFBFBD><EFBFBD>ʤ<EFBFBD>"
#define CMT_PASSWDFILE "<22>ѥ<EFBFBD><D1A5><EFBFBD>ɥե<C9A5><D5A5><EFBFBD><EFBFBD><EFBFBD>"
#define CMT_PRE_FORM_FILE "ʸ<><CAB8><EFBFBD>ɹ<EFBFBD><C9B9><EFBFBD><EFBFBD>Υե<CEA5><D5A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ѥե<D1A5><D5A5><EFBFBD><EFBFBD><EFBFBD>"
#define CMT_FTPPASS "FTP<54>Υѥ<CEA5><D1A5><EFBFBD><EFA1BC>(<28><><EFBFBD>̤ϼ<CCA4>ʬ<EFBFBD><CAAC>mail address<73><73><EFBFBD>Ȥ<EFBFBD>)"
#ifdef FTPPASS_HOSTNAMEGEN
#define CMT_FTPPASS_HOSTNAMEGEN "FTP<54>Υѥ<CEA5><D1A5><EFBFBD>ɤΥɥᥤ<C9A5><E1A5A4>̾<EFBFBD><CCBE><EFBFBD><EFBFBD>ư<EFBFBD><C6B0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
@@ -224,7 +224,6 @@ static char *config_file = NULL;
#endif
#define CMT_MULTICOL "Display file names in multi-column format"
#define CMT_ALT_ENTITY "Use ASCII equivalents to display entities"
#define CMT_PRE_FORM_FILE "pre_form file"
#define CMT_FOLD_TEXTAREA "Fold lines in TEXTAREA"
#define CMT_COLOR "Display with color"
#define CMT_B_COLOR "Color of normal character"
@@ -278,6 +277,7 @@ static char *config_file = NULL;
#define CMT_EXTBRZ3 "Third External Browser"
#define CMT_DISABLE_SECRET_SECURITY_CHECK "Disable secret file security check"
#define CMT_PASSWDFILE "Password file"
#define CMT_PRE_FORM_FILE "File for setting form on loading"
#define CMT_FTPPASS "Password for anonymous FTP (your mail address)"
#ifdef FTPPASS_HOSTNAMEGEN
#define CMT_FTPPASS_HOSTNAMEGEN "Generate domain part of password for FTP"
@@ -490,8 +490,6 @@ struct param_ptr params1[] = {
{"multicol", P_INT, PI_ONOFF, (void *)&multicolList, CMT_MULTICOL, NULL},
{"alt_entity", P_CHARINT, PI_ONOFF, (void *)&UseAltEntity, CMT_ALT_ENTITY,
NULL},
{"pre_form_file", P_STRING, PI_TEXT, (void *)&pre_form_file,
CMT_PRE_FORM_FILE, NULL},
{"fold_textarea", P_CHARINT, PI_ONOFF, (void *)&FoldTextarea,
CMT_FOLD_TEXTAREA, NULL},
{"ignore_null_img_alt", P_INT, PI_ONOFF, (void *)&ignore_null_img_alt,
@@ -694,6 +692,8 @@ struct param_ptr params9[] = {
{"ftppass_hostnamegen", P_INT, PI_ONOFF, (void *)&ftppass_hostnamegen,
CMT_FTPPASS_HOSTNAMEGEN, NULL},
#endif
{"pre_form_file", P_STRING, PI_TEXT, (void *)&pre_form_file,
CMT_PRE_FORM_FILE, NULL},
{"user_agent", P_STRING, PI_TEXT, (void *)&UserAgent, CMT_USERAGENT, NULL},
{"no_referer", P_INT, PI_ONOFF, (void *)&NoSendReferer, CMT_NOSENDREFERER,
NULL},
@@ -1270,7 +1270,12 @@ sync_with_option(void)
AcceptEncoding = acceptableEncoding();
if (AcceptMedia == NULL || *AcceptMedia == '\0')
AcceptMedia = acceptableMimeTypes();
initKeymap(FALSE);
if (fmInitialized) {
initKeymap(FALSE);
#ifdef USE_MENU
initMenu();
#endif /* MENU */
}
}
void
@@ -1324,7 +1329,6 @@ init_rc(char *config_filename)
interpret_rc(f);
fclose(f);
}
sync_with_option();
}