mirror of
https://github.com/rkd77/elinks.git
synced 2025-02-02 15:09:23 -05:00
[combine] Drop the rest of combine characters
This commit is contained in:
parent
c8d28d8558
commit
24d3c00a1c
@ -1077,11 +1077,6 @@ static union option_info config_options_info[] = {
|
||||
"terminal codepage is used. ELinks ignores this option "
|
||||
"if the terminal codepage is UTF-8.")),
|
||||
|
||||
INIT_OPT_BOOL("terminal._template_", N_("Combining characters"),
|
||||
"combine", OPT_ZERO, 0,
|
||||
N_("Enable combining characters. It works only with "
|
||||
"the xterm in UTF-8 mode.")),
|
||||
|
||||
INIT_OPT_BOOL("terminal._template_", N_("Restrict frames in cp850/852"),
|
||||
"restrict_852", OPT_ZERO, 0,
|
||||
N_("Restrict the characters used when drawing lines. "
|
||||
|
@ -97,7 +97,6 @@ enum termopt {
|
||||
TERM_OPT_UNDERLINE,
|
||||
TERM_OPT_ITALIC,
|
||||
TERM_OPT_STRIKE,
|
||||
TERM_OPT_COMBINE,
|
||||
#ifdef CONFIG_LIBSIXEL
|
||||
TERM_OPT_SIXEL,
|
||||
#endif
|
||||
@ -115,7 +114,6 @@ static struct option_resolver resolvers[] = {
|
||||
{ TERM_OPT_UNDERLINE, "underline" },
|
||||
{ TERM_OPT_ITALIC, "italic" },
|
||||
{ TERM_OPT_STRIKE, "strike" },
|
||||
{ TERM_OPT_COMBINE, "combine" },
|
||||
#ifdef CONFIG_LIBSIXEL
|
||||
{ TERM_OPT_SIXEL, "sixel" },
|
||||
#endif
|
||||
@ -242,7 +240,6 @@ terminal_options(struct terminal *term, void *xxx, struct session *ses)
|
||||
add_dlg_checkbox(dlg, _("Underline", term), &values[TERM_OPT_UNDERLINE].number);
|
||||
add_dlg_checkbox(dlg, _("Strikethrough", term), &values[TERM_OPT_STRIKE].number);
|
||||
add_dlg_checkbox(dlg, _("UTF-8 I/O", term), &values[TERM_OPT_UTF_8_IO].number);
|
||||
add_dlg_checkbox(dlg, _("Combining characters", term), &values[TERM_OPT_COMBINE].number);
|
||||
#ifdef CONFIG_LIBSIXEL
|
||||
add_dlg_checkbox(dlg, _("Sixel", term), &values[TERM_OPT_SIXEL].number);
|
||||
#endif
|
||||
|
@ -271,9 +271,6 @@ struct screen_driver_opt {
|
||||
unsigned int utf8_cp:1;
|
||||
#endif /* CONFIG_UTF8 */
|
||||
|
||||
/* Whether the terminal supports combining characters. */
|
||||
unsigned int combine:1;
|
||||
|
||||
#ifdef CONFIG_TERMINFO
|
||||
/* Whether use terminfo. */
|
||||
unsigned int terminfo:1;
|
||||
@ -319,7 +316,6 @@ static const struct screen_driver_opt dumb_screen_driver_opt = {
|
||||
#ifdef CONFIG_UTF8
|
||||
/* utf8_cp: */ 0,
|
||||
#endif /* CONFIG_UTF8 */
|
||||
/* combine */ 0,
|
||||
#ifdef CONFIG_TERMINFO
|
||||
/* terminfo */ 0,
|
||||
#endif
|
||||
@ -344,7 +340,6 @@ static const struct screen_driver_opt vt100_screen_driver_opt = {
|
||||
#ifdef CONFIG_UTF8
|
||||
/* utf8_cp: */ 0,
|
||||
#endif /* CONFIG_UTF8 */
|
||||
/* combine */ 0,
|
||||
#ifdef CONFIG_TERMINFO
|
||||
/* terminfo */ 0,
|
||||
#endif
|
||||
@ -369,7 +364,6 @@ static const struct screen_driver_opt linux_screen_driver_opt = {
|
||||
#ifdef CONFIG_UTF8
|
||||
/* utf8_cp: */ 0,
|
||||
#endif /* CONFIG_UTF8 */
|
||||
/* combine */ 0,
|
||||
#ifdef CONFIG_TERMINFO
|
||||
/* terminfo */ 0,
|
||||
#endif
|
||||
@ -394,7 +388,6 @@ static const struct screen_driver_opt koi8_screen_driver_opt = {
|
||||
#ifdef CONFIG_UTF8
|
||||
/* utf8_cp: */ 0,
|
||||
#endif /* CONFIG_UTF8 */
|
||||
/* combine */ 0,
|
||||
#ifdef CONFIG_TERMINFO
|
||||
/* terminfo */ 0,
|
||||
#endif
|
||||
@ -419,7 +412,6 @@ static const struct screen_driver_opt freebsd_screen_driver_opt = {
|
||||
#ifdef CONFIG_UTF8
|
||||
/* utf8_cp: */ 0,
|
||||
#endif /* CONFIG_UTF8 */
|
||||
/* combine */ 0,
|
||||
#ifdef CONFIG_TERMINFO
|
||||
/* terminfo */ 0,
|
||||
#endif
|
||||
@ -444,7 +436,6 @@ static const struct screen_driver_opt fbterm_screen_driver_opt = {
|
||||
#ifdef CONFIG_UTF8
|
||||
/* utf8_cp: */ 0,
|
||||
#endif /* CONFIG_UTF8 */
|
||||
/* combine */ 0,
|
||||
#ifdef CONFIG_TERMINFO
|
||||
/* terminfo */ 0,
|
||||
#endif
|
||||
@ -496,8 +487,6 @@ set_screen_driver_opt(struct screen_driver *driver, struct option *term_spec)
|
||||
* function need not carefully restore options one by one. */
|
||||
copy_struct(&driver->opt, screen_driver_opts[driver->type]);
|
||||
|
||||
driver->opt.combine = get_opt_bool_tree(term_spec, "combine", NULL);
|
||||
|
||||
#ifdef CONFIG_LIBSIXEL
|
||||
driver->opt.sixel = get_opt_bool_tree(term_spec, "sixel", NULL);
|
||||
#endif /* CONFIG_LIBSIXEL */
|
||||
|
Loading…
x
Reference in New Issue
Block a user