diff options
| author | Neil Hodgson <nyamatongwe@gmail.com> | 2021-04-28 14:54:36 +1000 |
|---|---|---|
| committer | Neil Hodgson <nyamatongwe@gmail.com> | 2021-04-28 14:54:36 +1000 |
| commit | c84506e472724377b9e8e4038eee15629046f942 (patch) | |
| tree | 5ea426190acaa5fb4e5489674b78b4f64d9c5901 /gtk/ScintillaGTK.h | |
| parent | 2a884698e73fc35319236ca56a25c0bc663f315b (diff) | |
| download | scintilla-mirror-c84506e472724377b9e8e4038eee15629046f942.tar.gz | |
Bug [#2227]. On GTK 3 with Wayland, fix primary selection.
Diffstat (limited to 'gtk/ScintillaGTK.h')
| -rwxr-xr-x | gtk/ScintillaGTK.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gtk/ScintillaGTK.h b/gtk/ScintillaGTK.h index 58f395432..5461ff37b 100755 --- a/gtk/ScintillaGTK.h +++ b/gtk/ScintillaGTK.h @@ -30,7 +30,6 @@ class ScintillaGTK : public ScintillaBase { Window scrollbarh; GtkAdjustment *adjustmentv; GtkAdjustment *adjustmenth; - Window wSelection; int verticalScrollBarWidth; int horizontalScrollBarHeight; @@ -51,6 +50,7 @@ class ScintillaGTK : public ScintillaBase { static inline GdkAtom atomUriList {}; static inline GdkAtom atomDROPFILES_DND {}; GdkAtom atomSought; + size_t inClearSelection = 0; #if PLAT_GTK_WIN32 CLIPFORMAT cfColumnSelect; @@ -160,9 +160,13 @@ private: static void ClipboardGetSelection(GtkClipboard *clip, GtkSelectionData *selection_data, guint info, void *data); static void ClipboardClearSelection(GtkClipboard *clip, void *data); + void ClearPrimarySelection(); + void PrimaryGetSelectionThis(GtkClipboard *clip, GtkSelectionData *selection_data, guint info); + static void PrimaryGetSelection(GtkClipboard *clip, GtkSelectionData *selection_data, guint info, gpointer pSci); + void PrimaryClearSelectionThis(GtkClipboard *clip); + static void PrimaryClearSelection(GtkClipboard *clip, gpointer pSci); + void UnclaimSelection(GdkEventSelection *selection_event); - static void PrimarySelection(GtkWidget *widget, GtkSelectionData *selection_data, guint info, guint time_stamp, ScintillaGTK *sciThis); - static gboolean PrimaryClear(GtkWidget *widget, GdkEventSelection *event, ScintillaGTK *sciThis); void Resize(int width, int height); // Callback functions |