Fixed saved panel state and fixed reading key definitions from config-file
misc/mc.lib: added escaping of all backslashes src/mcconfig/common.c: removed forgotten debug code src/setup.c: fixed non-saving of panels state
Этот коммит содержится в:
Slava Zanko
родитель
a70255f643
Коммит
acc64ecd68
280
misc/mc.lib
280
misc/mc.lib
@ -2,102 +2,102 @@
|
||||
list=/afs,/coda,/:,/...,/net,/#smb
|
||||
|
||||
[terminal:console]
|
||||
insert=\e[2~
|
||||
f11=\e[23~
|
||||
f12=\e[24~
|
||||
f13=\e[25~
|
||||
f14=\e[26~
|
||||
f15=\e[28~
|
||||
f16=\e[29~
|
||||
f17=\e[31~
|
||||
f18=\e[32~
|
||||
f19=\e[33~
|
||||
f20=\e[34~
|
||||
kpleft=\eOt
|
||||
kpright=\eOv
|
||||
kpup=\eOx
|
||||
kpdown=\eOr
|
||||
kphome=\eOw
|
||||
kpend=\eOq
|
||||
kpnpage=\eOs
|
||||
kpppage=\eOy
|
||||
kpplus=\eOl
|
||||
kpminus=\eOS
|
||||
kpasterix=\eOR
|
||||
kpinsert=\eOp
|
||||
kpdelete=\eOn
|
||||
kpenter=\eOM
|
||||
kpslash=\eOQ
|
||||
kpnumlock=\eOP
|
||||
insert=\\e[2~
|
||||
f11=\\e[23~
|
||||
f12=\\e[24~
|
||||
f13=\\e[25~
|
||||
f14=\\e[26~
|
||||
f15=\\e[28~
|
||||
f16=\\e[29~
|
||||
f17=\\e[31~
|
||||
f18=\\e[32~
|
||||
f19=\\e[33~
|
||||
f20=\\e[34~
|
||||
kpleft=\\eOt
|
||||
kpright=\\eOv
|
||||
kpup=\\eOx
|
||||
kpdown=\\eOr
|
||||
kphome=\\eOw
|
||||
kpend=\\eOq
|
||||
kpnpage=\\eOs
|
||||
kpppage=\\eOy
|
||||
kpplus=\\eOl
|
||||
kpminus=\\eOS
|
||||
kpasterix=\\eOR
|
||||
kpinsert=\\eOp
|
||||
kpdelete=\\eOn
|
||||
kpenter=\\eOM
|
||||
kpslash=\\eOQ
|
||||
kpnumlock=\\eOP
|
||||
|
||||
[terminal:linux]
|
||||
insert=\e[2~
|
||||
f11=\e[23~
|
||||
f12=\e[24~
|
||||
f13=\e[25~
|
||||
f14=\e[26~
|
||||
f15=\e[28~
|
||||
f16=\e[29~
|
||||
f17=\e[31~
|
||||
f18=\e[32~
|
||||
f19=\e[33~
|
||||
f20=\e[34~
|
||||
kpleft=\eOt
|
||||
kpright=\eOv
|
||||
kpup=\eOx
|
||||
kpdown=\eOr
|
||||
kphome=\eOw
|
||||
kpend=\eOq
|
||||
kpnpage=\eOs
|
||||
kpppage=\eOy
|
||||
kpplus=\eOl
|
||||
kpminus=\eOS
|
||||
kpasterix=\eOR
|
||||
kpinsert=\eOp
|
||||
kpdelete=\eOn
|
||||
kpenter=\eOM
|
||||
kpslash=\eOQ
|
||||
kpnumlock=\eOP
|
||||
insert=\\e[2~
|
||||
f11=\\e[23~
|
||||
f12=\\e[24~
|
||||
f13=\\e[25~
|
||||
f14=\\e[26~
|
||||
f15=\\e[28~
|
||||
f16=\\e[29~
|
||||
f17=\\e[31~
|
||||
f18=\\e[32~
|
||||
f19=\\e[33~
|
||||
f20=\\e[34~
|
||||
kpleft=\\eOt
|
||||
kpright=\\eOv
|
||||
kpup=\\eOx
|
||||
kpdown=\\eOr
|
||||
kphome=\\eOw
|
||||
kpend=\\eOq
|
||||
kpnpage=\\eOs
|
||||
kpppage=\\eOy
|
||||
kpplus=\\eOl
|
||||
kpminus=\\eOS
|
||||
kpasterix=\\eOR
|
||||
kpinsert=\\eOp
|
||||
kpdelete=\\eOn
|
||||
kpenter=\\eOM
|
||||
kpslash=\\eOQ
|
||||
kpnumlock=\\eOP
|
||||
|
||||
[terminal:xterm]
|
||||
insert=\e[2~
|
||||
f11=\e[23~;\eO2P;\eO1;2P
|
||||
f12=\e[24~;\eO2Q;\eO1;2Q
|
||||
f13=\e[25~;\eO2R
|
||||
f14=\e[26~;\eO2S
|
||||
f15=\e[28~;\e[15;2~
|
||||
f16=\e[29~;\e[17;2~
|
||||
f17=\e[31~;\e[18;2~
|
||||
f18=\e[32~;\e[19;2~
|
||||
f19=\e[33~;\e[20;2~
|
||||
f20=\e[34~;\e[21;2~
|
||||
kpleft=\eOt
|
||||
kpright=\eOv
|
||||
kpup=\eOx
|
||||
kpdown=\eOr
|
||||
kphome=\eOw
|
||||
kpend=\eOq
|
||||
kpnpage=\eOs
|
||||
kpppage=\eOy
|
||||
kpplus=\eOk
|
||||
kpminus=\eOm
|
||||
kpasterix=\eOj
|
||||
delete=\e[3~
|
||||
insert=\\e[2~
|
||||
f11=\\e[23~;\\eO2P;\\eO1;2P
|
||||
f12=\\e[24~;\\eO2Q;\\eO1;2Q
|
||||
f13=\\e[25~;\\eO2R
|
||||
f14=\\e[26~;\\eO2S
|
||||
f15=\\e[28~;\\e[15;2~
|
||||
f16=\\e[29~;\\e[17;2~
|
||||
f17=\\e[31~;\\e[18;2~
|
||||
f18=\\e[32~;\\e[19;2~
|
||||
f19=\\e[33~;\\e[20;2~
|
||||
f20=\\e[34~;\\e[21;2~
|
||||
kpleft=\\eOt
|
||||
kpright=\\eOv
|
||||
kpup=\\eOx
|
||||
kpdown=\\eOr
|
||||
kphome=\\eOw
|
||||
kpend=\\eOq
|
||||
kpnpage=\\eOs
|
||||
kpppage=\\eOy
|
||||
kpplus=\\eOk
|
||||
kpminus=\\eOm
|
||||
kpasterix=\\eOj
|
||||
delete=\\e[3~
|
||||
bs=
|
||||
home=\e[1~;\e[7~;\eOH;\e[H
|
||||
end=\eOF;\e[F;\e[4~;\e[8~
|
||||
pgdn=\e[6~
|
||||
pgup=\e[5~
|
||||
home=\\e[1~;\\e[7~;\\eOH;\\e[H
|
||||
end=\\eOF;\\e[F;\\e[4~;\\e[8~
|
||||
pgdn=\\e[6~
|
||||
pgup=\\e[5~
|
||||
|
||||
# Arrows for both keypad modes (application and normal).
|
||||
up=\e[A
|
||||
up=\eOA
|
||||
down=\e[B
|
||||
down=\eOB
|
||||
right=\e[C
|
||||
right=\eOC
|
||||
left=\e[D
|
||||
left=\eOD
|
||||
up=\\e[A
|
||||
up=\\eOA
|
||||
down=\\e[B
|
||||
down=\\eOB
|
||||
right=\\e[C
|
||||
right=\\eOC
|
||||
left=\\e[D
|
||||
left=\\eOD
|
||||
|
||||
[terminal:gnome]
|
||||
copy=xterm
|
||||
@ -109,60 +109,60 @@ copy=xterm
|
||||
copy=xterm
|
||||
|
||||
[terminal:xterm-color]
|
||||
insert=\e[2~
|
||||
f11=\e[23~
|
||||
f12=\e[24~
|
||||
f13=\e[25~
|
||||
f14=\e[26~
|
||||
f15=\e[28~
|
||||
f16=\e[29~
|
||||
f17=\e[31~
|
||||
f18=\e[32~
|
||||
f19=\e[33~
|
||||
f20=\e[34~
|
||||
kpleft=\eOt
|
||||
kpright=\eOv
|
||||
kpup=\eOx
|
||||
kpdown=\eOr
|
||||
kphome=\eOw
|
||||
kpend=\eOq
|
||||
kpnpage=\eOs
|
||||
kpppage=\eOy
|
||||
kpplus=\eOk
|
||||
kpminus=\eOm
|
||||
kpasterix=\eOj
|
||||
delete=\e[3~
|
||||
insert=\\e[2~
|
||||
f11=\\e[23~
|
||||
f12=\\e[24~
|
||||
f13=\\e[25~
|
||||
f14=\\e[26~
|
||||
f15=\\e[28~
|
||||
f16=\\e[29~
|
||||
f17=\\e[31~
|
||||
f18=\\e[32~
|
||||
f19=\\e[33~
|
||||
f20=\\e[34~
|
||||
kpleft=\\eOt
|
||||
kpright=\\eOv
|
||||
kpup=\\eOx
|
||||
kpdown=\\eOr
|
||||
kphome=\\eOw
|
||||
kpend=\\eOq
|
||||
kpnpage=\\eOs
|
||||
kpppage=\\eOy
|
||||
kpplus=\\eOk
|
||||
kpminus=\\eOm
|
||||
kpasterix=\\eOj
|
||||
delete=\\e[3~
|
||||
bs=
|
||||
home=\e[1~;\e[7~;\eOH
|
||||
end=\e[4~;\e[8~;\eOF
|
||||
pgdn=\e[6~
|
||||
pgup=\e[5~
|
||||
home=\\e[1~;\\e[7~;\\eOH
|
||||
end=\\e[4~;\\e[8~;\\eOF
|
||||
pgdn=\\e[6~
|
||||
pgup=\\e[5~
|
||||
|
||||
[terminal:ibmpc3]
|
||||
f11=\e[Y
|
||||
f12=\e[Z
|
||||
f13=\e[a
|
||||
f14=\e[b
|
||||
f15=\e[c
|
||||
f16=\e[d
|
||||
f17=\e[e
|
||||
f18=\e[f
|
||||
f19=\e[g
|
||||
f20=\e[h
|
||||
f11=\\e[Y
|
||||
f12=\\e[Z
|
||||
f13=\\e[a
|
||||
f14=\\e[b
|
||||
f15=\\e[c
|
||||
f16=\\e[d
|
||||
f17=\\e[e
|
||||
f18=\\e[f
|
||||
f19=\\e[g
|
||||
f20=\\e[h
|
||||
bs=^h
|
||||
end=\e[F
|
||||
kpplus=\e[+
|
||||
kpminus=\e[-
|
||||
kpasterix=\e[*
|
||||
end=\\e[F
|
||||
kpplus=\\e[+
|
||||
kpminus=\\e[-
|
||||
kpasterix=\\e[*
|
||||
|
||||
[terminal:cons25]
|
||||
f11=\e[Y
|
||||
f12=\e[Z
|
||||
f13=\e[a
|
||||
f14=\e[b
|
||||
f15=\e[c
|
||||
f16=\e[d
|
||||
f17=\e[e
|
||||
f18=\e[f
|
||||
f19=\e[g
|
||||
f20=\e[h
|
||||
f11=\\e[Y
|
||||
f12=\\e[Z
|
||||
f13=\\e[a
|
||||
f14=\\e[b
|
||||
f15=\\e[c
|
||||
f16=\\e[d
|
||||
f17=\\e[e
|
||||
f18=\\e[f
|
||||
f19=\\e[g
|
||||
f20=\\e[h
|
||||
|
||||
@ -219,7 +219,6 @@ mc_config_save_to_file (mc_config_t * mc_config, const gchar * ini_path)
|
||||
{
|
||||
mc_unlink (ini_path);
|
||||
}
|
||||
mc_log("ini_path = %s\n", ini_path);
|
||||
ret = g_file_set_contents(ini_path,data,len,NULL);
|
||||
g_free(data);
|
||||
return ret;
|
||||
|
||||
@ -350,6 +350,12 @@ save_panel_types (void)
|
||||
mc_config_set_string(mc_panels_config, "Dirs" , "current_is_left",
|
||||
get_current_index () == 0 ? "1" : "0");
|
||||
|
||||
if (mc_panels_config->ini_path == NULL)
|
||||
mc_panels_config->ini_path = g_strdup(panels_profile_name);
|
||||
|
||||
mc_config_del_group (mc_panels_config, "Temporal:New Left Panel");
|
||||
mc_config_del_group (mc_panels_config, "Temporal:New Right Panel");
|
||||
|
||||
mc_config_save_file (mc_panels_config);
|
||||
}
|
||||
|
||||
@ -568,8 +574,6 @@ load_setup (void)
|
||||
/* Load the directory history */
|
||||
/* directory_history_load (); */
|
||||
/* Remove the temporal entries */
|
||||
mc_config_del_group (mc_panels_config, "Temporal:New Left Panel");
|
||||
mc_config_del_group (mc_panels_config, "Temporal:New Right Panel");
|
||||
#if defined(USE_VFS) && defined (USE_NETCODE)
|
||||
ftpfs_init_passwd ();
|
||||
#endif /* USE_VFS && USE_NETCODE */
|
||||
|
||||
Загрузка…
x
Ссылка в новой задаче
Block a user