Plugins-Commits

plugins-commits@lists.geany.org

5468 discussions

[geany/geany-plugins] 3e3896: Merge pull request #1350 from scresto09/vimode-fold-support-fix
by Jiří Techet 25 May '24

25 May '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Sat, 25 May 2024 18:42:12 UTC Commit: 3e38966d6baf53a84d2c3644aaa6eaadd38e532e https://github.com/geany/geany-plugins/commit/3e38966d6baf53a84d2c3644aaa6e… Log Message: ----------- Merge pull request #1350 from scresto09/vimode-fold-support-fix Vimode: implement fold in vimode plugin Modified Paths: -------------- vimode/README vimode/src/Makefile.am vimode/src/cmd-runner.c vimode/src/cmds/fold.c vimode/src/cmds/fold.h Modified: vimode/README 11 lines changed, 10 insertions(+), 1 deletions(-) =================================================================== @@ -96,7 +96,7 @@ This is an incomplete list of known limitations of the plugin: * named registers and related commands are not implemented * Ctrl+X mode is not implemented * marks are not implemented -* fold commands are not implemented +* many fold commands are not implemented * most commands starting with "'", "z", and "g" are not implemented * most ex mode commands are not implemented (excluding basic stuff like search, replace, saving, etc.) @@ -501,7 +501,16 @@ a new command, please do not forget to update the table below.:: cursor on first non-blank z. z. redraw, cursor line to center of window, cursor on first non-blank + zA zA open a closed fold or close an open fold + recursively + zC zC close folds recursively + zM zM set 'foldlevel' to zero + zO zO open folds recursively + zR zR set 'foldlevel' to the deepest fold + za za open a closed fold, close an open fold zb zb redraw, cursor line at bottom of window + zc zc close a fold + zo zo open fold zt zt redraw, cursor line at top of window zz zz redraw, cursor line at center of window Modified: vimode/src/Makefile.am 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -37,7 +37,9 @@ vi_srcs = \ cmds/excmds.h \ cmds/excmds.c \ cmds/undo.h \ - cmds/undo.c + cmds/undo.c \ + cmds/fold.h \ + cmds/fold.c vimode_la_SOURCES = \ backends/backend-geany.c \ Modified: vimode/src/cmd-runner.c 10 lines changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -25,6 +25,7 @@ #include "cmds/changemode.h" #include "cmds/edit.h" #include "cmds/special.h" +#include "cmds/fold.h" #include <gdk/gdkkeysyms.h> @@ -262,6 +263,15 @@ CmdDef text_object_cmds[] = { {cmd_copy_line, GDK_KEY_Y, 0, 0, 0, FALSE, FALSE}, \ {cmd_paste_after, GDK_KEY_p, 0, 0, 0, FALSE, FALSE}, \ {cmd_paste_before, GDK_KEY_P, 0, 0, 0, FALSE, FALSE}, \ + /* fold */ \ + {cmd_toggle_fold, GDK_KEY_z, GDK_KEY_a, 0, 0, FALSE, FALSE}, \ + {cmd_open_fold, GDK_KEY_z, GDK_KEY_o, 0, 0, FALSE, FALSE}, \ + {cmd_close_fold, GDK_KEY_z, GDK_KEY_c, 0, 0, FALSE, FALSE}, \ + {cmd_toggle_fold_child, GDK_KEY_z, GDK_KEY_A, 0, 0, FALSE, FALSE}, \ + {cmd_open_fold_child, GDK_KEY_z, GDK_KEY_O, 0, 0, FALSE, FALSE}, \ + {cmd_close_fold_child, GDK_KEY_z, GDK_KEY_C, 0, 0, FALSE, FALSE}, \ + {cmd_open_fold_all, GDK_KEY_z, GDK_KEY_R, 0, 0, FALSE, FALSE}, \ + {cmd_close_fold_all, GDK_KEY_z, GDK_KEY_M, 0, 0, FALSE, FALSE}, \ /* changing text */ \ {cmd_enter_insert_cut_line, GDK_KEY_c, GDK_KEY_c, 0, 0, FALSE, FALSE}, \ {cmd_enter_insert_cut_line, GDK_KEY_S, 0, 0, 0, FALSE, FALSE}, \ Modified: vimode/src/cmds/fold.c 127 lines changed, 127 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,127 @@ +/* + * Copyright 2024 Sylvain Cresto <scresto(a)gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "cmds/fold.h" +#include "utils.h" + +#define GOTO_NEAREST_PARENT 0 +#define GOTO_TOPMOST_PARENT 1 +#define GOTO_CONTRACTED_PARENT 2 + +static gint goto_above_fold(CmdParams *p, gint type) +{ + /* foldparent of the next line */ + gint line = SSM(p->sci, SCI_GETFOLDPARENT, p->line + 1, 0); + + if (p->line == line) + ; /* we are already on the fold point line */ + else + { + /* foldparent of the current line */ + line = SSM(p->sci, SCI_GETFOLDPARENT, p->line, 0); + } + + /* retreive first parent when type != GOTO_NEAREST_PARENT + when type == GOTO_CONTRACTED_PARENT we stop on first contracted parent if exist + */ + if (type == GOTO_CONTRACTED_PARENT && line != -1 && ! SSM(p->sci, SCI_GETFOLDEXPANDED, line, 0)) + ; /* this fold point is contracted and type == GOTO_CONTRACTED_PARENT */ + else if (type != GOTO_NEAREST_PARENT) + { + gint prev_line = line; + while (prev_line != -1) + { + prev_line = SSM(p->sci, SCI_GETFOLDPARENT, prev_line, 0); + if (prev_line != -1) + { + line = prev_line; + if (type == GOTO_CONTRACTED_PARENT && ! SSM(p->sci, SCI_GETFOLDEXPANDED, line, 0)) + break; + } + } + } + + if (line != -1) + { + /* move the cursor on the visible line before the fold */ + gint pos = SSM(p->sci, SCI_POSITIONFROMLINE, line, 0); + SET_POS_NOX(p->sci, pos, TRUE); + } + + return line; +} + + +void cmd_toggle_fold(CmdContext *c, CmdParams *p) +{ + gint line = goto_above_fold(p, GOTO_NEAREST_PARENT); + if (line != -1) + SSM(p->sci, SCI_FOLDLINE, (uptr_t) line, SC_FOLDACTION_TOGGLE); +} + + +void cmd_open_fold(CmdContext *c, CmdParams *p) +{ + gint line = goto_above_fold(p, GOTO_NEAREST_PARENT); + if (line != -1) + SSM(p->sci, SCI_FOLDLINE, (uptr_t) line, SC_FOLDACTION_EXPAND); +} + + +void cmd_close_fold(CmdContext *c, CmdParams *p) +{ + gint line = goto_above_fold(p, GOTO_NEAREST_PARENT); + if (line != -1) + SSM(p->sci, SCI_FOLDLINE, (uptr_t) line, SC_FOLDACTION_CONTRACT); +} + + +void cmd_toggle_fold_child(CmdContext *c, CmdParams *p) +{ + gint line = goto_above_fold(p, GOTO_CONTRACTED_PARENT); + if (line != -1) + SSM(p->sci, SCI_FOLDCHILDREN, (uptr_t) line, SC_FOLDACTION_TOGGLE); +} + + +void cmd_open_fold_child(CmdContext *c, CmdParams *p) +{ + gint line = goto_above_fold(p, GOTO_NEAREST_PARENT); + SSM(p->sci, SCI_FOLDCHILDREN, (uptr_t) line, SC_FOLDACTION_EXPAND); +} + + +void cmd_close_fold_child(CmdContext *c, CmdParams *p) +{ + gint line = goto_above_fold(p, GOTO_TOPMOST_PARENT); + if (line != -1) + SSM(p->sci, SCI_FOLDCHILDREN, (uptr_t) line, SC_FOLDACTION_CONTRACT); +} + + +void cmd_open_fold_all(CmdContext *c, CmdParams *p) +{ + SSM(p->sci, SCI_FOLDALL, SC_FOLDACTION_EXPAND | SC_FOLDACTION_CONTRACT_EVERY_LEVEL, 0); +} + + +void cmd_close_fold_all(CmdContext *c, CmdParams *p) +{ + goto_above_fold(p, GOTO_TOPMOST_PARENT); + SSM(p->sci, SCI_FOLDALL, SC_FOLDACTION_CONTRACT | SC_FOLDACTION_CONTRACT_EVERY_LEVEL, 0); +} Modified: vimode/src/cmds/fold.h 37 lines changed, 37 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,37 @@ +/* + * Copyright 2024 Sylvain Cresto <scresto(a)gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef __VIMODE_CMDS_FOLD_H__ +#define __VIMODE_CMDS_FOLD_H__ + +#include "context.h" +#include "cmd-params.h" + +void cmd_toggle_fold(CmdContext *c, CmdParams *p); +void cmd_open_fold(CmdContext *c, CmdParams *p); +void cmd_close_fold(CmdContext *c, CmdParams *p); + +void cmd_toggle_fold_child(CmdContext *c, CmdParams *p); +void cmd_open_fold_child(CmdContext *c, CmdParams *p); +void cmd_close_fold_child(CmdContext *c, CmdParams *p); + +void cmd_toggle_fold_all(CmdContext *c, CmdParams *p); +void cmd_open_fold_all(CmdContext *c, CmdParams *p); +void cmd_close_fold_all(CmdContext *c, CmdParams *p); + +#endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 5c74ce: Vimode: implement fold in vimode plugin
by Sylvain Cresto 25 May '24

25 May '24

Branch: refs/heads/master Author: Sylvain Cresto <scresto(a)gmail.com> Committer: Sylvain Cresto <scresto(a)gmail.com> Date: Sat, 25 May 2024 09:20:22 UTC Commit: 5c74ce1d1a5b4f7a52b232e7b198a0d07242120a https://github.com/geany/geany-plugins/commit/5c74ce1d1a5b4f7a52b232e7b198a… Log Message: ----------- Vimode: implement fold in vimode plugin Modified Paths: -------------- vimode/README vimode/src/Makefile.am vimode/src/cmd-runner.c vimode/src/cmds/fold.c vimode/src/cmds/fold.h Modified: vimode/README 11 lines changed, 10 insertions(+), 1 deletions(-) =================================================================== @@ -96,7 +96,7 @@ This is an incomplete list of known limitations of the plugin: * named registers and related commands are not implemented * Ctrl+X mode is not implemented * marks are not implemented -* fold commands are not implemented +* many fold commands are not implemented * most commands starting with "'", "z", and "g" are not implemented * most ex mode commands are not implemented (excluding basic stuff like search, replace, saving, etc.) @@ -501,7 +501,16 @@ a new command, please do not forget to update the table below.:: cursor on first non-blank z. z. redraw, cursor line to center of window, cursor on first non-blank + zA zA open a closed fold or close an open fold + recursively + zC zC close folds recursively + zM zM set 'foldlevel' to zero + zO zO open folds recursively + zR zR set 'foldlevel' to the deepest fold + za za open a closed fold, close an open fold zb zb redraw, cursor line at bottom of window + zc zc close a fold + zo zo open fold zt zt redraw, cursor line at top of window zz zz redraw, cursor line at center of window Modified: vimode/src/Makefile.am 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -37,7 +37,9 @@ vi_srcs = \ cmds/excmds.h \ cmds/excmds.c \ cmds/undo.h \ - cmds/undo.c + cmds/undo.c \ + cmds/fold.h \ + cmds/fold.c vimode_la_SOURCES = \ backends/backend-geany.c \ Modified: vimode/src/cmd-runner.c 10 lines changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -25,6 +25,7 @@ #include "cmds/changemode.h" #include "cmds/edit.h" #include "cmds/special.h" +#include "cmds/fold.h" #include <gdk/gdkkeysyms.h> @@ -262,6 +263,15 @@ CmdDef text_object_cmds[] = { {cmd_copy_line, GDK_KEY_Y, 0, 0, 0, FALSE, FALSE}, \ {cmd_paste_after, GDK_KEY_p, 0, 0, 0, FALSE, FALSE}, \ {cmd_paste_before, GDK_KEY_P, 0, 0, 0, FALSE, FALSE}, \ + /* fold */ \ + {cmd_toggle_fold, GDK_KEY_z, GDK_KEY_a, 0, 0, FALSE, FALSE}, \ + {cmd_open_fold, GDK_KEY_z, GDK_KEY_o, 0, 0, FALSE, FALSE}, \ + {cmd_close_fold, GDK_KEY_z, GDK_KEY_c, 0, 0, FALSE, FALSE}, \ + {cmd_toggle_fold_child, GDK_KEY_z, GDK_KEY_A, 0, 0, FALSE, FALSE}, \ + {cmd_open_fold_child, GDK_KEY_z, GDK_KEY_O, 0, 0, FALSE, FALSE}, \ + {cmd_close_fold_child, GDK_KEY_z, GDK_KEY_C, 0, 0, FALSE, FALSE}, \ + {cmd_open_fold_all, GDK_KEY_z, GDK_KEY_R, 0, 0, FALSE, FALSE}, \ + {cmd_close_fold_all, GDK_KEY_z, GDK_KEY_M, 0, 0, FALSE, FALSE}, \ /* changing text */ \ {cmd_enter_insert_cut_line, GDK_KEY_c, GDK_KEY_c, 0, 0, FALSE, FALSE}, \ {cmd_enter_insert_cut_line, GDK_KEY_S, 0, 0, 0, FALSE, FALSE}, \ Modified: vimode/src/cmds/fold.c 127 lines changed, 127 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,127 @@ +/* + * Copyright 2024 Sylvain Cresto <scresto(a)gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "cmds/fold.h" +#include "utils.h" + +#define GOTO_NEAREST_PARENT 0 +#define GOTO_TOPMOST_PARENT 1 +#define GOTO_CONTRACTED_PARENT 2 + +static gint goto_above_fold(CmdParams *p, gint type) +{ + /* foldparent of the next line */ + gint line = SSM(p->sci, SCI_GETFOLDPARENT, p->line + 1, 0); + + if (p->line == line) + ; /* we are already on the fold point line */ + else + { + /* foldparent of the current line */ + line = SSM(p->sci, SCI_GETFOLDPARENT, p->line, 0); + } + + /* retreive first parent when type != GOTO_NEAREST_PARENT + when type == GOTO_CONTRACTED_PARENT we stop on first contracted parent if exist + */ + if (type == GOTO_CONTRACTED_PARENT && line != -1 && ! SSM(p->sci, SCI_GETFOLDEXPANDED, line, 0)) + ; /* this fold point is contracted and type == GOTO_CONTRACTED_PARENT */ + else if (type != GOTO_NEAREST_PARENT) + { + gint prev_line = line; + while (prev_line != -1) + { + prev_line = SSM(p->sci, SCI_GETFOLDPARENT, prev_line, 0); + if (prev_line != -1) + { + line = prev_line; + if (type == GOTO_CONTRACTED_PARENT && ! SSM(p->sci, SCI_GETFOLDEXPANDED, line, 0)) + break; + } + } + } + + if (line != -1) + { + /* move the cursor on the visible line before the fold */ + gint pos = SSM(p->sci, SCI_POSITIONFROMLINE, line, 0); + SET_POS_NOX(p->sci, pos, TRUE); + } + + return line; +} + + +void cmd_toggle_fold(CmdContext *c, CmdParams *p) +{ + gint line = goto_above_fold(p, GOTO_NEAREST_PARENT); + if (line != -1) + SSM(p->sci, SCI_FOLDLINE, (uptr_t) line, SC_FOLDACTION_TOGGLE); +} + + +void cmd_open_fold(CmdContext *c, CmdParams *p) +{ + gint line = goto_above_fold(p, GOTO_NEAREST_PARENT); + if (line != -1) + SSM(p->sci, SCI_FOLDLINE, (uptr_t) line, SC_FOLDACTION_EXPAND); +} + + +void cmd_close_fold(CmdContext *c, CmdParams *p) +{ + gint line = goto_above_fold(p, GOTO_NEAREST_PARENT); + if (line != -1) + SSM(p->sci, SCI_FOLDLINE, (uptr_t) line, SC_FOLDACTION_CONTRACT); +} + + +void cmd_toggle_fold_child(CmdContext *c, CmdParams *p) +{ + gint line = goto_above_fold(p, GOTO_CONTRACTED_PARENT); + if (line != -1) + SSM(p->sci, SCI_FOLDCHILDREN, (uptr_t) line, SC_FOLDACTION_TOGGLE); +} + + +void cmd_open_fold_child(CmdContext *c, CmdParams *p) +{ + gint line = goto_above_fold(p, GOTO_NEAREST_PARENT); + SSM(p->sci, SCI_FOLDCHILDREN, (uptr_t) line, SC_FOLDACTION_EXPAND); +} + + +void cmd_close_fold_child(CmdContext *c, CmdParams *p) +{ + gint line = goto_above_fold(p, GOTO_TOPMOST_PARENT); + if (line != -1) + SSM(p->sci, SCI_FOLDCHILDREN, (uptr_t) line, SC_FOLDACTION_CONTRACT); +} + + +void cmd_open_fold_all(CmdContext *c, CmdParams *p) +{ + SSM(p->sci, SCI_FOLDALL, SC_FOLDACTION_EXPAND | SC_FOLDACTION_CONTRACT_EVERY_LEVEL, 0); +} + + +void cmd_close_fold_all(CmdContext *c, CmdParams *p) +{ + goto_above_fold(p, GOTO_TOPMOST_PARENT); + SSM(p->sci, SCI_FOLDALL, SC_FOLDACTION_CONTRACT | SC_FOLDACTION_CONTRACT_EVERY_LEVEL, 0); +} Modified: vimode/src/cmds/fold.h 37 lines changed, 37 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,37 @@ +/* + * Copyright 2024 Sylvain Cresto <scresto(a)gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef __VIMODE_CMDS_FOLD_H__ +#define __VIMODE_CMDS_FOLD_H__ + +#include "context.h" +#include "cmd-params.h" + +void cmd_toggle_fold(CmdContext *c, CmdParams *p); +void cmd_open_fold(CmdContext *c, CmdParams *p); +void cmd_close_fold(CmdContext *c, CmdParams *p); + +void cmd_toggle_fold_child(CmdContext *c, CmdParams *p); +void cmd_open_fold_child(CmdContext *c, CmdParams *p); +void cmd_close_fold_child(CmdContext *c, CmdParams *p); + +void cmd_toggle_fold_all(CmdContext *c, CmdParams *p); +void cmd_open_fold_all(CmdContext *c, CmdParams *p); +void cmd_close_fold_all(CmdContext *c, CmdParams *p); + +#endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 7da755: Merge pull request #1349 from scresto09/vimode-handle-fold-marginclick
by Jiří Techet 24 May '24

24 May '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Fri, 24 May 2024 20:14:51 UTC Commit: 7da755364ccbed6b25463845e9afe970840e579d https://github.com/geany/geany-plugins/commit/7da755364ccbed6b25463845e9afe… Log Message: ----------- Merge pull request #1349 from scresto09/vimode-handle-fold-marginclick Vimode: handle fold and margin click event Modified Paths: -------------- vimode/src/utils.c vimode/src/utils.h vimode/src/vi.c Modified: vimode/src/utils.c 25 lines changed, 25 insertions(+), 0 deletions(-) =================================================================== @@ -228,3 +228,28 @@ void ensure_current_line_expanded(ScintillaObject *sci) if (!SSM(sci, SCI_GETLINEVISIBLE, line, 0)) SSM(sci, SCI_ENSUREVISIBLE, line, 0); } + + +gint jump_to_expended_parent(ScintillaObject *sci, gint line) +{ + gint fold_parent = line; + + /* go through the parents as long as they are not visible */ + while (SSM(sci, SCI_GETLINEVISIBLE, fold_parent, 0) == FALSE) + { + gint prev_parent = SSM(sci, SCI_GETFOLDPARENT, fold_parent, 0); + + if (prev_parent == -1) + break; + fold_parent = prev_parent; + } + + if (fold_parent != line) + { + /* move the cursor on the visible line before the fold */ + gint pos = SSM(sci, SCI_POSITIONFROMLINE, fold_parent, 0); + SET_POS(sci, pos, TRUE); + } + + return fold_parent; +} Modified: vimode/src/utils.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -34,4 +34,6 @@ void perform_substitute(ScintillaObject *sci, const gchar *cmd, gint from, gint gint get_line_number_rel(ScintillaObject *sci, gint shift); void ensure_current_line_expanded(ScintillaObject *sci); +gint jump_to_expended_parent(ScintillaObject *sci, gint line); + #endif Modified: vimode/src/vi.c 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -312,6 +312,15 @@ gboolean vi_notify_sci(SCNotification *nt) if (nt->nmhdr.code == SCN_MODIFIED && (nt->modificationType & SC_MOD_BEFOREINSERT && nt->modificationType & SC_PERFORMED_UNDO) && nt->length > 1) undo_update(&ctx, nt->position); + if (nt->nmhdr.code == SCN_MARGINCLICK) + { + if (nt->margin == 2) + { + gint line = GET_CUR_LINE(sci); + jump_to_expended_parent(sci, line); + } + } + /* This makes sure that when we click behind the end of line in command mode, * the cursor is not placed BEHIND the last character but ON the last character. * We want to ignore this when doing selection with mouse as it breaks things. */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] fade2b: Vimode: handle fold and margin click event
by Sylvain Cresto 24 May '24

24 May '24

Branch: refs/heads/master Author: Sylvain Cresto <scresto(a)gmail.com> Committer: Sylvain Cresto <scresto(a)gmail.com> Date: Fri, 24 May 2024 12:22:57 UTC Commit: fade2b75401f0ef57486ef93ea854d7ff226b211 https://github.com/geany/geany-plugins/commit/fade2b75401f0ef57486ef93ea854… Log Message: ----------- Vimode: handle fold and margin click event Modified Paths: -------------- vimode/src/utils.c vimode/src/utils.h vimode/src/vi.c Modified: vimode/src/utils.c 25 lines changed, 25 insertions(+), 0 deletions(-) =================================================================== @@ -228,3 +228,28 @@ void ensure_current_line_expanded(ScintillaObject *sci) if (!SSM(sci, SCI_GETLINEVISIBLE, line, 0)) SSM(sci, SCI_ENSUREVISIBLE, line, 0); } + + +gint jump_to_expended_parent(ScintillaObject *sci, gint line) +{ + gint fold_parent = line; + + /* go through the parents as long as they are not visible */ + while (SSM(sci, SCI_GETLINEVISIBLE, fold_parent, 0) == FALSE) + { + gint prev_parent = SSM(sci, SCI_GETFOLDPARENT, fold_parent, 0); + + if (prev_parent == -1) + break; + fold_parent = prev_parent; + } + + if (fold_parent != line) + { + /* move the cursor on the visible line before the fold */ + gint pos = SSM(sci, SCI_POSITIONFROMLINE, fold_parent, 0); + SET_POS(sci, pos, TRUE); + } + + return fold_parent; +} Modified: vimode/src/utils.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -34,4 +34,6 @@ void perform_substitute(ScintillaObject *sci, const gchar *cmd, gint from, gint gint get_line_number_rel(ScintillaObject *sci, gint shift); void ensure_current_line_expanded(ScintillaObject *sci); +gint jump_to_expended_parent(ScintillaObject *sci, gint line); + #endif Modified: vimode/src/vi.c 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -312,6 +312,15 @@ gboolean vi_notify_sci(SCNotification *nt) if (nt->nmhdr.code == SCN_MODIFIED && (nt->modificationType & SC_MOD_BEFOREINSERT && nt->modificationType & SC_PERFORMED_UNDO) && nt->length > 1) undo_update(&ctx, nt->position); + if (nt->nmhdr.code == SCN_MARGINCLICK) + { + if (nt->margin == 2) + { + gint line = GET_CUR_LINE(sci); + jump_to_expended_parent(sci, line); + } + } + /* This makes sure that when we click behind the end of line in command mode, * the cursor is not placed BEHIND the last character but ON the last character. * We want to ignore this when doing selection with mouse as it breaks things. */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 0e299a: Merge pull request #1328 from scresto09/vimode-fix-undo-pos
by Jiří Techet 22 May '24

22 May '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Wed, 22 May 2024 15:09:58 UTC Commit: 0e299a898165cedfc8010d1ae43fa14a0c9f8e00 https://github.com/geany/geany-plugins/commit/0e299a898165cedfc8010d1ae43fa… Log Message: ----------- Merge pull request #1328 from scresto09/vimode-fix-undo-pos Vimode: fix cursor position after using undo Modified Paths: -------------- vimode/src/Makefile.am vimode/src/cmds/edit.c vimode/src/cmds/excmds.c vimode/src/cmds/undo.c vimode/src/cmds/undo.h vimode/src/context.h vimode/src/utils.c vimode/src/vi.c Modified: vimode/src/Makefile.am 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -35,7 +35,9 @@ vi_srcs = \ cmds/edit.h \ cmds/edit.c \ cmds/excmds.h \ - cmds/excmds.c + cmds/excmds.c \ + cmds/undo.h \ + cmds/undo.c vimode_la_SOURCES = \ backends/backend-geany.c \ Modified: vimode/src/cmds/edit.c 9 lines changed, 2 insertions(+), 7 deletions(-) =================================================================== @@ -17,6 +17,7 @@ */ #include "cmds/edit.h" +#include "cmds/undo.h" #include "utils.h" @@ -161,13 +162,7 @@ void cmd_del_word_left(CmdContext *c, CmdParams *p) void cmd_undo(CmdContext *c, CmdParams *p) { - gint i; - for (i = 0; i < p->num; i++) - { - if (!SSM(p->sci, SCI_CANUNDO, 0, 0)) - break; - SSM(p->sci, SCI_UNDO, 0, 0); - } + undo_apply(c, p->num); } Modified: vimode/src/cmds/excmds.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -18,6 +18,7 @@ #include "cmds/excmds.h" #include "cmds/edit.h" +#include "cmds/undo.h" #include "utils.h" void excmd_save(CmdContext *c, ExCmdParams *p) @@ -93,7 +94,7 @@ void excmd_put(CmdContext *c, ExCmdParams *p) void excmd_undo(CmdContext *c, ExCmdParams *p) { - SSM(c->sci, SCI_UNDO, 0, 0); + undo_apply(c, 1); } Modified: vimode/src/cmds/undo.c 59 lines changed, 59 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,59 @@ +/* + * Copyright 2024 Sylvain Cresto <scresto(a)gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "undo.h" +#include "utils.h" + +void undo_update(CmdContext *c, gint pos) +{ + c->undo_pos = pos; +} + + +static gboolean is_start_of_line(ScintillaObject *sci, gint pos) +{ + gint line = SSM(sci, SCI_LINEFROMPOSITION, pos, 0); + gint line_pos = SSM(sci, SCI_POSITIONFROMLINE, line, 0); + + return pos == line_pos; +} + + +void undo_apply(CmdContext *c, gint num) +{ + ScintillaObject *sci = c->sci; + gint i; + + c->undo_pos = -1; + + for (i = 0; i < num; i++) + { + if (!SSM(sci, SCI_CANUNDO, 0, 0)) + break; + SSM(sci, SCI_UNDO, 0, 0); + } + + /* exit when no undo has been applied */ + if (c->undo_pos == -1) + return; + + if (is_start_of_line(sci, c->undo_pos)) + goto_nonempty(sci, SSM(sci, SCI_LINEFROMPOSITION, c->undo_pos, 0), FALSE); + else + SET_POS(sci, c->undo_pos, FALSE); +} Modified: vimode/src/cmds/undo.h 27 lines changed, 27 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,27 @@ +/* + * Copyright 2024 Sylvain Cresto <scresto(a)gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef __UNDO_H__ +#define __UNDO_H__ + +#include "context.h" + +void undo_update(CmdContext *c, gint pos); +void undo_apply(CmdContext *c, gint num); + +#endif Modified: vimode/src/context.h 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -57,6 +57,9 @@ typedef struct * copied N times when e.g. 'i' is preceded by a number or when using '.' */ gchar insert_buf[INSERT_BUF_LEN]; gint insert_buf_len; + + /* cursor position to restore after undo */ + gint undo_pos; } CmdContext; #endif Modified: vimode/src/utils.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -210,6 +210,7 @@ gint get_line_number_rel(ScintillaObject *sci, gint shift) return new_line; } + void goto_nonempty(ScintillaObject *sci, gint line, gboolean scroll) { gint line_end_pos = SSM(sci, SCI_GETLINEENDPOSITION, line, 0); Modified: vimode/src/vi.c 8 lines changed, 7 insertions(+), 1 deletions(-) =================================================================== @@ -21,6 +21,7 @@ #include "utils.h" #include "keypress.h" #include "excmd-prompt.h" +#include "cmds/undo.h" #include <gdk/gdkkeysyms.h> @@ -51,7 +52,8 @@ CmdContext ctx = NULL, NULL, NULL, FALSE, FALSE, 0, 1, - "", 0 + "", 0, + -1 }; @@ -306,6 +308,10 @@ gboolean vi_notify_sci(SCNotification *nt) } } + /* Keep position of undo operation */ + if (nt->nmhdr.code == SCN_MODIFIED && (nt->modificationType & SC_MOD_BEFOREINSERT && nt->modificationType & SC_PERFORMED_UNDO) && nt->length > 1) + undo_update(&ctx, nt->position); + /* This makes sure that when we click behind the end of line in command mode, * the cursor is not placed BEHIND the last character but ON the last character. * We want to ignore this when doing selection with mouse as it breaks things. */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] cc7d25: vimode: fix cursor position after using undo (u key)
by Sylvain Cresto 22 May '24

22 May '24

Branch: refs/heads/master Author: Sylvain Cresto <scresto(a)gmail.com> Committer: Sylvain Cresto <scresto(a)gmail.com> Date: Wed, 22 May 2024 08:42:16 UTC Commit: cc7d25d426b107ff033c71ea051a90bd4310c7be https://github.com/geany/geany-plugins/commit/cc7d25d426b107ff033c71ea051a9… Log Message: ----------- vimode: fix cursor position after using undo (u key) Modified Paths: -------------- vimode/src/Makefile.am vimode/src/cmds/edit.c vimode/src/cmds/excmds.c vimode/src/cmds/undo.c vimode/src/cmds/undo.h vimode/src/context.h vimode/src/utils.c vimode/src/vi.c Modified: vimode/src/Makefile.am 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -35,7 +35,9 @@ vi_srcs = \ cmds/edit.h \ cmds/edit.c \ cmds/excmds.h \ - cmds/excmds.c + cmds/excmds.c \ + cmds/undo.h \ + cmds/undo.c vimode_la_SOURCES = \ backends/backend-geany.c \ Modified: vimode/src/cmds/edit.c 9 lines changed, 2 insertions(+), 7 deletions(-) =================================================================== @@ -17,6 +17,7 @@ */ #include "cmds/edit.h" +#include "cmds/undo.h" #include "utils.h" @@ -161,13 +162,7 @@ void cmd_del_word_left(CmdContext *c, CmdParams *p) void cmd_undo(CmdContext *c, CmdParams *p) { - gint i; - for (i = 0; i < p->num; i++) - { - if (!SSM(p->sci, SCI_CANUNDO, 0, 0)) - break; - SSM(p->sci, SCI_UNDO, 0, 0); - } + undo_apply(c, p->num); } Modified: vimode/src/cmds/excmds.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -18,6 +18,7 @@ #include "cmds/excmds.h" #include "cmds/edit.h" +#include "cmds/undo.h" #include "utils.h" void excmd_save(CmdContext *c, ExCmdParams *p) @@ -93,7 +94,7 @@ void excmd_put(CmdContext *c, ExCmdParams *p) void excmd_undo(CmdContext *c, ExCmdParams *p) { - SSM(c->sci, SCI_UNDO, 0, 0); + undo_apply(c, 1); } Modified: vimode/src/cmds/undo.c 59 lines changed, 59 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,59 @@ +/* + * Copyright 2024 Sylvain Cresto <scresto(a)gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "undo.h" +#include "utils.h" + +void undo_update(CmdContext *c, gint pos) +{ + c->undo_pos = pos; +} + + +static gboolean is_start_of_line(ScintillaObject *sci, gint pos) +{ + gint line = SSM(sci, SCI_LINEFROMPOSITION, pos, 0); + gint line_pos = SSM(sci, SCI_POSITIONFROMLINE, line, 0); + + return pos == line_pos; +} + + +void undo_apply(CmdContext *c, gint num) +{ + ScintillaObject *sci = c->sci; + gint i; + + c->undo_pos = -1; + + for (i = 0; i < num; i++) + { + if (!SSM(sci, SCI_CANUNDO, 0, 0)) + break; + SSM(sci, SCI_UNDO, 0, 0); + } + + /* exit when no undo has been applied */ + if (c->undo_pos == -1) + return; + + if (is_start_of_line(sci, c->undo_pos)) + goto_nonempty(sci, SSM(sci, SCI_LINEFROMPOSITION, c->undo_pos, 0), FALSE); + else + SET_POS(sci, c->undo_pos, FALSE); +} Modified: vimode/src/cmds/undo.h 27 lines changed, 27 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,27 @@ +/* + * Copyright 2024 Sylvain Cresto <scresto(a)gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef __UNDO_H__ +#define __UNDO_H__ + +#include "context.h" + +void undo_update(CmdContext *c, gint pos); +void undo_apply(CmdContext *c, gint num); + +#endif Modified: vimode/src/context.h 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -57,6 +57,9 @@ typedef struct * copied N times when e.g. 'i' is preceded by a number or when using '.' */ gchar insert_buf[INSERT_BUF_LEN]; gint insert_buf_len; + + /* cursor position to restore after undo */ + gint undo_pos; } CmdContext; #endif Modified: vimode/src/utils.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -210,6 +210,7 @@ gint get_line_number_rel(ScintillaObject *sci, gint shift) return new_line; } + void goto_nonempty(ScintillaObject *sci, gint line, gboolean scroll) { gint line_end_pos = SSM(sci, SCI_GETLINEENDPOSITION, line, 0); Modified: vimode/src/vi.c 8 lines changed, 7 insertions(+), 1 deletions(-) =================================================================== @@ -21,6 +21,7 @@ #include "utils.h" #include "keypress.h" #include "excmd-prompt.h" +#include "cmds/undo.h" #include <gdk/gdkkeysyms.h> @@ -51,7 +52,8 @@ CmdContext ctx = NULL, NULL, NULL, FALSE, FALSE, 0, 1, - "", 0 + "", 0, + -1 }; @@ -306,6 +308,10 @@ gboolean vi_notify_sci(SCNotification *nt) } } + /* Keep position of undo operation */ + if (nt->nmhdr.code == SCN_MODIFIED && (nt->modificationType & SC_MOD_BEFOREINSERT && nt->modificationType & SC_PERFORMED_UNDO) && nt->length > 1) + undo_update(&ctx, nt->position); + /* This makes sure that when we click behind the end of line in command mode, * the cursor is not placed BEHIND the last character but ON the last character. * We want to ignore this when doing selection with mouse as it breaks things. */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 23d0a5: Merge pull request #1338 from techee/vimode_fold
by Jiří Techet 21 May '24

21 May '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Tue, 21 May 2024 21:59:43 UTC Commit: 23d0a582859019e11c28ceaefe44b578ad343af6 https://github.com/geany/geany-plugins/commit/23d0a582859019e11c28ceaefe44b… Log Message: ----------- Merge pull request #1338 from techee/vimode_fold vimode: Handle folded lines correctly Modified Paths: -------------- vimode/src/cmd-runner.c vimode/src/cmds/motion.c vimode/src/excmd-runner.c vimode/src/utils.c vimode/src/utils.h Modified: vimode/src/cmd-runner.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -704,6 +704,7 @@ static gboolean process_cmd(CmdDef *cmds, CmdContext *ctx, gboolean ins_mode) { if (orig_mode == VI_MODE_COMMAND_SINGLE) vi_set_mode(VI_MODE_INSERT); + ensure_current_line_expanded(ctx->sci); } else if (!consumed && ctx->kpl) { Modified: vimode/src/cmds/motion.c 74 lines changed, 56 insertions(+), 18 deletions(-) =================================================================== @@ -41,9 +41,39 @@ void cmd_goto_right(CmdContext *c, CmdParams *p) } +static gint doc_line_from_visible_delta(CmdParams *p, gint line, gint delta, gboolean *overflow) +{ + gboolean oflow = FALSE; + gint new_line = line; + gint i = 0; + + while (i < ABS(delta)) + { + gint inc = delta > 0 ? 1 : -1; + gint tmp = new_line + inc; + + if (tmp < 0 || tmp >= p->line_num) + { + oflow = TRUE; + break; + } + new_line = tmp; + + if (SSM(p->sci, SCI_GETLINEVISIBLE, new_line, 0)) + i++; + } + + if (overflow) + *overflow = oflow; + + return new_line; +} + + void cmd_goto_up(CmdContext *c, CmdParams *p) { gint one_above, pos; + gboolean line_underflow; if (p->line == 0) return; @@ -53,8 +83,8 @@ void cmd_goto_up(CmdContext *c, CmdParams *p) * SCI_CHOOSECARETX which we cannot read directly from Scintilla and which * we want to keep - perform jump to previous/following line and add * one final SCI_LINEUP/SCI_LINEDOWN which recovers SCI_CHOOSECARETX for us. */ - one_above = p->line - p->num - 1; - if (one_above >= 0) + one_above = doc_line_from_visible_delta(p, p->line, -p->num - 1, &line_underflow); + if (!line_underflow) { /* Every case except for the first line - go one line above and perform * SCI_LINEDOWN. This ensures that even with wrapping on, we get the @@ -70,7 +100,7 @@ void cmd_goto_up(CmdContext *c, CmdParams *p) * on, we need to repeat SCI_LINEUP to get to the first line of wrapping. * This may lead to visible slow scrolling which is why there's the * fast case above for anything else but the first line. */ - gint one_below = p->line - p->num + 1; + gint one_below = doc_line_from_visible_delta(p, p->line, -p->num + 1, NULL); gint wrap_count; one_below = one_below > 0 ? one_below : 1; @@ -98,15 +128,13 @@ void cmd_goto_up_nonempty(CmdContext *c, CmdParams *p) static void goto_down(CmdParams *p, gint num) { gint one_above, pos; - gint last_line = p->line_num - 1; - if (p->line == last_line) + if (p->line >= p->line_num - 1) return; - /* see cmd_goto_up() for explanation */ - one_above = p->line + num - 1; - one_above = one_above < last_line ? one_above : last_line - 1; + one_above = doc_line_from_visible_delta(p, p->line, p->num - 1, NULL); pos = SSM(p->sci, SCI_GETLINEENDPOSITION, one_above, 0); + SET_POS_NOX(p->sci, pos, FALSE); SSM(p->sci, SCI_LINEDOWN, 0, 0); } @@ -136,39 +164,40 @@ void cmd_goto_down_one_less_nonempty(CmdContext *c, CmdParams *p) void cmd_goto_page_up(CmdContext *c, CmdParams *p) { gint shift = p->line_visible_num * p->num; - gint new_line = get_line_number_rel(p->sci, -shift); + gint new_line = doc_line_from_visible_delta(p, p->line, -shift, NULL); goto_nonempty(p->sci, new_line, TRUE); } void cmd_goto_page_down(CmdContext *c, CmdParams *p) { gint shift = p->line_visible_num * p->num; - gint new_line = get_line_number_rel(p->sci, shift); + gint new_line = doc_line_from_visible_delta(p, p->line, shift, NULL); goto_nonempty(p->sci, new_line, TRUE); } void cmd_goto_halfpage_up(CmdContext *c, CmdParams *p) { gint shift = p->num_present ? p->num : p->line_visible_num / 2; - gint new_line = get_line_number_rel(p->sci, -shift); + gint new_line = doc_line_from_visible_delta(p, p->line, -shift, NULL); goto_nonempty(p->sci, new_line, TRUE); } void cmd_goto_halfpage_down(CmdContext *c, CmdParams *p) { gint shift = p->num_present ? p->num : p->line_visible_num / 2; - gint new_line = get_line_number_rel(p->sci, shift); + gint new_line = doc_line_from_visible_delta(p, p->line, shift, NULL); goto_nonempty(p->sci, new_line, TRUE); } void cmd_goto_line(CmdContext *c, CmdParams *p) { gint num = p->num > p->line_num ? p->line_num : p->num; - goto_nonempty(p->sci, num - 1, TRUE); + num = doc_line_from_visible_delta(p, num, -1, NULL); + goto_nonempty(p->sci, num, TRUE); } @@ -177,30 +206,39 @@ void cmd_goto_line_last(CmdContext *c, CmdParams *p) gint num = p->num > p->line_num ? p->line_num : p->num; if (!p->num_present) num = p->line_num; - goto_nonempty(p->sci, num - 1, TRUE); + num = doc_line_from_visible_delta(p, num, -1, NULL); + goto_nonempty(p->sci, num, TRUE); } void cmd_goto_screen_top(CmdContext *c, CmdParams *p) { + gint line; gint top = p->line_visible_first; gint count = p->line_visible_num; - gint line = top + p->num; - goto_nonempty(p->sci, line > top + count ? top + count : line, FALSE); + gint max = doc_line_from_visible_delta(p, top, count, NULL); + gint num = p->num; + + if (!p->num_present) + num = 0; + + line = doc_line_from_visible_delta(p, top, num, NULL); + goto_nonempty(p->sci, line > max ? max : line, FALSE); } void cmd_goto_screen_middle(CmdContext *c, CmdParams *p) { - goto_nonempty(p->sci, p->line_visible_first + p->line_visible_num/2, FALSE); + gint num = doc_line_from_visible_delta(p, p->line_visible_first, p->line_visible_num / 2, NULL); + goto_nonempty(p->sci, num, FALSE); } void cmd_goto_screen_bottom(CmdContext *c, CmdParams *p) { gint top = p->line_visible_first; gint count = p->line_visible_num; - gint line = top + count - p->num; + gint line = doc_line_from_visible_delta(p, top, count - p->num, NULL); goto_nonempty(p->sci, line < top ? top : line, FALSE); } Modified: vimode/src/excmd-runner.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -465,6 +465,7 @@ void excmd_perform(CmdContext *ctx, const gchar *cmd) { case ':': perform_simple_ex_cmd(ctx, cmd + 1); + ensure_current_line_expanded(ctx->sci); break; case '/': case '?': @@ -483,6 +484,7 @@ void excmd_perform(CmdContext *ctx, const gchar *cmd) pos = perform_search(ctx->sci, ctx->search_text, ctx->num, FALSE); if (pos >= 0) SET_POS(ctx->sci, pos, TRUE); + ensure_current_line_expanded(ctx->sci); break; } } Modified: vimode/src/utils.c 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -219,3 +219,11 @@ void goto_nonempty(ScintillaObject *sci, gint line, gboolean scroll) pos = NEXT(sci, pos); SET_POS(sci, pos, scroll); } + + +void ensure_current_line_expanded(ScintillaObject *sci) +{ + gint line = GET_CUR_LINE(sci); + if (!SSM(sci, SCI_GETLINEVISIBLE, line, 0)) + SSM(sci, SCI_ENSUREVISIBLE, line, 0); +} Modified: vimode/src/utils.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -32,5 +32,6 @@ void perform_substitute(ScintillaObject *sci, const gchar *cmd, gint from, gint const gchar *flag_override); gint get_line_number_rel(ScintillaObject *sci, gint shift); +void ensure_current_line_expanded(ScintillaObject *sci); #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 33984a: vimode: Ensure that the line with the cursor is expanded after performing a command
by Jiří Techet 21 May '24

21 May '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 21 May 2024 21:45:11 UTC Commit: 33984abc9bd24bbf03db3ac517eb45ca2c7e6b7f https://github.com/geany/geany-plugins/commit/33984abc9bd24bbf03db3ac517eb4… Log Message: ----------- vimode: Ensure that the line with the cursor is expanded after performing a command Without this, using e.g. 'w' to go to the next word makes the cursor go "inside" the fold and disappear. Vim seems to auto-expand the fold in such situations so do the same. Modified Paths: -------------- vimode/src/cmd-runner.c vimode/src/excmd-runner.c vimode/src/utils.c vimode/src/utils.h Modified: vimode/src/cmd-runner.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -704,6 +704,7 @@ static gboolean process_cmd(CmdDef *cmds, CmdContext *ctx, gboolean ins_mode) { if (orig_mode == VI_MODE_COMMAND_SINGLE) vi_set_mode(VI_MODE_INSERT); + ensure_current_line_expanded(ctx->sci); } else if (!consumed && ctx->kpl) { Modified: vimode/src/excmd-runner.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -465,6 +465,7 @@ void excmd_perform(CmdContext *ctx, const gchar *cmd) { case ':': perform_simple_ex_cmd(ctx, cmd + 1); + ensure_current_line_expanded(ctx->sci); break; case '/': case '?': @@ -483,6 +484,7 @@ void excmd_perform(CmdContext *ctx, const gchar *cmd) pos = perform_search(ctx->sci, ctx->search_text, ctx->num, FALSE); if (pos >= 0) SET_POS(ctx->sci, pos, TRUE); + ensure_current_line_expanded(ctx->sci); break; } } Modified: vimode/src/utils.c 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -219,3 +219,11 @@ void goto_nonempty(ScintillaObject *sci, gint line, gboolean scroll) pos = NEXT(sci, pos); SET_POS(sci, pos, scroll); } + + +void ensure_current_line_expanded(ScintillaObject *sci) +{ + gint line = GET_CUR_LINE(sci); + if (!SSM(sci, SCI_GETLINEVISIBLE, line, 0)) + SSM(sci, SCI_ENSUREVISIBLE, line, 0); +} Modified: vimode/src/utils.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -32,5 +32,6 @@ void perform_substitute(ScintillaObject *sci, const gchar *cmd, gint from, gint const gchar *flag_override); gint get_line_number_rel(ScintillaObject *sci, gint shift); +void ensure_current_line_expanded(ScintillaObject *sci); #endif -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 522b79: vimode: Take into account folded lines when moving cursor
by Jiří Techet 21 May '24

21 May '24

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 21 May 2024 21:41:42 UTC Commit: 522b79dc7b1f25576e4bf44277f5e49bfa46cd9d https://github.com/geany/geany-plugins/commit/522b79dc7b1f25576e4bf44277f5e… Log Message: ----------- vimode: Take into account folded lines when moving cursor We need to perform the moves based on visible lines and not plain document lines as the latter may be folded and then the moves are made incorrectly. Modified Paths: -------------- vimode/src/cmds/motion.c Modified: vimode/src/cmds/motion.c 74 lines changed, 56 insertions(+), 18 deletions(-) =================================================================== @@ -41,9 +41,39 @@ void cmd_goto_right(CmdContext *c, CmdParams *p) } +static gint doc_line_from_visible_delta(CmdParams *p, gint line, gint delta, gboolean *overflow) +{ + gboolean oflow = FALSE; + gint new_line = line; + gint i = 0; + + while (i < ABS(delta)) + { + gint inc = delta > 0 ? 1 : -1; + gint tmp = new_line + inc; + + if (tmp < 0 || tmp >= p->line_num) + { + oflow = TRUE; + break; + } + new_line = tmp; + + if (SSM(p->sci, SCI_GETLINEVISIBLE, new_line, 0)) + i++; + } + + if (overflow) + *overflow = oflow; + + return new_line; +} + + void cmd_goto_up(CmdContext *c, CmdParams *p) { gint one_above, pos; + gboolean line_underflow; if (p->line == 0) return; @@ -53,8 +83,8 @@ void cmd_goto_up(CmdContext *c, CmdParams *p) * SCI_CHOOSECARETX which we cannot read directly from Scintilla and which * we want to keep - perform jump to previous/following line and add * one final SCI_LINEUP/SCI_LINEDOWN which recovers SCI_CHOOSECARETX for us. */ - one_above = p->line - p->num - 1; - if (one_above >= 0) + one_above = doc_line_from_visible_delta(p, p->line, -p->num - 1, &line_underflow); + if (!line_underflow) { /* Every case except for the first line - go one line above and perform * SCI_LINEDOWN. This ensures that even with wrapping on, we get the @@ -70,7 +100,7 @@ void cmd_goto_up(CmdContext *c, CmdParams *p) * on, we need to repeat SCI_LINEUP to get to the first line of wrapping. * This may lead to visible slow scrolling which is why there's the * fast case above for anything else but the first line. */ - gint one_below = p->line - p->num + 1; + gint one_below = doc_line_from_visible_delta(p, p->line, -p->num + 1, NULL); gint wrap_count; one_below = one_below > 0 ? one_below : 1; @@ -98,15 +128,13 @@ void cmd_goto_up_nonempty(CmdContext *c, CmdParams *p) static void goto_down(CmdParams *p, gint num) { gint one_above, pos; - gint last_line = p->line_num - 1; - if (p->line == last_line) + if (p->line >= p->line_num - 1) return; - /* see cmd_goto_up() for explanation */ - one_above = p->line + num - 1; - one_above = one_above < last_line ? one_above : last_line - 1; + one_above = doc_line_from_visible_delta(p, p->line, p->num - 1, NULL); pos = SSM(p->sci, SCI_GETLINEENDPOSITION, one_above, 0); + SET_POS_NOX(p->sci, pos, FALSE); SSM(p->sci, SCI_LINEDOWN, 0, 0); } @@ -136,39 +164,40 @@ void cmd_goto_down_one_less_nonempty(CmdContext *c, CmdParams *p) void cmd_goto_page_up(CmdContext *c, CmdParams *p) { gint shift = p->line_visible_num * p->num; - gint new_line = get_line_number_rel(p->sci, -shift); + gint new_line = doc_line_from_visible_delta(p, p->line, -shift, NULL); goto_nonempty(p->sci, new_line, TRUE); } void cmd_goto_page_down(CmdContext *c, CmdParams *p) { gint shift = p->line_visible_num * p->num; - gint new_line = get_line_number_rel(p->sci, shift); + gint new_line = doc_line_from_visible_delta(p, p->line, shift, NULL); goto_nonempty(p->sci, new_line, TRUE); } void cmd_goto_halfpage_up(CmdContext *c, CmdParams *p) { gint shift = p->num_present ? p->num : p->line_visible_num / 2; - gint new_line = get_line_number_rel(p->sci, -shift); + gint new_line = doc_line_from_visible_delta(p, p->line, -shift, NULL); goto_nonempty(p->sci, new_line, TRUE); } void cmd_goto_halfpage_down(CmdContext *c, CmdParams *p) { gint shift = p->num_present ? p->num : p->line_visible_num / 2; - gint new_line = get_line_number_rel(p->sci, shift); + gint new_line = doc_line_from_visible_delta(p, p->line, shift, NULL); goto_nonempty(p->sci, new_line, TRUE); } void cmd_goto_line(CmdContext *c, CmdParams *p) { gint num = p->num > p->line_num ? p->line_num : p->num; - goto_nonempty(p->sci, num - 1, TRUE); + num = doc_line_from_visible_delta(p, num, -1, NULL); + goto_nonempty(p->sci, num, TRUE); } @@ -177,30 +206,39 @@ void cmd_goto_line_last(CmdContext *c, CmdParams *p) gint num = p->num > p->line_num ? p->line_num : p->num; if (!p->num_present) num = p->line_num; - goto_nonempty(p->sci, num - 1, TRUE); + num = doc_line_from_visible_delta(p, num, -1, NULL); + goto_nonempty(p->sci, num, TRUE); } void cmd_goto_screen_top(CmdContext *c, CmdParams *p) { + gint line; gint top = p->line_visible_first; gint count = p->line_visible_num; - gint line = top + p->num; - goto_nonempty(p->sci, line > top + count ? top + count : line, FALSE); + gint max = doc_line_from_visible_delta(p, top, count, NULL); + gint num = p->num; + + if (!p->num_present) + num = 0; + + line = doc_line_from_visible_delta(p, top, num, NULL); + goto_nonempty(p->sci, line > max ? max : line, FALSE); } void cmd_goto_screen_middle(CmdContext *c, CmdParams *p) { - goto_nonempty(p->sci, p->line_visible_first + p->line_visible_num/2, FALSE); + gint num = doc_line_from_visible_delta(p, p->line_visible_first, p->line_visible_num / 2, NULL); + goto_nonempty(p->sci, num, FALSE); } void cmd_goto_screen_bottom(CmdContext *c, CmdParams *p) { gint top = p->line_visible_first; gint count = p->line_visible_num; - gint line = top + count - p->num; + gint line = doc_line_from_visible_delta(p, top, count - p->num, NULL); goto_nonempty(p->sci, line < top ? top : line, FALSE); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] adaceb: codenav: Fix use-after-free in cached completion model
by gkatev 19 May '24

19 May '24

Branch: refs/heads/master Author: gkatev <george_kate(a)hotmail.com> Committer: gkatev <george_kate(a)hotmail.com> Date: Fri, 26 Apr 2024 13:58:26 UTC Commit: adaceb62c17a477a4e1b2a0711f682546acac058 https://github.com/geany/geany-plugins/commit/adaceb62c17a477a4e1b2a0711f68… Log Message: ----------- codenav: Fix use-after-free in cached completion model Add a reference when saving the completion model in the old_model var. Otherwise, when the entry field is destroyed the attached model's refcount drops to 0 and it's deallocated, resulting in a use-after-free when attempting to recover it in the next invocation. Modified Paths: -------------- codenav/src/goto_file.c Modified: codenav/src/goto_file.c 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -163,8 +163,11 @@ directory_check(GtkEntry* entry, GtkEntryCompletion* completion) if (old_model != NULL) { /* Restore the no-sub-directory model */ log_debug("Restoring old model!"); + gtk_entry_completion_set_model (completion, old_model); + g_object_unref(old_model); old_model = NULL; + g_free(curr_dir); curr_dir = NULL; } @@ -185,7 +188,10 @@ directory_check(GtkEntry* entry, GtkEntryCompletion* completion) /* Save the completion_mode for future restore. */ if (old_model == NULL) + { old_model = gtk_entry_completion_get_model(completion); + g_object_ref(old_model); + } log_debug("New completion list!"); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
547
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits