aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/ScintillaHistory.html7
-rwxr-xr-xgtk/ScintillaGTK.cxx29
-rwxr-xr-xgtk/ScintillaGTK.h5
3 files changed, 29 insertions, 12 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 49484fef0..9c622cf90 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -553,6 +553,7 @@
<td>McLoo</td>
</tr><tr>
<td>Shmuel Zeigerman</td>
+ <td>Chris Graham</td>
</tr>
</table>
<p>
@@ -593,10 +594,14 @@
<a href="https://sourceforge.net/p/scintilla/bugs/2019/">Bug #2019</a>.
</li>
<li>
- Fixed bug with GTK+ on recent Linux distributions where underscores were invisible.
+ Fixed bug with GTK on recent Linux distributions where underscores were invisible.
<a href="https://sourceforge.net/p/scintilla/bugs/2173/">Bug #2173</a>.
</li>
<li>
+ Fixed GTK on Linux bug when pasting from closed application.
+ <a href="https://sourceforge.net/p/scintilla/bugs/2175/">Bug #2175</a>.
+ </li>
+ <li>
Fixed bug in SciTE with Lua stack balance.
<a href="https://sourceforge.net/p/scintilla/bugs/2176/">Bug #2176</a>.
</li>
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index e040c3f00..3ceab67e6 100755
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -1278,10 +1278,10 @@ public:
sci(sci_) {
}
- static void ClipboardReceived(GtkClipboard *, GtkSelectionData *selection_data, gpointer data) {
+ static void ClipboardReceived(GtkClipboard *clipboard, GtkSelectionData *selection_data, gpointer data) {
SelectionReceiver *self = static_cast<SelectionReceiver *>(data);
if (self->sci) {
- self->sci->ReceivedClipboard(selection_data);
+ self->sci->ReceivedClipboard(clipboard, selection_data);
}
delete self;
}
@@ -1385,7 +1385,7 @@ void ScintillaGTK::GetGtkSelectionText(GtkSelectionData *selectionData, Selectio
GdkAtom selectionTypeData = TypeOfGSD(selectionData);
// Return empty string if selection is not a string
- if ((selectionTypeData != GDK_TARGET_STRING) && (selectionTypeData != atomUTF8)) {
+ if ((selectionTypeData != GDK_TARGET_STRING) && (selectionTypeData != atomUTF8) && (selectionTypeData != atomUTF8Mime)) {
selText.Clear();
return;
}
@@ -1431,7 +1431,7 @@ void ScintillaGTK::GetGtkSelectionText(GtkSelectionData *selectionData, Selectio
}
}
-void ScintillaGTK::InsertSelection(GtkSelectionData *selectionData) {
+void ScintillaGTK::InsertSelection(GtkClipboard *clipBoard, GtkSelectionData *selectionData) {
const gint length = gtk_selection_data_get_length(selectionData);
if (length >= 0) {
GdkAtom selection = gtk_selection_data_get_selection(selectionData);
@@ -1446,6 +1446,15 @@ void ScintillaGTK::InsertSelection(GtkSelectionData *selectionData) {
InsertPasteShape(selText.Data(), selText.Length(),
selText.rectangular ? pasteRectangular : pasteStream);
EnsureCaretVisible();
+ } else {
+ GdkAtom target = gtk_selection_data_get_target(selectionData);
+ if (target == atomUTF8) {
+ // In case data is actually only stored as text/plain;charset=utf-8 not UTF8_STRING
+ gtk_clipboard_request_contents(clipBoard, atomUTF8Mime,
+ SelectionReceiver::ClipboardReceived,
+ new SelectionReceiver(this)
+ );
+ }
}
Redraw();
}
@@ -1454,9 +1463,9 @@ GObject *ScintillaGTK::MainObject() const noexcept {
return G_OBJECT(PWidget(wMain));
}
-void ScintillaGTK::ReceivedClipboard(GtkSelectionData *selection_data) noexcept {
+void ScintillaGTK::ReceivedClipboard(GtkClipboard *clipBoard, GtkSelectionData *selection_data) noexcept {
try {
- InsertSelection(selection_data);
+ InsertSelection(clipBoard, selection_data);
} catch (...) {
errorStatus = SC_STATUS_FAILURE;
}
@@ -1471,8 +1480,9 @@ void ScintillaGTK::ReceivedSelection(GtkSelectionData *selection_data) {
gtk_selection_convert(GTK_WIDGET(PWidget(wMain)),
SelectionOfGSD(selection_data), atomSought, GDK_CURRENT_TIME);
} else if ((LengthOfGSD(selection_data) > 0) &&
- ((TypeOfGSD(selection_data) == GDK_TARGET_STRING) || (TypeOfGSD(selection_data) == atomUTF8))) {
- InsertSelection(selection_data);
+ ((TypeOfGSD(selection_data) == GDK_TARGET_STRING) || (TypeOfGSD(selection_data) == atomUTF8) || (TypeOfGSD(selection_data) == atomUTF8Mime))) {
+ GtkClipboard *clipBoard = gtk_widget_get_clipboard(GTK_WIDGET(PWidget(wMain)), SelectionOfGSD(selection_data));
+ InsertSelection(clipBoard, selection_data);
}
}
// else fprintf(stderr, "Target non string %d %d\n", (int)(selection_data->type),
@@ -1489,7 +1499,7 @@ void ScintillaGTK::ReceivedDrop(GtkSelectionData *selection_data) {
std::vector<char> drop(data, data + LengthOfGSD(selection_data));
drop.push_back('\0');
NotifyURIDropped(&drop[0]);
- } else if ((TypeOfGSD(selection_data) == GDK_TARGET_STRING) || (TypeOfGSD(selection_data) == atomUTF8)) {
+ } else if ((TypeOfGSD(selection_data) == GDK_TARGET_STRING) || (TypeOfGSD(selection_data) == atomUTF8) || (TypeOfGSD(selection_data) == atomUTF8Mime)) {
if (LengthOfGSD(selection_data) > 0) {
SelectionText selText;
GetGtkSelectionText(selection_data, selText);
@@ -3041,6 +3051,7 @@ GType scintilla_object_get_type() {
void ScintillaGTK::ClassInit(OBJECT_CLASS *object_class, GtkWidgetClass *widget_class, GtkContainerClass *container_class) {
Platform_Initialise();
atomUTF8 = gdk_atom_intern("UTF8_STRING", FALSE);
+ atomUTF8Mime = gdk_atom_intern("text/plain;charset=utf-8", FALSE);
atomString = GDK_SELECTION_TYPE_STRING;
atomUriList = gdk_atom_intern("text/uri-list", FALSE);
atomDROPFILES_DND = gdk_atom_intern("DROPFILES_DND", FALSE);
diff --git a/gtk/ScintillaGTK.h b/gtk/ScintillaGTK.h
index 4a446ec99..2d948d71e 100755
--- a/gtk/ScintillaGTK.h
+++ b/gtk/ScintillaGTK.h
@@ -37,6 +37,7 @@ class ScintillaGTK : public ScintillaBase {
GtkWidgetClass *parentClass;
static inline GdkAtom atomUTF8 {};
+ static inline GdkAtom atomUTF8Mime {};
static inline GdkAtom atomString {};
static inline GdkAtom atomUriList {};
static inline GdkAtom atomDROPFILES_DND {};
@@ -134,10 +135,10 @@ private:
bool OwnPrimarySelection();
void ClaimSelection() override;
void GetGtkSelectionText(GtkSelectionData *selectionData, SelectionText &selText);
- void InsertSelection(GtkSelectionData *selectionData);
+ void InsertSelection(GtkClipboard *clipBoard, GtkSelectionData *selectionData);
public: // Public for SelectionReceiver
GObject *MainObject() const noexcept;
- void ReceivedClipboard(GtkSelectionData *selection_data) noexcept;
+ void ReceivedClipboard(GtkClipboard *clipBoard, GtkSelectionData *selection_data) noexcept;
private:
void ReceivedSelection(GtkSelectionData *selection_data);
void ReceivedDrop(GtkSelectionData *selection_data);
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 21:15:50 +0000