Commits December 2016

commits@lists.geany.org

1 participants
20 discussions

[geany/geany] 2f327b: GTK: Fix accessible object lifetime on GTK < 3.8
by Colomban Wendling 20 Dec '16

20 Dec '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 20 Dec 2016 20:45:29 UTC Commit: 2f327b767b1b6659083d0d6e0a1f34ae52fb6a12 https://github.com/geany/geany/commit/2f327b767b1b6659083d0d6e0a1f34ae52fb6… Log Message: ----------- GTK: Fix accessible object lifetime on GTK < 3.8 Modified Paths: -------------- scintilla/gtk/ScintillaGTKAccessible.cxx Modified: scintilla/gtk/ScintillaGTKAccessible.cxx 40 lines changed, 20 insertions(+), 20 deletions(-) =================================================================== @@ -1064,10 +1064,12 @@ static AtkObject *scintilla_object_accessible_new(GType parent_type, GObject *ob // @p cache pointer to store the AtkObject between repeated calls. Might or might not be filled. // @p widget_parent_class pointer to the widget's parent class (to chain up method calls). AtkObject *ScintillaGTKAccessible::WidgetGetAccessibleImpl(GtkWidget *widget, AtkObject **cache, gpointer widget_parent_class G_GNUC_UNUSED) { -#if HAVE_GTK_A11Y_H // just instantiate the accessible - if (*cache == NULL) { - *cache = scintilla_object_accessible_new(0, G_OBJECT(widget)); + if (*cache != NULL) { + return *cache; } + +#if HAVE_GTK_A11Y_H // just instantiate the accessible + *cache = scintilla_object_accessible_new(0, G_OBJECT(widget)); #elif HAVE_GTK_FACTORY // register in the factory and let GTK instantiate static volatile gsize registered = 0; @@ -1085,24 +1087,22 @@ AtkObject *ScintillaGTKAccessible::WidgetGetAccessibleImpl(GtkWidget *widget, At } g_once_init_leave(&registered, 1); } - *cache = GTK_WIDGET_CLASS(widget_parent_class)->get_accessible(widget); + AtkObject *obj = GTK_WIDGET_CLASS(widget_parent_class)->get_accessible(widget); + *cache = static_cast<AtkObject*>(g_object_ref(obj)); #else // no public API, no factory, so guess from the parent and instantiate - if (*cache == NULL) { - static GType parent_atk_type = 0; - - if (parent_atk_type == 0) { - AtkObject *parent_obj = GTK_WIDGET_CLASS(widget_parent_class)->get_accessible(widget); - if (parent_obj) { - GType parent_atk_type = G_OBJECT_TYPE(parent_obj); - - // Figure out whether accessibility is enabled by looking at the type of the accessible - // object which would be created for the parent type of ScintillaObject. - if (g_type_is_a(parent_atk_type, GTK_TYPE_ACCESSIBLE)) { - *cache = scintilla_object_accessible_new(parent_atk_type, G_OBJECT(widget)); - g_object_unref(parent_obj); - } else { - *cache = parent_obj; - } + static GType parent_atk_type = 0; + + if (parent_atk_type == 0) { + AtkObject *parent_obj = GTK_WIDGET_CLASS(widget_parent_class)->get_accessible(widget); + if (parent_obj) { + GType parent_atk_type = G_OBJECT_TYPE(parent_obj); + + // Figure out whether accessibility is enabled by looking at the type of the accessible + // object which would be created for the parent type of ScintillaObject. + if (g_type_is_a(parent_atk_type, GTK_TYPE_ACCESSIBLE)) { + *cache = scintilla_object_accessible_new(parent_atk_type, G_OBJECT(widget)); + } else { + *cache = static_cast<AtkObject*>(g_object_ref(parent_obj)); } } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 745d15: GTK: Fix off-by-one error in accessible attribute runs
by Colomban Wendling 20 Dec '16

20 Dec '16

1 0

[geany/geany] a31a43: GTK: Fix reporting deletion length in the accessible
by Colomban Wendling 20 Dec '16

20 Dec '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 20 Dec 2016 20:45:29 UTC Commit: a31a43efe15a55ea249c2224f6688c9dcf5f5b64 https://github.com/geany/geany/commit/a31a43efe15a55ea249c2224f6688c9dcf5f5… Log Message: ----------- GTK: Fix reporting deletion length in the accessible We cannot compute the length in characters after the text has been deleted, so we need to compute it in BEFOREDELETE. However, we need to emit the signal once the buffer has actually changed, so we need to cache the value in-between those events. Modified Paths: -------------- scintilla/gtk/ScintillaGTKAccessible.cxx scintilla/gtk/ScintillaGTKAccessible.h Modified: scintilla/gtk/ScintillaGTKAccessible.cxx 10 lines changed, 8 insertions(+), 2 deletions(-) =================================================================== @@ -156,6 +156,7 @@ ScintillaGTKAccessible *ScintillaGTKAccessible::FromAccessible(GtkAccessible *ac ScintillaGTKAccessible::ScintillaGTKAccessible(GtkAccessible *accessible_, GtkWidget *widget_) : accessible(accessible_), sci(ScintillaGTK::FromWidget(widget_)), + deletionLengthChar(0), old_pos(-1) { g_signal_connect(widget_, "sci-notify", G_CALLBACK(SciNotify), this); } @@ -857,10 +858,15 @@ void ScintillaGTKAccessible::Notify(GtkWidget *, gint, SCNotification *nt) { g_signal_emit_by_name(accessible, "text-changed::insert", startChar, lengthChar); UpdateCursor(); } + if (nt->modificationType & SC_MOD_BEFOREDELETE) { + // We cannot compute the deletion length in DELETETEXT as it requires accessing the + // buffer, so that the character are still present. So, we cache the value here, + // and use it in DELETETEXT that fires quickly after. + deletionLengthChar = sci->pdoc->CountCharacters(nt->position, nt->position + nt->length); + } if (nt->modificationType & SC_MOD_DELETETEXT) { int startChar = CharacterOffsetFromByteOffset(nt->position); - int lengthChar = sci->pdoc->CountCharacters(nt->position, nt->position + nt->length); - g_signal_emit_by_name(accessible, "text-changed::delete", startChar, lengthChar); + g_signal_emit_by_name(accessible, "text-changed::delete", startChar, deletionLengthChar); UpdateCursor(); } if (nt->modificationType & SC_MOD_CHANGESTYLE) { Modified: scintilla/gtk/ScintillaGTKAccessible.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -20,6 +20,8 @@ class ScintillaGTKAccessible { GtkAccessible *accessible; ScintillaGTK *sci; + // cached length of the deletion, in characters (see Notify()) + int deletionLengthChar; // local state for comparing Position old_pos; std::vector<SelectionRange> old_sels; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 07c665: GTK: Ensure styles are valid when retrieving them for accessibility purposes
by Colomban Wendling 20 Dec '16

20 Dec '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 20 Dec 2016 20:45:29 UTC Commit: 07c665197f8130b293007a7e3d7a58cf51af18fb https://github.com/geany/geany/commit/07c665197f8130b293007a7e3d7a58cf51af1… Log Message: ----------- GTK: Ensure styles are valid when retrieving them for accessibility purposes Modified Paths: -------------- scintilla/gtk/ScintillaGTKAccessible.cxx scintilla/gtk/ScintillaGTKAccessible.h Modified: scintilla/gtk/ScintillaGTKAccessible.cxx 7 lines changed, 4 insertions(+), 3 deletions(-) =================================================================== @@ -478,7 +478,7 @@ void ScintillaGTKAccessible::GetCharacterExtents(int charOffset, } else if (nextByteOffset > byteOffset) { /* maybe next position was on the next line or something. * just compute the expected character width */ - int style = sci->pdoc->StyleAt(byteOffset); + int style = StyleAt(byteOffset, true); int len = nextByteOffset - byteOffset; char *ch = new char[len + 1]; sci->pdoc->GetCharRange(ch, byteOffset, len); @@ -556,13 +556,14 @@ AtkAttributeSet *ScintillaGTKAccessible::GetRunAttributes(int charOffset, int *s g_return_val_if_fail(byteOffset <= length, NULL); - const char style = sci->pdoc->StyleAt(byteOffset); + const char style = StyleAt(byteOffset, true); // compute the range for this style Position startByte = byteOffset; + // when going backwards, we know the style is already computed while (startByte > 0 && sci->pdoc->StyleAt((startByte) - 1) == style) (startByte)--; Position endByte = byteOffset + 1; - while (endByte < length && sci->pdoc->StyleAt(endByte) == style) + while (endByte < length && StyleAt(endByte, true) == style) (endByte)++; CharacterRangeFromByteRange(startByte, endByte, startChar, endChar); Modified: scintilla/gtk/ScintillaGTKAccessible.h 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -73,6 +73,12 @@ class ScintillaGTKAccessible { return sci->pdoc->MovePositionOutsideChar(pos + 1, 1, true); } + int StyleAt(Position position, bool ensureStyle = false) { + if (ensureStyle) + sci->pdoc->EnsureStyledTo(position); + return sci->pdoc->StyleAt(position); + } + // For AtkText gchar *GetTextRangeUTF8(Position startByte, Position endByte); gchar *GetText(int startChar, int endChar); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 658f63: Make the bundle runnable on OS X 10.6 and later
by Jiří Techet 19 Dec '16

19 Dec '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 19 Dec 2016 21:30:15 UTC Commit: 658f6360de447bade41781e67d12e1c30dc98d98 https://github.com/geany/geany-osx/commit/658f6360de447bade41781e67d12e1c30… Log Message: ----------- Make the bundle runnable on OS X 10.6 and later Modified Paths: -------------- Info.plist README.md Modified: Info.plist 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -28,7 +28,7 @@ <key>CFBundleSignature</key> <string>????</string> <key>LSMinimumSystemVersion</key> - <string>10.7</string> + <string>10.6</string> <key>LSApplicationCategoryType</key> <string>public.app-category.developer-tools</string> <key>NSHighResolutionCapable</key> Modified: README.md 14 lines changed, 11 insertions(+), 3 deletions(-) =================================================================== @@ -59,7 +59,7 @@ building and bundling Geany. Prerequisities -------------- -* OS X 10.7 or later +* OS X * Xcode and command-line tools JHBuild Installation @@ -84,10 +84,18 @@ To create the bundle, you need to first install JHBuild and GTK as described bel to set path to jhbuild installed in the previous step. -4. By default, jhbuild compiles without optimization flags. To enable +4. Update the `setup_sdk()` call in `~/.jhbuildrc-custom` to something like + + ``` + setup_sdk(target="10.6", sdk_version="native", architectures=["x86_64"]) + ``` + + so the build creates a 64-bit binary that works on OS X 10.6 and later. + +5. By default, jhbuild compiles without optimization flags. To enable optimization, add `setup_release()` at the end of `~/.jhbuildrc-custom`. -5. Install GTK 2 and all its dependencies using the following commands: +6. Install GTK 2 and all its dependencies using the following commands: ``` jhbuild bootstrap -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 9fdb01: javascript: Partial highlighting of ES6 template strings
by Colomban Wendling 18 Dec '16

18 Dec '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 18 Dec 2016 16:38:37 UTC Commit: 9fdb014b073f9035bc8df9b843213a9d1e997ccb https://github.com/geany/geany/commit/9fdb014b073f9035bc8df9b843213a9d1e997… Log Message: ----------- javascript: Partial highlighting of ES6 template strings This doesn't support nested templates or escaped `es, but at least handles the most obvious cases for now. Part of #934. Modified Paths: -------------- data/filedefs/filetypes.javascript Modified: data/filedefs/filetypes.javascript 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -7,6 +7,8 @@ primary=break case catch class const continue default delete do each else extend secondary=Array Boolean Date Function Math Number Object String RegExp EvalError Error RangeError ReferenceError SyntaxError TypeError URIError constructor prototype decodeURI decodeURIComponent encodeURI encodeURIComponent eval isFinite isNaN parseFloat parseInt [lexer_properties=C] +# partially handles ES6 template strings +lexer.cpp.backquoted.strings=1 [settings] # default extension used when saving files -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 21b37f: Add Arduino custom filetype
by SukkoPera 16 Dec '16

16 Dec '16

Branch: refs/heads/master Author: SukkoPera <software(a)sukkology.net> Committer: Matthew Brush <matt(a)geany.org> Date: Fri, 16 Dec 2016 10:55:35 UTC Commit: 21b37f553fdcaa37463465bd24d9ca5537800f0a https://github.com/geany/geany/commit/21b37f553fdcaa37463465bd24d9ca5537800… Log Message: ----------- Add Arduino custom filetype Closes #1339 Modified Paths: -------------- data/Makefile.am data/filedefs/filetypes.Arduino.conf data/filetype_extensions.conf Modified: data/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -7,6 +7,7 @@ filetypes = \ filedefs/filetypes.abc \ filedefs/filetypes.actionscript \ filedefs/filetypes.ada \ + filedefs/filetypes.Arduino.conf \ filedefs/filetypes.asciidoc \ filedefs/filetypes.asm \ filedefs/filetypes.batch \ Modified: data/filedefs/filetypes.Arduino.conf 44 lines changed, 44 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,44 @@ +[styling=C] + + +[keywords] +primary=and and_eq asm auto bitand bitor bool boolean break byte case catch char class compl const const_cast constexpr continue decltype default delete do double dynamic_cast else enum explicit extern false final float for friend goto if inline int int8_t int16_t int32_t int64_t long mutable namespace new noexcept not not_eq nullptr operator or or_eq override private protected ptrdiff_t public register reinterpret_cast return short signed sizeof size_t static static_assert static_cast struct switch template this throw true try typedef typeid typename uint8_t uint16_t uint32_t uint64_t union unsigned using virtual void volatile while xor xor_eq +secondary=abs analogRead analogReadResolution analogReference analogWrite analogWriteResolution attachInterrupt bit bitClear bitRead bitSet bitWrite constrain cos delay delayMicroseconds detachInterrupt digitalRead digitalWrite EEPROM Ethernet F highByte interrupts isAlpha isAlphaNumeric isAscii isControl isDigit isGraph isHexadecimalDigit isLowerCase isPrintable isPunct isSpace isUpperCase isWhitespace Keyboard LiquidCrystal loop lowByte map max micros millis min Mouse noInterrupts noTone pinMode pow PROGMEM pulseIn random randomSeed SD Serial Servo setup shiftIn shiftOut sin SoftwareSerial SPI sqrt Stepper tan tone Wire word yield + + +[lexer_properties=C] + + +[settings] +lexer_filetype=C +tag_parser=C +extension=ino + +# context action command (please see Geany's main documentation for details) +context_action_cmd=xdg-open "https://www.arduino.cc/en/Reference/%s" + + +[indentation] +#width=2 +# 0 is spaces, 1 is tabs, 2 is tab & spaces +#type=0 + + +# Use this reference for making up Arduino command lines: +# https://github.com/arduino/Arduino/blob/master/build/shared/manpage.adoc +[build-menu] +FT_00_LB=_Build +FT_00_CM=arduino --verify "%d/%f" --board arduino:avr:uno +FT_00_WD= + +FT_01_LB=Build (_Verbose) +FT_01_CM=arduino --verify --verbose-build "%d/%f" --board arduino:avr:uno +FT_01_WD= + +EX_00_LB=_Upload +EX_00_CM=arduino --upload "%d/%f" --board arduino:avr:uno +EX_00_WD= + +EX_01_LB=Up_load (Verbose) +EX_01_CM=arduino --upload --verbose-upload "%d/%f" --board arduino:avr:uno +EX_01_WD= Modified: data/filetype_extensions.conf 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -6,6 +6,7 @@ Abaqus=*.inp; Abc=*.abc;*.abp; ActionScript=*.as; Ada=*.adb;*.ads; +Arduino=*.ino;*.pde; Asciidoc=*.asciidoc;*.adoc; ASM=*.asm;*.asm51;*.a51; Batch=*.bat;*.cmd;*.nt; @@ -73,7 +74,7 @@ None=*; # Note: restarting is required after editing groups [Groups] -Programming=Clojure;CUDA;Cython;Genie;Scala; +Programming=Arduino;Clojure;CUDA;Cython;Genie;Scala; Script=Graphviz; Markup= Misc=JSON; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 9573a3: Update HACKING (#1340)
by tsvisimcha 16 Dec '16

16 Dec '16

Branch: refs/heads/master Author: tsvisimcha <tsvisimcha(a)gmail.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Fri, 16 Dec 2016 08:27:00 UTC Commit: 9573a3886d92c1ffa28e7aab9afa1fa535d7dd28 https://github.com/geany/geany/commit/9573a3886d92c1ffa28e7aab9afa1fa535d7d… Log Message: ----------- Update HACKING (#1340) Modified Paths: -------------- HACKING Modified: HACKING 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -167,7 +167,7 @@ unmanageable diffs. GTK versions & API documentation -------------------------------- -Geany requires GTK >= 2.24 and GLib >= 2.28. API symbols from newer +Geany requires GTK >= 2.24 and GLib >= 2.32. API symbols from newer GTK/GLib versions should be avoided or made optional to keep the source code building on older systems. -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 3ddea9: Update NEWS for Scintilla 3.7.1
by Colomban Wendling 10 Dec '16

10 Dec '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 10 Dec 2016 10:31:50 UTC Commit: 3ddea9c3aefc5efcaf03a2b293d4785d7d5ed9ec https://github.com/geany/geany/commit/3ddea9c3aefc5efcaf03a2b293d4785d7d5ed… Log Message: ----------- Update NEWS for Scintilla 3.7.1 It actually introduces a few new things worth mentioning. Modified Paths: -------------- NEWS Modified: NEWS 10 lines changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -1,8 +1,18 @@ Geany 1.30 (unreleased) + General + * Initial accessibility support in the editor (SF#328). + + Editor + * Update Scintilla to version 3.7.1. + Internationalization * Updated translations: lt + API + * Remove unprefixed Scintilla structure aliases. Plugins must use + the `Sci_`-prefixed version from now on. + Geany 1.29 (November 13, 2016) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] aa11c3: Update Scintilla to version 3.7.1
by Colomban Wendling 05 Dec '16

05 Dec '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 05 Dec 2016 13:23:34 UTC Commit: aa11c3ea48a67eee384605cace71e3111745b68f https://github.com/geany/geany/commit/aa11c3ea48a67eee384605cace71e3111745b… Log Message: ----------- Update Scintilla to version 3.7.1 Modified Paths: -------------- scintilla/Makefile.am scintilla/gtk/PlatGTK.cxx scintilla/gtk/ScintillaGTK.cxx scintilla/gtk/ScintillaGTK.h scintilla/gtk/ScintillaGTKAccessible.cxx scintilla/gtk/ScintillaGTKAccessible.h scintilla/include/Platform.h scintilla/include/SciLexer.h scintilla/include/Scintilla.h scintilla/include/Scintilla.iface scintilla/lexers/LexCPP.cxx scintilla/lexers/LexMatlab.cxx scintilla/lexers/LexPerl.cxx scintilla/lexers/LexYAML.cxx scintilla/lexlib/LexerModule.h scintilla/scintilla_changes.patch scintilla/src/CaseConvert.cxx scintilla/src/CaseConvert.h scintilla/src/CellBuffer.h scintilla/src/ContractionState.cxx scintilla/src/ContractionState.h scintilla/src/Document.cxx scintilla/src/EditModel.cxx scintilla/src/EditModel.h scintilla/src/EditView.cxx scintilla/src/EditView.h scintilla/src/Editor.cxx scintilla/src/Editor.h scintilla/src/Indicator.cxx scintilla/src/Indicator.h scintilla/src/PositionCache.cxx scintilla/src/PositionCache.h scintilla/src/ScintillaBase.cxx scintilla/src/ScintillaBase.h scintilla/src/SparseVector.h scintilla/src/ViewStyle.cxx scintilla/src/ViewStyle.h scintilla/version.txt Modified: scintilla/Makefile.am 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -53,6 +53,9 @@ SRCS= \ gtk/Converter.h \ gtk/PlatGTK.cxx \ gtk/ScintillaGTK.cxx \ +gtk/ScintillaGTK.h \ +gtk/ScintillaGTKAccessible.cxx \ +gtk/ScintillaGTKAccessible.h \ gtk/scintilla-marshal.c \ gtk/scintilla-marshal.h \ lexlib/Accessor.cxx \ @@ -132,6 +135,7 @@ src/ScintillaBase.cxx \ src/ScintillaBase.h \ src/Selection.cxx \ src/Selection.h \ +src/SparseVector.h \ src/SplitVector.h \ src/Style.cxx \ src/Style.h \ Modified: scintilla/gtk/PlatGTK.cxx 7 lines changed, 1 insertions(+), 6 deletions(-) =================================================================== @@ -28,11 +28,6 @@ #include "XPM.h" #include "UniConversion.h" -#if defined(__clang__) -// Clang 3.0 incorrectly displays sentinel warnings. Fixed by clang 3.1. -#pragma GCC diagnostic ignored "-Wsentinel" -#endif - #include "Converter.h" static const double kPi = 3.14159265358979323846; @@ -550,7 +545,7 @@ static void PathRoundRectangle(cairo_t *context, double left, double top, double } void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize, ColourDesired fill, int alphaFill, - ColourDesired outline, int alphaOutline, int flags) { + ColourDesired outline, int alphaOutline, int /*flags*/) { if (context && rc.Width() > 0) { ColourDesired cdFill(fill.AsLong()); cairo_set_source_rgba(context, Modified: scintilla/gtk/ScintillaGTK.cxx 401 lines changed, 128 insertions(+), 273 deletions(-) =================================================================== @@ -72,15 +72,12 @@ #include "ExternalLexer.h" #endif +#include "ScintillaGTK.h" #include "scintilla-marshal.h" +#include "ScintillaGTKAccessible.h" #include "Converter.h" -#if defined(__clang__) -// Clang 3.0 incorrectly displays sentinel warnings. Fixed by clang 3.1. -#pragma GCC diagnostic ignored "-Wsentinel" -#endif - #if GTK_CHECK_VERSION(2,20,0) #define IS_WIDGET_REALIZED(w) (gtk_widget_get_realized(GTK_WIDGET(w))) #define IS_WIDGET_MAPPED(w) (gtk_widget_get_mapped(GTK_WIDGET(w))) @@ -105,8 +102,6 @@ static GdkWindow *WindowFromWidget(GtkWidget *w) { #pragma warning(disable: 4505) #endif -#define OBJECT_CLASS GObjectClass - #ifdef SCI_NAMESPACE using namespace Scintilla; #endif @@ -118,230 +113,6 @@ static GdkWindow *PWindow(const Window &w) { extern std::string UTF8FromLatin1(const char *s, int len); -class ScintillaGTK : public ScintillaBase { - _ScintillaObject *sci; - Window wText; - Window scrollbarv; - Window scrollbarh; - GtkAdjustment *adjustmentv; - GtkAdjustment *adjustmenth; - int verticalScrollBarWidth; - int horizontalScrollBarHeight; - - SelectionText primary; - - GdkEventButton *evbtn; - bool capturedMouse; - bool dragWasDropped; - int lastKey; - int rectangularSelectionModifier; - - GtkWidgetClass *parentClass; - - static GdkAtom atomClipboard; - static GdkAtom atomUTF8; - static GdkAtom atomString; - static GdkAtom atomUriList; - static GdkAtom atomDROPFILES_DND; - GdkAtom atomSought; - -#if PLAT_GTK_WIN32 - CLIPFORMAT cfColumnSelect; -#endif - - Window wPreedit; - Window wPreeditDraw; - GtkIMContext *im_context; - PangoScript lastNonCommonScript; - - // Wheel mouse support - unsigned int linesPerScroll; - GTimeVal lastWheelMouseTime; - gint lastWheelMouseDirection; - gint wheelMouseIntensity; - -#if GTK_CHECK_VERSION(3,0,0) - cairo_rectangle_list_t *rgnUpdate; -#else - GdkRegion *rgnUpdate; -#endif - bool repaintFullWindow; - - guint styleIdleID; - - // Private so ScintillaGTK objects can not be copied - ScintillaGTK(const ScintillaGTK &); - ScintillaGTK &operator=(const ScintillaGTK &); - -public: - explicit ScintillaGTK(_ScintillaObject *sci_); - virtual ~ScintillaGTK(); - static void ClassInit(OBJECT_CLASS* object_class, GtkWidgetClass *widget_class, GtkContainerClass *container_class); -private: - virtual void Initialise(); - virtual void Finalise(); - virtual bool AbandonPaint(); - virtual void DisplayCursor(Window::Cursor c); - virtual bool DragThreshold(Point ptStart, Point ptNow); - virtual void StartDrag(); - int TargetAsUTF8(char *text); - int EncodedFromUTF8(char *utf8, char *encoded) const; - virtual bool ValidCodePage(int codePage) const; -public: // Public for scintilla_send_message - virtual sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam); -private: - virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam); - struct TimeThunk { - TickReason reason; - ScintillaGTK *scintilla; - guint timer; - TimeThunk() : reason(tickCaret), scintilla(NULL), timer(0) {} - }; - TimeThunk timers[tickDwell+1]; - virtual bool FineTickerAvailable(); - virtual bool FineTickerRunning(TickReason reason); - virtual void FineTickerStart(TickReason reason, int millis, int tolerance); - virtual void FineTickerCancel(TickReason reason); - virtual bool SetIdle(bool on); - virtual void SetMouseCapture(bool on); - virtual bool HaveMouseCapture(); - virtual bool PaintContains(PRectangle rc); - void FullPaint(); - virtual PRectangle GetClientRectangle() const; - virtual void ScrollText(int linesToMove); - virtual void SetVerticalScrollPos(); - virtual void SetHorizontalScrollPos(); - virtual bool ModifyScrollBars(int nMax, int nPage); - void ReconfigureScrollBars(); - virtual void NotifyChange(); - virtual void NotifyFocus(bool focus); - virtual void NotifyParent(SCNotification scn); - void NotifyKey(int key, int modifiers); - void NotifyURIDropped(const char *list); - const char *CharacterSetID() const; - virtual CaseFolder *CaseFolderForEncoding(); - virtual std::string CaseMapString(const std::string &s, int caseMapping); - virtual int KeyDefault(int key, int modifiers); - virtual void CopyToClipboard(const SelectionText &selectedText); - virtual void Copy(); - virtual void Paste(); - virtual void CreateCallTipWindow(PRectangle rc); - virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true); - bool OwnPrimarySelection(); - virtual void ClaimSelection(); - void GetGtkSelectionText(GtkSelectionData *selectionData, SelectionText &selText); - void ReceivedSelection(GtkSelectionData *selection_data); - void ReceivedDrop(GtkSelectionData *selection_data); - static void GetSelection(GtkSelectionData *selection_data, guint info, SelectionText *selected); - void StoreOnClipboard(SelectionText *clipText); - static void ClipboardGetSelection(GtkClipboard* clip, GtkSelectionData *selection_data, guint info, void *data); - static void ClipboardClearSelection(GtkClipboard* clip, void *data); - - void UnclaimSelection(GdkEventSelection *selection_event); - void Resize(int width, int height); - - // Callback functions - void RealizeThis(GtkWidget *widget); - static void Realize(GtkWidget *widget); - void UnRealizeThis(GtkWidget *widget); - static void UnRealize(GtkWidget *widget); - void MapThis(); - static void Map(GtkWidget *widget); - void UnMapThis(); - static void UnMap(GtkWidget *widget); - gint FocusInThis(GtkWidget *widget); - static gint FocusIn(GtkWidget *widget, GdkEventFocus *event); - gint FocusOutThis(GtkWidget *widget); - static gint FocusOut(GtkWidget *widget, GdkEventFocus *event); - static void SizeRequest(GtkWidget *widget, GtkRequisition *requisition); -#if GTK_CHECK_VERSION(3,0,0) - static void GetPreferredWidth(GtkWidget *widget, gint *minimalWidth, gint *naturalWidth); - static void GetPreferredHeight(GtkWidget *widget, gint *minimalHeight, gint *naturalHeight); -#endif - static void SizeAllocate(GtkWidget *widget, GtkAllocation *allocation); -#if GTK_CHECK_VERSION(3,0,0) - gboolean DrawTextThis(cairo_t *cr); - static gboolean DrawText(GtkWidget *widget, cairo_t *cr, ScintillaGTK *sciThis); - gboolean DrawThis(cairo_t *cr); - static gboolean DrawMain(GtkWidget *widget, cairo_t *cr); -#else - gboolean ExposeTextThis(GtkWidget *widget, GdkEventExpose *ose); - static gboolean ExposeText(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis); - gboolean Expose(GtkWidget *widget, GdkEventExpose *ose); - static gboolean ExposeMain(GtkWidget *widget, GdkEventExpose *ose); -#endif - void ForAll(GtkCallback callback, gpointer callback_data); - static void MainForAll(GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data); - - static void ScrollSignal(GtkAdjustment *adj, ScintillaGTK *sciThis); - static void ScrollHSignal(GtkAdjustment *adj, ScintillaGTK *sciThis); - gint PressThis(GdkEventButton *event); - static gint Press(GtkWidget *widget, GdkEventButton *event); - static gint MouseRelease(GtkWidget *widget, GdkEventButton *event); - static gint ScrollEvent(GtkWidget *widget, GdkEventScroll *event); - static gint Motion(GtkWidget *widget, GdkEventMotion *event); - gboolean KeyThis(GdkEventKey *event); - static gboolean KeyPress(GtkWidget *widget, GdkEventKey *event); - static gboolean KeyRelease(GtkWidget *widget, GdkEventKey *event); -#if GTK_CHECK_VERSION(3,0,0) - gboolean DrawPreeditThis(GtkWidget *widget, cairo_t *cr); - static gboolean DrawPreedit(GtkWidget *widget, cairo_t *cr, ScintillaGTK *sciThis); -#else - gboolean ExposePreeditThis(GtkWidget *widget, GdkEventExpose *ose); - static gboolean ExposePreedit(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis); -#endif - - bool KoreanIME(); - void CommitThis(char *str); - static void Commit(GtkIMContext *context, char *str, ScintillaGTK *sciThis); - void PreeditChangedInlineThis(); - void PreeditChangedWindowedThis(); - static void PreeditChanged(GtkIMContext *context, ScintillaGTK *sciThis); - void MoveImeCarets(int pos); - void DrawImeIndicator(int indicator, int len); - void SetCandidateWindowPos(); - - static void StyleSetText(GtkWidget *widget, GtkStyle *previous, void*); - static void RealizeText(GtkWidget *widget, void*); - static void Dispose(GObject *object); - static void Destroy(GObject *object); - static void SelectionReceived(GtkWidget *widget, GtkSelectionData *selection_data, - guint time); - static void ClipboardReceived(GtkClipboard *clipboard, GtkSelectionData *selection_data, - gpointer data); - static void SelectionGet(GtkWidget *widget, GtkSelectionData *selection_data, - guint info, guint time); - static gint SelectionClear(GtkWidget *widget, GdkEventSelection *selection_event); - gboolean DragMotionThis(GdkDragContext *context, gint x, gint y, guint dragtime); - static gboolean DragMotion(GtkWidget *widget, GdkDragContext *context, - gint x, gint y, guint dragtime); - static void DragLeave(GtkWidget *widget, GdkDragContext *context, - guint time); - static void DragEnd(GtkWidget *widget, GdkDragContext *context); - static gboolean Drop(GtkWidget *widget, GdkDragContext *context, - gint x, gint y, guint time); - static void DragDataReceived(GtkWidget *widget, GdkDragContext *context, - gint x, gint y, GtkSelectionData *selection_data, guint info, guint time); - static void DragDataGet(GtkWidget *widget, GdkDragContext *context, - GtkSelectionData *selection_data, guint info, guint time); - static gboolean TimeOut(gpointer ptt); - static gboolean IdleCallback(gpointer pSci); - static gboolean StyleIdle(gpointer pSci); - virtual void IdleWork(); - virtual void QueueIdleWork(WorkNeeded::workItems items, int upTo); - static void PopUpCB(GtkMenuItem *menuItem, ScintillaGTK *sciThis); - -#if GTK_CHECK_VERSION(3,0,0) - static gboolean DrawCT(GtkWidget *widget, cairo_t *cr, CallTip *ctip); -#else - static gboolean ExposeCT(GtkWidget *widget, GdkEventExpose *ose, CallTip *ct); -#endif - static gboolean PressCT(GtkWidget *widget, GdkEventButton *event, ScintillaGTK *sciThis); - - static sptr_t DirectFunction(sptr_t ptr, - unsigned int iMessage, uptr_t wParam, sptr_t lParam); -}; - enum { COMMAND_SIGNAL, NOTIFY_SIGNAL, @@ -381,7 +152,7 @@ static GtkWidget *PWidget(Window &w) { return static_cast<GtkWidget *>(w.GetID()); } -static ScintillaGTK *ScintillaFromWidget(GtkWidget *widget) { +ScintillaGTK *ScintillaGTK::FromWidget(GtkWidget *widget) { ScintillaObject *scio = SCINTILLA(widget); return static_cast<ScintillaGTK *>(scio->pscin); } @@ -396,7 +167,8 @@ ScintillaGTK::ScintillaGTK(_ScintillaObject *sci_) : wheelMouseIntensity(0), rgnUpdate(0), repaintFullWindow(false), - styleIdleID(0) { + styleIdleID(0), + accessible(0) { sci = sci_; wMain = GTK_WIDGET(sci); @@ -529,7 +301,7 @@ void ScintillaGTK::RealizeThis(GtkWidget *widget) { } void ScintillaGTK::Realize(GtkWidget *widget) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); sciThis->RealizeThis(widget); } @@ -564,7 +336,7 @@ void ScintillaGTK::UnRealizeThis(GtkWidget *widget) { } void ScintillaGTK::UnRealize(GtkWidget *widget) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); sciThis->UnRealizeThis(widget); } @@ -598,7 +370,7 @@ void ScintillaGTK::MapThis() { } void ScintillaGTK::Map(GtkWidget *widget) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); sciThis->MapThis(); } @@ -623,7 +395,7 @@ void ScintillaGTK::UnMapThis() { } void ScintillaGTK::UnMap(GtkWidget *widget) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); sciThis->UnMapThis(); } @@ -640,7 +412,7 @@ void ScintillaGTK::ForAll(GtkCallback callback, gpointer callback_data) { } void ScintillaGTK::MainForAll(GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data) { - ScintillaGTK *sciThis = ScintillaFromWidget((GtkWidget *)container); + ScintillaGTK *sciThis = FromWidget((GtkWidget *)container); if (callback != NULL && include_internals) { sciThis->ForAll(callback, callback_data); @@ -674,7 +446,7 @@ class PreEditString { } -gint ScintillaGTK::FocusInThis(GtkWidget *widget) { +gint ScintillaGTK::FocusInThis(GtkWidget *) { try { SetFocusState(true); if (im_context != NULL) { @@ -696,11 +468,11 @@ gint ScintillaGTK::FocusInThis(GtkWidget *widget) { } gint ScintillaGTK::FocusIn(GtkWidget *widget, GdkEventFocus * /*event*/) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); return sciThis->FocusInThis(widget); } -gint ScintillaGTK::FocusOutThis(GtkWidget *widget) { +gint ScintillaGTK::FocusOutThis(GtkWidget *) { try { SetFocusState(false); @@ -716,12 +488,12 @@ gint ScintillaGTK::FocusOutThis(GtkWidget *widget) { } gint ScintillaGTK::FocusOut(GtkWidget *widget, GdkEventFocus * /*event*/) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); return sciThis->FocusOutThis(widget); } void ScintillaGTK::SizeRequest(GtkWidget *widget, GtkRequisition *requisition) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); requisition->width = 1; requisition->height = 1; GtkRequisition child_requisition; @@ -751,7 +523,7 @@ void ScintillaGTK::GetPreferredHeight(GtkWidget *widget, gint *minimalHeight, gi #endif void ScintillaGTK::SizeAllocate(GtkWidget *widget, GtkAllocation *allocation) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); try { gtk_widget_set_allocation(widget, allocation); if (IS_WIDGET_REALIZED(widget)) @@ -888,6 +660,12 @@ void ScintillaGTK::Finalise() { for (TickReason tr = tickCaret; tr <= tickDwell; tr = static_cast<TickReason>(tr + 1)) { FineTickerCancel(tr); } + if (accessible) { + gtk_accessible_set_widget(GTK_ACCESSIBLE(accessible), NULL); + g_object_unref(accessible); + accessible = 0; + } + ScintillaBase::Finalise(); } @@ -931,8 +709,11 @@ void ScintillaGTK::StartDrag() { #endif } -static std::string ConvertText(const char *s, size_t len, const char *charSetDest, - const char *charSetSource, bool transliterations, bool silent=false) { +#ifdef SCI_NAMESPACE +namespace Scintilla { +#endif +std::string ConvertText(const char *s, size_t len, const char *charSetDest, + const char *charSetSource, bool transliterations, bool silent) { // s is not const because of different versions of iconv disagreeing about const std::string destForm; Converter conv(charSetDest, charSetSource, transliterations); @@ -963,6 +744,9 @@ static std::string ConvertText(const char *s, size_t len, const char *charSetDes } return destForm; } +#ifdef SCI_NAMESPACE +} +#endif // Returns the target converted to UTF8. // Return the length in bytes. @@ -1063,6 +847,17 @@ sptr_t ScintillaGTK::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam case SCI_GETRECTANGULARSELECTIONMODIFIER: return rectangularSelectionModifier; + case SCI_SETREADONLY: { + sptr_t ret = ScintillaBase::WndProc(iMessage, wParam, lParam); + if (accessible) { + ScintillaGTKAccessible *sciAccessible = ScintillaGTKAccessible::FromAccessible(accessible); + if (sciAccessible) { + sciAccessible->NotifyReadOnly(); + } + } + return ret; + } + default: return ScintillaBase::WndProc(iMessage, wParam, lParam); } @@ -1456,18 +1251,37 @@ void ScintillaGTK::Copy() { } } -void ScintillaGTK::ClipboardReceived(GtkClipboard *clipboard, GtkSelectionData *selection_data, gpointer data) { - ScintillaGTK *sciThis = static_cast<ScintillaGTK *>(data); - sciThis->ReceivedSelection(selection_data); -} - void ScintillaGTK::Paste() { atomSought = atomUTF8; GtkClipboard *clipBoard = gtk_widget_get_clipboard(GTK_WIDGET(PWidget(wMain)), atomClipboard); if (clipBoard == NULL) return; - gtk_clipboard_request_contents(clipBoard, atomSought, ClipboardReceived, this); + + // helper class for the asynchronous paste not to risk calling in a destroyed ScintillaGTK + class Helper : GObjectWatcher { + ScintillaGTK *sci; + + virtual void Destroyed() { + sci = 0; + } + + public: + Helper(ScintillaGTK *sci_) : + GObjectWatcher(G_OBJECT(PWidget(sci_->wMain))), + sci(sci_) { + } + + static void ClipboardReceived(GtkClipboard *, GtkSelectionData *selection_data, gpointer data) { + Helper *self = static_cast<Helper*>(data); + if (self->sci != 0) { + self->sci->ReceivedSelection(selection_data); + } + delete self; + } + }; + + gtk_clipboard_request_contents(clipBoard, atomSought, Helper::ClipboardReceived, new Helper(this)); } void ScintillaGTK::CreateCallTipWindow(PRectangle rc) { @@ -1889,14 +1703,23 @@ gint ScintillaGTK::PressThis(GdkEventButton *event) { } else if (event->button == 3) { if (!PointInSelection(pt)) SetEmptySelection(PositionFromLocation(pt)); - if (displayPopupMenu) { + if (ShouldDisplayPopup(pt)) { // PopUp menu // Convert to screen int ox = 0; int oy = 0; gdk_window_get_origin(PWindow(wMain), &ox, &oy); ContextMenu(Point(pt.x + ox, pt.y + oy)); } else { +#if PLAT_GTK_MACOSX + bool meta = ctrl; + // GDK reports the Command modifer key as GDK_MOD2_MASK for button events, + // not GDK_META_MASK like in key events. + ctrl = (event->state & GDK_MOD2_MASK) != 0; +#else + bool meta = false; +#endif + RightButtonDownWithModifiers(pt, event->time, ModifierFlags(shift, ctrl, alt, meta)); return FALSE; } } else if (event->button == 4) { @@ -1921,12 +1744,12 @@ gint ScintillaGTK::PressThis(GdkEventButton *event) { gint ScintillaGTK::Press(GtkWidget *widget, GdkEventButton *event) { if (event->window != WindowFromWidget(widget)) return FALSE; - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); return sciThis->PressThis(event); } gint ScintillaGTK::MouseRelease(GtkWidget *widget, GdkEventButton *event) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); try { //Platform::DebugPrintf("Release %x %d %d\n",sciThis,event->time,event->state); if (!sciThis->HaveMouseCapture()) @@ -1952,7 +1775,7 @@ gint ScintillaGTK::MouseRelease(GtkWidget *widget, GdkEventButton *event) { // win32gtk and GTK >= 2 use SCROLL_* events instead of passing the // button4/5/6/7 events to the GTK app gint ScintillaGTK::ScrollEvent(GtkWidget *widget, GdkEventScroll *event) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); try { if (widget == NULL || event == NULL) @@ -2036,7 +1859,7 @@ gint ScintillaGTK::ScrollEvent(GtkWidget *widget, GdkEventScroll *event) { } gint ScintillaGTK::Motion(GtkWidget *widget, GdkEventMotion *event) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); try { //Platform::DebugPrintf("Motion %x %d\n",sciThis,event->time); if (event->window != WindowFromWidget(widget)) @@ -2267,13 +2090,13 @@ gboolean ScintillaGTK::KeyThis(GdkEventKey *event) { } gboolean ScintillaGTK::KeyPress(GtkWidget *widget, GdkEventKey *event) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); return sciThis->KeyThis(event); } gboolean ScintillaGTK::KeyRelease(GtkWidget *widget, GdkEventKey *event) { //Platform::DebugPrintf("SC-keyrel: %d %x %3s\n",event->keyval, event->state, event->string); - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); if (gtk_im_context_filter_keypress(sciThis->im_context, event)) { return TRUE; } @@ -2282,7 +2105,7 @@ gboolean ScintillaGTK::KeyRelease(GtkWidget *widget, GdkEventKey *event) { #if GTK_CHECK_VERSION(3,0,0) -gboolean ScintillaGTK::DrawPreeditThis(GtkWidget *widget, cairo_t *cr) { +gboolean ScintillaGTK::DrawPreeditThis(GtkWidget *, cairo_t *cr) { try { PreEditString pes(im_context); PangoLayout *layout = gtk_widget_create_pango_layout(PWidget(wText), pes.str); @@ -2304,7 +2127,7 @@ gboolean ScintillaGTK::DrawPreedit(GtkWidget *widget, cairo_t *cr, ScintillaGTK #else -gboolean ScintillaGTK::ExposePreeditThis(GtkWidget *widget, GdkEventExpose *ose) { +gboolean ScintillaGTK::ExposePreeditThis(GtkWidget *widget, GdkEventExpose *) { try { PreEditString pes(im_context); PangoLayout *layout = gtk_widget_create_pango_layout(PWidget(wText), pes.str); @@ -2721,7 +2544,7 @@ gboolean ScintillaGTK::DrawThis(cairo_t *cr) { } gboolean ScintillaGTK::DrawMain(GtkWidget *widget, cairo_t *cr) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); return sciThis->DrawThis(cr); } @@ -2771,7 +2594,7 @@ gboolean ScintillaGTK::ExposeText(GtkWidget *widget, GdkEventExpose *ose, Scinti } gboolean ScintillaGTK::ExposeMain(GtkWidget *widget, GdkEventExpose *ose) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); //Platform::DebugPrintf("Expose Main %0d,%0d %0d,%0d\n", //ose->area.x, ose->area.y, ose->area.width, ose->area.height); return sciThis->Expose(widget, ose); @@ -2814,14 +2637,14 @@ void ScintillaGTK::ScrollHSignal(GtkAdjustment *adj, ScintillaGTK *sciThis) { void ScintillaGTK::SelectionReceived(GtkWidget *widget, GtkSelectionData *selection_data, guint) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); //Platform::DebugPrintf("Selection received\n"); sciThis->ReceivedSelection(selection_data); } void ScintillaGTK::SelectionGet(GtkWidget *widget, GtkSelectionData *selection_data, guint info, guint) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); try { //Platform::DebugPrintf("Selection get\n"); if (SelectionOfGSD(selection_data) == GDK_SELECTION_PRIMARY) { @@ -2836,7 +2659,7 @@ void ScintillaGTK::SelectionGet(GtkWidget *widget, } gint ScintillaGTK::SelectionClear(GtkWidget *widget, GdkEventSelection *selection_event) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); //Platform::DebugPrintf("Selection clear\n"); sciThis->UnclaimSelection(selection_event); if (GTK_WIDGET_CLASS(sciThis->parentClass)->selection_clear_event) { @@ -2875,12 +2698,12 @@ gboolean ScintillaGTK::DragMotionThis(GdkDragContext *context, gboolean ScintillaGTK::DragMotion(GtkWidget *widget, GdkDragContext *context, gint x, gint y, guint dragtime) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); return sciThis->DragMotionThis(context, x, y, dragtime); } void ScintillaGTK::DragLeave(GtkWidget *widget, GdkDragContext * /*context*/, guint) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); try { sciThis->SetDragPosition(SelectionPosition(invalidPosition)); //Platform::DebugPrintf("DragLeave %x\n", sciThis); @@ -2890,7 +2713,7 @@ void ScintillaGTK::DragLeave(GtkWidget *widget, GdkDragContext * /*context*/, gu } void ScintillaGTK::DragEnd(GtkWidget *widget, GdkDragContext * /*context*/) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); try { // If drag did not result in drop here or elsewhere if (!sciThis->dragWasDropped) @@ -2905,7 +2728,7 @@ void ScintillaGTK::DragEnd(GtkWidget *widget, GdkDragContext * /*context*/) { gboolean ScintillaGTK::Drop(GtkWidget *widget, GdkDragContext * /*context*/, gint, gint, guint) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); try { //Platform::DebugPrintf("Drop %x\n", sciThis); sciThis->SetDragPosition(SelectionPosition(invalidPosition)); @@ -2917,7 +2740,7 @@ gboolean ScintillaGTK::Drop(GtkWidget *widget, GdkDragContext * /*context*/, void ScintillaGTK::DragDataReceived(GtkWidget *widget, GdkDragContext * /*context*/, gint, gint, GtkSelectionData *selection_data, guint /*info*/, guint) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); try { sciThis->ReceivedDrop(selection_data); sciThis->SetDragPosition(SelectionPosition(invalidPosition)); @@ -2928,7 +2751,7 @@ void ScintillaGTK::DragDataReceived(GtkWidget *widget, GdkDragContext * /*contex void ScintillaGTK::DragDataGet(GtkWidget *widget, GdkDragContext *context, GtkSelectionData *selection_data, guint info, guint) { - ScintillaGTK *sciThis = ScintillaFromWidget(widget); + ScintillaGTK *sciThis = FromWidget(widget); try { sciThis->dragWasDropped = true; if (!sciThis->sel.Empty()) { @@ -2997,6 +2820,28 @@ void ScintillaGTK::QueueIdleWork(WorkNeeded::workItems items, int upTo) { } } +void ScintillaGTK::SetDocPointer(Document *document) { + Document *oldDoc = 0; + ScintillaGTKAccessible *sciAccessible = 0; + if (accessible) { + sciAccessible = ScintillaGTKAccessible::FromAccessible(accessible); + if (sciAccessible && pdoc) { + oldDoc = pdoc; + oldDoc->AddRef(); + } + } + + Editor::SetDocPointer(document); + + if (sciAccessible) { + // the accessible needs have the old Document, but also the new one active + sciAccessible->ChangeDocument(oldDoc, pdoc); + } + if (oldDoc) { + oldDoc->Release(); + } +} + void ScintillaGTK::PopUpCB(GtkMenuItem *menuItem, ScintillaGTK *sciThis) { guint action = GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(menuItem), "CmdNum")); if (action) { @@ -3062,6 +2907,14 @@ gboolean ScintillaGTK::ExposeCT(GtkWidget *widget, GdkEventExpose * /*ose*/, Cal #endif +AtkObject* ScintillaGTK::GetAccessibleThis(GtkWidget *widget) { + return ScintillaGTKAccessible::WidgetGetAccessibleImpl(widget, &accessible, scintilla_class_parent_class); +} + +AtkObject* ScintillaGTK::GetAccessible(GtkWidget *widget) { + return FromWidget(widget)->GetAccessibleThis(widget); +} + sptr_t ScintillaGTK::DirectFunction( sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam) { return reinterpret_cast<ScintillaGTK *>(ptr)->WndProc(iMessage, wParam, lParam); @@ -3174,6 +3027,8 @@ void ScintillaGTK::ClassInit(OBJECT_CLASS* object_class, GtkWidgetClass *widget_ widget_class->map = Map; widget_class->unmap = UnMap; + widget_class->get_accessible = GetAccessible; + container_class->forall = MainForAll; } @@ -3252,7 +3107,7 @@ void scintilla_release_resources(void) { * recognize gpointer-derived types. Note that SCNotificaiton * is always allocated on stack so copying is not appropriate. */ static void *copy_(void *src) { return src; } -static void free_(void *doc) { } +static void free_(void *) { } GEANY_API_SYMBOL GType scnotification_get_type(void) { Modified: scintilla/gtk/ScintillaGTK.h 287 lines changed, 287 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,287 @@ +// Scintilla source code edit control +// ScintillaGTK.h - GTK+ specific subclass of ScintillaBase +// Copyright 1998-2004 by Neil Hodgson <neilh(a)scintilla.org> +// The License.txt file describes the conditions under which this software may be distributed. + +#ifndef SCINTILLAGTK_H +#define SCINTILLAGTK_H + +#ifdef SCI_NAMESPACE +namespace Scintilla { +#endif + +class ScintillaGTKAccessible; + +#define OBJECT_CLASS GObjectClass + +class ScintillaGTK : public ScintillaBase { + friend class ScintillaGTKAccessible; + + _ScintillaObject *sci; + Window wText; + Window scrollbarv; + Window scrollbarh; + GtkAdjustment *adjustmentv; + GtkAdjustment *adjustmenth; + int verticalScrollBarWidth; + int horizontalScrollBarHeight; + + SelectionText primary; + + GdkEventButton *evbtn; + bool capturedMouse; + bool dragWasDropped; + int lastKey; + int rectangularSelectionModifier; + + GtkWidgetClass *parentClass; + + static GdkAtom atomClipboard; + static GdkAtom atomUTF8; + static GdkAtom atomString; + static GdkAtom atomUriList; + static GdkAtom atomDROPFILES_DND; + GdkAtom atomSought; + +#if PLAT_GTK_WIN32 + CLIPFORMAT cfColumnSelect; +#endif + + Window wPreedit; + Window wPreeditDraw; + GtkIMContext *im_context; + PangoScript lastNonCommonScript; + + // Wheel mouse support + unsigned int linesPerScroll; + GTimeVal lastWheelMouseTime; + gint lastWheelMouseDirection; + gint wheelMouseIntensity; + +#if GTK_CHECK_VERSION(3,0,0) + cairo_rectangle_list_t *rgnUpdate; +#else + GdkRegion *rgnUpdate; +#endif + bool repaintFullWindow; + + guint styleIdleID; + AtkObject *accessible; + + // Private so ScintillaGTK objects can not be copied + ScintillaGTK(const ScintillaGTK &); + ScintillaGTK &operator=(const ScintillaGTK &); + +public: + explicit ScintillaGTK(_ScintillaObject *sci_); + virtual ~ScintillaGTK(); + static ScintillaGTK *FromWidget(GtkWidget *widget); + static void ClassInit(OBJECT_CLASS* object_class, GtkWidgetClass *widget_class, GtkContainerClass *container_class); +private: + virtual void Initialise(); + virtual void Finalise(); + virtual bool AbandonPaint(); + virtual void DisplayCursor(Window::Cursor c); + virtual bool DragThreshold(Point ptStart, Point ptNow); + virtual void StartDrag(); + int TargetAsUTF8(char *text); + int EncodedFromUTF8(char *utf8, char *encoded) const; + virtual bool ValidCodePage(int codePage) const; +public: // Public for scintilla_send_message + virtual sptr_t WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam); +private: + virtual sptr_t DefWndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam); + struct TimeThunk { + TickReason reason; + ScintillaGTK *scintilla; + guint timer; + TimeThunk() : reason(tickCaret), scintilla(NULL), timer(0) {} + }; + TimeThunk timers[tickDwell+1]; + virtual bool FineTickerAvailable(); + virtual bool FineTickerRunning(TickReason reason); + virtual void FineTickerStart(TickReason reason, int millis, int tolerance); + virtual void FineTickerCancel(TickReason reason); + virtual bool SetIdle(bool on); + virtual void SetMouseCapture(bool on); + virtual bool HaveMouseCapture(); + virtual bool PaintContains(PRectangle rc); + void FullPaint(); + virtual PRectangle GetClientRectangle() const; + virtual void ScrollText(int linesToMove); + virtual void SetVerticalScrollPos(); + virtual void SetHorizontalScrollPos(); + virtual bool ModifyScrollBars(int nMax, int nPage); + void ReconfigureScrollBars(); + virtual void NotifyChange(); + virtual void NotifyFocus(bool focus); + virtual void NotifyParent(SCNotification scn); + void NotifyKey(int key, int modifiers); + void NotifyURIDropped(const char *list); + const char *CharacterSetID() const; + virtual CaseFolder *CaseFolderForEncoding(); + virtual std::string CaseMapString(const std::string &s, int caseMapping); + virtual int KeyDefault(int key, int modifiers); + virtual void CopyToClipboard(const SelectionText &selectedText); + virtual void Copy(); + virtual void Paste(); + virtual void CreateCallTipWindow(PRectangle rc); + virtual void AddToPopUp(const char *label, int cmd = 0, bool enabled = true); + bool OwnPrimarySelection(); + virtual void ClaimSelection(); + void GetGtkSelectionText(GtkSelectionData *selectionData, SelectionText &selText); + void ReceivedSelection(GtkSelectionData *selection_data); + void ReceivedDrop(GtkSelectionData *selection_data); + static void GetSelection(GtkSelectionData *selection_data, guint info, SelectionText *selected); + void StoreOnClipboard(SelectionText *clipText); + static void ClipboardGetSelection(GtkClipboard* clip, GtkSelectionData *selection_data, guint info, void *data); + static void ClipboardClearSelection(GtkClipboard* clip, void *data); + + void UnclaimSelection(GdkEventSelection *selection_event); + void Resize(int width, int height); + + // Callback functions + void RealizeThis(GtkWidget *widget); + static void Realize(GtkWidget *widget); + void UnRealizeThis(GtkWidget *widget); + static void UnRealize(GtkWidget *widget); + void MapThis(); + static void Map(GtkWidget *widget); + void UnMapThis(); + static void UnMap(GtkWidget *widget); + gint FocusInThis(GtkWidget *widget); + static gint FocusIn(GtkWidget *widget, GdkEventFocus *event); + gint FocusOutThis(GtkWidget *widget); + static gint FocusOut(GtkWidget *widget, GdkEventFocus *event); + static void SizeRequest(GtkWidget *widget, GtkRequisition *requisition); +#if GTK_CHECK_VERSION(3,0,0) + static void GetPreferredWidth(GtkWidget *widget, gint *minimalWidth, gint *naturalWidth); + static void GetPreferredHeight(GtkWidget *widget, gint *minimalHeight, gint *naturalHeight); +#endif + static void SizeAllocate(GtkWidget *widget, GtkAllocation *allocation); +#if GTK_CHECK_VERSION(3,0,0) + gboolean DrawTextThis(cairo_t *cr); + static gboolean DrawText(GtkWidget *widget, cairo_t *cr, ScintillaGTK *sciThis); + gboolean DrawThis(cairo_t *cr); + static gboolean DrawMain(GtkWidget *widget, cairo_t *cr); +#else + gboolean ExposeTextThis(GtkWidget *widget, GdkEventExpose *ose); + static gboolean ExposeText(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis); + gboolean Expose(GtkWidget *widget, GdkEventExpose *ose); + static gboolean ExposeMain(GtkWidget *widget, GdkEventExpose *ose); +#endif + void ForAll(GtkCallback callback, gpointer callback_data); + static void MainForAll(GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data); + + static void ScrollSignal(GtkAdjustment *adj, ScintillaGTK *sciThis); + static void ScrollHSignal(GtkAdjustment *adj, ScintillaGTK *sciThis); + gint PressThis(GdkEventButton *event); + static gint Press(GtkWidget *widget, GdkEventButton *event); + static gint MouseRelease(GtkWidget *widget, GdkEventButton *event); + static gint ScrollEvent(GtkWidget *widget, GdkEventScroll *event); + static gint Motion(GtkWidget *widget, GdkEventMotion *event); + gboolean KeyThis(GdkEventKey *event); + static gboolean KeyPress(GtkWidget *widget, GdkEventKey *event); + static gboolean KeyRelease(GtkWidget *widget, GdkEventKey *event); +#if GTK_CHECK_VERSION(3,0,0) + gboolean DrawPreeditThis(GtkWidget *widget, cairo_t *cr); + static gboolean DrawPreedit(GtkWidget *widget, cairo_t *cr, ScintillaGTK *sciThis); +#else + gboolean ExposePreeditThis(GtkWidget *widget, GdkEventExpose *ose); + static gboolean ExposePreedit(GtkWidget *widget, GdkEventExpose *ose, ScintillaGTK *sciThis); +#endif + AtkObject* GetAccessibleThis(GtkWidget *widget); + static AtkObject* GetAccessible(GtkWidget *widget); + + bool KoreanIME(); + void CommitThis(char *str); + static void Commit(GtkIMContext *context, char *str, ScintillaGTK *sciThis); + void PreeditChangedInlineThis(); + void PreeditChangedWindowedThis(); + static void PreeditChanged(GtkIMContext *context, ScintillaGTK *sciThis); + void MoveImeCarets(int pos); + void DrawImeIndicator(int indicator, int len); + void SetCandidateWindowPos(); + + static void StyleSetText(GtkWidget *widget, GtkStyle *previous, void*); + static void RealizeText(GtkWidget *widget, void*); + static void Dispose(GObject *object); + static void Destroy(GObject *object); + static void SelectionReceived(GtkWidget *widget, GtkSelectionData *selection_data, + guint time); + static void SelectionGet(GtkWidget *widget, GtkSelectionData *selection_data, + guint info, guint time); + static gint SelectionClear(GtkWidget *widget, GdkEventSelection *selection_event); + gboolean DragMotionThis(GdkDragContext *context, gint x, gint y, guint dragtime); + static gboolean DragMotion(GtkWidget *widget, GdkDragContext *context, + gint x, gint y, guint dragtime); + static void DragLeave(GtkWidget *widget, GdkDragContext *context, + guint time); + static void DragEnd(GtkWidget *widget, GdkDragContext *context); + static gboolean Drop(GtkWidget *widget, GdkDragContext *context, + gint x, gint y, guint time); + static void DragDataReceived(GtkWidget *widget, GdkDragContext *context, + gint x, gint y, GtkSelectionData *selection_data, guint info, guint time); + static void DragDataGet(GtkWidget *widget, GdkDragContext *context, + GtkSelectionData *selection_data, guint info, guint time); + static gboolean TimeOut(gpointer ptt); + static gboolean IdleCallback(gpointer pSci); + static gboolean StyleIdle(gpointer pSci); + virtual void IdleWork(); + virtual void QueueIdleWork(WorkNeeded::workItems items, int upTo); + virtual void SetDocPointer(Document *document); + static void PopUpCB(GtkMenuItem *menuItem, ScintillaGTK *sciThis); + +#if GTK_CHECK_VERSION(3,0,0) + static gboolean DrawCT(GtkWidget *widget, cairo_t *cr, CallTip *ctip); +#else + static gboolean ExposeCT(GtkWidget *widget, GdkEventExpose *ose, CallTip *ct); +#endif + static gboolean PressCT(GtkWidget *widget, GdkEventButton *event, ScintillaGTK *sciThis); + + static sptr_t DirectFunction(sptr_t ptr, + unsigned int iMessage, uptr_t wParam, sptr_t lParam); +}; + +// helper class to watch a GObject lifetime and get notified when it dies +class GObjectWatcher { + GObject *weakRef; + + void WeakNotifyThis(GObject *obj G_GNUC_UNUSED) { + PLATFORM_ASSERT(obj == weakRef); + + Destroyed(); + weakRef = 0; + } + + static void WeakNotify(gpointer data, GObject *obj) { + static_cast<GObjectWatcher*>(data)->WeakNotifyThis(obj); + } + +public: + GObjectWatcher(GObject *obj) : + weakRef(obj) { + g_object_weak_ref(weakRef, WeakNotify, this); + } + + virtual ~GObjectWatcher() { + if (weakRef) { + g_object_weak_unref(weakRef, WeakNotify, this); + } + } + + virtual void Destroyed() {} + + bool IsDestroyed() const { + return weakRef != 0; + } +}; + +std::string ConvertText(const char *s, size_t len, const char *charSetDest, + const char *charSetSource, bool transliterations, bool silent=false); + +#ifdef SCI_NAMESPACE +} +#endif + +#endif Modified: scintilla/gtk/ScintillaGTKAccessible.cxx 1205 lines changed, 1205 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,1205 @@ +/* Scintilla source code edit control */ +/* ScintillaGTKAccessible.c - GTK+ accessibility for ScintillaGTK */ +/* Copyright 2016 by Colomban Wendling <colomban(a)geany.org> + * The License.txt file describes the conditions under which this software may be distributed. */ + +// On GTK < 3.2, we need to use the AtkObjectFactory. We need to query +// the factory to see what type we should derive from, thus making use of +// dynamic inheritance. It's tricky, but it works so long as it's done +// carefully enough. +// +// On GTK 3.2 through 3.6, we need to hack around because GTK stopped +// registering its accessible types in the factory, so we can't query +// them that way. Unfortunately, the accessible types aren't exposed +// yet (not until 3.8), so there's no proper way to know which type to +// inherit from. To work around this, we instantiate the parent's +// AtkObject temporarily, and use it's type. It means creating an extra +// throwaway object and being able to pass the type information up to the +// type registration code, but it's the only solution I could find. +// +// On GTK 3.8 onward, we use the proper exposed GtkContainerAccessible as +// parent, and so a straightforward class. +// +// To hide and contain the complexity in type creation arising from the +// hackish support for GTK 3.2 to 3.8, the actual implementation for the +// widget's get_accessible() is located in the accessibility layer itself. + +// Initially based on GtkTextViewAccessible from GTK 3.20 +// Inspiration for the GTK < 3.2 part comes from Evince 2.24, thanks. + +// FIXME: optimize character/byte offset conversion (with a cache?) + +#include <stdlib.h> +#include <string.h> + +#include <stdexcept> +#include <new> +#include <string> +#include <vector> +#include <map> +#include <algorithm> + +#include <glib.h> +#include <gtk/gtk.h> + +// whether we have widget_set() and widget_unset() +#define HAVE_WIDGET_SET_UNSET (GTK_CHECK_VERSION(3, 3, 6)) +// whether GTK accessibility is available through the ATK factory +#define HAVE_GTK_FACTORY (! GTK_CHECK_VERSION(3, 1, 9)) +// whether we have gtk-a11y.h and the public GTK accessible types +#define HAVE_GTK_A11Y_H (GTK_CHECK_VERSION(3, 7, 6)) + +#if HAVE_GTK_A11Y_H +# include <gtk/gtk-a11y.h> +#endif + +#if defined(__WIN32__) || defined(_MSC_VER) +#include <windows.h> +#endif + +// ScintillaGTK.h and stuff it needs +#include "Platform.h" + +#include "ILexer.h" +#include "Scintilla.h" +#include "ScintillaWidget.h" +#ifdef SCI_LEXER +#include "SciLexer.h" +#endif +#include "StringCopy.h" +#ifdef SCI_LEXER +#include "LexerModule.h" +#endif +#include "Position.h" +#include "SplitVector.h" +#include "Partitioning.h" +#include "RunStyles.h" +#include "ContractionState.h" +#include "CellBuffer.h" +#include "CallTip.h" +#include "KeyMap.h" +#include "Indicator.h" +#include "XPM.h" +#include "LineMarker.h" +#include "Style.h" +#include "ViewStyle.h" +#include "CharClassify.h" +#include "Decoration.h" +#include "CaseFolder.h" +#include "Document.h" +#include "CaseConvert.h" +#include "UniConversion.h" +#include "UnicodeFromUTF8.h" +#include "Selection.h" +#include "PositionCache.h" +#include "EditModel.h" +#include "MarginView.h" +#include "EditView.h" +#include "Editor.h" +#include "AutoComplete.h" +#include "ScintillaBase.h" + +#include "ScintillaGTK.h" +#include "ScintillaGTKAccessible.h" + +#ifdef SCI_NAMESPACE +using namespace Scintilla; +#endif + +struct ScintillaObjectAccessiblePrivate { + ScintillaGTKAccessible *pscin; +}; + +typedef GtkAccessible ScintillaObjectAccessible; +typedef GtkAccessibleClass ScintillaObjectAccessibleClass; + +#define SCINTILLA_OBJECT_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), SCINTILLA_TYPE_OBJECT_ACCESSIBLE, ScintillaObjectAccessible)) +#define SCINTILLA_TYPE_OBJECT_ACCESSIBLE (scintilla_object_accessible_get_type(0)) + +// We can't use priv member because of dynamic inheritance, so we don't actually know the offset. Meh. +#define SCINTILLA_OBJECT_ACCESSIBLE_GET_PRIVATE(inst) (G_TYPE_INSTANCE_GET_PRIVATE((inst), SCINTILLA_TYPE_OBJECT_ACCESSIBLE, ScintillaObjectAccessiblePrivate)) + +static GType scintilla_object_accessible_get_type(GType parent_type); + +ScintillaGTKAccessible *ScintillaGTKAccessible::FromAccessible(GtkAccessible *accessible) { + // FIXME: do we need the check below? GTK checks that in all methods, so maybe + GtkWidget *widget = gtk_accessible_get_widget(accessible); + if (! widget) { + return 0; + } + + return SCINTILLA_OBJECT_ACCESSIBLE_GET_PRIVATE(accessible)->pscin; +} + +ScintillaGTKAccessible::ScintillaGTKAccessible(GtkAccessible *accessible_, GtkWidget *widget_) : + accessible(accessible_), + sci(ScintillaGTK::FromWidget(widget_)), + old_pos(-1) { + g_signal_connect(widget_, "sci-notify", G_CALLBACK(SciNotify), this); +} + +ScintillaGTKAccessible::~ScintillaGTKAccessible() { +} + +gchar *ScintillaGTKAccessible::GetTextRangeUTF8(Position startByte, Position endByte) { + g_return_val_if_fail(startByte >= 0, NULL); + // FIXME: should we swap start/end if necessary? + g_return_val_if_fail(endByte >= startByte, NULL); + + gchar *utf8Text = NULL; + const char *charSetBuffer; + + // like TargetAsUTF8, but avoids a double conversion + if (sci->IsUnicodeMode() || ! *(charSetBuffer = sci->CharacterSetID())) { + int len = endByte - startByte; + utf8Text = (char *) g_malloc(len + 1); + sci->pdoc->GetCharRange(utf8Text, startByte, len); + utf8Text[len] = '\0'; + } else { + // Need to convert + std::string s = sci->RangeText(startByte, endByte); + std::string tmputf = ConvertText(&s[0], s.length(), "UTF-8", charSetBuffer, false); + size_t len = tmputf.length(); + utf8Text = (char *) g_malloc(len + 1); + memcpy(utf8Text, tmputf.c_str(), len); + utf8Text[len] = '\0'; + } + + return utf8Text; +} + +gchar *ScintillaGTKAccessible::GetText(int startChar, int endChar) { + Position startByte, endByte; + if (endChar == -1) { + startByte = ByteOffsetFromCharacterOffset(startChar); + endByte = sci->pdoc->Length(); + } else { + ByteRangeFromCharacterRange(startChar, endChar, startByte, endByte); + } + return GetTextRangeUTF8(startByte, endByte); +} + +gchar *ScintillaGTKAccessible::GetTextAfterOffset(int charOffset, + AtkTextBoundary boundaryType, int *startChar, int *endChar) { + g_return_val_if_fail(charOffset >= 0, NULL); + + Position startByte, endByte; + Position byteOffset = ByteOffsetFromCharacterOffset(charOffset); + + switch (boundaryType) { + case ATK_TEXT_BOUNDARY_CHAR: + startByte = PositionAfter(byteOffset); + endByte = PositionAfter(startByte); + // FIXME: optimize conversion back, as we can reasonably assume +1 char? + break; + + case ATK_TEXT_BOUNDARY_WORD_START: + startByte = sci->WndProc(SCI_WORDENDPOSITION, byteOffset, 1); + startByte = sci->WndProc(SCI_WORDENDPOSITION, startByte, 0); + endByte = sci->WndProc(SCI_WORDENDPOSITION, startByte, 1); + endByte = sci->WndProc(SCI_WORDENDPOSITION, endByte, 0); + break; + + case ATK_TEXT_BOUNDARY_WORD_END: + startByte = sci->WndProc(SCI_WORDENDPOSITION, byteOffset, 0); + startByte = sci->WndProc(SCI_WORDENDPOSITION, startByte, 1); + endByte = sci->WndProc(SCI_WORDENDPOSITION, startByte, 0); + endByte = sci->WndProc(SCI_WORDENDPOSITION, endByte, 1); + break; + + case ATK_TEXT_BOUNDARY_LINE_START: { + int line = sci->WndProc(SCI_LINEFROMPOSITION, byteOffset, 0); + startByte = sci->WndProc(SCI_POSITIONFROMLINE, line + 1, 0); + endByte = sci->WndProc(SCI_POSITIONFROMLINE, line + 2, 0); + break; + } + + case ATK_TEXT_BOUNDARY_LINE_END: { + int line = sci->WndProc(SCI_LINEFROMPOSITION, byteOffset, 0); + startByte = sci->WndProc(SCI_GETLINEENDPOSITION, line, 0); + endByte = sci->WndProc(SCI_GETLINEENDPOSITION, line + 1, 0); + break; + } + + default: + *startChar = *endChar = -1; + return NULL; + } + + CharacterRangeFromByteRange(startByte, endByte, startChar, endChar); + return GetTextRangeUTF8(startByte, endByte); +} + +gchar *ScintillaGTKAccessible::GetTextBeforeOffset(int charOffset, + AtkTextBoundary boundaryType, int *startChar, int *endChar) { + g_return_val_if_fail(charOffset >= 0, NULL); + + Position startByte, endByte; + Position byteOffset = ByteOffsetFromCharacterOffset(charOffset); + + switch (boundaryType) { + case ATK_TEXT_BOUNDARY_CHAR: + endByte = PositionBefore(byteOffset); + startByte = PositionBefore(endByte); + break; + + case ATK_TEXT_BOUNDARY_WORD_START: + endByte = sci->WndProc(SCI_WORDSTARTPOSITION, byteOffset, 0); + endByte = sci->WndProc(SCI_WORDSTARTPOSITION, endByte, 1); + startByte = sci->WndProc(SCI_WORDSTARTPOSITION, endByte, 0); + startByte = sci->WndProc(SCI_WORDSTARTPOSITION, startByte, 1); + break; + + case ATK_TEXT_BOUNDARY_WORD_END: + endByte = sci->WndProc(SCI_WORDSTARTPOSITION, byteOffset, 1); + endByte = sci->WndProc(SCI_WORDSTARTPOSITION, endByte, 0); + startByte = sci->WndProc(SCI_WORDSTARTPOSITION, endByte, 1); + startByte = sci->WndProc(SCI_WORDSTARTPOSITION, startByte, 0); + break; + + case ATK_TEXT_BOUNDARY_LINE_START: { + int line = sci->WndProc(SCI_LINEFROMPOSITION, byteOffset, 0); + endByte = sci->WndProc(SCI_POSITIONFROMLINE, line, 0); + if (line > 0) { + startByte = sci->WndProc(SCI_POSITIONFROMLINE, line - 1, 0); + } else { + startByte = endByte; + } + break; + } + + case ATK_TEXT_BOUNDARY_LINE_END: { + int line = sci->WndProc(SCI_LINEFROMPOSITION, byteOffset, 0); + if (line > 0) { + endByte = sci->WndProc(SCI_GETLINEENDPOSITION, line - 1, 0); + } else { + endByte = 0; + } + if (line > 1) { + startByte = sci->WndProc(SCI_GETLINEENDPOSITION, line - 2, 0); + } else { + startByte = endByte; + } + break; + } + + default: + *startChar = *endChar = -1; + return NULL; + } + + CharacterRangeFromByteRange(startByte, endByte, startChar, endChar); + return GetTextRangeUTF8(startByte, endByte); +} + +gchar *ScintillaGTKAccessible::GetTextAtOffset(int charOffset, + AtkTextBoundary boundaryType, int *startChar, int *endChar) { + g_return_val_if_fail(charOffset >= 0, NULL); + + Position startByte, endByte; + Position byteOffset = ByteOffsetFromCharacterOffset(charOffset); + + switch (boundaryType) { + case ATK_TEXT_BOUNDARY_CHAR: + startByte = byteOffset; + endByte = sci->WndProc(SCI_POSITIONAFTER, byteOffset, 0); + break; + + case ATK_TEXT_BOUNDARY_WORD_START: + startByte = sci->WndProc(SCI_WORDSTARTPOSITION, byteOffset, 1); + endByte = sci->WndProc(SCI_WORDENDPOSITION, byteOffset, 1); + if (! sci->WndProc(SCI_ISRANGEWORD, startByte, endByte)) { + // if the cursor was not on a word, forward back + startByte = sci->WndProc(SCI_WORDSTARTPOSITION, startByte, 0); + startByte = sci->WndProc(SCI_WORDSTARTPOSITION, startByte, 1); + } + endByte = sci->WndProc(SCI_WORDENDPOSITION, endByte, 0); + break; + + case ATK_TEXT_BOUNDARY_WORD_END: + startByte = sci->WndProc(SCI_WORDSTARTPOSITION, byteOffset, 1); + endByte = sci->WndProc(SCI_WORDENDPOSITION, byteOffset, 1); + if (! sci->WndProc(SCI_ISRANGEWORD, startByte, endByte)) { + // if the cursor was not on a word, forward back + endByte = sci->WndProc(SCI_WORDENDPOSITION, endByte, 0); + endByte = sci->WndProc(SCI_WORDENDPOSITION, endByte, 1); + } + startByte = sci->WndProc(SCI_WORDSTARTPOSITION, startByte, 0); + break; + + case ATK_TEXT_BOUNDARY_LINE_START: { + int line = sci->WndProc(SCI_LINEFROMPOSITION, byteOffset, 0); + startByte = sci->WndProc(SCI_POSITIONFROMLINE, line, 0); + endByte = sci->WndProc(SCI_POSITIONFROMLINE, line + 1, 0); + break; + } + + case ATK_TEXT_BOUNDARY_LINE_END: { + int line = sci->WndProc(SCI_LINEFROMPOSITION, byteOffset, 0); + if (line > 0) { + startByte = sci->WndProc(SCI_GETLINEENDPOSITION, line - 1, 0); + } else { + startByte = 0; + } + endByte = sci->WndProc(SCI_GETLINEENDPOSITION, line, 0); + break; + } + + default: + *startChar = *endChar = -1; + return NULL; + } + + CharacterRangeFromByteRange(startByte, endByte, startChar, endChar); + return GetTextRangeUTF8(startByte, endByte); +} + +#if ATK_CHECK_VERSION(2, 10, 0) +gchar *ScintillaGTKAccessible::GetStringAtOffset(int charOffset, + AtkTextGranularity granularity, int *startChar, int *endChar) { + g_return_val_if_fail(charOffset >= 0, NULL); + + Position startByte, endByte; + Position byteOffset = ByteOffsetFromCharacterOffset(charOffset); + + switch (granularity) { + case ATK_TEXT_GRANULARITY_CHAR: + startByte = byteOffset; + endByte = sci->WndProc(SCI_POSITIONAFTER, byteOffset, 0); + break; + case ATK_TEXT_GRANULARITY_WORD: + startByte = sci->WndProc(SCI_WORDSTARTPOSITION, byteOffset, 1); + endByte = sci->WndProc(SCI_WORDENDPOSITION, byteOffset, 1); + break; + case ATK_TEXT_GRANULARITY_LINE: { + gint line = sci->WndProc(SCI_LINEFROMPOSITION, byteOffset, 0); + startByte = sci->WndProc(SCI_POSITIONFROMLINE, line, 0); + endByte = sci->WndProc(SCI_GETLINEENDPOSITION, line, 0); + break; + } + default: + *startChar = *endChar = -1; + return NULL; + } + + CharacterRangeFromByteRange(startByte, endByte, startChar, endChar); + return GetTextRangeUTF8(startByte, endByte); +} +#endif + +gunichar ScintillaGTKAccessible::GetCharacterAtOffset(int charOffset) { + g_return_val_if_fail(charOffset >= 0, 0); + + Position startByte = ByteOffsetFromCharacterOffset(charOffset); + Position endByte = PositionAfter(startByte); + gchar *ch = GetTextRangeUTF8(startByte, endByte); + gunichar unichar = g_utf8_get_char_validated(ch, -1); + g_free(ch); + + return unichar; +} + +gint ScintillaGTKAccessible::GetCharacterCount() { + return sci->pdoc->CountCharacters(0, sci->pdoc->Length()); +} + +gint ScintillaGTKAccessible::GetCaretOffset() { + return CharacterOffsetFromByteOffset(sci->WndProc(SCI_GETCURRENTPOS, 0, 0)); +} + +gboolean ScintillaGTKAccessible::SetCaretOffset(int charOffset) { + sci->WndProc(SCI_GOTOPOS, ByteOffsetFromCharacterOffset(charOffset), 0); + return TRUE; +} + +gint ScintillaGTKAccessible::GetOffsetAtPoint(gint x, gint y, AtkCoordType coords) { + gint x_widget, y_widget, x_window, y_window; + GtkWidget *widget = gtk_accessible_get_widget(accessible); + + GdkWindow *window = gtk_widget_get_window(widget); + gdk_window_get_origin(window, &x_widget, &y_widget); + if (coords == ATK_XY_SCREEN) { + x = x - x_widget; + y = y - y_widget; + } else if (coords == ATK_XY_WINDOW) { + window = gdk_window_get_toplevel(window); + gdk_window_get_origin(window, &x_window, &y_window); + + x = x - x_widget + x_window; + y = y - y_widget + y_window; + } else { + return -1; + } + + // FIXME: should we handle scrolling? + return CharacterOffsetFromByteOffset(sci->WndProc(SCI_CHARPOSITIONFROMPOINTCLOSE, x, y)); +} + +void ScintillaGTKAccessible::GetCharacterExtents(int charOffset, + gint *x, gint *y, gint *width, gint *height, AtkCoordType coords) { + *x = *y = *height = *width = 0; + + Position byteOffset = ByteOffsetFromCharacterOffset(charOffset); + + // FIXME: should we handle scrolling? + *x = sci->WndProc(SCI_POINTXFROMPOSITION, 0, byteOffset); + *y = sci->WndProc(SCI_POINTYFROMPOSITION, 0, byteOffset); + + int line = sci->WndProc(SCI_LINEFROMPOSITION, byteOffset, 0); + *height = sci->WndProc(SCI_TEXTHEIGHT, line, 0); + + int nextByteOffset = PositionAfter(byteOffset); + int next_x = sci->WndProc(SCI_POINTXFROMPOSITION, 0, nextByteOffset); + if (next_x > *x) { + *width = next_x - *x; + } else if (nextByteOffset > byteOffset) { + /* maybe next position was on the next line or something. + * just compute the expected character width */ + int style = sci->pdoc->StyleAt(byteOffset); + int len = nextByteOffset - byteOffset; + char *ch = new char[len + 1]; + sci->pdoc->GetCharRange(ch, byteOffset, len); + ch[len] = '\0'; + *width = sci->TextWidth(style, ch); + delete[] ch; + } + + GtkWidget *widget = gtk_accessible_get_widget(accessible); + GdkWindow *window = gtk_widget_get_window(widget); + int x_widget, y_widget; + gdk_window_get_origin(window, &x_widget, &y_widget); + if (coords == ATK_XY_SCREEN) { + *x += x_widget; + *y += y_widget; + } else if (coords == ATK_XY_WINDOW) { + window = gdk_window_get_toplevel(window); + int x_window, y_window; + gdk_window_get_origin(window, &x_window, &y_window); + + *x += x_widget - x_window; + *y += y_widget - y_window; + } else { + *x = *y = *height = *width = 0; + } +} + +static AtkAttributeSet *AddTextAttribute(AtkAttributeSet *attributes, AtkTextAttribute attr, gchar *value) { + AtkAttribute *at = g_new(AtkAttribute, 1); + at->name = g_strdup(atk_text_attribute_get_name(attr)); + at->value = value; + + return g_slist_prepend(attributes, at); +} + +static AtkAttributeSet *AddTextIntAttribute(AtkAttributeSet *attributes, AtkTextAttribute attr, gint i) { + return AddTextAttribute(attributes, attr, g_strdup(atk_text_attribute_get_value(attr, i))); +} + +static AtkAttributeSet *AddTextColorAttribute(AtkAttributeSet *attributes, AtkTextAttribute attr, const ColourDesired &colour) { + return AddTextAttribute(attributes, attr, + g_strdup_printf("%u,%u,%u", colour.GetRed() * 257, colour.GetGreen() * 257, colour.GetBlue() * 257)); +} + +AtkAttributeSet *ScintillaGTKAccessible::GetAttributesForStyle(unsigned int styleNum) { + AtkAttributeSet *attr_set = NULL; + + if (styleNum >= sci->vs.styles.size()) + return NULL; + Style &style = sci->vs.styles[styleNum]; + + attr_set = AddTextAttribute(attr_set, ATK_TEXT_ATTR_FAMILY_NAME, g_strdup(style.fontName)); + attr_set = AddTextAttribute(attr_set, ATK_TEXT_ATTR_SIZE, g_strdup_printf("%d", style.size / SC_FONT_SIZE_MULTIPLIER)); + attr_set = AddTextIntAttribute(attr_set, ATK_TEXT_ATTR_WEIGHT, CLAMP(style.weight, 100, 1000)); + attr_set = AddTextIntAttribute(attr_set, ATK_TEXT_ATTR_STYLE, style.italic ? PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL); + attr_set = AddTextIntAttribute(attr_set, ATK_TEXT_ATTR_UNDERLINE, style.underline ? PANGO_UNDERLINE_SINGLE : PANGO_UNDERLINE_NONE); + attr_set = AddTextColorAttribute(attr_set, ATK_TEXT_ATTR_FG_COLOR, style.fore); + attr_set = AddTextColorAttribute(attr_set, ATK_TEXT_ATTR_BG_COLOR, style.back); + attr_set = AddTextIntAttribute(attr_set, ATK_TEXT_ATTR_INVISIBLE, style.visible ? 0 : 1); + attr_set = AddTextIntAttribute(attr_set, ATK_TEXT_ATTR_EDITABLE, style.changeable ? 1 : 0); + + return attr_set; +} + +AtkAttributeSet *ScintillaGTKAccessible::GetRunAttributes(int charOffset, int *startChar, int *endChar) { + g_return_val_if_fail(charOffset >= -1, NULL); + + Position byteOffset; + if (charOffset == -1) { + byteOffset = sci->WndProc(SCI_GETCURRENTPOS, 0, 0); + } else { + byteOffset = ByteOffsetFromCharacterOffset(charOffset); + } + int length = sci->pdoc->Length(); + + g_return_val_if_fail(byteOffset < length, NULL); + + const char style = sci->pdoc->StyleAt(byteOffset); + // compute the range for this style + Position startByte = byteOffset; + while (startByte > 0 && sci->pdoc->StyleAt((startByte) - 1) == style) + (startByte)--; + Position endByte = byteOffset; + while ((endByte) + 1 < length && sci->pdoc->StyleAt((endByte) + 1) == style) + (endByte)++; + + CharacterRangeFromByteRange(startByte, endByte, startChar, endChar); + return GetAttributesForStyle((unsigned int) style); +} + +AtkAttributeSet *ScintillaGTKAccessible::GetDefaultAttributes() { + return GetAttributesForStyle(0); +} + +gint ScintillaGTKAccessible::GetNSelections() { + return sci->sel.Empty() ? 0 : sci->sel.Count(); +} + +gchar *ScintillaGTKAccessible::GetSelection(gint selection_num, int *startChar, int *endChar) { + if (selection_num < 0 || (unsigned int) selection_num >= sci->sel.Count()) + return NULL; + + Position startByte = sci->sel.Range(selection_num).Start().Position(); + Position endByte = sci->sel.Range(selection_num).End().Position(); + + CharacterRangeFromByteRange(startByte, endByte, startChar, endChar); + return GetTextRangeUTF8(startByte, endByte); +} + +gboolean ScintillaGTKAccessible::AddSelection(int startChar, int endChar) { + size_t n_selections = sci->sel.Count(); + Position startByte, endByte; + ByteRangeFromCharacterRange(startChar, endChar, startByte, endByte); + // use WndProc() to set the selections so it notifies as needed + if (n_selections > 1 || ! sci->sel.Empty()) { + sci->WndProc(SCI_ADDSELECTION, startByte, endByte); + } else { + sci->WndProc(SCI_SETSELECTION, startByte, endByte); + } + + return TRUE; +} + +gboolean ScintillaGTKAccessible::RemoveSelection(gint selection_num) { + size_t n_selections = sci->sel.Count(); + if (selection_num < 0 || (unsigned int) selection_num >= n_selections) + return FALSE; + + if (n_selections > 1) { + sci->WndProc(SCI_DROPSELECTIONN, selection_num, 0); + } else if (sci->sel.Empty()) { + return FALSE; + } else { + sci->WndProc(SCI_CLEARSELECTIONS, 0, 0); + } + + return TRUE; +} + +gboolean ScintillaGTKAccessible::SetSelection(gint selection_num, int startChar, int endChar) { + if (selection_num < 0 || (unsigned int) selection_num >= sci->sel.Count()) + return FALSE; + + Position startByte, endByte; + ByteRangeFromCharacterRange(startChar, endChar, startByte, endByte); + + sci->WndProc(SCI_SETSELECTIONNSTART, selection_num, startByte); + sci->WndProc(SCI_SETSELECTIONNEND, selection_num, endByte); + + return TRUE; +} + +void ScintillaGTKAccessible::AtkTextIface::init(::AtkTextIface *iface) { + iface->get_text = GetText; + iface->get_text_after_offset = GetTextAfterOffset; + iface->get_text_at_offset = GetTextAtOffset; + iface->get_text_before_offset = GetTextBeforeOffset; +#if ATK_CHECK_VERSION(2, 10, 0) + iface->get_string_at_offset = GetStringAtOffset; +#endif + iface->get_character_at_offset = GetCharacterAtOffset; + iface->get_character_count = GetCharacterCount; + iface->get_caret_offset = GetCaretOffset; + iface->set_caret_offset = SetCaretOffset; + iface->get_offset_at_point = GetOffsetAtPoint; + iface->get_character_extents = GetCharacterExtents; + iface->get_n_selections = GetNSelections; + iface->get_selection = GetSelection; + iface->add_selection = AddSelection; + iface->remove_selection = RemoveSelection; + iface->set_selection = SetSelection; + iface->get_run_attributes = GetRunAttributes; + iface->get_default_attributes = GetDefaultAttributes; +} + +/* atkeditabletext.h */ + +void ScintillaGTKAccessible::SetTextContents(const gchar *contents) { + // FIXME: it's probably useless to check for READONLY here, SETTEXT probably does it just fine? + if (! sci->pdoc->IsReadOnly()) { + sci->WndProc(SCI_SETTEXT, 0, (sptr_t) contents); + } +} + +bool ScintillaGTKAccessible::InsertStringUTF8(Position bytePos, const gchar *utf8, int lengthBytes) { + if (sci->pdoc->IsReadOnly()) { + return false; + } + + // like EncodedFromUTF8(), but avoids an extra copy + // FIXME: update target? + const char *charSetBuffer; + if (sci->IsUnicodeMode() || ! *(charSetBuffer = sci->CharacterSetID())) { + sci->pdoc->InsertString(bytePos, utf8, lengthBytes); + } else { + // conversion needed + std::string encoded = ConvertText(utf8, lengthBytes, charSetBuffer, "UTF-8", true); + sci->pdoc->InsertString(bytePos, encoded.c_str(), encoded.length()); + } + + return true; +} + +void ScintillaGTKAccessible::InsertText(const gchar *text, int lengthBytes, int *charPosition) { + Position bytePosition = ByteOffsetFromCharacterOffset(*charPosition); + + // FIXME: should we update the target? + if (InsertStringUTF8(bytePosition, text, lengthBytes)) { + (*charPosition) += sci->pdoc->CountCharacters(bytePosition, lengthBytes); + } +} + +void ScintillaGTKAccessible::CopyText(int startChar, int endChar) { + Position startByte, endByte; + ByteRangeFromCharacterRange(startChar, endChar, startByte, endByte); + sci->CopyRangeToClipboard(startByte, endByte); +} + +void ScintillaGTKAccessible::CutText(int startChar, int endChar) { + g_return_if_fail(endChar >= startChar); + + if (! sci->pdoc->IsReadOnly()) { + // FIXME: have a byte variant of those and convert only once? + CopyText(startChar, endChar); + DeleteText(startChar, endChar); + } +} + +void ScintillaGTKAccessible::DeleteText(int startChar, int endChar) { + g_return_if_fail(endChar >= startChar); + + if (! sci->pdoc->IsReadOnly()) { + Position startByte, endByte; + ByteRangeFromCharacterRange(startChar, endChar, startByte, endByte); + + if (! sci->RangeContainsProtected(startByte, endByte)) { + // FIXME: restore the target? + sci->pdoc->DeleteChars(startByte, endByte - startByte); + } + } +} + +void ScintillaGTKAccessible::PasteText(int charPosition) { + if (sci->pdoc->IsReadOnly()) + return; + + // Helper class holding the position for the asynchronous paste operation. + // We can only hope that when the callback gets called scia is still valid, but ScintillaGTK + // has always done that without problems, so let's guess it's a fairly safe bet. + struct Helper : GObjectWatcher { + ScintillaGTKAccessible *scia; + Position bytePosition; + + virtual void Destroyed() { + scia = 0; + } + + Helper(ScintillaGTKAccessible *scia_, Position bytePos_) : + GObjectWatcher(G_OBJECT(scia_->sci->sci)), + scia(scia_), + bytePosition(bytePos_) { + } + + void TextReceived(GtkClipboard *, const gchar *text) { + if (text) { + size_t len = strlen(text); + std::string convertedText; + if (len > 0 && scia->sci->convertPastes) { + // Convert line endings of the paste into our local line-endings mode + convertedText = Document::TransformLineEnds(text, len, scia->sci->pdoc->eolMode); + len = convertedText.length(); + text = convertedText.c_str(); + } + scia->InsertStringUTF8(bytePosition, text, static_cast<int>(len)); + } + } + + static void TextReceivedCallback(GtkClipboard *clipboard, const gchar *text, gpointer data) { + Helper *helper = reinterpret_cast<Helper*>(data); + try { + if (helper->scia != 0) { + helper->TextReceived(clipboard, text); + } + } catch (...) {} + delete helper; + } + }; + + Helper *helper = new Helper(this, ByteOffsetFromCharacterOffset(charPosition)); + GtkWidget *widget = gtk_accessible_get_widget(accessible); + GtkClipboard *clipboard = gtk_widget_get_clipboard(widget, GDK_SELECTION_CLIPBOARD); + gtk_clipboard_request_text(clipboard, helper->TextReceivedCallback, helper); +} + +void ScintillaGTKAccessible::AtkEditableTextIface::init(::AtkEditableTextIface *iface) { + iface->set_text_contents = SetTextContents; + iface->insert_text = InsertText; + iface->copy_text = CopyText; + iface->cut_text = CutText; + iface->delete_text = DeleteText; + iface->paste_text = PasteText; + //~ iface->set_run_attributes = SetRunAttributes; +} + +// Callbacks + +void ScintillaGTKAccessible::UpdateCursor() { + Position pos = sci->WndProc(SCI_GETCURRENTPOS, 0, 0); + if (old_pos != pos) { + int charPosition = CharacterOffsetFromByteOffset(pos); + g_signal_emit_by_name(accessible, "text-caret-moved", charPosition); + old_pos = pos; + } + + size_t n_selections = sci->sel.Count(); + size_t prev_n_selections = old_sels.size(); + bool selection_changed = n_selections != prev_n_selections; + + old_sels.resize(n_selections); + for (size_t i = 0; i < n_selections; i++) { + SelectionRange &sel = sci->sel.Range(i); + + if (i < prev_n_selections && ! selection_changed) { + SelectionRange &old_sel = old_sels[i]; + // do not consider a caret move to be a selection change + selection_changed = ((! old_sel.Empty() || ! sel.Empty()) && ! (old_sel == sel)); + } + + old_sels[i] = sel; + } + + if (selection_changed) + g_signal_emit_by_name(accessible, "text-selection-changed"); +} + +void ScintillaGTKAccessible::ChangeDocument(Document *oldDoc, Document *newDoc) { + if (oldDoc == newDoc) { + return; + } + + if (oldDoc) { + int charLength = oldDoc->CountCharacters(0, oldDoc->Length()); + g_signal_emit_by_name(accessible, "text-changed::delete", 0, charLength); + } + + if (newDoc) { + PLATFORM_ASSERT(newDoc == sci->pdoc); + + int charLength = newDoc->CountCharacters(0, newDoc->Length()); + g_signal_emit_by_name(accessible, "text-changed::insert", 0, charLength); + + if ((oldDoc ? oldDoc->IsReadOnly() : false) != newDoc->IsReadOnly()) { + NotifyReadOnly(); + } + + // update cursor and selection + old_pos = -1; + old_sels.clear(); + UpdateCursor(); + } +} + +void ScintillaGTKAccessible::NotifyReadOnly() { + bool readonly = sci->pdoc->IsReadOnly(); + atk_object_notify_state_change(ATK_OBJECT(accessible), ATK_STATE_EDITABLE, ! readonly); +#if ATK_CHECK_VERSION(2, 16, 0) + atk_object_notify_state_change(ATK_OBJECT(accessible), ATK_STATE_READ_ONLY, readonly); +#endif +} + +void ScintillaGTKAccessible::Notify(GtkWidget *, gint, SCNotification *nt) { + switch (nt->nmhdr.code) { + case SCN_MODIFIED: { + if (nt->modificationType & SC_MOD_INSERTTEXT) { + int startChar = CharacterOffsetFromByteOffset(nt->position); + int lengthChar = sci->pdoc->CountCharacters(nt->position, nt->position + nt->length); + g_signal_emit_by_name(accessible, "text-changed::insert", startChar, lengthChar); + UpdateCursor(); + } + if (nt->modificationType & SC_MOD_DELETETEXT) { + int startChar = CharacterOffsetFromByteOffset(nt->position); + int lengthChar = sci->pdoc->CountCharacters(nt->position, nt->position + nt->length); + g_signal_emit_by_name(accessible, "text-changed::delete", startChar, lengthChar); + UpdateCursor(); + } + if (nt->modificationType & SC_MOD_CHANGESTYLE) { + g_signal_emit_by_name(accessible, "text-attributes-changed"); + } + } break; + case SCN_UPDATEUI: { + if (nt->updated & SC_UPDATE_SELECTION) { + UpdateCursor(); + } + } break; + } +} + +// ATK method wrappers + +// wraps a call from the accessible object to the ScintillaGTKAccessible, and avoid leaking any exception +#define WRAPPER_METHOD_BODY(accessible, call, defret) \ + try { \ + ScintillaGTKAccessible *thisAccessible = FromAccessible(reinterpret_cast<GtkAccessible*>(accessible)); \ + if (thisAccessible) { \ + return thisAccessible->call; \ + } else { \ + return defret; \ + } \ + } catch (...) { \ + return defret; \ + } + +// AtkText +gchar *ScintillaGTKAccessible::AtkTextIface::GetText(AtkText *text, int start_offset, int end_offset) { + WRAPPER_METHOD_BODY(text, GetText(start_offset, end_offset), NULL); +} +gchar *ScintillaGTKAccessible::AtkTextIface::GetTextAfterOffset(AtkText *text, int offset, AtkTextBoundary boundary_type, int *start_offset, int *end_offset) { + WRAPPER_METHOD_BODY(text, GetTextAfterOffset(offset, boundary_type, start_offset, end_offset), NULL) +} +gchar *ScintillaGTKAccessible::AtkTextIface::GetTextBeforeOffset(AtkText *text, int offset, AtkTextBoundary boundary_type, int *start_offset, int *end_offset) { + WRAPPER_METHOD_BODY(text, GetTextBeforeOffset(offset, boundary_type, start_offset, end_offset), NULL) +} +gchar *ScintillaGTKAccessible::AtkTextIface::GetTextAtOffset(AtkText *text, gint offset, AtkTextBoundary boundary_type, gint *start_offset, gint *end_offset) { + WRAPPER_METHOD_BODY(text, GetTextAtOffset(offset, boundary_type, start_offset, end_offset), NULL) +} +#if ATK_CHECK_VERSION(2, 10, 0) +gchar *ScintillaGTKAccessible::AtkTextIface::GetStringAtOffset(AtkText *text, gint offset, AtkTextGranularity granularity, gint *start_offset, gint *end_offset) { + WRAPPER_METHOD_BODY(text, GetStringAtOffset(offset, granularity, start_offset, end_offset), NULL) +} +#endif +gunichar ScintillaGTKAccessible::AtkTextIface::GetCharacterAtOffset(AtkText *text, gint offset) { + WRAPPER_METHOD_BODY(text, GetCharacterAtOffset(offset), 0) +} +gint ScintillaGTKAccessible::AtkTextIface::GetCharacterCount(AtkText *text) { + WRAPPER_METHOD_BODY(text, GetCharacterCount(), 0) +} +gint ScintillaGTKAccessible::AtkTextIface::GetCaretOffset(AtkText *text) { + WRAPPER_METHOD_BODY(text, GetCaretOffset(), 0) +} +gboolean ScintillaGTKAccessible::AtkTextIface::SetCaretOffset(AtkText *text, gint offset) { + WRAPPER_METHOD_BODY(text, SetCaretOffset(offset), FALSE) +} +gint ScintillaGTKAccessible::AtkTextIface::GetOffsetAtPoint(AtkText *text, gint x, gint y, AtkCoordType coords) { + WRAPPER_METHOD_BODY(text, GetOffsetAtPoint(x, y, coords), -1) +} +void ScintillaGTKAccessible::AtkTextIface::GetCharacterExtents(AtkText *text, gint offset, gint *x, gint *y, gint *width, gint *height, AtkCoordType coords) { + WRAPPER_METHOD_BODY(text, GetCharacterExtents(offset, x, y, width, height, coords), ) +} +AtkAttributeSet *ScintillaGTKAccessible::AtkTextIface::GetRunAttributes(AtkText *text, gint offset, gint *start_offset, gint *end_offset) { + WRAPPER_METHOD_BODY(text, GetRunAttributes(offset, start_offset, end_offset), NULL) +} +AtkAttributeSet *ScintillaGTKAccessible::AtkTextIface::GetDefaultAttributes(AtkText *text) { + WRAPPER_METHOD_BODY(text, GetDefaultAttributes(), NULL) +} +gint ScintillaGTKAccessible::AtkTextIface::GetNSelections(AtkText *text) { + WRAPPER_METHOD_BODY(text, GetNSelections(), 0) +} +gchar *ScintillaGTKAccessible::AtkTextIface::GetSelection(AtkText *text, gint selection_num, gint *start_pos, gint *end_pos) { + WRAPPER_METHOD_BODY(text, GetSelection(selection_num, start_pos, end_pos), NULL) +} +gboolean ScintillaGTKAccessible::AtkTextIface::AddSelection(AtkText *text, gint start, gint end) { + WRAPPER_METHOD_BODY(text, AddSelection(start, end), FALSE) +} +gboolean ScintillaGTKAccessible::AtkTextIface::RemoveSelection(AtkText *text, gint selection_num) { + WRAPPER_METHOD_BODY(text, RemoveSelection(selection_num), FALSE) +} +gboolean ScintillaGTKAccessible::AtkTextIface::SetSelection(AtkText *text, gint selection_num, gint start, gint end) { + WRAPPER_METHOD_BODY(text, SetSelection(selection_num, start, end), FALSE) +} +// AtkEditableText +void ScintillaGTKAccessible::AtkEditableTextIface::SetTextContents(AtkEditableText *text, const gchar *contents) { + WRAPPER_METHOD_BODY(text, SetTextContents(contents), ) +} +void ScintillaGTKAccessible::AtkEditableTextIface::InsertText(AtkEditableText *text, const gchar *contents, gint length, gint *position) { + WRAPPER_METHOD_BODY(text, InsertText(contents, length, position), ) +} +void ScintillaGTKAccessible::AtkEditableTextIface::CopyText(AtkEditableText *text, gint start, gint end) { + WRAPPER_METHOD_BODY(text, CopyText(start, end), ) +} +void ScintillaGTKAccessible::AtkEditableTextIface::CutText(AtkEditableText *text, gint start, gint end) { + WRAPPER_METHOD_BODY(text, CutText(start, end), ) +} +void ScintillaGTKAccessible::AtkEditableTextIface::DeleteText(AtkEditableText *text, gint start, gint end) { + WRAPPER_METHOD_BODY(text, DeleteText(start, end), ) +} +void ScintillaGTKAccessible::AtkEditableTextIface::PasteText(AtkEditableText *text, gint position) { + WRAPPER_METHOD_BODY(text, PasteText(position), ) +} + +// GObject glue + +#if HAVE_GTK_FACTORY +static GType scintilla_object_accessible_factory_get_type(void); +#endif + +static void scintilla_object_accessible_init(ScintillaObjectAccessible *accessible); +static void scintilla_object_accessible_class_init(ScintillaObjectAccessibleClass *klass); +static gpointer scintilla_object_accessible_parent_class = NULL; + + +// @p parent_type is only required on GTK 3.2 to 3.6, and only on the first call +static GType scintilla_object_accessible_get_type(GType parent_type G_GNUC_UNUSED) { + static volatile gsize type_id_result = 0; + + if (g_once_init_enter(&type_id_result)) { + GTypeInfo tinfo = { + 0, /* class size */ + (GBaseInitFunc) NULL, /* base init */ + (GBaseFinalizeFunc) NULL, /* base finalize */ + (GClassInitFunc) scintilla_object_accessible_class_init, /* class init */ + (GClassFinalizeFunc) NULL, /* class finalize */ + NULL, /* class data */ + 0, /* instance size */ + 0, /* nb preallocs */ + (GInstanceInitFunc) scintilla_object_accessible_init, /* instance init */ + NULL /* value table */ + }; + + const GInterfaceInfo atk_text_info = { + (GInterfaceInitFunc) ScintillaGTKAccessible::AtkTextIface::init, + (GInterfaceFinalizeFunc) NULL, + NULL + }; + + const GInterfaceInfo atk_editable_text_info = { + (GInterfaceInitFunc) ScintillaGTKAccessible::AtkEditableTextIface::init, + (GInterfaceFinalizeFunc) NULL, + NULL + }; + +#if HAVE_GTK_A11Y_H + // good, we have gtk-a11y.h, we can use that + GType derived_atk_type = GTK_TYPE_CONTAINER_ACCESSIBLE; + tinfo.class_size = sizeof (GtkContainerAccessibleClass); + tinfo.instance_size = sizeof (GtkContainerAccessible); +#else // ! HAVE_GTK_A11Y_H +# if HAVE_GTK_FACTORY + // Figure out the size of the class and instance we are deriving from through the registry + GType derived_type = g_type_parent(SCINTILLA_TYPE_OBJECT); + AtkObjectFactory *factory = atk_registry_get_factory(atk_get_default_registry(), derived_type); + GType derived_atk_type = atk_object_factory_get_accessible_type(factory); +# else // ! HAVE_GTK_FACTORY + // We're kind of screwed and can't determine the parent (no registry, and no public type) + // Hack your way around by requiring the caller to give us our parent type. The caller + // might be able to trick its way into doing that, by e.g. instantiating the parent's + // accessible type and get its GType. It's ugly but we can't do better on GTK 3.2 to 3.6. + g_assert(parent_type != 0); + + GType derived_atk_type = parent_type; +# endif // ! HAVE_GTK_FACTORY + + GTypeQuery query; + g_type_query(derived_atk_type, &query); + tinfo.class_size = query.class_size; + tinfo.instance_size = query.instance_size; +#endif // ! HAVE_GTK_A11Y_H + + GType type_id = g_type_register_static(derived_atk_type, "ScintillaObjectAccessible", &tinfo, (GTypeFlags) 0); + g_type_add_interface_static(type_id, ATK_TYPE_TEXT, &atk_text_info); + g_type_add_interface_static(type_id, ATK_TYPE_EDITABLE_TEXT, &atk_editable_text_info); + + g_once_init_leave(&type_id_result, type_id); + } + + return type_id_result; +} + +static AtkObject *scintilla_object_accessible_new(GType parent_type, GObject *obj) { + g_return_val_if_fail(SCINTILLA_IS_OBJECT(obj), NULL); + + AtkObject *accessible = (AtkObject *) g_object_new(scintilla_object_accessible_get_type(parent_type), +#if HAVE_WIDGET_SET_UNSET + "widget", obj, +#endif + NULL); + atk_object_initialize(accessible, obj); + + return accessible; +} + +// implementation for gtk_widget_get_accessible(). +// See the comment at the top of the file for details on the implementation +// @p widget the widget. +// @p cache pointer to store the AtkObject between repeated calls. Might or might not be filled. +// @p widget_parent_class pointer to the widget's parent class (to chain up method calls). +AtkObject *ScintillaGTKAccessible::WidgetGetAccessibleImpl(GtkWidget *widget, AtkObject **cache, gpointer widget_parent_class G_GNUC_UNUSED) { +#if HAVE_GTK_A11Y_H // just instantiate the accessible + if (*cache == NULL) { + *cache = scintilla_object_accessible_new(0, G_OBJECT(widget)); + } +#elif HAVE_GTK_FACTORY // register in the factory and let GTK instantiate + static volatile gsize registered = 0; + + if (g_once_init_enter(&registered)) { + // Figure out whether accessibility is enabled by looking at the type of the accessible + // object which would be created for the parent type of ScintillaObject. + GType derived_type = g_type_parent(SCINTILLA_TYPE_OBJECT); + + AtkRegistry *registry = atk_get_default_registry(); + AtkObjectFactory *factory = atk_registry_get_factory(registry, derived_type); + GType derived_atk_type = atk_object_factory_get_accessible_type(factory); + if (g_type_is_a(derived_atk_type, GTK_TYPE_ACCESSIBLE)) { + atk_registry_set_factory_type(registry, SCINTILLA_TYPE_OBJECT, + scintilla_object_accessible_factory_get_type()); + } + g_once_init_leave(&registered, 1); + } + *cache = GTK_WIDGET_CLASS(widget_parent_class)->get_accessible(widget); +#else // no public API, no factory, so guess from the parent and instantiate + if (*cache == NULL) { + static GType parent_atk_type = 0; + + if (parent_atk_type == 0) { + AtkObject *parent_obj = GTK_WIDGET_CLASS(widget_parent_class)->get_accessible(widget); + if (parent_obj) { + GType parent_atk_type = G_OBJECT_TYPE(parent_obj); + + // Figure out whether accessibility is enabled by looking at the type of the accessible + // object which would be created for the parent type of ScintillaObject. + if (g_type_is_a(parent_atk_type, GTK_TYPE_ACCESSIBLE)) { + *cache = scintilla_object_accessible_new(parent_atk_type, G_OBJECT(widget)); + g_object_unref(parent_obj); + } else { + *cache = parent_obj; + } + } + } + } +#endif + return *cache; +} + +static AtkStateSet *scintilla_object_accessible_ref_state_set(AtkObject *accessible) { + AtkStateSet *state_set = ATK_OBJECT_CLASS(scintilla_object_accessible_parent_class)->ref_state_set(accessible); + + GtkWidget *widget = gtk_accessible_get_widget(GTK_ACCESSIBLE(accessible)); + if (widget == NULL) { + atk_state_set_add_state(state_set, ATK_STATE_DEFUNCT); + } else { + if (! scintilla_send_message(SCINTILLA_OBJECT(widget), SCI_GETREADONLY, 0, 0)) + atk_state_set_add_state(state_set, ATK_STATE_EDITABLE); +#if ATK_CHECK_VERSION(2, 16, 0) + else + atk_state_set_add_state(state_set, ATK_STATE_READ_ONLY); +#endif + atk_state_set_add_state(state_set, ATK_STATE_MULTI_LINE); + atk_state_set_add_state(state_set, ATK_STATE_MULTISELECTABLE); + atk_state_set_add_state(state_set, ATK_STATE_SELECTABLE_TEXT); + /*atk_state_set_add_state(state_set, ATK_STATE_SUPPORTS_AUTOCOMPLETION);*/ + } + + return state_set; +} + +static void scintilla_object_accessible_widget_set(GtkAccessible *accessible) { + GtkWidget *widget = gtk_accessible_get_widget(accessible); + if (widget == NULL) + return; + + ScintillaObjectAccessiblePrivate *priv = SCINTILLA_OBJECT_ACCESSIBLE_GET_PRIVATE(accessible); + if (priv->pscin != 0) + delete priv->pscin; + priv->pscin = new ScintillaGTKAccessible(accessible, widget); +} + +#if HAVE_WIDGET_SET_UNSET +static void scintilla_object_accessible_widget_unset(GtkAccessible *accessible) { + GtkWidget *widget = gtk_accessible_get_widget(accessible); + if (widget == NULL) + return; + + ScintillaObjectAccessiblePrivate *priv = SCINTILLA_OBJECT_ACCESSIBLE_GET_PRIVATE(accessible); + delete priv->pscin; + priv->pscin = 0; +} +#endif + +static void scintilla_object_accessible_initialize(AtkObject *obj, gpointer data) { + ATK_OBJECT_CLASS(scintilla_object_accessible_parent_class)->initialize(obj, data); + +#if ! HAVE_WIDGET_SET_UNSET + scintilla_object_accessible_widget_set(GTK_ACCESSIBLE(obj)); +#endif + + obj->role = ATK_ROLE_TEXT; +} + +static void scintilla_object_accessible_finalize(GObject *object) { + ScintillaObjectAccessiblePrivate *priv = SCINTILLA_OBJECT_ACCESSIBLE_GET_PRIVATE(object); + + if (priv->pscin) { + delete priv->pscin; + priv->pscin = 0; + } + + G_OBJECT_CLASS(scintilla_object_accessible_parent_class)->finalize(object); +} + +static void scintilla_object_accessible_class_init(ScintillaObjectAccessibleClass *klass) { + GObjectClass *gobject_class = G_OBJECT_CLASS(klass); + AtkObjectClass *object_class = ATK_OBJECT_CLASS(klass); + +#if HAVE_WIDGET_SET_UNSET + GtkAccessibleClass *accessible_class = GTK_ACCESSIBLE_CLASS(klass); + accessible_class->widget_set = scintilla_object_accessible_widget_set; + accessible_class->widget_unset = scintilla_object_accessible_widget_unset; +#endif + + object_class->ref_state_set = scintilla_object_accessible_ref_state_set; + object_class->initialize = scintilla_object_accessible_initialize; + + gobject_class->finalize = scintilla_object_accessible_finalize; + + scintilla_object_accessible_parent_class = g_type_class_peek_parent(klass); + + g_type_class_add_private(klass, sizeof (ScintillaObjectAccessiblePrivate)); +} + +static void scintilla_object_accessible_init(ScintillaObjectAccessible *accessible) { + ScintillaObjectAccessiblePrivate *priv = SCINTILLA_OBJECT_ACCESSIBLE_GET_PRIVATE(accessible); + + priv->pscin = 0; +} + +#if HAVE_GTK_FACTORY +// Object factory +typedef AtkObjectFactory ScintillaObjectAccessibleFactory; +typedef AtkObjectFactoryClass ScintillaObjectAccessibleFactoryClass; + +G_DEFINE_TYPE(ScintillaObjectAccessibleFactory, scintilla_object_accessible_factory, ATK_TYPE_OBJECT_FACTORY) + +static void scintilla_object_accessible_factory_init(ScintillaObjectAccessibleFactory *) { +} + +static GType scintilla_object_accessible_factory_get_accessible_type(void) { + return SCINTILLA_TYPE_OBJECT_ACCESSIBLE; +} + +static AtkObject *scintilla_object_accessible_factory_create_accessible(GObject *obj) { + return scintilla_object_accessible_new(0, obj); +} + +static void scintilla_object_accessible_factory_class_init(AtkObjectFactoryClass * klass) { + klass->create_accessible = scintilla_object_accessible_factory_create_accessible; + klass->get_accessible_type = scintilla_object_accessible_factory_get_accessible_type; +} +#endif Modified: scintilla/gtk/ScintillaGTKAccessible.h 171 lines changed, 171 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,171 @@ +/* Scintilla source code edit control */ +/* ScintillaGTKAccessible.h - GTK+ accessibility for ScintillaGTK */ +/* Copyright 2016 by Colomban Wendling <colomban(a)geany.org> + * The License.txt file describes the conditions under which this software may be distributed. */ + +#ifndef SCINTILLAGTKACCESSIBLE_H +#define SCINTILLAGTKACCESSIBLE_H + +#ifdef SCI_NAMESPACE +namespace Scintilla { +#endif + +#ifndef ATK_CHECK_VERSION +# define ATK_CHECK_VERSION(x, y, z) 0 +#endif + +class ScintillaGTKAccessible { +private: + GtkAccessible *accessible; + ScintillaGTK *sci; + + // local state for comparing + Position old_pos; + std::vector<SelectionRange> old_sels; + + void UpdateCursor(); + void Notify(GtkWidget *widget, gint code, SCNotification *nt); + static void SciNotify(GtkWidget *widget, gint code, SCNotification *nt, gpointer data) { + try { + reinterpret_cast<ScintillaGTKAccessible*>(data)->Notify(widget, code, nt); + } catch (...) {} + } + + Position ByteOffsetFromCharacterOffset(Position startByte, int characterOffset) { + Position pos = sci->pdoc->GetRelativePosition(startByte, characterOffset); + if (pos == INVALID_POSITION) { + // clamp invalid positions inside the document + if (characterOffset > 0) { + return sci->pdoc->Length(); + } else { + return 0; + } + } + return pos; + } + + Position ByteOffsetFromCharacterOffset(int characterOffset) { + return ByteOffsetFromCharacterOffset(0, characterOffset); + } + + int CharacterOffsetFromByteOffset(Position byteOffset) { + return sci->pdoc->CountCharacters(0, byteOffset); + } + + void CharacterRangeFromByteRange(Position startByte, Position endByte, int *startChar, int *endChar) { + *startChar = CharacterOffsetFromByteOffset(startByte); + *endChar = *startChar + sci->pdoc->CountCharacters(startByte, endByte); + } + + void ByteRangeFromCharacterRange(int startChar, int endChar, Position& startByte, Position& endByte) { + startByte = ByteOffsetFromCharacterOffset(startChar); + endByte = ByteOffsetFromCharacterOffset(startByte, endChar - startChar); + } + + Position PositionBefore(Position pos) { + return sci->pdoc->MovePositionOutsideChar(pos - 1, -1, true); + } + + Position PositionAfter(Position pos) { + return sci->pdoc->MovePositionOutsideChar(pos + 1, 1, true); + } + + // For AtkText + gchar *GetTextRangeUTF8(Position startByte, Position endByte); + gchar *GetText(int startChar, int endChar); + gchar *GetTextAfterOffset(int charOffset, AtkTextBoundary boundaryType, int *startChar, int *endChar); + gchar *GetTextBeforeOffset(int charOffset, AtkTextBoundary boundaryType, int *startChar, int *endChar); + gchar *GetTextAtOffset(int charOffset, AtkTextBoundary boundaryType, int *startChar, int *endChar); +#if ATK_CHECK_VERSION(2, 10, 0) + gchar *GetStringAtOffset(int charOffset, AtkTextGranularity granularity, int *startChar, int *endChar); +#endif + gunichar GetCharacterAtOffset(int charOffset); + gint GetCharacterCount(); + gint GetCaretOffset(); + gboolean SetCaretOffset(int charOffset); + gint GetOffsetAtPoint(gint x, gint y, AtkCoordType coords); + void GetCharacterExtents(int charOffset, gint *x, gint *y, gint *width, gint *height, AtkCoordType coords); + AtkAttributeSet *GetAttributesForStyle(unsigned int style); + AtkAttributeSet *GetRunAttributes(int charOffset, int *startChar, int *endChar); + AtkAttributeSet *GetDefaultAttributes(); + gint GetNSelections(); + gchar *GetSelection(gint selection_num, int *startChar, int *endChar); + gboolean AddSelection(int startChar, int endChar); + gboolean RemoveSelection(int selection_num); + gboolean SetSelection(gint selection_num, int startChar, int endChar); + // for AtkEditableText + bool InsertStringUTF8(Position bytePos, const gchar *utf8, int lengthBytes); + void SetTextContents(const gchar *contents); + void InsertText(const gchar *contents, int lengthBytes, int *charPosition); + void CopyText(int startChar, int endChar); + void CutText(int startChar, int endChar); + void DeleteText(int startChar, int endChar); + void PasteText(int charPosition); + +public: + ScintillaGTKAccessible(GtkAccessible *accessible, GtkWidget *widget); + ~ScintillaGTKAccessible(); + + static ScintillaGTKAccessible *FromAccessible(GtkAccessible *accessible); + static ScintillaGTKAccessible *FromAccessible(AtkObject *accessible) { + return FromAccessible(GTK_ACCESSIBLE(accessible)); + } + // So ScintillaGTK can notify us + void ChangeDocument(Document *oldDoc, Document *newDoc); + void NotifyReadOnly(); + + // Helper GtkWidget methods + static AtkObject *WidgetGetAccessibleImpl(GtkWidget *widget, AtkObject **cache, gpointer widget_parent_class); + + // ATK methods + + class AtkTextIface { + public: + static void init(::AtkTextIface *iface); + + private: + AtkTextIface(); + + static gchar *GetText(AtkText *text, int start_offset, int end_offset); + static gchar *GetTextAfterOffset(AtkText *text, int offset, AtkTextBoundary boundary_type, int *start_offset, int *end_offset); + static gchar *GetTextBeforeOffset(AtkText *text, int offset, AtkTextBoundary boundary_type, int *start_offset, int *end_offset); + static gchar *GetTextAtOffset(AtkText *text, gint offset, AtkTextBoundary boundary_type, gint *start_offset, gint *end_offset); +#if ATK_CHECK_VERSION(2, 10, 0) + static gchar *GetStringAtOffset(AtkText *text, gint offset, AtkTextGranularity granularity, gint *start_offset, gint *end_offset); +#endif + static gunichar GetCharacterAtOffset(AtkText *text, gint offset); + static gint GetCharacterCount(AtkText *text); + static gint GetCaretOffset(AtkText *text); + static gboolean SetCaretOffset(AtkText *text, gint offset); + static gint GetOffsetAtPoint(AtkText *text, gint x, gint y, AtkCoordType coords); + static void GetCharacterExtents(AtkText *text, gint offset, gint *x, gint *y, gint *width, gint *height, AtkCoordType coords); + static AtkAttributeSet *GetRunAttributes(AtkText *text, gint offset, gint *start_offset, gint *end_offset); + static AtkAttributeSet *GetDefaultAttributes(AtkText *text); + static gint GetNSelections(AtkText *text); + static gchar *GetSelection(AtkText *text, gint selection_num, gint *start_pos, gint *end_pos); + static gboolean AddSelection(AtkText *text, gint start, gint end); + static gboolean RemoveSelection(AtkText *text, gint selection_num); + static gboolean SetSelection(AtkText *text, gint selection_num, gint start, gint end); + }; + class AtkEditableTextIface { + public: + static void init(::AtkEditableTextIface *iface); + + private: + AtkEditableTextIface(); + + static void SetTextContents(AtkEditableText *text, const gchar *contents); + static void InsertText(AtkEditableText *text, const gchar *contents, gint length, gint *position); + static void CopyText(AtkEditableText *text, gint start, gint end); + static void CutText(AtkEditableText *text, gint start, gint end); + static void DeleteText(AtkEditableText *text, gint start, gint end); + static void PasteText(AtkEditableText *text, gint position); + }; +}; + +#ifdef SCI_NAMESPACE +} +#endif + + +#endif /* SCINTILLAGTKACCESSIBLE_H */ Modified: scintilla/include/Platform.h 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -526,8 +526,4 @@ class Platform { } #endif -#if defined(__GNUC__) && defined(SCINTILLA_QT) -#pragma GCC diagnostic ignored "-Wmissing-field-initializers" -#endif - #endif Modified: scintilla/include/SciLexer.h 10 lines changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -133,6 +133,7 @@ #define SCLEX_IHEX 118 #define SCLEX_TEHEX 119 #define SCLEX_JSON 120 +#define SCLEX_EDIFACT 121 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 #define SCE_P_COMMENTLINE 1 @@ -1797,6 +1798,15 @@ #define SCE_JSON_KEYWORD 11 #define SCE_JSON_LDKEYWORD 12 #define SCE_JSON_ERROR 13 +#define SCE_EDI_DEFAULT 0 +#define SCE_EDI_SEGMENTSTART 1 +#define SCE_EDI_SEGMENTEND 2 +#define SCE_EDI_SEP_ELEMENT 3 +#define SCE_EDI_SEP_COMPOSITE 4 +#define SCE_EDI_SEP_RELEASE 5 +#define SCE_EDI_UNA 6 +#define SCE_EDI_UNH 7 +#define SCE_EDI_BADSEGMENT 8 /* --Autogenerated -- end of section automatically generated from Scintilla.iface */ #endif Modified: scintilla/include/Scintilla.h 66 lines changed, 34 insertions(+), 32 deletions(-) =================================================================== @@ -11,8 +11,6 @@ #ifndef SCINTILLA_H #define SCINTILLA_H -#include "Sci_Position.h" - #ifdef __cplusplus extern "C" { #endif @@ -28,20 +26,21 @@ int Scintilla_LinkLexers(void); } #endif -/* Here should be placed typedefs for uptr_t, an unsigned integer type large enough to - * hold a pointer and sptr_t, a signed integer large enough to hold a pointer. - * May need to be changed for 64 bit platforms. */ -#if defined(_WIN32) -#include <basetsd.h> -#endif -#ifdef MAXULONG_PTR -typedef ULONG_PTR uptr_t; -typedef LONG_PTR sptr_t; +// Include header that defines basic numeric types. +#if defined(_MSC_VER) +// Older releases of MSVC did not have stdint.h. +#include <stddef.h> #else -typedef unsigned long uptr_t; -typedef long sptr_t; +#include <stdint.h> #endif +// Define uptr_t, an unsigned integer type large enough to hold a pointer. +typedef uintptr_t uptr_t; +// Define sptr_t, a signed integer large enough to hold a pointer. +typedef intptr_t sptr_t; + +#include "Sci_Position.h" + typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam); /* ++Autogenerated -- start of section automatically generated from Scintilla.iface */ @@ -76,6 +75,10 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define SCWS_VISIBLEONLYININDENT 3 #define SCI_GETVIEWWS 2020 #define SCI_SETVIEWWS 2021 +#define SCTD_LONGARROW 0 +#define SCTD_STRIKEOUT 1 +#define SCI_GETTABDRAWMODE 2698 +#define SCI_SETTABDRAWMODE 2699 #define SCI_POSITIONFROMPOINT 2022 #define SCI_POSITIONFROMPOINTCLOSE 2023 #define SCI_GOTOLINE 2024 @@ -189,6 +192,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define STYLE_CONTROLCHAR 36 #define STYLE_INDENTGUIDE 37 #define STYLE_CALLTIP 38 +#define STYLE_FOLDDISPLAYTEXT 39 #define STYLE_LASTPREDEFINED 39 #define STYLE_MAX 255 #define SC_CHARSET_ANSI 0 @@ -287,6 +291,8 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define INDIC_COMPOSITIONTHIN 15 #define INDIC_FULLBOX 16 #define INDIC_TEXTFORE 17 +#define INDIC_POINT 18 +#define INDIC_POINTCHARACTER 19 #define INDIC_IME 32 #define INDIC_IME_MAX 35 #define INDIC_MAX 35 @@ -480,6 +486,11 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define SCI_SETFOLDEXPANDED 2229 #define SCI_GETFOLDEXPANDED 2230 #define SCI_TOGGLEFOLD 2231 +#define SCI_TOGGLEFOLDSHOWTEXT 2700 +#define SC_FOLDDISPLAYTEXT_HIDDEN 0 +#define SC_FOLDDISPLAYTEXT_STANDARD 1 +#define SC_FOLDDISPLAYTEXT_BOXED 2 +#define SCI_FOLDDISPLAYTEXTSETSTYLE 2701 #define SC_FOLDACTION_CONTRACT 0 #define SC_FOLDACTION_EXPAND 1 #define SC_FOLDACTION_TOGGLE 2 @@ -668,6 +679,9 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define SCI_SEARCHNEXT 2367 #define SCI_SEARCHPREV 2368 #define SCI_LINESONSCREEN 2370 +#define SC_POPUP_NEVER 0 +#define SC_POPUP_ALL 1 +#define SC_POPUP_TEXT 2 #define SCI_USEPOPUP 2371 #define SCI_SELECTIONISRECTANGLE 2372 #define SCI_SETZOOM 2373 @@ -1080,16 +1094,13 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define SCN_FOCUSIN 2028 #define SCN_FOCUSOUT 2029 #define SCN_AUTOCCOMPLETED 2030 +#define SCN_MARGINRIGHTCLICK 2031 /* --Autogenerated -- end of section automatically generated from Scintilla.iface */ /* These structures are defined to be exactly the same shape as the Win32 * CHARRANGE, TEXTRANGE, FINDTEXTEX, FORMATRANGE, and NMHDR structs. * So older code that treats Scintilla as a RichEdit will work. */ -#if defined(__cplusplus) && defined(SCI_NAMESPACE) -namespace Scintilla { -#endif - struct Sci_CharacterRange { Sci_PositionCR cpMin; Sci_PositionCR cpMax; @@ -1106,10 +1117,6 @@ struct Sci_TextToFind { struct Sci_CharacterRange chrgText; }; -#define CharacterRange Sci_CharacterRange -#define TextRange Sci_TextRange -#define TextToFind Sci_TextToFind - typedef void *Sci_SurfaceID; struct Sci_Rectangle { @@ -1130,8 +1137,6 @@ struct Sci_RangeToFormat { struct Sci_CharacterRange chrg; }; -#define RangeToFormat Sci_RangeToFormat - #ifndef __cplusplus /* For the GTK+ platform, g-ir-scanner needs to have these typedefs. This * is not required in C++ code and actually seems to break ScintillaEditPy */ @@ -1148,8 +1153,6 @@ struct Sci_NotifyHeader { unsigned int code; }; -#define NotifyHeader Sci_NotifyHeader - struct SCNotification { Sci_NotifyHeader nmhdr; Sci_Position position; @@ -1189,18 +1192,17 @@ struct SCNotification { /* SCN_AUTOCSELECTION, SCN_AUTOCCOMPLETED, SCN_USERLISTSELECTION, */ }; -#if defined(__cplusplus) && defined(SCI_NAMESPACE) -} -#endif - #ifdef INCLUDE_DEPRECATED_FEATURES -#define SC_CP_DBCS 1 -#define SCI_SETUSEPALETTE 2039 -#define SCI_GETUSEPALETTE 2139 #define SCI_SETKEYSUNICODE 2521 #define SCI_GETKEYSUNICODE 2522 +#define CharacterRange Sci_CharacterRange +#define TextRange Sci_TextRange +#define TextToFind Sci_TextToFind +#define RangeToFormat Sci_RangeToFormat +#define NotifyHeader Sci_NotifyHeader + #endif #endif Modified: scintilla/include/Scintilla.iface 59 lines changed, 44 insertions(+), 15 deletions(-) =================================================================== @@ -168,6 +168,17 @@ get int GetViewWS=2020(,) # Make white space characters invisible, always visible or visible outside indentation. set void SetViewWS=2021(int viewWS,) +enu TabDrawMode=SCTD_ +val SCTD_LONGARROW=0 +val SCTD_STRIKEOUT=1 + +# Retrieve the current tab draw mode. +# Returns one of SCTD_* constants. +get int GetTabDrawMode=2698(,) + +# Set how tabs are drawn when visible. +set void SetTabDrawMode=2699(int tabDrawMode,) + # Find the position from a point within the window. fun position PositionFromPoint=2022(int x, int y) @@ -414,6 +425,7 @@ val STYLE_BRACEBAD=35 val STYLE_CONTROLCHAR=36 val STYLE_INDENTGUIDE=37 val STYLE_CALLTIP=38 +val STYLE_FOLDDISPLAYTEXT=39 val STYLE_LASTPREDEFINED=39 val STYLE_MAX=255 @@ -626,6 +638,8 @@ val INDIC_COMPOSITIONTHICK=14 val INDIC_COMPOSITIONTHIN=15 val INDIC_FULL@@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2016