On Do, 19 Jun 2014, Praful wrote:
> On Wednesday, 18 June 2014 22:37:47 UTC+1, Christian Brabandt wrote:
> > On Mi, 18 Jun 2014, Christian Brabandt wrote:
> >
> >
> > Perhaps, it's clip_gen_set_selection() that is slow?
> >
>
> Sorry, still slow! Is there any debugging information I can provide to help
> you diagnose what's going on?
>
> In case you've forgotten, your original solution did work even though it
> wasn't as generic as Bram wanted. It could be there is no generic solution
> and you have to settle for a specific solution.
Please try the attached patch. It was indeed clip_gen_set_selection()
that was slow, but the previous patch was still a little bit wrong.
Please also make sure, the clipboard still works. I have tested it
locally and instead of 15 seconds for a :g/^/y command it took 2.5
seconds (as much as with :set clipboard=), while still copying the last
yank into the clipboard.
For the records, I did profiling using ltprof. This worked quite well.
Best,
Christian
--
Computer können Dinge tun, die wir nur tun können, indem wir darüber
nachdenken.
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -5511,10 +5511,18 @@ ex_global(eap)
smsg((char_u *)_("Pattern not found: %s"), pat);
}
else
+ {
+#ifdef FEAT_CLIPBOARD
+ start_global_changes();
+#endif
global_exe(cmd);
+ }
ml_clearmarked(); /* clear rest of the marks */
vim_regfree(regmatch.regprog);
+#ifdef FEAT_CLIPBOARD
+ end_global_changes();
+#endif
}
/*
diff --git a/src/ex_cmds2.c b/src/ex_cmds2.c
--- a/src/ex_cmds2.c
+++ b/src/ex_cmds2.c
@@ -2464,6 +2464,9 @@ ex_listdo(eap)
* great speed improvement. */
save_ei = au_event_disable(",Syntax");
#endif
+#ifdef FEAT_CLIPBOARD
+ start_global_changes();
+#endif
if (eap->cmdidx == CMD_windo
|| eap->cmdidx == CMD_tabdo
@@ -2591,6 +2594,9 @@ ex_listdo(eap)
curbuf->b_fname, TRUE, curbuf);
}
#endif
+#ifdef FEAT_CLIPBOARD
+ end_global_changes();
+#endif
}
/*
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -11534,6 +11534,10 @@ ex_folddo(eap)
{
linenr_T lnum;
+#ifdef FEAT_CLIPBOARD
+ start_global_changes();
+#endif
+
/* First set the marks for all lines closed/open. */
for (lnum = eap->line1; lnum <= eap->line2; ++lnum)
if (hasFolding(lnum, NULL, NULL) == (eap->cmdidx == CMD_folddoclosed))
@@ -11542,5 +11546,8 @@ ex_folddo(eap)
/* Execute the command on the marked lines. */
global_exe(eap->arg);
ml_clearmarked(); /* clear rest of the marks */
-}
-#endif
+#ifdef FEAT_CLIPBOARD
+ end_global_changes();
+#endif
+}
+#endif
diff --git a/src/globals.h b/src/globals.h
--- a/src/globals.h
+++ b/src/globals.h
@@ -533,6 +533,8 @@ EXTERN int clip_autoselect_plus INIT(= F
EXTERN int clip_autoselectml INIT(= FALSE);
EXTERN int clip_html INIT(= FALSE);
EXTERN regprog_T *clip_exclude_prog INIT(= NULL);
+EXTERN int clip_did_set_selection INIT(= TRUE);
+EXTERN int clip_unnamed_saved INIT(= 0);
#endif
/*
diff --git a/src/ops.c b/src/ops.c
--- a/src/ops.c
+++ b/src/ops.c
@@ -1591,9 +1591,15 @@ adjust_clip_reg(rp)
{
/* If no reg. specified, and "unnamed" or "unnamedplus" is in 'clipboard',
* use '*' or '+' reg, respectively. "unnamedplus" prevails. */
- if (*rp == 0 && clip_unnamed != 0)
- *rp = ((clip_unnamed & CLIP_UNNAMED_PLUS) && clip_plus.available)
+ if (*rp == 0 && (clip_unnamed != 0 || clip_unnamed_saved != 0))
+ {
+ if (clip_unnamed != 0)
+ *rp = ((clip_unnamed & CLIP_UNNAMED_PLUS) && clip_plus.available)
? '+' : '*';
+ else
+ *rp = ((clip_unnamed_saved & CLIP_UNNAMED_PLUS) && clip_plus.available)
+ ? '+' : '*';
+ }
if (!clip_star.available && *rp == '*')
*rp = 0;
if (!clip_plus.available && *rp == '+')
@@ -3197,7 +3203,7 @@ op_yank(oap, deleting, mess)
if (clip_star.available
&& (curr == &(y_regs[STAR_REGISTER])
|| (!deleting && oap->regname == 0
- && (clip_unnamed & CLIP_UNNAMED))))
+ && ((clip_unnamed | clip_unnamed_saved) & CLIP_UNNAMED))))
{
if (curr != &(y_regs[STAR_REGISTER]))
/* Copy the text from register 0 to the clipboard register. */
@@ -3218,7 +3224,8 @@ op_yank(oap, deleting, mess)
if (clip_plus.available
&& (curr == &(y_regs[PLUS_REGISTER])
|| (!deleting && oap->regname == 0
- && (clip_unnamed & CLIP_UNNAMED_PLUS))))
+ && ((clip_unnamed | clip_unnamed_saved) &
+ CLIP_UNNAMED_PLUS))))
{
if (curr != &(y_regs[PLUS_REGISTER]))
/* Copy the text from register 0 to the clipboard register. */
diff --git a/src/proto/ui.pro b/src/proto/ui.pro
--- a/src/proto/ui.pro
+++ b/src/proto/ui.pro
@@ -14,6 +14,8 @@ void clip_init __ARGS((int can_use));
void clip_update_selection __ARGS((VimClipboard *clip));
void clip_own_selection __ARGS((VimClipboard *cbd));
void clip_lose_selection __ARGS((VimClipboard *cbd));
+void start_global_changes __ARGS((void));
+void end_global_changes __ARGS((void));
void clip_auto_select __ARGS((void));
int clip_isautosel_star __ARGS((void));
int clip_isautosel_plus __ARGS((void));
diff --git a/src/ui.c b/src/ui.c
--- a/src/ui.c
+++ b/src/ui.c
@@ -557,6 +557,43 @@ clip_copy_selection(clip)
}
}
+/* Save and restore clip_unnamed before doing possibly many changes. This prevents
+ * accessing the clipboard very often which might slow down Vim considerably */
+
+/* Save clip_unnamed and reset it */
+ void
+start_global_changes()
+{
+
+ clip_unnamed_saved = clip_unnamed;
+
+ if (clip_did_set_selection)
+ {
+ clip_unnamed = FALSE;
+ clip_did_set_selection = FALSE;
+ }
+}
+ void
+end_global_changes()
+{
+ if (!clip_did_set_selection)
+ {
+ clip_did_set_selection = TRUE;
+ clip_unnamed = clip_unnamed_saved;
+ if (clip_unnamed & CLIP_UNNAMED)
+ {
+ clip_own_selection(&clip_star);
+ clip_gen_set_selection(&clip_star);
+ }
+ if (clip_unnamed & CLIP_UNNAMED_PLUS)
+ {
+ clip_own_selection(&clip_plus);
+ clip_gen_set_selection(&clip_plus);
+ }
+ }
+ clip_unnamed_saved = FALSE;
+}
+
/*
* Called when Visual mode is ended: update the selection.
*/
@@ -1428,6 +1465,15 @@ clip_gen_lose_selection(cbd)
clip_gen_set_selection(cbd)
VimClipboard *cbd;
{
+ /* updating postponed, so that accessing the system clipboard won't hang
+ * vim when accessing it many times (e.g. on a :g comand) */
+ if (!clip_did_set_selection)
+ {
+ if (cbd == &clip_plus && (clip_unnamed_saved & CLIP_UNNAMED_PLUS))
+ return;
+ else if (cbd == &clip_star && (clip_unnamed_saved & CLIP_UNNAMED))
+ return;
+ }
#ifdef FEAT_XCLIPBOARD
# ifdef FEAT_GUI
if (gui.in_use)
