diff options
| -rw-r--r-- | src/gui_gtk_x11.c | 19 | ||||
| -rw-r--r-- | src/message.c | 2 | ||||
| -rw-r--r-- | src/ops.c | 23 | ||||
| -rw-r--r-- | src/proto/ui.pro | 1 | ||||
| -rw-r--r-- | src/ui.c | 66 | ||||
| -rw-r--r-- | src/version.c | 2 |
6 files changed, 83 insertions, 30 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 29ab9a799..33fdaed48 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -6717,8 +6717,6 @@ clip_mch_request_selection(VimClipboard *cbd) { GdkAtom target; unsigned i; - int nbytes; - char_u *buffer; time_t start; for (i = 0; i < N_SELECTION_TARGETS; ++i) @@ -6746,22 +6744,7 @@ clip_mch_request_selection(VimClipboard *cbd) } /* Final fallback position - use the X CUT_BUFFER0 store */ - nbytes = 0; - buffer = (char_u *)XFetchBuffer(GDK_WINDOW_XDISPLAY(gui.mainwin->window), - &nbytes, 0); - if (nbytes > 0) - { - /* Got something */ - clip_yank_selection(MCHAR, buffer, (long)nbytes, cbd); - if (p_verbose > 0) - { - verbose_enter(); - smsg((char_u *)_("Used CUT_BUFFER0 instead of empty selection")); - verbose_leave(); - } - } - if (buffer != NULL) - XFree(buffer); + yank_cut_buffer0(GDK_WINDOW_XDISPLAY(gui.mainwin->window), cbd); } /* diff --git a/src/message.c b/src/message.c index c0f661b09..e29f5f8fe 100644 --- a/src/message.c +++ b/src/message.c @@ -107,7 +107,7 @@ msg(s) } #if defined(FEAT_EVAL) || defined(FEAT_X11) || defined(USE_XSMP) \ - || defined(PROTO) + || defined(FEAT_GUI_GTK) || defined(PROTO) /* * Like msg() but keep it silent when 'verbosefile' is set. */ @@ -5591,6 +5591,29 @@ x11_export_final_selection() if (dpy != NULL && str != NULL && motion_type >= 0 && len < 1024*1024 && len > 0) { +#ifdef FEAT_MBYTE + /* The CUT_BUFFER0 is supposed to always contain latin1. Convert from + * 'enc' when it is a multi-byte encoding. When 'enc' is an 8-bit + * encoding conversion usually doesn't work, so keep the text as-is. + */ + if (has_mbyte) + { + char_u *conv_str = str; + vimconv_T vc; + + vc.vc_type = CONV_NONE; + if (convert_setup(&vc, p_enc, (char_u *)"latin1") == OK) + { + conv_str = string_convert(&vc, str, (int*)&len); + if (conv_str != NULL) + { + vim_free(str); + str = conv_str; + } + convert_setup(&vc, NULL, NULL); + } + } +#endif XStoreBuffer(dpy, (char *)str, (int)len, 0); XFlush(dpy); } diff --git a/src/proto/ui.pro b/src/proto/ui.pro index 8825b6a16..2bc0c31ec 100644 --- a/src/proto/ui.pro +++ b/src/proto/ui.pro @@ -48,6 +48,7 @@ int check_row __ARGS((int row)); void open_app_context __ARGS((void)); void x11_setup_atoms __ARGS((Display *dpy)); void clip_x11_request_selection __ARGS((Widget myShell, Display *dpy, VimClipboard *cbd)); +void yank_cut_buffer0 __ARGS((Display *dpy, VimClipboard *cbd)); void clip_x11_lose_selection __ARGS((Widget myShell, VimClipboard *cbd)); int clip_x11_own_selection __ARGS((Widget myShell, VimClipboard *cbd)); void clip_x11_set_selection __ARGS((VimClipboard *cbd)); @@ -2104,8 +2104,6 @@ clip_x11_request_selection(myShell, dpy, cbd) Atom type; static int success; int i; - int nbytes = 0; - char_u *buffer; time_t start_time; int timed_out = FALSE; @@ -2185,15 +2183,7 @@ clip_x11_request_selection(myShell, dpy, cbd) } /* Final fallback position - use the X CUT_BUFFER0 store */ - buffer = (char_u *)XFetchBuffer(dpy, &nbytes, 0); - if (nbytes > 0) - { - /* Got something */ - clip_yank_selection(MCHAR, buffer, (long)nbytes, cbd); - XFree((void *)buffer); - if (p_verbose > 0) - verb_msg((char_u *)_("Used CUT_BUFFER0 instead of empty selection")); - } + yank_cut_buffer0(dpy, cbd); } static Boolean clip_x11_convert_selection_cb __ARGS((Widget, Atom *, Atom *, Atom *, XtPointer *, long_u *, int *)); @@ -2369,6 +2359,60 @@ clip_x11_set_selection(cbd) } #endif +#if defined(FEAT_XCLIPBOARD) || defined(FEAT_GUI_X11) \ + || defined(FEAT_GUI_GTK) || defined(PROTO) +/* + * Get the contents of the X CUT_BUFFER0 and put it in "cbd". + */ + void +yank_cut_buffer0(dpy, cbd) + Display *dpy; + VimClipboard *cbd; +{ + int nbytes = 0; + char_u *buffer = (char_u *)XFetchBuffer(dpy, &nbytes, 0); + + if (nbytes > 0) + { +#ifdef FEAT_MBYTE + int done = FALSE; + + /* CUT_BUFFER0 is supposed to be always latin1. Convert to 'enc' when + * using a multi-byte encoding. Conversion between two 8-bit + * character sets usually fails and the text might actually be in + * 'enc' anyway. */ + if (has_mbyte) + { + char_u *conv_buf = buffer; + vimconv_T vc; + + vc.vc_type = CONV_NONE; + if (convert_setup(&vc, (char_u *)"latin1", p_enc) == OK) + { + conv_buf = string_convert(&vc, buffer, &nbytes); + if (conv_buf != NULL) + { + clip_yank_selection(MCHAR, conv_buf, (long)nbytes, cbd); + vim_free(conv_buf); + done = TRUE; + } + convert_setup(&vc, NULL, NULL); + } + } + if (!done) /* use the text without conversion */ +#endif + clip_yank_selection(MCHAR, buffer, (long)nbytes, cbd); + XFree((void *)buffer); + if (p_verbose > 0) + { + verbose_enter(); + verb_msg((char_u *)_("Used CUT_BUFFER0 instead of empty selection")); + verbose_leave(); + } + } +} +#endif + #if defined(FEAT_MOUSE) || defined(PROTO) /* diff --git a/src/version.c b/src/version.c index b553e4ed4..245443638 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 221, +/**/ 220, /**/ 219, |