diff options
| author | Mehmet Samet Duman <yongdohyun@projecttick.org> | 2026-04-03 22:21:25 +0300 |
|---|---|---|
| committer | Mehmet Samet Duman <yongdohyun@projecttick.org> | 2026-04-04 00:23:03 +0300 |
| commit | 2eae5db069dc171f74cd863487655f6a88e5384d (patch) | |
| tree | 2d9d05e09978a2a44acbfbb8d651f240df3ca052 /uvim/src/libvterm | |
| parent | 473d922faed49241a5d29d9e37dc4819cd512006 (diff) | |
| download | Project-Tick-2eae5db069dc171f74cd863487655f6a88e5384d.tar.gz Project-Tick-2eae5db069dc171f74cd863487655f6a88e5384d.zip | |
NOISSUE rebrand vim to MNV's not Vim
Signed-off-by: Mehmet Samet Duman <yongdohyun@projecttick.org>
Diffstat (limited to 'uvim/src/libvterm')
| -rw-r--r-- | uvim/src/libvterm/README | 6 | ||||
| -rw-r--r-- | uvim/src/libvterm/include/vterm.h | 18 | ||||
| -rw-r--r-- | uvim/src/libvterm/src/encoding.c | 2 | ||||
| -rw-r--r-- | uvim/src/libvterm/src/keyboard.c | 8 | ||||
| -rw-r--r-- | uvim/src/libvterm/src/pen.c | 2 | ||||
| -rw-r--r-- | uvim/src/libvterm/src/screen.c | 2 | ||||
| -rw-r--r-- | uvim/src/libvterm/src/unicode.c | 2 | ||||
| -rw-r--r-- | uvim/src/libvterm/src/vterm.c | 2 | ||||
| -rw-r--r-- | uvim/src/libvterm/t/63screen_resize.test | 4 | ||||
| -rw-r--r-- | uvim/src/libvterm/t/69screen_reflow.test | 2 |
10 files changed, 24 insertions, 24 deletions
diff --git a/uvim/src/libvterm/README b/uvim/src/libvterm/README index 56c6e222be..a04a777ac8 100644 --- a/uvim/src/libvterm/README +++ b/uvim/src/libvterm/README @@ -4,7 +4,7 @@ The original can be found: - on the original site (tar archive and Bazaar repository): http://www.leonerd.org.uk/code/libvterm/ - cloned on Github: - https://github.com/neovim/libvterm + https://github.com/neomnv/libvterm Modifications: - revisions up to 839 have been included @@ -12,7 +12,7 @@ Modifications: - use TRUE and FALSE instead of true and false - use int or unsigned int instead of bool - Converted some code from C99 to C90. -- Other changes to support embedding in Vim. +- Other changes to support embedding in MNV. To get the latest version of libvterm you need the "bzr" command and do: bzr co http://bazaar.leonerd.org.uk/c/libvterm/ @@ -24,7 +24,7 @@ patch number: To merge in changes from Github, do this: - Commit any pending changes. - Setup the merge tool: - git config merge.tool vimdiff + git config merge.tool mnvdiff git config merge.conflictstyle diff3 git config mergetool.prompt false - Run the merge tool: diff --git a/uvim/src/libvterm/include/vterm.h b/uvim/src/libvterm/include/vterm.h index 48deebe25e..dd2fc2fd41 100644 --- a/uvim/src/libvterm/include/vterm.h +++ b/uvim/src/libvterm/include/vterm.h @@ -12,16 +12,16 @@ extern "C" { #include "vterm_keycodes.h" -// VIM: use TRUE and FALSE instead of true and false +// MNV: use TRUE and FALSE instead of true and false #define TRUE 1 #define FALSE 0 -// VIM: from stdint.h +// MNV: from stdint.h typedef unsigned char uint8_t; typedef unsigned short uint16_t; typedef unsigned int uint32_t; -// VIM: define max screen cols and rows +// MNV: define max screen cols and rows #define VTERM_MAX_COLS 1000 #define VTERM_MAX_ROWS 1000 @@ -137,7 +137,7 @@ typedef enum { VTERM_COLOR_DEFAULT_MASK = 0x06, /** - * VIM: If set, indicates that the color is invalid. + * MNV: If set, indicates that the color is invalid. */ VTERM_COLOR_INVALID = 0x08 } VTermColorType; @@ -178,7 +178,7 @@ typedef enum { */ #define VTERM_COLOR_IS_INVALID(col) (!!((col)->type & VTERM_COLOR_INVALID)) -// VIM: this was a union, but that doesn't always work. +// MNV: this was a union, but that doesn't always work. typedef struct { /** * Tag indicating which member is actually valid. @@ -261,7 +261,7 @@ typedef enum { VTERM_PROP_CURSORSHAPE, // number VTERM_PROP_MOUSE, // number VTERM_PROP_FOCUSREPORT, // bool - VTERM_PROP_CURSORCOLOR, // VIM - string + VTERM_PROP_CURSORCOLOR, // MNV - string VTERM_N_PROPS } VTermProp; @@ -405,7 +405,7 @@ void vterm_mouse_button(VTerm *vt, int button, int pressed, VTermModifier mod); #define CSI_ARG(a) ((a) & CSI_ARG_MASK) /* Can't use -1 to indicate a missing argument; use this instead */ -// VIM: changed 31 to 30 to avoid an overflow warning +// MNV: changed 31 to 30 to avoid an overflow warning #define CSI_ARG_MISSING ((1<<30)-1) #define CSI_ARG_IS_MISSING(a) (CSI_ARG(a) == CSI_ARG_MISSING) @@ -454,7 +454,7 @@ typedef struct { int (*sb_clear)(void *user); } VTermStateCallbacks; -// VIM: added +// MNV: added typedef struct { VTermPos pos; int buttons; @@ -495,7 +495,7 @@ void *vterm_state_get_unrecognised_fbdata(VTermState *state); void vterm_state_reset(VTermState *state, int hard); void vterm_state_get_cursorpos(const VTermState *state, VTermPos *cursorpos); -// VIM: added +// MNV: added void vterm_state_get_mousestate(const VTermState *state, VTermMouseState *mousestate); void vterm_state_get_default_colors(const VTermState *state, VTermColor *default_fg, VTermColor *default_bg); void vterm_state_get_palette_color(const VTermState *state, int index, VTermColor *col); diff --git a/uvim/src/libvterm/src/encoding.c b/uvim/src/libvterm/src/encoding.c index 817344f333..9d1216767a 100644 --- a/uvim/src/libvterm/src/encoding.c +++ b/uvim/src/libvterm/src/encoding.c @@ -49,7 +49,7 @@ static void decode_utf8(VTermEncoding *enc UNUSED, void *data_, if(data->bytes_remaining) { data->bytes_remaining = 0; cp[(*cpi)++] = UNICODE_INVALID; - // VIM: avoid going over the end + // MNV: avoid going over the end if (*cpi >= cplen) break; } diff --git a/uvim/src/libvterm/src/keyboard.c b/uvim/src/libvterm/src/keyboard.c index 7a44670e7e..7ea82542e6 100644 --- a/uvim/src/libvterm/src/keyboard.c +++ b/uvim/src/libvterm/src/keyboard.c @@ -4,13 +4,13 @@ #include "utf8.h" -// VIM: added +// MNV: added int vterm_is_modify_other_keys(VTerm *vt) { return vt->state->mode.modify_other_keys; } -// VIM: added +// MNV: added int vterm_is_kitty_keyboard(VTerm *vt) { return vt->state->mode.kitty_keyboard; @@ -19,13 +19,13 @@ int vterm_is_kitty_keyboard(VTerm *vt) void vterm_keyboard_unichar(VTerm *vt, uint32_t c, VTermModifier mod) { - // VIM: added modifyOtherKeys support + // MNV: added modifyOtherKeys support if (vterm_is_modify_other_keys(vt) && mod != 0) { vterm_push_output_sprintf_ctrl(vt, C1_CSI, "27;%d;%d~", mod+1, c); return; } - // VIM: added kitty keyboard protocol support + // MNV: added kitty keyboard protocol support if (vterm_is_kitty_keyboard(vt) && mod != 0) { vterm_push_output_sprintf_ctrl(vt, C1_CSI, "%d;%du", c, mod+1); return; diff --git a/uvim/src/libvterm/src/pen.c b/uvim/src/libvterm/src/pen.c index 33d3dae9f1..8a893006af 100644 --- a/uvim/src/libvterm/src/pen.c +++ b/uvim/src/libvterm/src/pen.c @@ -44,7 +44,7 @@ static int ramp24[] = { static void lookup_default_colour_ansi(long idx, VTermColor *col) { - // VIM: store both RGB color and index + // MNV: store both RGB color and index vterm_color_rgb( col, ansi_colors[idx].red, ansi_colors[idx].green, ansi_colors[idx].blue); diff --git a/uvim/src/libvterm/src/screen.c b/uvim/src/libvterm/src/screen.c index fd76777c41..228c9e333f 100644 --- a/uvim/src/libvterm/src/screen.c +++ b/uvim/src/libvterm/src/screen.c @@ -1,6 +1,6 @@ #include "vterm_internal.h" -// vim: set sw=2 : +// mnv: set sw=2 : #include <stdio.h> #include <string.h> diff --git a/uvim/src/libvterm/src/unicode.c b/uvim/src/libvterm/src/unicode.c index a6a46e131c..304f603c76 100644 --- a/uvim/src/libvterm/src/unicode.c +++ b/uvim/src/libvterm/src/unicode.c @@ -76,7 +76,7 @@ struct interval { /* sorted list of non-overlapping intervals of non-spacing characters */ /* generated by "uniset +cat=Me +cat=Mn +cat=Cf -00AD +1160-11FF +200B c" */ -// Replaced by the combining table from Vim. +// Replaced by the combining table from MNV. static const struct interval combining[] = { {0X0300, 0X036F}, {0X0483, 0X0489}, diff --git a/uvim/src/libvterm/src/vterm.c b/uvim/src/libvterm/src/vterm.c index dba6377186..52bfdcad1e 100644 --- a/uvim/src/libvterm/src/vterm.c +++ b/uvim/src/libvterm/src/vterm.c @@ -1,6 +1,6 @@ #define DEFINE_INLINES -// vim: set sw=2 : +// mnv: set sw=2 : #include "vterm_internal.h" #include <stdio.h> diff --git a/uvim/src/libvterm/t/63screen_resize.test b/uvim/src/libvterm/t/63screen_resize.test index 6835222db7..3cf3bdb970 100644 --- a/uvim/src/libvterm/t/63screen_resize.test +++ b/uvim/src/libvterm/t/63screen_resize.test @@ -55,7 +55,7 @@ RESIZE 20,80 ?cursor = 9,0 !Resize shorter does not lose line with cursor -# See also https://github.com/neovim/libvterm/commit/1b745d29d45623aa8d22a7b9288c7b0e331c7088 +# See also https://github.com/neomnv/libvterm/commit/1b745d29d45623aa8d22a7b9288c7b0e331c7088 RESET WANTSCREEN -b RESIZE 25,80 @@ -70,7 +70,7 @@ RESIZE 24,80 ?cursor = 23,0 !Resize shorter does not send the cursor to a negative row -# See also https://github.com/vim/vim/pull/6141 +# See also https://github.com/Project-Tick/Project-Tick/pull/6141 RESET WANTSCREEN -b RESIZE 25,80 diff --git a/uvim/src/libvterm/t/69screen_reflow.test b/uvim/src/libvterm/t/69screen_reflow.test index eb7e4e4d95..6d6e8486a6 100644 --- a/uvim/src/libvterm/t/69screen_reflow.test +++ b/uvim/src/libvterm/t/69screen_reflow.test @@ -79,7 +79,7 @@ RESIZE 5,16 ?cursor = 3,2 !Cursor goes missing -# For more context: https://github.com/neovim/neovim/pull/21124 +# For more context: https://github.com/neomnv/neomnv/pull/21124 RESET RESIZE 5,5 RESIZE 3,1 |
