끝글자 버그를 고칩시다 3 - scintilla

hodong@debian:~/Downloads/geany_1.33.orig/geany-1.33$ git diff scintilla/gtk/ScintillaGTK.*
diff --git a/scintilla/gtk/ScintillaGTK.cxx b/scintilla/gtk/ScintillaGTK.cxx
index 3e48ed6..75c7169 100644
--- a/scintilla/gtk/ScintillaGTK.cxx
+++ b/scintilla/gtk/ScintillaGTK.cxx
@@ -665,6 +665,8 @@ void ScintillaGTK::Init() {
                caret.period = 0;
        }
 
+       g_signal_connect(PWidget(wMain), "button-press-event", G_CALLBACK(ScintillaGTK::OnButtonPress), NULL);
+
        for (TickReason tr = tickCaret; tr <= tickDwell; tr = static_cast<TickReason>(tr + 1)) {
                timers[tr].reason = tr;
                timers[tr].scintilla = this;
@@ -2154,6 +2156,18 @@ gboolean ScintillaGTK::KeyRelease(GtkWidget *widget, GdkEventKey *event) {
        return FALSE;
 }
 
+gboolean ScintillaGTK::OnButtonPress(GtkWidget *widget, GdkEvent *event, gpointer user_data) {
+       ScintillaGTK *sciThis = FromWidget(widget);
+
+       if (sciThis->im_context) {
+               PreEditString pes(sciThis->im_context);
+               if (strlen(pes.str) > 0)
+                       gtk_im_context_reset(sciThis->im_context);
+       }
+
+       return FALSE;
+}
+
 #if GTK_CHECK_VERSION(3,0,0)
 
 gboolean ScintillaGTK::DrawPreeditThis(GtkWidget *, cairo_t *cr) {
diff --git a/scintilla/gtk/ScintillaGTK.h b/scintilla/gtk/ScintillaGTK.h
index a20f3bc..acb72bb 100644
--- a/scintilla/gtk/ScintillaGTK.h
+++ b/scintilla/gtk/ScintillaGTK.h
@@ -185,6 +185,7 @@ private:
        gboolean KeyThis(GdkEventKey *event);
        static gboolean KeyPress(GtkWidget *widget, GdkEventKey *event);
        static gboolean KeyRelease(GtkWidget *widget, GdkEventKey *event);
+       static gboolean OnButtonPress(GtkWidget *widget, GdkEvent *event, gpointer user_data);
 #if GTK_CHECK_VERSION(3,0,0)
        gboolean DrawPreeditThis(GtkWidget *widget, cairo_t *cr);
        static gboolean DrawPreedit(GtkWidget *widget, cairo_t *cr, ScintillaGTK *sciThis);