Scintilla changes: * Fix GTK crash on Windows, as it does not support font options. This patch has been submitted upstream. * Hijack SCI_CHANGEINSERTION for programmatically setting input method. This is helpful on newer versions of macOS, where changing the input method is flaky. * Handle leading whitespace in XPM images in order to prevent crashes. diff -r 52d56f79dc0f gtk/ScintillaGTK.cxx --- a/gtk/ScintillaGTK.cxx Fri Apr 09 15:11:26 2021 +1000 +++ b/gtk/ScintillaGTK.cxx Tue Apr 13 16:36:00 2021 -0400 @@ -177,6 +177,7 @@ } FontOptions::FontOptions(GtkWidget *widget) noexcept { +#if !PLAT_GTK_WIN32 PangoContext *pcontext = gtk_widget_create_pango_context(widget); PLATFORM_ASSERT(pcontext); const cairo_font_options_t *options = pango_cairo_context_get_font_options(pcontext); @@ -186,6 +187,7 @@ order = cairo_font_options_get_subpixel_order(options); hint = cairo_font_options_get_hint_style(options); g_object_unref(pcontext); +#endif } bool FontOptions::operator==(const FontOptions &other) const noexcept { @@ -885,6 +887,11 @@ case SCI_GETDIRECTPOINTER: return reinterpret_cast(this); + case SCI_CHANGEINSERTION: + // Hijack this interface to programmatically set input method. + gtk_im_multicontext_set_context_id(GTK_IM_MULTICONTEXT(im_context), ConstCharPtrFromSPtr(lParam)); + break; + case SCI_TARGETASUTF8: return TargetAsUTF8(CharPtrFromSPtr(lParam)); diff -r 22b6bbb36280 src/XPM.cxx --- a/src/XPM.cxx Sat Sep 05 07:55:08 2020 +1000 +++ b/src/XPM.cxx Fri Oct 02 20:32:13 2020 -0400 @@ -92,6 +92,9 @@ void XPM::Init(const char *textForm) { // Test done is two parts to avoid possibility of overstepping the memory // if memcmp implemented strangely. Must be 4 bytes at least at destination. + while (*textForm == ' ') { + textForm++; + } if ((0 == memcmp(textForm, "/* X", 4)) && (0 == memcmp(textForm, "/* XPM */", 9))) { // Build the lines form out of the text form std::vector linesForm = LinesFormFromTextForm(textForm);