HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Import fix from upstream Scintilla to fix crash upon DnD with GTK3

Browse Source 
This imports Scintilla commit e488315f2d30e1795f0899779bac948da41b4eef
from HG, "Bug: [#1481]. Incorrect event copying on GTK+ 3.x."
This commit is contained in:
Colomban Wendling 2013-05-25 17:48:49 +02:00
parent 6cff31488e
commit 0dc9e4ec38
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scintilla/gtk/ScintillaGTK.cxx
View File

@ -122,7 +122,7 @@ class ScintillaGTK : public ScintillaBase {
SelectionText primary;
GdkEventButton evbtn;
GdkEventButton *evbtn;
bool capturedMouse;
bool dragWasDropped;
int lastKey;
@ -354,7 +354,7 @@ static ScintillaGTK *ScintillaFromWidget(GtkWidget *widget) {
ScintillaGTK::ScintillaGTK(_ScintillaObject *sci_) :
adjustmentv(0), adjustmenth(0),
scrollBarWidth(30), scrollBarHeight(30),
capturedMouse(false), dragWasDropped(false),
evbtn(0), capturedMouse(false), dragWasDropped(false),
lastKey(0), rectangularSelectionModifier(SCMOD_CTRL), parentClass(0),
im_context(NULL),
lastWheelMouseDirection(0),
@ -392,6 +392,10 @@ ScintillaGTK::ScintillaGTK(_ScintillaObject *sci_) :
ScintillaGTK::~ScintillaGTK() {
g_idle_remove_by_data(this);
if (evbtn) {
gdk_event_free(reinterpret_cast<GdkEvent *>(evbtn));
evbtn = 0;
}
}
static void UnRefCursor(GdkCursor *cursor) {
@ -824,14 +828,15 @@ bool ScintillaGTK::DragThreshold(Point ptStart, Point ptNow) {
}
void ScintillaGTK::StartDrag() {
PLATFORM_ASSERT(evbtn != 0);
dragWasDropped = false;
inDragDrop = ddDragging;
GtkTargetList *tl = gtk_target_list_new(clipboardCopyTargets, nClipboardCopyTargets);
gtk_drag_begin(GTK_WIDGET(PWidget(wMain)),
tl,
static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE),
evbtn.button,
reinterpret_cast<GdkEvent *>(&evbtn));
evbtn->button,
reinterpret_cast<GdkEvent *>(evbtn));
}
static std::string ConvertText(char *s, size_t len, const char *charSetDest,
@ -1761,7 +1766,11 @@ gint ScintillaGTK::PressThis(GdkEventButton *event) {
if (event->type != GDK_BUTTON_PRESS)
return FALSE;
evbtn = *event;
if (evbtn) {
gdk_event_free(reinterpret_cast<GdkEvent *>(evbtn));
evbtn = 0;
}
evbtn = reinterpret_cast<GdkEventButton *>(gdk_event_copy(reinterpret_cast<GdkEvent *>(event)));
Point pt;
pt.x = int(event->x);
pt.y = int(event->y);