From 9f8309fba8fbb7170d2825c685f45bc2dd5e4a0f Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Mon, 14 Jun 2021 09:10:08 +0200 Subject: [PATCH] help: use smaller triangles for the arrows In Dejavu Sans Mono the old pointing triangles had a decent size, but in Noto Mono and in Ubuntu Mono (fonts that handle combining diacritics better) those triangles were massive, visually taking up more than a single cell, overlapping the closing parenthesis when they are displayed in the second column. Not nice. The new pointing small triangles look good in the Noto and Ubuntu fonts, but are real tiny in Dejavu. :| Oh well, one can't have everything. (Other triangles are not an option, because they don't degrade to actual arrows when on a Linux console.) --- src/global.c | 28 ++++++++++++++-------------- syntax/nanohelp.nanorc | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/global.c b/src/global.c index 6e03260f..0e9b0618 100644 --- a/src/global.c +++ b/src/global.c @@ -1293,14 +1293,14 @@ void shortcut_init(void) add_to_sclist(MMOST|MBROWSER, "^F", 0, do_right, 0); #ifdef ENABLE_UTF8 if (using_utf8()) { - add_to_sclist(MMOST|MBROWSER|MHELP, "\xE2\x97\x80", KEY_LEFT, do_left, 0); - add_to_sclist(MMOST|MBROWSER|MHELP, "\xE2\x96\xb6", KEY_RIGHT, do_right, 0); - add_to_sclist(MSOME, "^\xE2\x97\x80", CONTROL_LEFT, to_prev_word, 0); - add_to_sclist(MSOME, "^\xE2\x96\xb6", CONTROL_RIGHT, to_next_word, 0); + add_to_sclist(MMOST|MBROWSER|MHELP, "\xE2\x97\x82", KEY_LEFT, do_left, 0); + add_to_sclist(MMOST|MBROWSER|MHELP, "\xE2\x96\xb8", KEY_RIGHT, do_right, 0); + add_to_sclist(MSOME, "^\xE2\x97\x82", CONTROL_LEFT, to_prev_word, 0); + add_to_sclist(MSOME, "^\xE2\x96\xb8", CONTROL_RIGHT, to_next_word, 0); #if !defined(NANO_TINY) && defined(ENABLE_MULTIBUFFER) if (!on_a_vt) { - add_to_sclist(MMAIN, "M-\xE2\x97\x80", ALT_LEFT, switch_to_prev_buffer, 0); - add_to_sclist(MMAIN, "M-\xE2\x96\xb6", ALT_RIGHT, switch_to_next_buffer, 0); + add_to_sclist(MMAIN, "M-\xE2\x97\x82", ALT_LEFT, switch_to_prev_buffer, 0); + add_to_sclist(MMAIN, "M-\xE2\x96\xb8", ALT_RIGHT, switch_to_next_buffer, 0); } #endif } else @@ -1327,10 +1327,10 @@ void shortcut_init(void) add_to_sclist(MMAIN|MBROWSER|MHELP, "^N", 0, do_down, 0); #ifdef ENABLE_UTF8 if (using_utf8()) { - add_to_sclist(MMAIN|MBROWSER|MHELP, "\xE2\x96\xb2", KEY_UP, do_up, 0); - add_to_sclist(MMAIN|MBROWSER|MHELP, "\xE2\x96\xbc", KEY_DOWN, do_down, 0); - add_to_sclist(MMAIN|MBROWSER|MLINTER, "^\xE2\x96\xb2", CONTROL_UP, to_prev_block, 0); - add_to_sclist(MMAIN|MBROWSER|MLINTER, "^\xE2\x96\xbc", CONTROL_DOWN, to_next_block, 0); + add_to_sclist(MMAIN|MBROWSER|MHELP, "\xE2\x96\xb4", KEY_UP, do_up, 0); + add_to_sclist(MMAIN|MBROWSER|MHELP, "\xE2\x96\xbe", KEY_DOWN, do_down, 0); + add_to_sclist(MMAIN|MBROWSER|MLINTER, "^\xE2\x96\xb4", CONTROL_UP, to_prev_block, 0); + add_to_sclist(MMAIN|MBROWSER|MLINTER, "^\xE2\x96\xbe", CONTROL_DOWN, to_next_block, 0); } else #endif { @@ -1350,8 +1350,8 @@ void shortcut_init(void) #ifndef NANO_TINY #ifdef ENABLE_UTF8 if (using_utf8()) { - add_to_sclist(MMAIN|MHELP, "M-\xE2\x96\xb2", ALT_UP, do_scroll_up, 0); - add_to_sclist(MMAIN|MHELP, "M-\xE2\x96\xbc", ALT_DOWN, do_scroll_down, 0); + add_to_sclist(MMAIN|MHELP, "M-\xE2\x96\xb4", ALT_UP, do_scroll_up, 0); + add_to_sclist(MMAIN|MHELP, "M-\xE2\x96\xbe", ALT_DOWN, do_scroll_down, 0); } else #endif { @@ -1435,8 +1435,8 @@ void shortcut_init(void) add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE|MFINDINHELP|MEXECUTE, "^N", 0, get_history_newer_void, 0); #ifdef ENABLE_UTF8 if (using_utf8()) { - add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE|MFINDINHELP|MEXECUTE, "\xE2\x96\xb2", KEY_UP, get_history_older_void, 0); - add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE|MFINDINHELP|MEXECUTE, "\xE2\x96\xbc", KEY_DOWN, get_history_newer_void, 0); + add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE|MFINDINHELP|MEXECUTE, "\xE2\x96\xb4", KEY_UP, get_history_older_void, 0); + add_to_sclist(MWHEREIS|MREPLACE|MREPLACEWITH|MWHEREISFILE|MFINDINHELP|MEXECUTE, "\xE2\x96\xbe", KEY_DOWN, get_history_newer_void, 0); } else #endif { diff --git a/syntax/nanohelp.nanorc b/syntax/nanohelp.nanorc index fdc01289..a024b134 100644 --- a/syntax/nanohelp.nanorc +++ b/syntax/nanohelp.nanorc @@ -4,7 +4,7 @@ syntax nanohelp # Key combos: -color cyan "\^[]/4-8@A-Z\^_`◀▶▲▼-]" "[◀▶▲▼]" "\<(M|S[Hh]-[Mm])-[^")”»“」]" "\" # Colorize M-) and M-" only when between parentheses...