Commits April 2019

commits@lists.geany.org

1 participants
43 discussions

[geany/geany-osx] 1500d9: 1.35
by Jiří Techet 30 Apr '19

30 Apr '19

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 30 Apr 2019 16:15:11 UTC Commit: 1500d99afb4c668e0b3a3c6418311a5d28871848 https://github.com/geany/geany-osx/commit/1500d99afb4c668e0b3a3c6418311a5d2… Log Message: ----------- 1.35 Modified Paths: -------------- Info.plist create_dmg.sh geany.modules Modified: Info.plist 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -3,11 +3,11 @@ <plist version="1.0"> <dict> <key>CFBundleShortVersionString</key> - <string>1.34.1</string> + <string>1.35</string> <key>CFBundleVersion</key> - <string>1.34.1</string> + <string>1.35</string> <key>CFBundleGetInfoString</key> - <string>1.34.1 (C) 2019 The Geany Team, https://www.geany.org</string> + <string>1.35 (C) 2019 The Geany Team, https://www.geany.org</string> <key>NSHumanReadableCopyright</key> <string>Copyright 2019 The Geany Team, GNU General Public License</string> Modified: create_dmg.sh 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,6 +1,6 @@ #!/bin/sh -VERSION="1.34.1" +VERSION="1.35" NAME="Geany" ICONNAME="Geany.icns" Modified: geany.modules 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -155,7 +155,7 @@ <branch repo="download.geany.org" module="geany-${version}.tar.bz2" checkoutdir="geany-${version}" - version="1.34.1"/> + version="1.35"/> <dependencies> <dep package="geany-deps-gtk2" /> </dependencies> @@ -167,7 +167,7 @@ <branch repo="download.geany.org" module="geany-${version}.tar.bz2" checkoutdir="geany-${version}" - version="1.34.1"/> + version="1.35"/> <dependencies> <dep package="geany-deps-gtk3" /> </dependencies> @@ -212,7 +212,7 @@ <branch repo="download.geany.org" module="geany-plugins/geany-plugins-${version}.tar.bz2" checkoutdir="geany-plugins-${version}" - version="1.34"/> + version="1.35"/> <dependencies> <dep package="geany-release-gtk2" /> <dep package="geany-plugins-deps" /> @@ -224,7 +224,7 @@ <branch repo="download.geany.org" module="geany-plugins/geany-plugins-${version}.tar.bz2" checkoutdir="geany-plugins-${version}" - version="1.34"/> + version="1.35"/> <dependencies> <dep package="geany-release-gtk3" /> <dep package="geany-plugins-deps" /> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 4bcedd: Update Scintilla to version 3.10.4
by Colomban Wendling 28 Apr '19

28 Apr '19

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 28 Apr 2019 17:02:15 UTC Commit: 4bceddb449b8727e1d8b449a5d92af5fa53a2405 https://github.com/geany/geany/commit/4bceddb449b8727e1d8b449a5d92af5fa53a2… Log Message: ----------- Update Scintilla to version 3.10.4 Modified Paths: -------------- scintilla/Makefile.am scintilla/gtk/Converter.h scintilla/gtk/PlatGTK.cxx scintilla/gtk/ScintillaGTK.cxx scintilla/gtk/ScintillaGTK.h scintilla/gtk/ScintillaGTKAccessible.cxx scintilla/include/Platform.h scintilla/include/SciLexer.h scintilla/include/Scintilla.h scintilla/include/Scintilla.iface scintilla/lexers/LexCPP.cxx scintilla/lexers/LexHaskell.cxx scintilla/lexers/LexTCL.cxx scintilla/lexlib/CharacterCategory.cxx scintilla/lexlib/CharacterCategory.h scintilla/lexlib/CharacterSet.h scintilla/lexlib/StyleContext.cxx scintilla/scintilla_changes.patch scintilla/src/CallTip.cxx scintilla/src/CaseConvert.cxx scintilla/src/CaseFolder.cxx scintilla/src/CaseFolder.h scintilla/src/CharClassify.cxx scintilla/src/ContractionState.cxx scintilla/src/ContractionState.h scintilla/src/DBCS.h scintilla/src/Document.cxx scintilla/src/Document.h 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/ElapsedPeriod.h scintilla/src/Indicator.cxx scintilla/src/Indicator.h scintilla/src/KeyMap.h scintilla/src/LineMarker.cxx scintilla/src/LineMarker.h scintilla/src/MarginView.cxx scintilla/src/MarginView.h scintilla/src/PerLine.h scintilla/src/PositionCache.cxx scintilla/src/PositionCache.h scintilla/src/RESearch.h scintilla/src/ScintillaBase.cxx scintilla/src/ScintillaBase.h scintilla/src/Selection.cxx scintilla/src/Selection.h scintilla/src/Style.cxx scintilla/src/Style.h scintilla/src/UniConversion.cxx scintilla/src/UniConversion.h scintilla/src/UniqueString.cxx scintilla/src/UniqueString.h scintilla/src/ViewStyle.cxx scintilla/src/ViewStyle.h scintilla/src/XPM.h scintilla/version.txt Modified: scintilla/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -148,6 +148,7 @@ src/Style.h \ src/UniConversion.cxx \ src/UniConversion.h \ src/UnicodeFromUTF8.h \ +src/UniqueString.cxx \ src/UniqueString.h \ src/ViewStyle.cxx \ src/ViewStyle.h \ Modified: scintilla/gtk/Converter.h 14 lines changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -15,24 +15,24 @@ const gsize sizeFailure = static_cast<gsize>(-1); */ class Converter { GIConv iconvh; - void OpenHandle(const char *fullDestination, const char *charSetSource) { + void OpenHandle(const char *fullDestination, const char *charSetSource) noexcept { iconvh = g_iconv_open(fullDestination, charSetSource); } - bool Succeeded() const { + bool Succeeded() const noexcept { return iconvh != iconvhBad; } public: - Converter() { + Converter() noexcept { iconvh = iconvhBad; } Converter(const char *charSetDestination, const char *charSetSource, bool transliterations) { iconvh = iconvhBad; - Open(charSetDestination, charSetSource, transliterations); + Open(charSetDestination, charSetSource, transliterations); } ~Converter() { Close(); } - operator bool() const { + operator bool() const noexcept { return Succeeded(); } void Open(const char *charSetDestination, const char *charSetSource, bool transliterations) { @@ -50,13 +50,13 @@ class Converter { } } } - void Close() { + void Close() noexcept { if (Succeeded()) { g_iconv_close(iconvh); iconvh = iconvhBad; } } - gsize Convert(char** src, gsize *srcleft, char **dst, gsize *dstleft) const { + gsize Convert(char **src, gsize *srcleft, char **dst, gsize *dstleft) const noexcept { if (!Succeeded()) { return sizeFailure; } else { Modified: scintilla/gtk/PlatGTK.cxx 393 lines changed, 202 insertions(+), 191 deletions(-) =================================================================== @@ -12,6 +12,7 @@ #include <string> #include <vector> #include <map> +#include <algorithm> #include <memory> #include <sstream> @@ -26,56 +27,63 @@ #include "Scintilla.h" #include "ScintillaWidget.h" #include "StringCopy.h" +#include "IntegerRectangle.h" #include "XPM.h" #include "UniConversion.h" #include "Converter.h" -static const double kPi = 3.14159265358979323846; +#ifdef _MSC_VER +// Ignore unreferenced local functions in GTK+ headers +#pragma warning(disable: 4505) +#endif + +using namespace Scintilla; + +namespace { + +const double kPi = 3.14159265358979323846; // The Pango version guard for pango_units_from_double and pango_units_to_double // is more complex than simply implementing these here. -static int pangoUnitsFromDouble(double d) { +int pangoUnitsFromDouble(double d) noexcept { return static_cast<int>(d * PANGO_SCALE + 0.5); } -static double doubleFromPangoUnits(int pu) { - return static_cast<double>(pu) / PANGO_SCALE; +float floatFromPangoUnits(int pu) noexcept { + return static_cast<float>(pu) / PANGO_SCALE; } -static cairo_surface_t *CreateSimilarSurface(GdkWindow *window, cairo_content_t content, int width, int height) { +cairo_surface_t *CreateSimilarSurface(GdkWindow *window, cairo_content_t content, int width, int height) noexcept { return gdk_window_create_similar_surface(window, content, width, height); } -static GdkWindow *WindowFromWidget(GtkWidget *w) { +GdkWindow *WindowFromWidget(GtkWidget *w) noexcept { return gtk_widget_get_window(w); } -#ifdef _MSC_VER -// Ignore unreferenced local functions in GTK+ headers -#pragma warning(disable: 4505) -#endif - -using namespace Scintilla; +GtkWidget *PWidget(WindowID wid) noexcept { + return static_cast<GtkWidget *>(wid); +} -enum encodingType { singleByte, UTF8, dbcs}; +enum encodingType { singleByte, UTF8, dbcs }; // Holds a PangoFontDescription*. class FontHandle { public: PangoFontDescription *pfd; int characterSet; - FontHandle() : pfd(0), characterSet(-1) { + FontHandle() noexcept : pfd(nullptr), characterSet(-1) { } - FontHandle(PangoFontDescription *pfd_, int characterSet_) { + FontHandle(PangoFontDescription *pfd_, int characterSet_) noexcept { pfd = pfd_; characterSet = characterSet_; } ~FontHandle() { if (pfd) pango_font_description_free(pfd); - pfd = 0; + pfd = nullptr; } static FontHandle *CreateNewFont(const FontParameters &fp); }; @@ -88,24 +96,22 @@ FontHandle *FontHandle::CreateNewFont(const FontParameters &fp) { pango_font_description_set_size(pfd, pangoUnitsFromDouble(fp.size)); pango_font_description_set_weight(pfd, static_cast<PangoWeight>(fp.weight)); pango_font_description_set_style(pfd, fp.italic ? PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL); - return new FontHandle(pfd,fp.characterSet); + return new FontHandle(pfd, fp.characterSet); } - return NULL; + return nullptr; } // X has a 16 bit coordinate space, so stop drawing here to avoid wrapping -static const int maxCoordinate = 32000; +const int maxCoordinate = 32000; -static FontHandle *PFont(Font &f) { +FontHandle *PFont(const Font &f) noexcept { return static_cast<FontHandle *>(f.GetID()); } -static GtkWidget *PWidget(WindowID wid) { - return static_cast<GtkWidget *>(wid); } -Font::Font() noexcept : fid(0) {} +Font::Font() noexcept : fid(nullptr) {} Font::~Font() {} @@ -117,7 +123,7 @@ void Font::Create(const FontParameters &fp) { void Font::Release() { if (fid) delete static_cast<FontHandle *>(fid); - fid = 0; + fid = nullptr; } // Required on OS X @@ -138,14 +144,14 @@ class SurfaceImpl : public Surface { int characterSet; void SetConverter(int characterSet_); public: - SurfaceImpl(); + SurfaceImpl() noexcept; ~SurfaceImpl() override; void Init(WindowID wid) override; void Init(SurfaceID sid, WindowID wid) override; void InitPixMap(int width, int height, Surface *surface_, WindowID wid) override; - void Clear(); + void Clear() noexcept; void Release() override; bool Initialised() override; void PenColour(ColourDesired fore) override; @@ -185,7 +191,7 @@ class SurfaceImpl : public Surface { }; } -const char *CharacterSetID(int characterSet) { +const char *CharacterSetID(int characterSet) noexcept { switch (characterSet) { case SC_CHARSET_ANSI: return ""; @@ -243,33 +249,33 @@ void SurfaceImpl::SetConverter(int characterSet_) { } } -SurfaceImpl::SurfaceImpl() : et(singleByte), -context(0), -psurf(0), -x(0), y(0), inited(false), createdGC(false) -, pcontext(0), layout(0), characterSet(-1) { +SurfaceImpl::SurfaceImpl() noexcept : et(singleByte), +context(nullptr), +psurf(nullptr), +x(0), y(0), inited(false), createdGC(false), +pcontext(nullptr), layout(nullptr), characterSet(-1) { } SurfaceImpl::~SurfaceImpl() { Clear(); } -void SurfaceImpl::Clear() { +void SurfaceImpl::Clear() noexcept { et = singleByte; if (createdGC) { createdGC = false; cairo_destroy(context); } - context = 0; + context = nullptr; if (psurf) cairo_surface_destroy(psurf); - psurf = 0; + psurf = nullptr; if (layout) g_object_unref(layout); - layout = 0; + layout = nullptr; if (pcontext) g_object_unref(pcontext); - pcontext = 0; + pcontext = nullptr; conv.Close(); characterSet = -1; x = 0; @@ -306,8 +312,8 @@ void SurfaceImpl::Init(WindowID wid) { Release(); PLATFORM_ASSERT(wid); // if we are only created from a window ID, we can't perform drawing - psurf = 0; - context = 0; + psurf = nullptr; + context = nullptr; createdGC = false; pcontext = gtk_widget_create_pango_context(PWidget(wid)); PLATFORM_ASSERT(pcontext); @@ -361,7 +367,7 @@ void SurfaceImpl::InitPixMap(int width, int height, Surface *surface_, WindowID void SurfaceImpl::PenColour(ColourDesired fore) { if (context) { - ColourDesired cdFore(fore.AsInteger()); + const ColourDesired cdFore(fore.AsInteger()); cairo_set_source_rgb(context, cdFore.GetRed() / 255.0, cdFore.GetGreen() / 255.0, @@ -374,7 +380,7 @@ int SurfaceImpl::LogPixelsY() { } int SurfaceImpl::DeviceHeightFont(int points) { - int logPix = LogPixelsY(); + const int logPix = LogPixelsY(); return (points * logPix + logPix / 2) / 72; } @@ -383,7 +389,7 @@ void SurfaceImpl::MoveTo(int x_, int y_) { y = y_; } -static int Delta(int difference) { +static int Delta(int difference) noexcept { if (difference < 0) return -1; else if (difference > 0) @@ -396,21 +402,21 @@ void SurfaceImpl::LineTo(int x_, int y_) { // cairo_line_to draws the end position, unlike Win32 or GDK with GDK_CAP_NOT_LAST. // For simple cases, move back one pixel from end. if (context) { - int xDiff = x_ - x; - int xDelta = Delta(xDiff); - int yDiff = y_ - y; - int yDelta = Delta(yDiff); + const int xDiff = x_ - x; + const int xDelta = Delta(xDiff); + const int yDiff = y_ - y; + const int yDelta = Delta(yDiff); if ((xDiff == 0) || (yDiff == 0)) { // Horizontal or vertical lines can be more precisely drawn as a filled rectangle - int xEnd = x_ - xDelta; - int left = std::min(x, xEnd); - int width = abs(x - xEnd) + 1; - int yEnd = y_ - yDelta; - int top = std::min(y, yEnd); - int height = abs(y - yEnd) + 1; + const int xEnd = x_ - xDelta; + const int left = std::min(x, xEnd); + const int width = std::abs(x - xEnd) + 1; + const int yEnd = y_ - yDelta; + const int top = std::min(y, yEnd); + const int height = std::abs(y - yEnd) + 1; cairo_rectangle(context, left, top, width, height); cairo_fill(context); - } else if ((abs(xDiff) == abs(yDiff))) { + } else if ((std::abs(xDiff) == std::abs(yDiff))) { // 45 degree slope cairo_move_to(context, x + 0.5, y + 0.5); cairo_line_to(context, x_ + 0.5 - xDelta, y_ + 0.5 - yDelta); @@ -453,8 +459,8 @@ void SurfaceImpl::RectangleDraw(PRectangle rc, ColourDesired fore, ColourDesired void SurfaceImpl::FillRectangle(PRectangle rc, ColourDesired back) { PenColour(back); if (context && (rc.left < maxCoordinate)) { // Protect against out of range - rc.left = lround(rc.left); - rc.right = lround(rc.right); + rc.left = std::round(rc.left); + rc.right = std::round(rc.right); cairo_rectangle(context, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top); cairo_fill(context); @@ -463,17 +469,18 @@ void SurfaceImpl::FillRectangle(PRectangle rc, ColourDesired back) { void SurfaceImpl::FillRectangle(PRectangle rc, Surface &surfacePattern) { SurfaceImpl &surfi = static_cast<SurfaceImpl &>(surfacePattern); - bool canDraw = surfi.psurf != NULL; + const bool canDraw = surfi.psurf != nullptr; if (canDraw) { PLATFORM_ASSERT(context); // Tile pattern over rectangle // Currently assumes 8x8 pattern - int widthPat = 8; - int heightPat = 8; - for (int xTile = rc.left; xTile < rc.right; xTile += widthPat) { - int widthx = (xTile + widthPat > rc.right) ? rc.right - xTile : widthPat; - for (int yTile = rc.top; yTile < rc.bottom; yTile += heightPat) { - int heighty = (yTile + heightPat > rc.bottom) ? rc.bottom - yTile : heightPat; + const int widthPat = 8; + const int heightPat = 8; + const IntegerRectangle irc(rc); + for (int xTile = irc.left; xTile < irc.right; xTile += widthPat) { + const int widthx = (xTile + widthPat > irc.right) ? irc.right - xTile : widthPat; + for (int yTile = irc.top; yTile < irc.bottom; yTile += heightPat) { + const int heighty = (yTile + heightPat > irc.bottom) ? irc.bottom - yTile : heightPat; cairo_set_source_surface(context, surfi.psurf, xTile, yTile); cairo_rectangle(context, xTile, yTile, widthx, heighty); cairo_fill(context); @@ -505,8 +512,8 @@ void SurfaceImpl::RoundedRectangle(PRectangle rc, ColourDesired fore, ColourDesi } } -static void PathRoundRectangle(cairo_t *context, double left, double top, double width, double height, int radius) { - double degrees = kPi / 180.0; +static void PathRoundRectangle(cairo_t *context, double left, double top, double width, double height, int radius) noexcept { + const double degrees = kPi / 180.0; cairo_new_sub_path(context); cairo_arc(context, left + width - radius, top + radius, radius, -90 * degrees, 0 * degrees); @@ -519,7 +526,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*/) { if (context && rc.Width() > 0) { - ColourDesired cdFill(fill.AsInteger()); + const ColourDesired cdFill(fill.AsInteger()); cairo_set_source_rgba(context, cdFill.GetRed() / 255.0, cdFill.GetGreen() / 255.0, @@ -531,7 +538,7 @@ void SurfaceImpl::AlphaRectangle(PRectangle rc, int cornerSize, ColourDesired fi cairo_rectangle(context, rc.left + 1.0, rc.top + 1.0, rc.right - rc.left - 2.0, rc.bottom - rc.top - 2.0); cairo_fill(context); - ColourDesired cdOutline(outline.AsInteger()); + const ColourDesired cdOutline(outline.AsInteger()); cairo_set_source_rgba(context, cdOutline.GetRed() / 255.0, cdOutline.GetGreen() / 255.0, @@ -581,12 +588,12 @@ void SurfaceImpl::DrawRGBAImage(PRectangle rc, int width, int height, const unsi rc.bottom = rc.top + height; int stride = cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, width); - int ucs = stride * height; + const int ucs = stride * height; std::vector<unsigned char> image(ucs); for (int iy=0; iy<height; iy++) { for (int ix=0; ix<width; ix++) { unsigned char *pixel = &image[0] + iy*stride + ix * 4; - unsigned char alpha = pixelsImage[3]; + const unsigned char alpha = pixelsImage[3]; pixel[2] = (*pixelsImage++) * alpha / 255; pixel[1] = (*pixelsImage++) * alpha / 255; pixel[0] = (*pixelsImage++) * alpha / 255; @@ -614,7 +621,7 @@ void SurfaceImpl::Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back) void SurfaceImpl::Copy(PRectangle rc, Point from, Surface &surfaceSource) { SurfaceImpl &surfi = static_cast<SurfaceImpl &>(surfaceSource); - bool canDraw = surfi.psurf != NULL; + const bool canDraw = surfi.psurf != nullptr; if (canDraw) { PLATFORM_ASSERT(context); cairo_set_source_surface(context, surfi.psurf, @@ -648,7 +655,7 @@ static std::string UTF8FromIconv(const Converter &conv, const char *s, int len) char *putf = &utfForm[0]; char *pout = putf; gsize outLeft = len*3+1; - gsize conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); + const gsize conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); if (conversions != sizeFailure) { *pout = '\0'; utfForm.resize(pout - putf); @@ -667,7 +674,7 @@ static size_t MultiByteLenFromIconv(const Converter &conv, const char *s, size_t gsize inLeft = lenMB; char *pout = wcForm; gsize outLeft = 2; - gsize conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); + const gsize conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); if (conversions != sizeFailure) { return lenMB; } @@ -679,7 +686,7 @@ void SurfaceImpl::DrawTextBase(PRectangle rc, Font &font_, XYPOSITION ybase, con ColourDesired fore) { PenColour(fore); if (context) { - XYPOSITION xText = rc.left; + const XYPOSITION xText = rc.left; if (PFont(font_)->pfd) { std::string utfForm; if (et == UTF8) { @@ -694,7 +701,7 @@ void SurfaceImpl::DrawTextBase(PRectangle rc, Font &font_, XYPOSITION ybase, con } pango_layout_set_font_description(layout, PFont(font_)->pfd); pango_cairo_update_layout(context, layout); - PangoLayoutLine *pll = pango_layout_get_line_readonly(layout,0); + PangoLayoutLine *pll = pango_layout_get_line_readonly(layout, 0); cairo_move_to(context, xText, ybase); pango_cairo_show_layout_line(context, pll); } @@ -735,24 +742,24 @@ class ClusterIterator { XYPOSITION position; XYPOSITION distance; int curIndex; - ClusterIterator(PangoLayout *layout, int len) : lenPositions(len), finished(false), + ClusterIterator(PangoLayout *layout, int len) noexcept : lenPositions(len), finished(false), positionStart(0), position(0), distance(0), curIndex(0) { iter = pango_layout_get_iter(layout); - pango_layout_iter_get_cluster_extents(iter, NULL, &pos); + pango_layout_iter_get_cluster_extents(iter, nullptr, &pos); } ~ClusterIterator() { pango_layout_iter_free(iter); } - void Next() { + void Next() noexcept { positionStart = position; if (pango_layout_iter_next_cluster(iter)) { - pango_layout_iter_get_cluster_extents(iter, NULL, &pos); - position = doubleFromPangoUnits(pos.x); + pango_layout_iter_get_cluster_extents(iter, nullptr, &pos); + position = floatFromPangoUnits(pos.x); curIndex = pango_layout_iter_get_index(iter); } else { finished = true; - position = doubleFromPangoUnits(pos.x + pos.width); + position = floatFromPangoUnits(pos.x + pos.width); curIndex = lenPositions; } distance = position - positionStart; @@ -771,7 +778,7 @@ void SurfaceImpl::MeasureWidths(Font &font_, const char *s, int len, XYPOSITION ClusterIterator iti(layout, lenPositions); while (!iti.finished) { iti.Next(); - int places = iti.curIndex - i; + const int places = iti.curIndex - i; while (i < iti.curIndex) { // Evenly distribute space among bytes of this cluster. // Would be better to find number of characters and then @@ -798,8 +805,8 @@ void SurfaceImpl::MeasureWidths(Font &font_, const char *s, int len, XYPOSITION ClusterIterator iti(layout, strlen(utfForm.c_str())); while (!iti.finished) { iti.Next(); - int clusterEnd = iti.curIndex; - int places = g_utf8_strlen(utfForm.c_str() + clusterStart, clusterEnd - clusterStart); + const int clusterEnd = iti.curIndex; + const int places = g_utf8_strlen(utfForm.c_str() + clusterStart, clusterEnd - clusterStart); int place = 1; while (clusterStart < clusterEnd) { size_t lenChar = MultiByteLenFromIconv(convMeasure, s+i, len-i); @@ -814,7 +821,7 @@ void SurfaceImpl::MeasureWidths(Font &font_, const char *s, int len, XYPOSITION PLATFORM_ASSERT(i == lenPositions); } } - if (positionsCalculated < 1 ) { + if (positionsCalculated < 1) { // Either 8-bit or DBCS conversion failed so treat as 8-bit. SetConverter(PFont(font_)->characterSet); const bool rtlCheck = PFont(font_)->characterSet == SC_CHARSET_HEBREW || @@ -831,13 +838,13 @@ void SurfaceImpl::MeasureWidths(Font &font_, const char *s, int len, XYPOSITION ClusterIterator iti(layout, utfForm.length()); while (!iti.finished) { iti.Next(); - int clusterEnd = iti.curIndex; - int ligatureLength = g_utf8_strlen(utfForm.c_str() + clusterStart, clusterEnd - clusterStart); + const int clusterEnd = iti.curIndex; + const int ligatureLength = g_utf8_strlen(utfForm.c_str() + clusterStart, clusterEnd - clusterStart); if (rtlCheck && ((clusterEnd <= clusterStart) || (ligatureLength == 0) || (ligatureLength > 3))) { // Something has gone wrong: exit quickly but pretend all the characters are equally spaced: int widthLayout = 0; - pango_layout_get_size(layout, &widthLayout, NULL); - XYPOSITION widthTotal = doubleFromPangoUnits(widthLayout); + pango_layout_get_size(layout, &widthLayout, nullptr); + const XYPOSITION widthTotal = floatFromPangoUnits(widthLayout); for (int bytePos=0; bytePos<lenPositions; bytePos++) { positions[bytePos] = widthTotal / lenPositions * (bytePos + 1); } @@ -881,9 +888,9 @@ XYPOSITION SurfaceImpl::WidthText(Font &font_, const char *s, int len) { } pango_layout_set_text(layout, utfForm.c_str(), utfForm.length()); } - PangoLayoutLine *pangoLine = pango_layout_get_line_readonly(layout,0); - pango_layout_line_get_extents(pangoLine, NULL, &pos); - return doubleFromPangoUnits(pos.width); + PangoLayoutLine *pangoLine = pango_layout_get_line_readonly(layout, 0); + pango_layout_line_get_extents(pangoLine, nullptr, &pos); + return floatFromPangoUnits(pos.width); } return 1; } else { @@ -896,12 +903,12 @@ XYPOSITION SurfaceImpl::WidthText(Font &font_, const char *s, int len) { XYPOSITION SurfaceImpl::Ascent(Font &font_) { if (!(font_.GetID())) return 1; - int ascent = 0; + XYPOSITION ascent = 0; if (PFont(font_)->pfd) { PangoFontMetrics *metrics = pango_context_get_metrics(pcontext, PFont(font_)->pfd, pango_context_get_language(pcontext)); - ascent = - doubleFromPangoUnits(pango_font_metrics_get_ascent(metrics)); + ascent = std::floor(floatFromPangoUnits( + pango_font_metrics_get_ascent(metrics))); pango_font_metrics_unref(metrics); } if (ascent == 0) { @@ -916,7 +923,8 @@ XYPOSITION SurfaceImpl::Descent(Font &font_) { if (PFont(font_)->pfd) { PangoFontMetrics *metrics = pango_context_get_metrics(pcontext, PFont(font_)->pfd, pango_context_get_language(pcontext)); - int descent = doubleFromPangoUnits(pango_font_metrics_get_descent(metrics)); + const XYPOSITION descent = std::floor(floatFromPangoUnits( + pango_font_metrics_get_descent(metrics))); pango_font_metrics_unref(metrics); return descent; } @@ -961,7 +969,7 @@ Window::~Window() {} void Window::Destroy() { if (wid) { - ListBox *listbox = dynamic_cast<ListBox*>(this); + ListBox *listbox = dynamic_cast<ListBox *>(this); if (listbox) { gtk_widget_hide(GTK_WIDGET(wid)); // clear up window content @@ -972,7 +980,7 @@ void Window::Destroy() { } else { gtk_widget_destroy(GTK_WIDGET(wid)); } - wid = 0; + wid = nullptr; } } @@ -982,8 +990,8 @@ PRectangle Window::GetPosition() const { if (wid) { GtkAllocation allocation; gtk_widget_get_allocation(PWidget(wid), &allocation); - rc.left = allocation.x; - rc.top = allocation.y; + rc.left = static_cast<XYPOSITION>(allocation.x); + rc.top = static_cast<XYPOSITION>(allocation.y); if (allocation.width > 20) { rc.right = rc.left + allocation.width; rc.bottom = rc.top + allocation.height; @@ -994,10 +1002,10 @@ PRectangle Window::GetPosition() const { void Window::SetPosition(PRectangle rc) { GtkAllocation alloc; - alloc.x = rc.left; - alloc.y = rc.top; - alloc.width = rc.Width(); - alloc.height = rc.Height(); + alloc.x = static_cast<int>(rc.left); + alloc.y = static_cast<int>(rc.top); + alloc.width = static_cast<int>(rc.Width()); + alloc.height = static_cast<int>(rc.Height()); gtk_widget_size_allocate(PWidget(wid), &alloc); } @@ -1011,8 +1019,8 @@ GdkRectangle MonitorRectangleForWidget(GtkWidget *wid) { GdkMonitor *monitor = gdk_display_get_monitor_at_window(pdisplay, wnd); gdk_monitor_get_geometry(monitor, &rcScreen); #else - GdkScreen* screen = gtk_widget_get_screen(wid); - gint monitor_num = gdk_screen_get_monitor_at_window(screen, wnd); + GdkScreen *screen = gtk_widget_get_screen(wid); + const gint monitor_num = gdk_screen_get_monitor_at_window(screen, wnd); gdk_screen_get_monitor_geometry(screen, monitor_num, &rcScreen); #endif return rcScreen; @@ -1021,18 +1029,19 @@ GdkRectangle MonitorRectangleForWidget(GtkWidget *wid) { } void Window::SetPositionRelative(PRectangle rc, const Window *relativeTo) { + const IntegerRectangle irc(rc); int ox = 0; int oy = 0; GdkWindow *wndRelativeTo = WindowFromWidget(PWidget(relativeTo->wid)); gdk_window_get_origin(wndRelativeTo, &ox, &oy); - ox += rc.left; - oy += rc.top; + ox += irc.left; + oy += irc.top; - GdkRectangle rcMonitor = MonitorRectangleForWidget(PWidget(relativeTo->wid)); + const GdkRectangle rcMonitor = MonitorRectangleForWidget(PWidget(relativeTo->wid)); /* do some corrections to fit into screen */ - int sizex = rc.right - rc.left; - int sizey = rc.bottom - rc.top; + const int sizex = irc.Width(); + const int sizey = irc.Height(); if (sizex > rcMonitor.width || ox < rcMonitor.x) ox = rcMonitor.x; /* the best we can do */ else if (ox + sizex > rcMonitor.x + rcMonitor.width) @@ -1065,9 +1074,10 @@ void Window::InvalidateAll() { void Window::InvalidateRectangle(PRectangle rc) { if (wid) { + const IntegerRectangle irc(rc); gtk_widget_queue_draw_area(PWidget(wid), - rc.left, rc.top, - rc.right - rc.left, rc.bottom - rc.top); + irc.left, irc.top, + irc.Width(), irc.Height()); } } @@ -1134,24 +1144,24 @@ PRectangle Window::GetMonitorRect(Point pt) { pt.x + x_offset, pt.y + y_offset); gdk_monitor_get_geometry(monitor, &rect); #else - GdkScreen* screen = gtk_widget_get_screen(PWidget(wid)); - gint monitor_num = gdk_screen_get_monitor_at_point(screen, + GdkScreen *screen = gtk_widget_get_screen(PWidget(wid)); + const gint monitor_num = gdk_screen_get_monitor_at_point(screen, pt.x + x_offset, pt.y + y_offset); gdk_screen_get_monitor_geometry(screen, monitor_num, &rect); #endif rect.x -= x_offset; rect.y -= y_offset; - return PRectangle(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height); + return PRectangle::FromInts(rect.x, rect.y, rect.x + rect.width, rect.y + rect.height); } -typedef std::map<int, RGBAImage*> ImageMap; +typedef std::map<int, RGBAImage *> ImageMap; struct ListImage { const RGBAImage *rgba_data; GdkPixbuf *pixbuf; }; -static void list_image_free(gpointer, gpointer value, gpointer) { +static void list_image_free(gpointer, gpointer value, gpointer) noexcept { ListImage *list_image = static_cast<ListImage *>(value); if (list_image->pixbuf) g_object_unref(list_image->pixbuf); @@ -1176,8 +1186,8 @@ class ListBoxX : public ListBox { WindowID list; WindowID scroller; void *pixhash; - GtkCellRenderer* pixbuf_renderer; - GtkCellRenderer* renderer; + GtkCellRenderer *pixbuf_renderer; + GtkCellRenderer *renderer; RGBAImageSet images; int desiredVisibleRows; unsigned int maxItemCharacters; @@ -1188,28 +1198,29 @@ class ListBoxX : public ListBox { public: IListBoxDelegate *delegate; - ListBoxX() : widCached(0), frame(0), list(0), scroller(0), pixhash(NULL), pixbuf_renderer(0), - renderer(0), + ListBoxX() noexcept : widCached(nullptr), frame(nullptr), list(nullptr), scroller(nullptr), + pixhash(nullptr), pixbuf_renderer(nullptr), + renderer(nullptr), desiredVisibleRows(5), maxItemCharacters(0), aveCharWidth(1), #if GTK_CHECK_VERSION(3,0,0) - cssProvider(NULL), + cssProvider(nullptr), #endif delegate(nullptr) { } ~ListBoxX() override { if (pixhash) { - g_hash_table_foreach((GHashTable *) pixhash, list_image_free, NULL); + g_hash_table_foreach((GHashTable *) pixhash, list_image_free, nullptr); g_hash_table_destroy((GHashTable *) pixhash); } if (widCached) { gtk_widget_destroy(GTK_WIDGET(widCached)); - wid = widCached = 0; + wid = widCached = nullptr; } #if GTK_CHECK_VERSION(3,0,0) if (cssProvider) { g_object_unref(cssProvider); - cssProvider = NULL; + cssProvider = nullptr; } #endif } @@ -1247,18 +1258,18 @@ static int treeViewGetRowHeight(GtkTreeView *view) { // version is inaccurate for GTK 3.14. GdkRectangle rect; GtkTreePath *path = gtk_tree_path_new_first(); - gtk_tree_view_get_background_area(view, path, NULL, &rect); + gtk_tree_view_get_background_area(view, path, nullptr, &rect); gtk_tree_path_free(path); return rect.height; #else int row_height=0; int vertical_separator=0; int expander_size=0; GtkTreeViewColumn *column = gtk_tree_view_get_column(view, 0); - gtk_tree_view_column_cell_get_size(column, NULL, NULL, NULL, NULL, &row_height); + gtk_tree_view_column_cell_get_size(column, nullptr, nullptr, nullptr, nullptr, &row_height); gtk_widget_style_get(GTK_WIDGET(view), "vertical-separator", &vertical_separator, - "expander-size", &expander_size, NULL); + "expander-size", &expander_size, nullptr); row_height += vertical_separator; row_height = std::max(row_height, expander_size); return row_height; @@ -1292,7 +1303,7 @@ static void small_scroller_get_preferred_height(GtkWidget *widget, gint *min, gi GtkWidget *child = gtk_bin_get_child(GTK_BIN(widget)); if (GTK_IS_TREE_VIEW(child)) { GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(child)); - int n_rows = gtk_tree_model_iter_n_children(model, NULL); + int n_rows = gtk_tree_model_iter_n_children(model, nullptr); int row_height = treeViewGetRowHeight(GTK_TREE_VIEW(child)); *min = MAX(1, row_height); @@ -1318,11 +1329,11 @@ static void small_scroller_class_init(SmallScrollerClass *klass) { #endif } -static void small_scroller_init(SmallScroller *){} +static void small_scroller_init(SmallScroller *) {} -static gboolean ButtonPress(GtkWidget *, GdkEventButton* ev, gpointer p) { +static gboolean ButtonPress(GtkWidget *, GdkEventButton *ev, gpointer p) { try { - ListBoxX* lb = static_cast<ListBoxX*>(p); + ListBoxX *lb = static_cast<ListBoxX *>(p); if (ev->type == GDK_2BUTTON_PRESS && lb->delegate) { ListBoxEvent event(ListBoxEvent::EventType::doubleClick); lb->delegate->ListNotify(&event); @@ -1335,9 +1346,9 @@ static gboolean ButtonPress(GtkWidget *, GdkEventButton* ev, gpointer p) { return FALSE; } -static gboolean ButtonRelease(GtkWidget *, GdkEventButton* ev, gpointer p) { +static gboolean ButtonRelease(GtkWidget *, GdkEventButton *ev, gpointer p) { try { - ListBoxX* lb = static_cast<ListBoxX*>(p); + ListBoxX *lb = static_cast<ListBoxX *>(p); if (ev->type != GDK_2BUTTON_PRESS && lb->delegate) { ListBoxEvent event(ListBoxEvent::EventType::selectionChange); lb->delegate->ListNotify(&event); @@ -1351,9 +1362,9 @@ static gboolean ButtonRelease(GtkWidget *, GdkEventButton* ev, gpointer p) { /* Change the active color to the selected color so the listbox uses the color scheme that it would use if it had the focus. */ -static void StyleSet(GtkWidget *w, GtkStyle*, void*) { +static void StyleSet(GtkWidget *w, GtkStyle *, void *) { - g_return_if_fail(w != NULL); + g_return_if_fail(w != nullptr); /* Copy the selected color to active. Note that the modify calls will cause recursive calls to this function after the value is updated and w->style to @@ -1365,7 +1376,7 @@ static void StyleSet(GtkWidget *w, GtkStyle*, void*) { // The *override* calls are deprecated now, so only call them for older versions of GTK+. #elif GTK_CHECK_VERSION(3,0,0) GtkStyleContext *styleContext = gtk_widget_get_style_context(w); - if (styleContext == NULL) + if (styleContext == nullptr) return; GdkRGBA colourForeSelected; @@ -1376,7 +1387,7 @@ static void StyleSet(GtkWidget *w, GtkStyle*, void*) { gtk_widget_override_color(w, GTK_STATE_FLAG_ACTIVE, &colourForeSelected); styleContext = gtk_widget_get_style_context(w); - if (styleContext == NULL) + if (styleContext == nullptr) return; GdkRGBA colourBaseSelected; @@ -1387,20 +1398,20 @@ static void StyleSet(GtkWidget *w, GtkStyle*, void*) { gtk_widget_override_background_color(w, GTK_STATE_FLAG_ACTIVE, &colourBaseSelected); #else GtkStyle *style = gtk_widget_get_style(w); - if (style == NULL) + if (style == nullptr) return; if (!gdk_color_equal(&style->base[GTK_STATE_SELECTED], &style->base[GTK_STATE_ACTIVE])) gtk_widget_modify_base(w, GTK_STATE_ACTIVE, &style->base[GTK_STATE_SELECTED]); style = gtk_widget_get_style(w); - if (style == NULL) + if (style == nullptr) return; if (!gdk_color_equal(&style->text[GTK_STATE_SELECTED], &style->text[GTK_STATE_ACTIVE])) gtk_widget_modify_text(w, GTK_STATE_ACTIVE, &style->text[GTK_STATE_SELECTED]); #endif } void ListBoxX::Create(Window &parent, int, Point, int, bool, int) { - if (widCached != 0) { + if (widCached != nullptr) { wid = widCached; return; } @@ -1413,13 +1424,13 @@ void ListBoxX::Create(Window &parent, int, Point, int, bool, int) { wid = widCached = gtk_window_new(GTK_WINDOW_POPUP); - frame = gtk_frame_new(NULL); + frame = gtk_frame_new(nullptr); gtk_widget_show(PWidget(frame)); gtk_container_add(GTK_CONTAINER(GetID()), PWidget(frame)); gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_OUT); gtk_container_set_border_width(GTK_CONTAINER(frame), 0); - scroller = g_object_new(small_scroller_get_type(), NULL); + scroller = g_object_new(small_scroller_get_type(), nullptr); gtk_container_set_border_width(GTK_CONTAINER(scroller), 0); gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroller), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); @@ -1431,7 +1442,7 @@ void ListBoxX::Create(Window &parent, int, Point, int, bool, int) { gtk_list_store_new(N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING); list = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); - g_signal_connect(G_OBJECT(list), "style-set", G_CALLBACK(StyleSet), NULL); + g_signal_connect(G_OBJECT(list), "style-set", G_CALLBACK(StyleSet), nullptr); #if GTK_CHECK_VERSION(3,0,0) GtkStyleContext *styleContext = gtk_widget_get_style_context(GTK_WIDGET(list)); @@ -1466,7 +1477,7 @@ void ListBoxX::Create(Window &parent, int, Point, int, bool, int) { gtk_tree_view_append_column(GTK_TREE_VIEW(list), column); if (g_object_class_find_property(G_OBJECT_GET_CLASS(list), "fixed-height-mode")) - g_object_set(G_OBJECT(list), "fixed-height-mode", TRUE, NULL); + g_object_set(G_OBJECT(list), "fixed-height-mode", TRUE, nullptr); GtkWidget *widget = PWidget(list); // No code inside the G_OBJECT macro gtk_container_add(GTK_CONTAINER(PWidget(scroller)), widget); @@ -1496,7 +1507,7 @@ void ListBoxX::SetFont(Font &font) { // On GTK < 3.21.0 the units are incorrectly parsed, so a font size in points // need to use the "px" unit. Normally we only get fonts in points here, so // don't bother to handle the case the font is actually in pixels on < 3.21.0. - if (gtk_check_version(3, 21, 0) != NULL || // on < 3.21.0 + if (gtk_check_version(3, 21, 0) != nullptr || // on < 3.21.0 pango_font_description_get_size_is_absolute(pfd)) { ssFontSetting << "px; "; } else { @@ -1505,7 +1516,7 @@ void ListBoxX::SetFont(Font &font) { ssFontSetting << "font-weight:"<< pango_font_description_get_weight(pfd) << "; "; ssFontSetting << "}"; gtk_css_provider_load_from_data(GTK_CSS_PROVIDER(cssProvider), - ssFontSetting.str().c_str(), -1, NULL); + ssFontSetting.str().c_str(), -1, nullptr); } #else gtk_widget_modify_font(PWidget(list), PFont(font)->pfd); @@ -1543,7 +1554,7 @@ PRectangle ListBoxX::GetDesiredRect() { // This, apparently unnecessary call, ensures gtk_tree_view_column_cell_get_size // returns reasonable values. #if GTK_CHECK_VERSION(3,0,0) - gtk_widget_get_preferred_size(GTK_WIDGET(frame), NULL, &req); + gtk_widget_get_preferred_size(GTK_WIDGET(frame), nullptr, &req); #else gtk_widget_size_request(GTK_WIDGET(frame), &req); #endif @@ -1552,7 +1563,7 @@ PRectangle ListBoxX::GetDesiredRect() { // First calculate height of the clist for our desired visible // row count otherwise it tries to expand to the total # of rows // Get cell height - int row_height = GetRowHeight(); + const int row_height = GetRowHeight(); #if GTK_CHECK_VERSION(3,0,0) GtkStyleContext *styleContextFrame = gtk_widget_get_style_context(PWidget(frame)); GtkStateFlags stateFlagsFrame = gtk_style_context_get_state(styleContextFrame); @@ -1573,7 +1584,7 @@ PRectangle ListBoxX::GetDesiredRect() { gtk_style_context_get_border(styleContextFrameBorder, stateFlagsFrame, &border_border); g_object_unref(styleContextFrameBorder); # else // < 3.20 - if (gtk_check_version(3, 20, 0) == NULL) { + if (gtk_check_version(3, 20, 0) == nullptr) { // default to 1px all around as it's likely what it is, and so we don't miss 2px height // on GTK 3.20 when built against an earlier version. border_border.top = border_border.bottom = border_border.left = border_border.right = 1; @@ -1599,7 +1610,7 @@ PRectangle ListBoxX::GetDesiredRect() { // Add horizontal padding and borders int horizontal_separator=0; gtk_widget_style_get(PWidget(list), - "horizontal-separator", &horizontal_separator, NULL); + "horizontal-separator", &horizontal_separator, nullptr); rc.right += horizontal_separator; #if GTK_CHECK_VERSION(3,0,0) rc.right += (padding.left + padding.right @@ -1615,7 +1626,7 @@ PRectangle ListBoxX::GetDesiredRect() { GtkWidget *vscrollbar = gtk_scrolled_window_get_vscrollbar(GTK_SCROLLED_WINDOW(scroller)); #if GTK_CHECK_VERSION(3,0,0) - gtk_widget_get_preferred_size(vscrollbar, NULL, &req); + gtk_widget_get_preferred_size(vscrollbar, nullptr, &req); #else gtk_widget_size_request(vscrollbar, &req); #endif @@ -1651,32 +1662,32 @@ static void init_pixmap(ListImage *list_image) { list_image->rgba_data->GetWidth(), list_image->rgba_data->GetHeight(), list_image->rgba_data->GetWidth() * 4, - NULL, - NULL); + nullptr, + nullptr); } } #define SPACING 5 void ListBoxX::Append(char *s, int type) { - ListImage *list_image = NULL; + ListImage *list_image = nullptr; if ((type >= 0) && pixhash) { - list_image = static_cast<ListImage *>(g_hash_table_lookup((GHashTable *) pixhash - , (gconstpointer) GINT_TO_POINTER(type))); + list_image = static_cast<ListImage *>(g_hash_table_lookup((GHashTable *) pixhash, + GINT_TO_POINTER(type))); } GtkTreeIter iter; GtkListStore *store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(list))); gtk_list_store_append(GTK_LIST_STORE(store), &iter); if (list_image) { - if (NULL == list_image->pixbuf) + if (nullptr == list_image->pixbuf) init_pixmap(list_image); if (list_image->pixbuf) { gtk_list_store_set(GTK_LIST_STORE(store), &iter, PIXBUF_COLUMN, list_image->pixbuf, TEXT_COLUMN, s, -1); - gint pixbuf_width = gdk_pixbuf_get_width(list_image->pixbuf); + const gint pixbuf_width = gdk_pixbuf_get_width(list_image->pixbuf); gint renderer_height, renderer_width; gtk_cell_renderer_get_fixed_size(pixbuf_renderer, &renderer_width, &renderer_height); @@ -1691,15 +1702,15 @@ void ListBoxX::Append(char *s, int type) { gtk_list_store_set(GTK_LIST_STORE(store), &iter, TEXT_COLUMN, s, -1); } - size_t len = strlen(s); + const size_t len = strlen(s); if (maxItemCharacters < len) maxItemCharacters = len; } int ListBoxX::Length() { if (wid) return gtk_tree_model_iter_n_children(gtk_tree_view_get_model - (GTK_TREE_VIEW(list)), NULL); + (GTK_TREE_VIEW(list)), nullptr); return 0; } @@ -1714,31 +1725,31 @@ void ListBoxX::Select(int n) { return; } - bool valid = gtk_tree_model_iter_nth_child(model, &iter, NULL, n) != FALSE; + const bool valid = gtk_tree_model_iter_nth_child(model, &iter, nullptr, n) != FALSE; if (valid) { gtk_tree_selection_select_iter(selection, &iter); // Move the scrollbar to show the selection. - int total = Length(); + const int total = Length(); #if GTK_CHECK_VERSION(3,0,0) GtkAdjustment *adj = gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(list)); #else GtkAdjustment *adj = gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(list)); #endif - gfloat value = ((gfloat)n / total) * (gtk_adjustment_get_upper(adj) - gtk_adjustment_get_lower(adj)) + gfloat value = (static_cast<gfloat>(n) / total) * (gtk_adjustment_get_upper(adj) - gtk_adjustment_get_lower(adj)) + gtk_adjustment_get_lower(adj) - gtk_adjustment_get_page_size(adj) / 2; // Get cell height - int row_height = GetRowHeight(); + const int row_height = GetRowHeight(); int rows = Length(); if ((rows == 0) || (rows > desiredVisibleRows)) rows = desiredVisibleRows; if (rows & 0x1) { // Odd rows to display -- We are now in the middle. // Align it so that we don't chop off rows. - value += (gfloat)row_height / 2.0; + value += static_cast<gfloat>(row_height) / 2.0f; } // Clamp it. value = (value < 0)? 0 : value; @@ -1765,7 +1776,7 @@ int ListBoxX::GetSelection() { selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list)); if (gtk_tree_selection_get_selected(selection, &model, &iter)) { GtkTreePath *path = gtk_tree_model_get_path(model, &iter); - int *indices = gtk_tree_path_get_indices(path); + const int *indices = gtk_tree_path_get_indices(path); // Don't free indices. if (indices) index = indices[0]; @@ -1780,7 +1791,7 @@ int ListBoxX::Find(const char *prefix) { gtk_tree_view_get_model(GTK_TREE_VIEW(list)); bool valid = gtk_tree_model_get_iter_first(model, &iter) != FALSE; int i = 0; - while(valid) { + while (valid) { gchar *s; gtk_tree_model_get(model, &iter, TEXT_COLUMN, &s, -1); if (s && (0 == strncmp(prefix, s, strlen(prefix)))) { @@ -1795,10 +1806,10 @@ int ListBoxX::Find(const char *prefix) { } void ListBoxX::GetValue(int n, char *value, int len) { - char *text = NULL; + char *text = nullptr; GtkTreeIter iter; GtkTreeModel *model = gtk_tree_view_get_model(GTK_TREE_VIEW(list)); - bool valid = gtk_tree_model_iter_nth_child(model, &iter, NULL, n) != FALSE; + const bool valid = gtk_tree_model_iter_nth_child(model, &iter, nullptr, n) != FALSE; if (valid) { gtk_tree_model_get(model, &iter, TEXT_COLUMN, &text, -1); } @@ -1822,12 +1833,12 @@ void ListBoxX::RegisterRGBA(int type, RGBAImage *image) { pixhash = g_hash_table_new(g_direct_hash, g_direct_equal); } ListImage *list_image = static_cast<ListImage *>(g_hash_table_lookup((GHashTable *) pixhash, - (gconstpointer) GINT_TO_POINTER(type))); + GINT_TO_POINTER(type))); if (list_image) { // Drop icon already registered if (list_image->pixbuf) g_object_unref(list_image->pixbuf); - list_image->pixbuf = NULL; + list_image->pixbuf = nullptr; list_image->rgba_data = image; } else { list_image = g_new0(ListImage, 1); @@ -1857,10 +1868,10 @@ void ListBoxX::SetDelegate(IListBoxDelegate *lbDelegate) { void ListBoxX::SetList(const char *listText, char separator, char typesep) { Clear(); - int count = strlen(listText) + 1; + const size_t count = strlen(listText) + 1; std::vector<char> words(listText, listText+count); char *startword = &words[0]; - char *numword = NULL; + char *numword = nullptr; int i = 0; for (; words[i]; i++) { if (words[i] == separator) { @@ -1869,7 +1880,7 @@ void ListBoxX::SetList(const char *listText, char separator, char typesep) { *numword = '\0'; Append(startword, numword?atoi(numword + 1):-1); startword = &words[0] + i + 1; - numword = NULL; + numword = nullptr; } else if (words[i] == typesep) { numword = &words[0] + i; } @@ -1881,7 +1892,7 @@ void ListBoxX::SetList(const char *listText, char separator, char typesep) { } } -Menu::Menu() noexcept : mid(0) {} +Menu::Menu() noexcept : mid(nullptr) {} void Menu::CreatePopUp() { Destroy(); @@ -1892,7 +1903,7 @@ void Menu::CreatePopUp() { void Menu::Destroy() { if (mid) g_object_unref(G_OBJECT(mid)); - mid = 0; + mid = nullptr; } #if !GTK_CHECK_VERSION(3,22,0) @@ -1908,12 +1919,12 @@ void Menu::Show(Point pt, Window &w) { gtk_widget_show_all(GTK_WIDGET(widget)); #if GTK_CHECK_VERSION(3,22,0) // Rely on GTK+ to do the right thing with positioning - gtk_menu_popup_at_pointer(widget, NULL); + gtk_menu_popup_at_pointer(widget, nullptr); #else - GdkRectangle rcMonitor = MonitorRectangleForWidget(PWidget(w.GetID())); + const GdkRectangle rcMonitor = MonitorRectangleForWidget(PWidget(w.GetID())); GtkRequisition requisition; #if GTK_CHECK_VERSION(3,0,0) - gtk_widget_get_preferred_size(GTK_WIDGET(widget), NULL, &requisition); + gtk_widget_get_preferred_size(GTK_WIDGET(widget), nullptr, &requisition); #else gtk_widget_size_request(GTK_WIDGET(widget), &requisition); #endif @@ -1923,46 +1934,46 @@ void Menu::Show(Point pt, Window &w) { if ((pt.y + requisition.height) > rcMonitor.y + rcMonitor.height) { pt.y = rcMonitor.y + rcMonitor.height - requisition.height; } - gtk_menu_popup(widget, NULL, NULL, MenuPositionFunc, + gtk_menu_popup(widget, nullptr, nullptr, MenuPositionFunc, GINT_TO_POINTER((static_cast<int>(pt.y) << 16) | static_cast<int>(pt.x)), 0, gtk_get_current_event_time()); #endif } class DynamicLibraryImpl : public DynamicLibrary { protected: - GModule* m; + GModule *m; public: - explicit DynamicLibraryImpl(const char *modulePath) { + explicit DynamicLibraryImpl(const char *modulePath) noexcept { m = g_module_open(modulePath, G_MODULE_BIND_LAZY); } ~DynamicLibraryImpl() override { - if (m != NULL) + if (m != nullptr) g_module_close(m); } // Use g_module_symbol to get a pointer to the relevant function. Function FindFunction(const char *name) override { - if (m != NULL) { - gpointer fn_address = NULL; - gboolean status = g_module_symbol(m, name, &fn_address); + if (m != nullptr) { + gpointer fn_address = nullptr; + const gboolean status = g_module_symbol(m, name, &fn_address); if (status) return static_cast<Function>(fn_address); else - return NULL; + return nullptr; } else { - return NULL; + return nullptr; } } bool IsValid() override { - return m != NULL; + return m != nullptr; } }; DynamicLibrary *DynamicLibrary::Load(const char *modulePath) { - return static_cast<DynamicLibrary *>( new DynamicLibraryImpl(modulePath) ); + return static_cast<DynamicLibrary *>(new DynamicLibraryImpl(modulePath)); } ColourDesired Platform::Chrome() { @@ -2017,7 +2028,7 @@ void Platform::DebugPrintf(const char *, ...) {} static bool assertionPopUps = true; bool Platform::ShowAssertionPopUps(bool assertionPopUps_) { - bool ret = assertionPopUps; + const bool ret = assertionPopUps; assertionPopUps = assertionPopUps_; return ret; } Modified: scintilla/gtk/ScintillaGTK.cxx 773 lines changed, 408 insertions(+), 365 deletions(-) =================================================================== @@ -7,7 +7,6 @@ #include <cstdlib> #include <cassert> #include <cstring> -#include <cctype> #include <cstdio> #include <ctime> #include <cmath> @@ -29,7 +28,10 @@ #include <gdk/gdkwayland.h> #endif -#if defined(__WIN32__) || defined(_MSC_VER) +#if defined(_WIN32) +// On Win32 use windows.h to access clipboard (rectangular format) and systems parameters +#undef NOMINMAX +#define NOMINMAX #include <windows.h> #endif @@ -43,6 +45,7 @@ #include "SciLexer.h" #endif #include "StringCopy.h" +#include "CharacterCategory.h" #ifdef SCI_LEXER #include "LexerModule.h" #endif @@ -92,7 +95,7 @@ #define SC_INDICATOR_CONVERTED INDIC_IME+2 #define SC_INDICATOR_UNKNOWN INDIC_IME_MAX -static GdkWindow *WindowFromWidget(GtkWidget *w) { +static GdkWindow *WindowFromWidget(GtkWidget *w) noexcept { return gtk_widget_get_window(w); } @@ -105,34 +108,33 @@ static GdkWindow *WindowFromWidget(GtkWidget *w) { using namespace Scintilla; -static GdkWindow *PWindow(const Window &w) { +static GdkWindow *PWindow(const Window &w) noexcept { GtkWidget *widget = static_cast<GtkWidget *>(w.GetID()); return gtk_widget_get_window(widget); } extern std::string UTF8FromLatin1(const char *s, int len); enum { - COMMAND_SIGNAL, - NOTIFY_SIGNAL, - LAST_SIGNAL + COMMAND_SIGNAL, + NOTIFY_SIGNAL, + LAST_SIGNAL }; static gint scintilla_signals[LAST_SIGNAL] = { 0 }; enum { - TARGET_STRING, - TARGET_TEXT, - TARGET_COMPOUND_TEXT, - TARGET_UTF8_STRING, - TARGET_URI + TARGET_STRING, + TARGET_TEXT, + TARGET_COMPOUND_TEXT, + TARGET_UTF8_STRING, + TARGET_URI }; -GdkAtom ScintillaGTK::atomClipboard = 0; -GdkAtom ScintillaGTK::atomUTF8 = 0; -GdkAtom ScintillaGTK::atomString = 0; -GdkAtom ScintillaGTK::atomUriList = 0; -GdkAtom ScintillaGTK::atomDROPFILES_DND = 0; +GdkAtom ScintillaGTK::atomUTF8 = nullptr; +GdkAtom ScintillaGTK::atomString = nullptr; +GdkAtom ScintillaGTK::atomUriList = nullptr; +GdkAtom ScintillaGTK::atomDROPFILES_DND = nullptr; static const GtkTargetEntry clipboardCopyTargets[] = { { (gchar *) "UTF8_STRING", 0, TARGET_UTF8_STRING }, @@ -149,7 +151,7 @@ static const gint nClipboardPasteTargets = ELEMENTS(clipboardPasteTargets); static const GdkDragAction actionCopyOrMove = static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE); -static GtkWidget *PWidget(Window &w) { +static GtkWidget *PWidget(const Window &w) noexcept { return static_cast<GtkWidget *>(w.GetID()); } @@ -159,20 +161,25 @@ ScintillaGTK *ScintillaGTK::FromWidget(GtkWidget *widget) { } ScintillaGTK::ScintillaGTK(_ScintillaObject *sci_) : - adjustmentv(0), adjustmenth(0), - verticalScrollBarWidth(30), horizontalScrollBarHeight(30), - evbtn(nullptr), capturedMouse(false), dragWasDropped(false), - lastKey(0), rectangularSelectionModifier(SCMOD_CTRL), parentClass(0), - im_context(NULL), lastNonCommonScript(PANGO_SCRIPT_INVALID_CODE), - lastWheelMouseDirection(0), - wheelMouseIntensity(0), - smoothScrollY(0), - smoothScrollX(0), - rgnUpdate(0), - repaintFullWindow(false), - styleIdleID(0), - accessibilityEnabled(SC_ACCESSIBILITY_ENABLED), - accessible(0) { + adjustmentv(nullptr), adjustmenth(nullptr), + verticalScrollBarWidth(30), horizontalScrollBarHeight(30), + evbtn(nullptr), + buttonMouse(0), + capturedMouse(false), dragWasDropped(false), + lastKey(0), rectangularSelectionModifier(SCMOD_CTRL), + parentClass(nullptr), + atomSought(nullptr), + im_context(nullptr), + lastNonCommonScript(PANGO_SCRIPT_INVALID_CODE), + lastWheelMouseDirection(0), + wheelMouseIntensity(0), + smoothScrollY(0), + smoothScrollX(0), + rgnUpdate(nullptr), + repaintFullWindow(false), + styleIdleID(0), + accessibilityEnabled(SC_ACCESSIBILITY_ENABLED), + accessible(nullptr) { sci = sci_; wMain = GTK_WIDGET(sci); @@ -182,7 +189,7 @@ ScintillaGTK::ScintillaGTK(_ScintillaObject *sci_) : // There does not seem to be a real standard for indicating that the clipboard // contains a rectangular selection, so copy Developer Studio. cfColumnSelect = static_cast<CLIPFORMAT>( - ::RegisterClipboardFormat("MSDEVColumnSelect")); + ::RegisterClipboardFormat("MSDEVColumnSelect")); // Get intellimouse parameters when running on win32; otherwise use // reasonable default @@ -241,21 +248,21 @@ void ScintillaGTK::RealizeThis(GtkWidget *widget) { attrs.cursor = cursor; #if GTK_CHECK_VERSION(3,0,0) gtk_widget_set_window(widget, gdk_window_new(gtk_widget_get_parent_window(widget), &attrs, - GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_CURSOR)); + GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_CURSOR)); #if GTK_CHECK_VERSION(3,8,0) gtk_widget_register_window(widget, gtk_widget_get_window(widget)); #else gdk_window_set_user_data(gtk_widget_get_window(widget), widget); #endif #if !GTK_CHECK_VERSION(3,18,0) gtk_style_context_set_background(gtk_widget_get_style_context(widget), - gtk_widget_get_window(widget)); + gtk_widget_get_window(widget)); #endif gdk_window_show(gtk_widget_get_window(widget)); UnRefCursor(cursor); #else widget->window = gdk_window_new(gtk_widget_get_parent_window(widget), &attrs, - GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_CURSOR); + GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_CURSOR); gdk_window_set_user_data(widget->window, widget); widget->style = gtk_style_attach(widget->style, widget->window); gdk_window_set_background(widget->window, &widget->style->bg[GTK_STATE_NORMAL]); @@ -267,15 +274,15 @@ void ScintillaGTK::RealizeThis(GtkWidget *widget) { im_context = gtk_im_multicontext_new(); g_signal_connect(G_OBJECT(im_context), "commit", - G_CALLBACK(Commit), this); + G_CALLBACK(Commit), this); g_signal_connect(G_OBJECT(im_context), "preedit_changed", - G_CALLBACK(PreeditChanged), this); + G_CALLBACK(PreeditChanged), this); gtk_im_context_set_client_window(im_context, WindowFromWidget(widget)); GtkWidget *widtxt = PWidget(wText); // // No code inside the G_OBJECT macro g_signal_connect_after(G_OBJECT(widtxt), "style_set", - G_CALLBACK(ScintillaGTK::StyleSetText), NULL); + G_CALLBACK(ScintillaGTK::StyleSetText), nullptr); g_signal_connect_after(G_OBJECT(widtxt), "realize", - G_CALLBACK(ScintillaGTK::RealizeText), NULL); + G_CALLBACK(ScintillaGTK::RealizeText), nullptr); gtk_widget_realize(widtxt); gtk_widget_realize(PWidget(scrollbarv)); gtk_widget_realize(PWidget(scrollbarh)); @@ -296,7 +303,7 @@ void ScintillaGTK::RealizeThis(GtkWidget *widget) { g_signal_connect(PWidget(wSelection), "selection_get", G_CALLBACK(PrimarySelection), (gpointer) this); g_signal_connect(PWidget(wSelection), "selection_clear_event", G_CALLBACK(PrimaryClear), (gpointer) this); gtk_selection_add_targets(PWidget(wSelection), GDK_SELECTION_PRIMARY, - clipboardCopyTargets, nClipboardCopyTargets); + clipboardCopyTargets, nClipboardCopyTargets); } void ScintillaGTK::Realize(GtkWidget *widget) { @@ -321,7 +328,7 @@ void ScintillaGTK::UnRealizeThis(GtkWidget *widget) { gtk_widget_unrealize(PWidget(wPreedit)); gtk_widget_unrealize(PWidget(wPreeditDraw)); g_object_unref(im_context); - im_context = NULL; + im_context = nullptr; if (GTK_WIDGET_CLASS(parentClass)->unrealize) GTK_WIDGET_CLASS(parentClass)->unrealize(widget); @@ -338,8 +345,8 @@ void ScintillaGTK::UnRealize(GtkWidget *widget) { static void MapWidget(GtkWidget *widget) { if (widget && - gtk_widget_get_visible(GTK_WIDGET(widget)) && - !IS_WIDGET_MAPPED(widget)) { + gtk_widget_get_visible(GTK_WIDGET(widget)) && + !IS_WIDGET_MAPPED(widget)) { gtk_widget_map(widget); } } @@ -389,11 +396,11 @@ void ScintillaGTK::UnMap(GtkWidget *widget) { void ScintillaGTK::ForAll(GtkCallback callback, gpointer callback_data) { try { - (*callback) (PWidget(wText), callback_data); + (*callback)(PWidget(wText), callback_data); if (PWidget(scrollbarv)) - (*callback) (PWidget(scrollbarv), callback_data); + (*callback)(PWidget(scrollbarv), callback_data); if (PWidget(scrollbarh)) - (*callback) (PWidget(scrollbarh), callback_data); + (*callback)(PWidget(scrollbarh), callback_data); } catch (...) { errorStatus = SC_STATUS_FAILURE; } @@ -402,7 +409,7 @@ void ScintillaGTK::ForAll(GtkCallback callback, gpointer callback_data) { void ScintillaGTK::MainForAll(GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data) { ScintillaGTK *sciThis = FromWidget((GtkWidget *)container); - if (callback != NULL && include_internals) { + if (callback && include_internals) { sciThis->ForAll(callback, callback_data); } } @@ -421,7 +428,7 @@ class PreEditString { explicit PreEditString(GtkIMContext *im_context) { gtk_im_context_get_preedit_string(im_context, &str, &attrs, &cursor_pos); - validUTF8 = g_utf8_validate(str, strlen(str), NULL); + validUTF8 = g_utf8_validate(str, strlen(str), nullptr); uniStr = g_utf8_to_ucs4_fast(str, strlen(str), &uniStrLen); pscript = pango_script_for_unichar(uniStr[0]); } @@ -437,9 +444,9 @@ class PreEditString { gint ScintillaGTK::FocusInThis(GtkWidget *) { try { SetFocusState(true); - if (im_context != NULL) { + if (im_context) { PreEditString pes(im_context); - if (PWidget(wPreedit) != NULL) { + if (PWidget(wPreedit)) { if (strlen(pes.str) > 0) { gtk_widget_show(PWidget(wPreedit)); } else { @@ -464,9 +471,9 @@ gint ScintillaGTK::FocusOutThis(GtkWidget *) { try { SetFocusState(false); - if (PWidget(wPreedit) != NULL) + if (PWidget(wPreedit)) gtk_widget_hide(PWidget(wPreedit)); - if (im_context != NULL) + if (im_context) gtk_im_context_focus_out(im_context); } catch (...) { @@ -486,8 +493,8 @@ void ScintillaGTK::SizeRequest(GtkWidget *widget, GtkRequisition *requisition) { requisition->height = 1; GtkRequisition child_requisition; #if GTK_CHECK_VERSION(3,0,0) - gtk_widget_get_preferred_size(PWidget(sciThis->scrollbarh), NULL, &child_requisition); - gtk_widget_get_preferred_size(PWidget(sciThis->scrollbarv), NULL, &child_requisition); + gtk_widget_get_preferred_size(PWidget(sciThis->scrollbarh), nullptr, &child_requisition); + gtk_widget_get_preferred_size(PWidget(sciThis->scrollbarv), nullptr, &child_requisition); #else gtk_widget_size_request(PWidget(sciThis->scrollbarh), &child_requisition); gtk_widget_size_request(PWidget(sciThis->scrollbarv), &child_requisition); @@ -516,10 +523,10 @@ void ScintillaGTK::SizeAllocate(GtkWidget *widget, GtkAllocation *allocation) { gtk_widget_set_allocation(widget, allocation); if (IS_WIDGET_REALIZED(widget)) gdk_window_move_resize(WindowFromWidget(widget), - allocation->x, - allocation->y, - allocation->width, - allocation->height); + allocation->x, + allocation->y, + allocation->width, + allocation->height); sciThis->Resize(allocation->width, allocation->height); @@ -530,7 +537,7 @@ void ScintillaGTK::SizeAllocate(GtkWidget *widget, GtkAllocation *allocation) { void ScintillaGTK::Init() { parentClass = reinterpret_cast<GtkWidgetClass *>( - g_type_class_ref(gtk_container_get_type())); + g_type_class_ref(gtk_container_get_type())); gint maskSmooth = 0; #if defined(GDK_WINDOWING_WAYLAND) @@ -544,34 +551,34 @@ void ScintillaGTK::Init() { gtk_widget_set_can_focus(PWidget(wMain), TRUE); gtk_widget_set_sensitive(PWidget(wMain), TRUE); gtk_widget_set_events(PWidget(wMain), - GDK_EXPOSURE_MASK - | GDK_SCROLL_MASK - | maskSmooth - | GDK_STRUCTURE_MASK - | GDK_KEY_PRESS_MASK - | GDK_KEY_RELEASE_MASK - | GDK_FOCUS_CHANGE_MASK - | GDK_LEAVE_NOTIFY_MASK - | GDK_BUTTON_PRESS_MASK - | GDK_BUTTON_RELEASE_MASK - | GDK_POINTER_MOTION_MASK - | GDK_POINTER_MOTION_HINT_MASK); + GDK_EXPOSURE_MASK + | GDK_SCROLL_MASK + | maskSmooth + | GDK_STRUCTURE_MASK + | GDK_KEY_PRESS_MASK + | GDK_KEY_RELEASE_MASK + | GDK_FOCUS_CHANGE_MASK + | GDK_LEAVE_NOTIFY_MASK + | GDK_BUTTON_PRESS_MASK + | GDK_BUTTON_RELEASE_MASK + | GDK_POINTER_MOTION_MASK + | GDK_POINTER_MOTION_HINT_MASK); wText = gtk_drawing_area_new(); gtk_widget_set_parent(PWidget(wText), PWidget(wMain)); GtkWidget *widtxt = PWidget(wText); // No code inside the G_OBJECT macro gtk_widget_show(widtxt); #if GTK_CHECK_VERSION(3,0,0) g_signal_connect(G_OBJECT(widtxt), "draw", - G_CALLBACK(ScintillaGTK::DrawText), this); + G_CALLBACK(ScintillaGTK::DrawText), this); #else g_signal_connect(G_OBJECT(widtxt), "expose_event", - G_CALLBACK(ScintillaGTK::ExposeText), this); + G_CALLBACK(ScintillaGTK::ExposeText), this); #endif #if GTK_CHECK_VERSION(3,0,0) // we need a runtime check because we don't want double buffering when // running on >= 3.9.2 - if (gtk_check_version(3,9,2) != NULL /* on < 3.9.2 */) + if (gtk_check_version(3, 9, 2) != nullptr /* on < 3.9.2 */) #endif { #if !GTK_CHECK_VERSION(3,14,0) @@ -589,7 +596,7 @@ void ScintillaGTK::Init() { #endif gtk_widget_set_can_focus(PWidget(scrollbarv), FALSE); g_signal_connect(G_OBJECT(adjustmentv), "value_changed", - G_CALLBACK(ScrollSignal), this); + G_CALLBACK(ScrollSignal), this); gtk_widget_set_parent(PWidget(scrollbarv), PWidget(wMain)); gtk_widget_show(PWidget(scrollbarv)); @@ -601,26 +608,26 @@ void ScintillaGTK::Init() { #endif gtk_widget_set_can_focus(PWidget(scrollbarh), FALSE); g_signal_connect(G_OBJECT(adjustmenth), "value_changed", - G_CALLBACK(ScrollHSignal), this); + G_CALLBACK(ScrollHSignal), this); gtk_widget_set_parent(PWidget(scrollbarh), PWidget(wMain)); gtk_widget_show(PWidget(scrollbarh)); gtk_widget_grab_focus(PWidget(wMain)); gtk_drag_dest_set(GTK_WIDGET(PWidget(wMain)), - GTK_DEST_DEFAULT_ALL, clipboardPasteTargets, nClipboardPasteTargets, - actionCopyOrMove); + GTK_DEST_DEFAULT_ALL, clipboardPasteTargets, nClipboardPasteTargets, + actionCopyOrMove); /* create pre-edit window */ wPreedit = gtk_window_new(GTK_WINDOW_POPUP); wPreeditDraw = gtk_drawing_area_new(); GtkWidget *predrw = PWidget(wPreeditDraw); // No code inside the G_OBJECT macro #if GTK_CHECK_VERSION(3,0,0) g_signal_connect(G_OBJECT(predrw), "draw", - G_CALLBACK(DrawPreedit), this); + G_CALLBACK(DrawPreedit), this); #else g_signal_connect(G_OBJECT(predrw), "expose_event", - G_CALLBACK(ExposePreedit), this); + G_CALLBACK(ExposePreedit), this); #endif gtk_container_add(GTK_CONTAINER(PWidget(wPreedit)), predrw); gtk_widget_show(predrw); @@ -630,15 +637,15 @@ void ScintillaGTK::Init() { if (g_object_class_find_property(G_OBJECT_GET_CLASS( G_OBJECT(gtk_settings_get_default())), "gtk-cursor-blink")) { g_object_get(G_OBJECT( - gtk_settings_get_default()), "gtk-cursor-blink", &blinkOn, NULL); + gtk_settings_get_default()), "gtk-cursor-blink", &blinkOn, nullptr); } if (blinkOn && - g_object_class_find_property(G_OBJECT_GET_CLASS( - G_OBJECT(gtk_settings_get_default())), "gtk-cursor-blink-time")) { + g_object_class_find_property(G_OBJECT_GET_CLASS( + G_OBJECT(gtk_settings_get_default())), "gtk-cursor-blink-time")) { gint value; g_object_get(G_OBJECT( - gtk_settings_get_default()), "gtk-cursor-blink-time", &value, NULL); - caret.period = gint(value / 1.75); + gtk_settings_get_default()), "gtk-cursor-blink-time", &value, nullptr); + caret.period = static_cast<int>(value / 1.75); } else { caret.period = 0; } @@ -658,9 +665,9 @@ void ScintillaGTK::Finalise() { FineTickerCancel(tr); } if (accessible) { - gtk_accessible_set_widget(GTK_ACCESSIBLE(accessible), NULL); + gtk_accessible_set_widget(GTK_ACCESSIBLE(accessible), nullptr); g_object_unref(accessible); - accessible = 0; + accessible = nullptr; } ScintillaBase::Finalise(); @@ -682,7 +689,7 @@ void ScintillaGTK::DisplayCursor(Window::Cursor c) { bool ScintillaGTK::DragThreshold(Point ptStart, Point ptNow) { return gtk_drag_check_threshold(GTK_WIDGET(PWidget(wMain)), - ptStart.x, ptStart.y, ptNow.x, ptNow.y); + ptStart.x, ptStart.y, ptNow.x, ptNow.y); } void ScintillaGTK::StartDrag() { @@ -692,23 +699,23 @@ void ScintillaGTK::StartDrag() { GtkTargetList *tl = gtk_target_list_new(clipboardCopyTargets, nClipboardCopyTargets); #if GTK_CHECK_VERSION(3,10,0) gtk_drag_begin_with_coordinates(GTK_WIDGET(PWidget(wMain)), - tl, - actionCopyOrMove, - buttonMouse, - evbtn, - -1, -1); + tl, + actionCopyOrMove, + buttonMouse, + evbtn, + -1, -1); #else gtk_drag_begin(GTK_WIDGET(PWidget(wMain)), - tl, - actionCopyOrMove, - buttonMouse, - evbtn); + tl, + actionCopyOrMove, + buttonMouse, + evbtn); #endif } namespace Scintilla { std::string ConvertText(const char *s, size_t len, const char *charSetDest, - const char *charSetSource, bool transliterations, bool silent) { + 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); @@ -720,7 +727,7 @@ std::string ConvertText(const char *s, size_t len, const char *charSetDest, gsize inLeft = len; char *putf = &destForm[0]; char *pout = putf; - gsize conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); + const gsize conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); if (conversions == sizeFailure) { if (!silent) { if (len == 1) @@ -744,7 +751,7 @@ std::string ConvertText(const char *s, size_t len, const char *charSetDest, // Returns the target converted to UTF8. // Return the length in bytes. Sci::Position ScintillaGTK::TargetAsUTF8(char *text) const { - Sci::Position targetLength = targetEnd - targetStart; + const Sci::Position targetLength = targetEnd - targetStart; if (IsUnicodeMode()) { if (text) { pdoc->GetCharRange(text, targetStart, targetLength); @@ -771,7 +778,7 @@ Sci::Position ScintillaGTK::TargetAsUTF8(char *text) const { // Translates a nul terminated UTF8 string into the document encoding. // Return the length of the result in bytes. Sci::Position ScintillaGTK::EncodedFromUTF8(const char *utf8, char *encoded) const { - Sci::Position inputLength = (lengthForEncode >= 0) ? lengthForEncode : strlen(utf8); + const Sci::Position inputLength = (lengthForEncode >= 0) ? lengthForEncode : strlen(utf8); if (IsUnicodeMode()) { if (encoded) { memcpy(encoded, utf8, inputLength); @@ -799,12 +806,12 @@ Sci::Position ScintillaGTK::EncodedFromUTF8(const char *utf8, char *encoded) con bool ScintillaGTK::ValidCodePage(int codePage) const { return codePage == 0 - || codePage == SC_CP_UTF8 - || codePage == 932 - || codePage == 936 - || codePage == 949 - || codePage == 950 - || codePage == 1361; + || codePage == SC_CP_UTF8 + || codePage == 932 + || codePage == 936 + || codePage == 949 + || codePage == 950 + || codePage == 1361; } sptr_t ScintillaGTK::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { @@ -831,7 +838,7 @@ sptr_t ScintillaGTK::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam case SCI_ENCODEDFROMUTF8: return EncodedFromUTF8(ConstCharPtrFromUPtr(wParam), - CharPtrFromSPtr(lParam)); + CharPtrFromSPtr(lParam)); case SCI_SETRECTANGULARSELECTIONMODIFIER: rectangularSelectionModifier = wParam; @@ -841,15 +848,15 @@ sptr_t ScintillaGTK::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam return rectangularSelectionModifier; case SCI_SETREADONLY: { - sptr_t ret = ScintillaBase::WndProc(iMessage, wParam, lParam); - if (accessible) { - ScintillaGTKAccessible *sciAccessible = ScintillaGTKAccessible::FromAccessible(accessible); - if (sciAccessible) { - sciAccessible->NotifyReadOnly(); + const sptr_t ret = ScintillaBase::WndProc(iMessage, wParam, lParam); + if (accessible) { + ScintillaGTKAccessible *sciAccessible = ScintillaGTKAccessible::FromAccessible(accessible); + if (sciAccessible) { + sciAccessible->NotifyReadOnly(); + } } + return ret; } - return ret; - } case SCI_GETACCESSIBILITY: return accessibilityEnabled; @@ -867,7 +874,7 @@ sptr_t ScintillaGTK::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam default: return ScintillaBase::WndProc(iMessage, wParam, lParam); } - } catch (std::bad_alloc&) { + } catch (std::bad_alloc &) { errorStatus = SC_STATUS_BADALLOC; } catch (...) { errorStatus = SC_STATUS_FAILURE; @@ -901,7 +908,7 @@ bool ScintillaGTK::SetIdle(bool on) { if (!idler.state) { idler.state = true; idler.idlerID = GUINT_TO_POINTER( - gdk_threads_add_idle_full(G_PRIORITY_DEFAULT_IDLE, IdleCallback, this, NULL)); + gdk_threads_add_idle_full(G_PRIORITY_DEFAULT_IDLE, IdleCallback, this, nullptr)); } } else { // Stop idler, if it's running @@ -959,11 +966,13 @@ bool ScintillaGTK::PaintContains(PRectangle rc) { } else if (rgnUpdate) { #if GTK_CHECK_VERSION(3,0,0) cairo_rectangle_t grc = {rc.left, rc.top, - rc.right - rc.left, rc.bottom - rc.top}; + rc.right - rc.left, rc.bottom - rc.top + }; contains = CRectListContains(rgnUpdate, grc); #else GdkRectangle grc = {static_cast<gint>(rc.left), static_cast<gint>(rc.top), - static_cast<gint>(rc.right - rc.left), static_cast<gint>(rc.bottom - rc.top)}; + static_cast<gint>(rc.right - rc.left), static_cast<gint>(rc.bottom - rc.top) + }; if (gdk_region_rect_in(rgnUpdate, &grc) != GDK_OVERLAP_RECTANGLE_IN) { contains = false; } @@ -1023,35 +1032,35 @@ void ScintillaGTK::SetHorizontalScrollPos() { bool ScintillaGTK::ModifyScrollBars(Sci::Line nMax, Sci::Line nPage) { bool modified = false; - int pageScroll = LinesToScroll(); + const int pageScroll = LinesToScroll(); if (gtk_adjustment_get_upper(adjustmentv) != (nMax + 1) || - gtk_adjustment_get_page_size(adjustmentv) != nPage || - gtk_adjustment_get_page_increment(adjustmentv) != pageScroll) { + gtk_adjustment_get_page_size(adjustmentv) != nPage || + gtk_adjustment_get_page_increment(adjustmentv) != pageScroll) { gtk_adjustment_set_upper(adjustmentv, nMax + 1); - gtk_adjustment_set_page_size(adjustmentv, nPage); - gtk_adjustment_set_page_increment(adjustmentv, pageScroll); + gtk_adjustment_set_page_size(adjustmentv, nPage); + gtk_adjustment_set_page_increment(adjustmentv, pageScroll); #if !GTK_CHECK_VERSION(3,18,0) gtk_adjustment_changed(GTK_ADJUSTMENT(adjustmentv)); #endif modified = true; } - PRectangle rcText = GetTextRectangle(); + const PRectangle rcText = GetTextRectangle(); int horizEndPreferred = scrollWidth; if (horizEndPreferred < 0) horizEndPreferred = 0; - unsigned int pageWidth = rcText.Width(); - unsigned int pageIncrement = pageWidth / 3; - unsigned int charWidth = vs.styles[STYLE_DEFAULT].aveCharWidth; + const unsigned int pageWidth = static_cast<unsigned int>(rcText.Width()); + const unsigned int pageIncrement = pageWidth / 3; + const unsigned int charWidth = vs.styles[STYLE_DEFAULT].aveCharWidth; if (gtk_adjustment_get_upper(adjustmenth) != horizEndPreferred || - gtk_adjustment_get_page_size(adjustmenth) != pageWidth || - gtk_adjustment_get_page_increment(adjustmenth) != pageIncrement || - gtk_adjustment_get_step_increment(adjustmenth) != charWidth) { + gtk_adjustment_get_page_size(adjustmenth) != pageWidth || + gtk_adjustment_get_page_increment(adjustmenth) != pageIncrement || + gtk_adjustment_get_step_increment(adjustmenth) != charWidth) { gtk_adjustment_set_upper(adjustmenth, horizEndPreferred); - gtk_adjustment_set_page_size(adjustmenth, pageWidth); - gtk_adjustment_set_page_increment(adjustmenth, pageIncrement); - gtk_adjustment_set_step_increment(adjustmenth, charWidth); + gtk_adjustment_set_page_size(adjustmenth, pageWidth); + gtk_adjustment_set_page_increment(adjustmenth, pageIncrement); + gtk_adjustment_set_step_increment(adjustmenth, charWidth); #if !GTK_CHECK_VERSION(3,18,0) gtk_adjustment_changed(GTK_ADJUSTMENT(adjustmenth)); #endif @@ -1065,28 +1074,28 @@ bool ScintillaGTK::ModifyScrollBars(Sci::Line nMax, Sci::Line nPage) { } void ScintillaGTK::ReconfigureScrollBars() { - PRectangle rc = wMain.GetClientPosition(); - Resize(rc.Width(), rc.Height()); + const PRectangle rc = wMain.GetClientPosition(); + Resize(static_cast<int>(rc.Width()), static_cast<int>(rc.Height())); } void ScintillaGTK::NotifyChange() { g_signal_emit(G_OBJECT(sci), scintilla_signals[COMMAND_SIGNAL], 0, - Platform::LongFromTwoShorts(GetCtrlID(), SCEN_CHANGE), PWidget(wMain)); + Platform::LongFromTwoShorts(GetCtrlID(), SCEN_CHANGE), PWidget(wMain)); } void ScintillaGTK::NotifyFocus(bool focus) { if (commandEvents) g_signal_emit(G_OBJECT(sci), scintilla_signals[COMMAND_SIGNAL], 0, - Platform::LongFromTwoShorts - (GetCtrlID(), focus ? SCEN_SETFOCUS : SCEN_KILLFOCUS), PWidget(wMain)); + Platform::LongFromTwoShorts + (GetCtrlID(), focus ? SCEN_SETFOCUS : SCEN_KILLFOCUS), PWidget(wMain)); Editor::NotifyFocus(focus); } void ScintillaGTK::NotifyParent(SCNotification scn) { scn.nmhdr.hwndFrom = PWidget(wMain); scn.nmhdr.idFrom = GetCtrlID(); g_signal_emit(G_OBJECT(sci), scintilla_signals[NOTIFY_SIGNAL], 0, - GetCtrlID(), &scn); + GetCtrlID(), &scn); } void ScintillaGTK::NotifyKey(int key, int modifiers) { @@ -1124,7 +1133,7 @@ class CaseFolderDBCS : public CaseFolderTable { return 1; } else if (*charSet) { std::string sUTF8 = ConvertText(mixed, lenMixed, - "UTF-8", charSet, false); + "UTF-8", charSet, false); if (!sUTF8.empty()) { gchar *mapped = g_utf8_casefold(sUTF8.c_str(), sUTF8.length()); size_t lenMapped = strlen(mapped); @@ -1159,12 +1168,12 @@ CaseFolder *ScintillaGTK::CaseFolderForEncoding() { sCharacter[0] = i; // Silent as some bytes have no assigned character std::string sUTF8 = ConvertText(sCharacter, 1, - "UTF-8", charSetBuffer, false, true); + "UTF-8", charSetBuffer, false, true); if (!sUTF8.empty()) { gchar *mapped = g_utf8_casefold(sUTF8.c_str(), sUTF8.length()); if (mapped) { std::string mappedBack = ConvertText(mapped, strlen(mapped), - charSetBuffer, "UTF-8", false, true); + charSetBuffer, "UTF-8", false, true); if ((mappedBack.length() == 1) && (mappedBack[0] != sCharacter[0])) { pcf->SetTranslation(sCharacter[0], mappedBack[0]); } @@ -1177,7 +1186,7 @@ CaseFolder *ScintillaGTK::CaseFolderForEncoding() { return new CaseFolderDBCS(charSetBuffer); } } - return 0; + return nullptr; } } @@ -1205,8 +1214,8 @@ std::string ScintillaGTK::CaseMapString(const std::string &s, int caseMapping) { if (IsUnicodeMode()) { std::string retMapped(s.length() * maxExpansionCaseConversion, 0); - size_t lenMapped = CaseConvertString(&retMapped[0], retMapped.length(), s.c_str(), s.length(), - (caseMapping == cmUpper) ? CaseConversionUpper : CaseConversionLower); + const size_t lenMapped = CaseConvertString(&retMapped[0], retMapped.length(), s.c_str(), s.length(), + (caseMapping == cmUpper) ? CaseConversionUpper : CaseConversionLower); retMapped.resize(lenMapped); return retMapped; } @@ -1219,7 +1228,7 @@ std::string ScintillaGTK::CaseMapString(const std::string &s, int caseMapping) { } else { // Change text to UTF-8 std::string sUTF8 = ConvertText(s.c_str(), s.length(), - "UTF-8", charSetBuffer, false); + "UTF-8", charSetBuffer, false); CaseMapper mapper(sUTF8, caseMapping == cmUpper); return ConvertText(mapper.mapped, strlen(mapper.mapped), charSetBuffer, "UTF-8", false); } @@ -1252,37 +1261,47 @@ void ScintillaGTK::Copy() { } } -void ScintillaGTK::Paste() { - atomSought = atomUTF8; - GtkClipboard *clipBoard = - gtk_widget_get_clipboard(GTK_WIDGET(PWidget(wMain)), atomClipboard); - if (clipBoard == NULL) - return; +namespace { - // helper class for the asynchronous paste not to risk calling in a destroyed ScintillaGTK - class Helper : GObjectWatcher { - ScintillaGTK *sci; +// Helper class for the asynchronous paste not to risk calling in a destroyed ScintillaGTK - void Destroyed() override { - sci = 0; - } +class SelectionReceiver : GObjectWatcher { + ScintillaGTK *sci; - public: - Helper(ScintillaGTK *sci_) : - GObjectWatcher(G_OBJECT(PWidget(sci_->wMain))), - sci(sci_) { - } + void Destroyed() override { + sci = nullptr; + } - 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; +public: + SelectionReceiver(ScintillaGTK *sci_) : + GObjectWatcher(G_OBJECT(sci_->MainObject())), + sci(sci_) { + } + + static void ClipboardReceived(GtkClipboard *, GtkSelectionData *selection_data, gpointer data) { + SelectionReceiver *self = static_cast<SelectionReceiver *>(data); + if (self->sci) { + self->sci->ReceivedClipboard(selection_data); } - }; + delete self; + } +}; - gtk_clipboard_request_contents(clipBoard, atomSought, Helper::ClipboardReceived, new Helper(this)); +} + +void ScintillaGTK::RequestSelection(GdkAtom atomSelection) { + atomSought = atomUTF8; + GtkClipboard *clipBoard = + gtk_widget_get_clipboard(GTK_WIDGET(PWidget(wMain)), atomSelection); + if (clipBoard) { + gtk_clipboard_request_contents(clipBoard, atomSought, + SelectionReceiver::ClipboardReceived, + new SelectionReceiver(this)); + } +} + +void ScintillaGTK::Paste() { + RequestSelection(GDK_SELECTION_CLIPBOARD); } void ScintillaGTK::CreateCallTipWindow(PRectangle rc) { @@ -1293,23 +1312,25 @@ void ScintillaGTK::CreateCallTipWindow(PRectangle rc) { gtk_container_add(GTK_CONTAINER(PWidget(ct.wCallTip)), widcdrw); #if GTK_CHECK_VERSION(3,0,0) g_signal_connect(G_OBJECT(widcdrw), "draw", - G_CALLBACK(ScintillaGTK::DrawCT), &ct); + G_CALLBACK(ScintillaGTK::DrawCT), &ct); #else g_signal_connect(G_OBJECT(widcdrw), "expose_event", - G_CALLBACK(ScintillaGTK::ExposeCT), &ct); + G_CALLBACK(ScintillaGTK::ExposeCT), &ct); #endif g_signal_connect(G_OBJECT(widcdrw), "button_press_event", - G_CALLBACK(ScintillaGTK::PressCT), this); + G_CALLBACK(ScintillaGTK::PressCT), this); gtk_widget_set_events(widcdrw, - GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK); + GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK); GtkWidget *top = gtk_widget_get_toplevel(static_cast<GtkWidget *>(wMain.GetID())); gtk_window_set_transient_for(GTK_WINDOW(static_cast<GtkWidget *>(PWidget(ct.wCallTip))), - GTK_WINDOW(top)); + GTK_WINDOW(top)); } - gtk_widget_set_size_request(PWidget(ct.wDraw), rc.Width(), rc.Height()); + const int width = static_cast<int>(rc.Width()); + const int height = static_cast<int>(rc.Height()); + gtk_widget_set_size_request(PWidget(ct.wDraw), width, height); ct.wDraw.Show(); if (PWindow(ct.wCallTip)) { - gdk_window_resize(PWindow(ct.wCallTip), rc.Width(), rc.Height()); + gdk_window_resize(PWindow(ct.wCallTip), width, height); } } @@ -1321,7 +1342,7 @@ void ScintillaGTK::AddToPopUp(const char *label, int cmd, bool enabled) { menuItem = gtk_separator_menu_item_new(); gtk_menu_shell_append(GTK_MENU_SHELL(popup.GetID()), menuItem); g_object_set_data(G_OBJECT(menuItem), "CmdNum", GINT_TO_POINTER(cmd)); - g_signal_connect(G_OBJECT(menuItem),"activate", G_CALLBACK(PopUpCB), this); + g_signal_connect(G_OBJECT(menuItem), "activate", G_CALLBACK(PopUpCB), this); if (cmd) { if (menuItem) @@ -1332,7 +1353,7 @@ void ScintillaGTK::AddToPopUp(const char *label, int cmd, bool enabled) { bool ScintillaGTK::OwnPrimarySelection() { return (wSelection.Created() && (gdk_selection_owner_get(GDK_SELECTION_PRIMARY) == PWindow(wSelection)) && - (PWindow(wSelection) != NULL)); + (PWindow(wSelection) != nullptr)); } void ScintillaGTK::ClaimSelection() { @@ -1341,12 +1362,12 @@ void ScintillaGTK::ClaimSelection() { if (!sel.Empty() && wSelection.Created() && IS_WIDGET_REALIZED(GTK_WIDGET(PWidget(wSelection)))) { primarySelection = true; gtk_selection_owner_set(GTK_WIDGET(PWidget(wSelection)), - GDK_SELECTION_PRIMARY, GDK_CURRENT_TIME); + GDK_SELECTION_PRIMARY, GDK_CURRENT_TIME); primary.Clear(); } else if (OwnPrimarySelection()) { primarySelection = true; if (primary.Empty()) - gtk_selection_owner_set(NULL, GDK_SELECTION_PRIMARY, GDK_CURRENT_TIME); + gtk_selection_owner_set(nullptr, GDK_SELECTION_PRIMARY, GDK_CURRENT_TIME); } else { primarySelection = false; primary.Clear(); @@ -1396,47 +1417,67 @@ void ScintillaGTK::GetGtkSelectionText(GtkSelectionData *selectionData, Selectio } else { // Assume buffer is in same encoding as selection selText.Copy(dest, pdoc->dbcsCodePage, - vs.styles[STYLE_DEFAULT].characterSet, isRectangular, false); + vs.styles[STYLE_DEFAULT].characterSet, isRectangular, false); } } else { // UTF-8 const char *charSetBuffer = CharacterSetID(); if (!IsUnicodeMode() && *charSetBuffer) { // Convert to locale dest = ConvertText(dest.c_str(), dest.length(), charSetBuffer, "UTF-8", true); selText.Copy(dest, pdoc->dbcsCodePage, - vs.styles[STYLE_DEFAULT].characterSet, isRectangular, false); + vs.styles[STYLE_DEFAULT].characterSet, isRectangular, false); } else { selText.Copy(dest, SC_CP_UTF8, 0, isRectangular, false); } } } +void ScintillaGTK::InsertSelection(GtkSelectionData *selectionData) { + const gint length = gtk_selection_data_get_length(selectionData); + if (length >= 0) { + GdkAtom selection = gtk_selection_data_get_selection(selectionData); + SelectionText selText; + GetGtkSelectionText(selectionData, selText); + + UndoGroup ug(pdoc); + if (selection == GDK_SELECTION_CLIPBOARD) { + ClearSelection(multiPasteMode == SC_MULTIPASTE_EACH); + } + + InsertPasteShape(selText.Data(), selText.Length(), + selText.rectangular ? pasteRectangular : pasteStream); + EnsureCaretVisible(); + } + Redraw(); +} + +GObject *ScintillaGTK::MainObject() const noexcept { + return G_OBJECT(PWidget(wMain)); +} + +void ScintillaGTK::ReceivedClipboard(GtkSelectionData *selection_data) noexcept { + try { + InsertSelection(selection_data); + } catch (...) { + errorStatus = SC_STATUS_FAILURE; + } +} + void ScintillaGTK::ReceivedSelection(GtkSelectionData *selection_data) { try { - if ((SelectionOfGSD(selection_data) == atomClipboard) || - (SelectionOfGSD(selection_data) == GDK_SELECTION_PRIMARY)) { + if ((SelectionOfGSD(selection_data) == GDK_SELECTION_CLIPBOARD) || + (SelectionOfGSD(selection_data) == GDK_SELECTION_PRIMARY)) { if ((atomSought == atomUTF8) && (LengthOfGSD(selection_data) <= 0)) { atomSought = atomString; gtk_selection_convert(GTK_WIDGET(PWidget(wMain)), - SelectionOfGSD(selection_data), atomSought, GDK_CURRENT_TIME); + SelectionOfGSD(selection_data), atomSought, GDK_CURRENT_TIME); } else if ((LengthOfGSD(selection_data) > 0) && - ((TypeOfGSD(selection_data) == GDK_TARGET_STRING) || (TypeOfGSD(selection_data) == atomUTF8))) { - SelectionText selText; - GetGtkSelectionText(selection_data, selText); - - UndoGroup ug(pdoc); - if (SelectionOfGSD(selection_data) != GDK_SELECTION_PRIMARY) { - ClearSelection(multiPasteMode == SC_MULTIPASTE_EACH); - } - - InsertPasteShape(selText.Data(), selText.Length(), - selText.rectangular ? pasteRectangular : pasteStream); - EnsureCaretVisible(); + ((TypeOfGSD(selection_data) == GDK_TARGET_STRING) || (TypeOfGSD(selection_data) == atomUTF8))) { + InsertSelection(selection_data); } } // else fprintf(stderr, "Target non string %d %d\n", (int)(selection_data->type), // (int)(atomUTF8)); - Redraw(); } catch (...) { errorStatus = SC_STATUS_FAILURE; } @@ -1507,29 +1548,29 @@ void ScintillaGTK::GetSelection(GtkSelectionData *selection_data, guint info, Se gtk_selection_data_set_text(selection_data, textData, len); } else { gtk_selection_data_set(selection_data, - static_cast<GdkAtom>(GDK_SELECTION_TYPE_STRING), - 8, reinterpret_cast<const guchar *>(textData), len); + static_cast<GdkAtom>(GDK_SELECTION_TYPE_STRING), + 8, reinterpret_cast<const guchar *>(textData), len); } } void ScintillaGTK::StoreOnClipboard(SelectionText *clipText) { GtkClipboard *clipBoard = - gtk_widget_get_clipboard(GTK_WIDGET(PWidget(wMain)), atomClipboard); - if (clipBoard == NULL) // Occurs if widget isn't in a toplevel + gtk_widget_get_clipboard(GTK_WIDGET(PWidget(wMain)), GDK_SELECTION_CLIPBOARD); + if (clipBoard == nullptr) // Occurs if widget isn't in a toplevel return; if (gtk_clipboard_set_with_data(clipBoard, clipboardCopyTargets, nClipboardCopyTargets, - ClipboardGetSelection, ClipboardClearSelection, clipText)) { + ClipboardGetSelection, ClipboardClearSelection, clipText)) { gtk_clipboard_set_can_store(clipBoard, clipboardCopyTargets, nClipboardCopyTargets); } } void ScintillaGTK::ClipboardGetSelection(GtkClipboard *, GtkSelectionData *selection_data, guint info, void *data) { - GetSelection(selection_data, info, static_cast<SelectionText*>(data)); + GetSelection(selection_data, info, static_cast<SelectionText *>(data)); } void ScintillaGTK::ClipboardClearSelection(GtkClipboard *, void *data) { - SelectionText *obj = static_cast<SelectionText*>(data); + SelectionText *obj = static_cast<SelectionText *>(data); delete obj; } @@ -1595,9 +1636,9 @@ void ScintillaGTK::Resize(int width, int height) { // These allocations should never produce negative sizes as they would wrap around to huge // unsigned numbers inside GTK+ causing warnings. - bool showSBHorizontal = horizontalScrollBarVisible && !Wrapping(); + const bool showSBHorizontal = horizontalScrollBarVisible && !Wrapping(); - GtkAllocation alloc; + GtkAllocation alloc = {}; if (showSBHorizontal) { gtk_widget_show(GTK_WIDGET(PWidget(scrollbarh))); alloc.x = 0; @@ -1632,7 +1673,7 @@ void ScintillaGTK::Resize(int width, int height) { #if GTK_CHECK_VERSION(3, 0, 0) // please GTK 3.20 and ask wText what size it wants, although we know it doesn't really need // anything special as it's ours. - gtk_widget_get_preferred_size(PWidget(wText), &requisition, NULL); + gtk_widget_get_preferred_size(PWidget(wText), &requisition, nullptr); alloc.width = requisition.width; alloc.height = requisition.height; #endif @@ -1641,10 +1682,12 @@ void ScintillaGTK::Resize(int width, int height) { gtk_widget_size_allocate(GTK_WIDGET(PWidget(wText)), &alloc); } -static void SetAdjustmentValue(GtkAdjustment *object, int value) { +namespace { + +void SetAdjustmentValue(GtkAdjustment *object, int value) { GtkAdjustment *adjustment = GTK_ADJUSTMENT(object); - int maxValue = static_cast<int>( - gtk_adjustment_get_upper(adjustment) - gtk_adjustment_get_page_size(adjustment)); + const int maxValue = static_cast<int>( + gtk_adjustment_get_upper(adjustment) - gtk_adjustment_get_page_size(adjustment)); if (value > maxValue) value = maxValue; @@ -1653,21 +1696,29 @@ static void SetAdjustmentValue(GtkAdjustment *object, int value) { gtk_adjustment_set_value(adjustment, value); } -static int modifierTranslated(int sciModifier) { +int modifierTranslated(int sciModifier) noexcept { switch (sciModifier) { - case SCMOD_SHIFT: - return GDK_SHIFT_MASK; - case SCMOD_CTRL: - return GDK_CONTROL_MASK; - case SCMOD_ALT: - return GDK_MOD1_MASK; - case SCMOD_SUPER: - return GDK_MOD4_MASK; - default: - return 0; + case SCMOD_SHIFT: + return GDK_SHIFT_MASK; + case SCMOD_CTRL: + return GDK_CONTROL_MASK; + case SCMOD_ALT: + return GDK_MOD1_MASK; + case SCMOD_SUPER: + return GDK_MOD4_MASK; + default: + return 0; } } +Point PointOfEvent(const GdkEventButton *event) noexcept { + // Use floor as want to round in the same direction (-infinity) so + // there is no stickiness crossing 0.0. + return Point(static_cast<XYPOSITION>(std::floor(event->x)), static_cast<XYPOSITION>(std::floor(event->y))); +} + +} + gint ScintillaGTK::PressThis(GdkEventButton *event) { try { //Platform::DebugPrintf("Press %x time=%d state = %x button = %x\n",this,event->time, event->state, event->button); @@ -1680,46 +1731,42 @@ gint ScintillaGTK::PressThis(GdkEventButton *event) { } evbtn = gdk_event_copy(reinterpret_cast<GdkEvent *>(event)); buttonMouse = event->button; - Point pt; - pt.x = floor(event->x); - pt.y = floor(event->y); - PRectangle rcClient = GetClientRectangle(); + const Point pt = PointOfEvent(event); + const PRectangle rcClient = GetClientRectangle(); //Platform::DebugPrintf("Press %0d,%0d in %0d,%0d %0d,%0d\n", // pt.x, pt.y, rcClient.left, rcClient.top, rcClient.right, rcClient.bottom); if ((pt.x > rcClient.right) || (pt.y > rcClient.bottom)) { Platform::DebugPrintf("Bad location\n"); return FALSE; } - bool shift = (event->state & GDK_SHIFT_MASK) != 0; + const bool shift = (event->state & GDK_SHIFT_MASK) != 0; bool ctrl = (event->state & GDK_CONTROL_MASK) != 0; // On X, instead of sending literal modifiers use the user specified // modifier, defaulting to control instead of alt. // This is because most X window managers grab alt + click for moving - bool alt = (event->state & modifierTranslated(rectangularSelectionModifier)) != 0; + const bool alt = (event->state & modifierTranslated(rectangularSelectionModifier)) != 0; gtk_widget_grab_focus(PWidget(wMain)); if (event->button == 1) { #if PLAT_GTK_MACOSX - bool meta = ctrl; + const 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; + const bool meta = false; #endif ButtonDownWithModifiers(pt, event->time, ModifierFlags(shift, ctrl, alt, meta)); } else if (event->button == 2) { // Grab the primary selection if it exists - SelectionPosition pos = SPositionFromLocation(pt, false, false, UserVirtualSpace()); + const SelectionPosition pos = SPositionFromLocation(pt, false, false, UserVirtualSpace()); if (OwnPrimarySelection() && primary.Empty()) CopySelectionRange(&primary); sel.Clear(); SetSelection(pos, pos); - atomSought = atomUTF8; - gtk_selection_convert(GTK_WIDGET(PWidget(wMain)), GDK_SELECTION_PRIMARY, - atomSought, event->time); + RequestSelection(GDK_SELECTION_PRIMARY); } else if (event->button == 3) { if (!PointInSelection(pt)) SetEmptySelection(PositionFromLocation(pt)); @@ -1732,12 +1779,12 @@ gint ScintillaGTK::PressThis(GdkEventButton *event) { ContextMenu(Point(pt.x + ox, pt.y + oy)); } else { #if PLAT_GTK_MACOSX - bool meta = ctrl; + const 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; + const bool meta = false; #endif RightButtonDownWithModifiers(pt, event->time, ModifierFlags(shift, ctrl, alt, meta)); return FALSE; @@ -1775,19 +1822,17 @@ gint ScintillaGTK::MouseRelease(GtkWidget *widget, GdkEventButton *event) { if (!sciThis->HaveMouseCapture()) return FALSE; if (event->button == 1) { - Point pt; - pt.x = int(event->x); - pt.y = int(event->y); + Point pt = PointOfEvent(event); //Platform::DebugPrintf("Up %x %x %d %d %d\n", // sciThis,event->window,event->time, pt.x, pt.y); if (event->window != PWindow(sciThis->wMain)) // If mouse released on scroll bar then the position is relative to the // scrollbar, not the drawing window so just repeat the most recent point. pt = sciThis->ptMouseLast; const int modifiers = ModifierFlags( - (event->state & GDK_SHIFT_MASK) != 0, - (event->state & GDK_CONTROL_MASK) != 0, - (event->state & modifierTranslated(sciThis->rectangularSelectionModifier)) != 0); + (event->state & GDK_SHIFT_MASK) != 0, + (event->state & GDK_CONTROL_MASK) != 0, + (event->state & modifierTranslated(sciThis->rectangularSelectionModifier)) != 0); sciThis->ButtonUpWithModifiers(pt, event->time, modifiers); } } catch (...) { @@ -1802,7 +1847,7 @@ gint ScintillaGTK::ScrollEvent(GtkWidget *widget, GdkEventScroll *event) { ScintillaGTK *sciThis = FromWidget(widget); try { - if (widget == NULL || event == NULL) + if (widget == nullptr || event == nullptr) return FALSE; #if defined(GDK_WINDOWING_WAYLAND) @@ -1811,12 +1856,12 @@ gint ScintillaGTK::ScrollEvent(GtkWidget *widget, GdkEventScroll *event) { sciThis->smoothScrollY += event->delta_y * smoothScrollFactor; sciThis->smoothScrollX += event->delta_x * smoothScrollFactor;; if (ABS(sciThis->smoothScrollY) >= 1.0) { - const int scrollLines = trunc(sciThis->smoothScrollY); + const int scrollLines = std::trunc(sciThis->smoothScrollY); sciThis->ScrollTo(sciThis->topLine + scrollLines); sciThis->smoothScrollY -= scrollLines; } if (ABS(sciThis->smoothScrollX) >= 1.0) { - const int scrollPixels = trunc(sciThis->smoothScrollX); + const int scrollPixels = std::trunc(sciThis->smoothScrollX); sciThis->HorizontalScrollTo(sciThis->xOffset + scrollPixels); sciThis->smoothScrollX -= scrollPixels; } @@ -1913,7 +1958,7 @@ gint ScintillaGTK::Motion(GtkWidget *widget, GdkEventMotion *event) { if (event->is_hint) { #if GTK_CHECK_VERSION(3,0,0) gdk_window_get_device_position(event->window, - event->device, &x, &y, &state); + event->device, &x, &y, &state); #else gdk_window_get_pointer(event->window, &x, &y, &state); #endif @@ -1924,11 +1969,11 @@ gint ScintillaGTK::Motion(GtkWidget *widget, GdkEventMotion *event) { } //Platform::DebugPrintf("Move %x %x %d %c %d %d\n", // sciThis,event->window,event->time,event->is_hint? 'h' :'.', x, y); - Point pt(x, y); + const Point pt(static_cast<XYPOSITION>(x), static_cast<XYPOSITION>(y)); const int modifiers = ModifierFlags( - (event->state & GDK_SHIFT_MASK) != 0, - (event->state & GDK_CONTROL_MASK) != 0, - (event->state & modifierTranslated(sciThis->rectangularSelectionModifier)) != 0); + (event->state & GDK_SHIFT_MASK) != 0, + (event->state & GDK_CONTROL_MASK) != 0, + (event->state & modifierTranslated(sciThis->rectangularSelectionModifier)) != 0); sciThis->ButtonMoveWithModifiers(pt, event->time, modifiers); } catch (...) { sciThis->errorStatus = SC_STATUS_FAILURE; @@ -2090,10 +2135,10 @@ gboolean ScintillaGTK::KeyThis(GdkEventKey *event) { return true; } - bool shift = (event->state & GDK_SHIFT_MASK) != 0; + const bool shift = (event->state & GDK_SHIFT_MASK) != 0; bool ctrl = (event->state & GDK_CONTROL_MASK) != 0; - bool alt = (event->state & GDK_MOD1_MASK) != 0; - bool super = (event->state & GDK_MOD4_MASK) != 0; + const bool alt = (event->state & GDK_MOD1_MASK) != 0; + const bool super = (event->state & GDK_MOD4_MASK) != 0; guint key = event->keyval; if ((ctrl || alt) && (key < 128)) key = toupper(key); @@ -2110,12 +2155,12 @@ gboolean ScintillaGTK::KeyThis(GdkEventKey *event) { bool consumed = false; #if !(PLAT_GTK_MACOSX) - bool meta = false; + const bool meta = false; #else - bool meta = ctrl; + const bool meta = ctrl; ctrl = (event->state & GDK_META_MASK) != 0; #endif - bool added = KeyDownWithModifiers(key, ModifierFlags(shift, ctrl, alt, meta, super), &consumed) != 0; + const bool added = KeyDownWithModifiers(key, ModifierFlags(shift, ctrl, alt, meta, super), &consumed) != 0; if (!consumed) consumed = added; //fprintf(stderr, "SK-key: %d %x %x\n",event->keyval, event->state, consumed); @@ -2204,7 +2249,7 @@ bool ScintillaGTK::KoreanIME() { void ScintillaGTK::MoveImeCarets(int pos) { // Move carets relatively by bytes for (size_t r=0; r<sel.Count(); r++) { - int positionInsert = sel.Range(r).Start().Position(); + const Sci::Position positionInsert = sel.Range(r).Start().Position(); sel.Range(r).caret.SetPosition(positionInsert + pos); sel.Range(r).anchor.SetPosition(positionInsert + pos); } @@ -2220,7 +2265,7 @@ void ScintillaGTK::DrawImeIndicator(int indicator, int len) { } pdoc->DecorationSetCurrentIndicator(indicator); for (size_t r=0; r<sel.Count(); r++) { - int positionInsert = sel.Range(r).Start().Position(); + const Sci::Position positionInsert = sel.Range(r).Start().Position(); pdoc->DecorationFillRange(positionInsert - len, 1, len); } } @@ -2229,17 +2274,17 @@ static std::vector<int> MapImeIndicators(PangoAttrList *attrs, const char *u8Str // Map input style to scintilla ime indicator. // Attrs position points between UTF-8 bytes. // Indicator index to be returned is character based though. - glong charactersLen = g_utf8_strlen(u8Str, strlen(u8Str)); + const glong charactersLen = g_utf8_strlen(u8Str, strlen(u8Str)); std::vector<int> indicator(charactersLen, SC_INDICATOR_UNKNOWN); PangoAttrIterator *iterunderline = pango_attr_list_get_iterator(attrs); if (iterunderline) { do { PangoAttribute *attrunderline = pango_attr_iterator_get(iterunderline, PANGO_ATTR_UNDERLINE); if (attrunderline) { - glong start = g_utf8_strlen(u8Str, attrunderline->start_index); - glong end = g_utf8_strlen(u8Str, attrunderline->end_index); - PangoUnderline uline = (PangoUnderline)((PangoAttrInt *)attrunderline)->value; + const glong start = g_utf8_strlen(u8Str, attrunderline->start_index); + const glong end = g_utf8_strlen(u8Str, attrunderline->end_index); + const PangoUnderline uline = (PangoUnderline)((PangoAttrInt *)attrunderline)->value; for (glong i=start; i < end; ++i) { switch (uline) { case PANGO_UNDERLINE_NONE: @@ -2262,10 +2307,10 @@ static std::vector<int> MapImeIndicators(PangoAttrList *attrs, const char *u8Str PangoAttrIterator *itercolor = pango_attr_list_get_iterator(attrs); if (itercolor) { do { - PangoAttribute *backcolor = pango_attr_iterator_get(itercolor, PANGO_ATTR_BACKGROUND); + const PangoAttribute *backcolor = pango_attr_iterator_get(itercolor, PANGO_ATTR_BACKGROUND); if (backcolor) { - glong start = g_utf8_strlen(u8Str, backcolor->start_index); - glong end = g_utf8_strlen(u8Str, backcolor->end_index); + const glong start = g_utf8_strlen(u8Str, backcolor->start_index); + const glong end = g_utf8_strlen(u8Str, backcolor->end_index); for (glong i=start; i < end; ++i) { indicator[i] = SC_INDICATOR_TARGET; // target converted } @@ -2278,10 +2323,10 @@ static std::vector<int> MapImeIndicators(PangoAttrList *attrs, const char *u8Str void ScintillaGTK::SetCandidateWindowPos() { // Composition box accompanies candidate box. - Point pt = PointMainCaret(); + const Point pt = PointMainCaret(); GdkRectangle imeBox = {0}; // No need to set width - imeBox.x = pt.x; // Only need positiion - imeBox.y = pt.y + vs.lineHeight; // underneath the first charater + imeBox.x = static_cast<gint>(pt.x); // Only need positiion + imeBox.y = static_cast<gint>(pt.y) + vs.lineHeight; // underneath the first charater gtk_im_context_set_cursor_location(im_context, &imeBox); } @@ -2300,7 +2345,7 @@ void ScintillaGTK::CommitThis(char *commitStr) { gunichar *uniStr = g_utf8_to_ucs4_fast(commitStr, strlen(commitStr), &uniStrLen); for (glong i = 0; i < uniStrLen; i++) { gchar u8Char[UTF8MaxBytes+2] = {0}; - gint u8CharLen = g_unichar_to_utf8(uniStr[i], u8Char); + const gint u8CharLen = g_unichar_to_utf8(uniStr[i], u8Char); std::string docChar = u8Char; if (!IsUnicodeMode()) docChar = ConvertText(u8Char, u8CharLen, charSetSource, "UTF-8", true); @@ -2341,7 +2386,7 @@ void ScintillaGTK::PreeditChangedInlineThis() { PreEditString preeditStr(im_context); const char *charSetSource = CharacterSetID(); - if (!preeditStr.validUTF8 || (charSetSource == NULL)) { + if (!preeditStr.validUTF8 || (charSetSource == nullptr)) { ShowCaretAtCurrentPosition(); return; } @@ -2358,11 +2403,11 @@ void ScintillaGTK::PreeditChangedInlineThis() { std::vector<int> indicator = MapImeIndicators(preeditStr.attrs, preeditStr.str); - bool tmpRecordingMacro = recordingMacro; + const bool tmpRecordingMacro = recordingMacro; recordingMacro = false; for (glong i = 0; i < preeditStr.uniStrLen; i++) { gchar u8Char[UTF8MaxBytes+2] = {0}; - gint u8CharLen = g_unichar_to_utf8(preeditStr.uniStr[i], u8Char); + const gint u8CharLen = g_u@@ 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

[geany/geany] 9d4aa7: Update making-a-release a little
by Colomban Wendling 28 Apr '19

28 Apr '19

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 28 Apr 2019 16:38:32 UTC Commit: 9d4aa7f8071da54efce0508dd92c0930703304a0 https://github.com/geany/geany/commit/9d4aa7f8071da54efce0508dd92c093070330… Log Message: ----------- Update making-a-release a little Modified Paths: -------------- doc/making-a-release Modified: doc/making-a-release 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -25,15 +25,15 @@ Rename LATEST-IS-... to the new version number in /srv/www/download.geany.org/ and /srv/www/www.geany.org/files. Execute (as user geany) /home/geany/md5sums to update /srv/www/download.geany.org/MD5SUMS. +You can use the script /home/geany/publish-release. Make sure the public part of the GPG key used to sign the archives can be found on the download page. Windows builds (enrico?). Create a signed tag for the release in Git with 'git tag -s <version>'. -Website: update Releases, Documentation links, Release Notes, ChangeLog -and add a News item. +Website: update Releases, Release Notes, ChangeLog and add a News item. Use the /home/geany/update-manual script to update the manual data and links in the filesystem at /srv/www/www.geany.org/manual, and to update current/hacking.html. -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 11436f: Post release version bump
by Colomban Wendling 28 Apr '19

28 Apr '19

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 28 Apr 2019 15:36:02 UTC Commit: 11436f58defe5312c4d6eec1225868c5dca585e4 https://github.com/geany/geany/commit/11436f58defe5312c4d6eec1225868c5dca58… Log Message: ----------- Post release version bump Say hello to Geany 1.36 "Poliff"! Modified Paths: -------------- NEWS configure.ac doc/geany.txt geany.exe.manifest geany_private.rc src/geany.h Modified: NEWS 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,6 @@ +Geany 1.36 (unreleased) + + Geany 1.35 (April 28, 2019) General Modified: configure.ac 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.60]) -AC_INIT([Geany], [1.35], +AC_INIT([Geany], [1.36], [https://github.com/geany/geany/issues]) AC_CONFIG_SRCDIR([src/geany.h]) AC_CONFIG_AUX_DIR([build-aux]) Modified: doc/geany.txt 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ -.. |(version)| replace:: 1.35 +.. |(version)| replace:: 1.36 .. -*- reStructuredText -*- ======= Modified: geany.exe.manifest 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity - version="1.35.0.0" + version="1.36.0.0" processorArchitecture="X86" name="Geany" type="win32" /> Modified: geany_private.rc 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -1,8 +1,8 @@ #include <windows.h> // include for version info constants -#define VER_FILEVERSION 1,35,0,0 -#define VER_FILEVERSION_STR "1.35" +#define VER_FILEVERSION 1,36,0,0 +#define VER_FILEVERSION_STR "1.36" #define APP_MANIFEST 1 A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "icons/geany.ico" Modified: src/geany.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -41,7 +41,7 @@ G_BEGIN_DECLS #define GEANY_FILEDEFS_SUBDIR "filedefs" #define GEANY_TEMPLATES_SUBDIR "templates" #define GEANY_TAGS_SUBDIR "tags" -#define GEANY_CODENAME "Siralt" +#define GEANY_CODENAME "Poliff" #define GEANY_HOMEPAGE "https://www.geany.org/" #define GEANY_WIKI "https://wiki.geany.org/" #define GEANY_BUG_REPORT "https://www.geany.org/Support/Bugs" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 58ae09: Update NEWS for upcoming 1.35 release
by Colomban Wendling 28 Apr '19

28 Apr '19

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 28 Apr 2019 14:16:15 UTC Commit: 58ae0952670b481dd866bdf841c8b7e84902b55f https://github.com/geany/geany/commit/58ae0952670b481dd866bdf841c8b7e84902b… Log Message: ----------- Update NEWS for upcoming 1.35 release Modified Paths: -------------- NEWS Modified: NEWS 33 lines changed, 33 insertions(+), 0 deletions(-) =================================================================== @@ -1,5 +1,38 @@ Geany 1.35 (unreleased) + General + * Start synchronization with Universal-CTags (Jiří Techet, PR#1263, + PR#2018). + + Bug fixes + * Improve IPC socket handling (Issue#641, PR#2111). + * Fix loading the default open encoding option (PR#1326). + * Fix VTE path following after reset (Issue#352, PR#2116). + + Interface + * Show variable type in a tooltip in symbol tree (Jiří Techet, PR#2036). + + Editor + * Update Scintilla to version 3.10.2 (Issue#971, Issue#1947, Issue#2076, + PR#2045). + * Drastically speed up huge bulk replacements (Issue#2092, PR#2097). + * Fix accessibility information reported upon deletion. + * Fix garbage data insertion when moving lines up or down (Issue#2066). + * Don't perform line breaking in rectangular selection mode (Issue#2051, + PR#2135). + + Filetypes + * Allow stripping trailing spaces from custom filetypes based on the Diff + lexer (Cristian Ciocaltea, Issue#2041, PR#2043). + * Improve JavaScript symbols parsing (Issue#1329, Issue#1891, Issue#1933, + part of PR#2018). + * Improve HTML symbols parsing (part of PR#2018). + * Improve COBOL symbols parsing (PR#2128). + * Improve ActionScript symbols parsing (PR#2134). + + Windows + * Installer: only install GTK translations if selected (Issue#2090). + Internationalization * Updated translations: da, de, es, fr, ja, lv, pt, ru, sk, zh_CN -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 2d4f36: Set release date
by Colomban Wendling 28 Apr '19

28 Apr '19

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 28 Apr 2019 14:16:15 UTC Commit: 2d4f369937c0dd08046e7f68a5d0a8c6c8e1b866 https://github.com/geany/geany/commit/2d4f369937c0dd08046e7f68a5d0a8c6c8e1b… Log Message: ----------- Set release date Modified Paths: -------------- NEWS doc/geany.1.in doc/geany.txt Modified: NEWS 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ -Geany 1.35 (unreleased) +Geany 1.35 (April 28, 2019) General * Start synchronization with Universal-CTags (Jiří Techet, PR#1263, Modified: doc/geany.1.in 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ -.TH "GEANY" "1" "January 4, 2019" "geany @VERSION@" "" +.TH "GEANY" "1" "April 28, 2019" "geany @VERSION@" "" .SH "NAME" Geany \(em a small and lightweight IDE .SH "SYNOPSIS" Modified: doc/geany.txt 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -14,7 +14,7 @@ Frank Lanitz, Colomban Wendling, Matthew Brush -:Date: 2019-01-04 +:Date: 2019-04-28 :Version: |(version)| Copyright © 2005 The Geany contributors -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 349b8c: Merge pull request #2134 from b4n/ctags/new-flex-parser
by Colomban Wendling 28 Apr '19

28 Apr '19

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 28 Apr 2019 09:14:33 UTC Commit: 349b8c40e252ddf1b335e0849ffcd37c403d72e9 https://github.com/geany/geany/commit/349b8c40e252ddf1b335e0849ffcd37c403d7… Log Message: ----------- Merge pull request #2134 from b4n/ctags/new-flex-parser Add new upstream candidate Flex parser Modified Paths: -------------- ctags/Makefile.am ctags/main/parsers.h ctags/parsers/actionscript.c ctags/parsers/flex.c src/symbols.c src/tagmanager/tm_parser.c tests/ctags/Makefile.am tests/ctags/actionscript/as-first-token.as tests/ctags/actionscript/as-first-token.as.tags tests/ctags/actionscript/classes.as tests/ctags/actionscript/classes.as.tags tests/ctags/actionscript/const.as tests/ctags/actionscript/const.as.tags tests/ctags/actionscript/const2.as tests/ctags/actionscript/const2.as.tags tests/ctags/actionscript/method-attributes.as tests/ctags/actionscript/method-attributes.as.tags tests/ctags/actionscript/packages.as tests/ctags/actionscript/packages.as.tags tests/ctags/actionscript/sampler.as tests/ctags/actionscript/sampler.as.tags Modified: ctags/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -11,7 +11,6 @@ noinst_LTLIBRARIES = libctags.la parsers = \ parsers/abaqus.c \ parsers/abc.c \ - parsers/actionscript.c \ parsers/asciidoc.c \ parsers/asm.c \ parsers/basic.c \ @@ -22,6 +21,7 @@ parsers = \ parsers/diff.c \ parsers/docbook.c \ parsers/erlang.c \ + parsers/flex.c \ parsers/fortran.c \ parsers/go.c \ parsers/haskell.c \ Modified: ctags/main/parsers.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -50,7 +50,7 @@ GLSLParser, \ MatLabParser, \ ValaParser, \ - ActionScriptParser, \ + FlexParser, \ NsisParser, \ MarkdownParser, \ Txt2tagsParser, \ Modified: ctags/parsers/actionscript.c 99 lines changed, 0 insertions(+), 99 deletions(-) =================================================================== @@ -1,99 +0,0 @@ -/* -* $Id: actionscript.c,v 1.1 2004/01/03 03:59:19 svoisen Exp $ -* -* Original file copyright (c) 2004, Sean Voisen -* -* Modified October 8, 2007 By Mike Fahy (VeryVito) of www.turdhead.com -* - Added initial AS3 support -* - Threw in some "TODO" and "NOTE" bits -* -* Modified October 9, 2007 By Ali Rantakari of hasseg.org: -* - Added more allowed AS3 attribute keywords (override, final, internal -* etc...) for classes, getters & setters, variables -* - Allowed varying versions of "note" and "todo" spellings -* - Allowed points (.) in package names so that they would display the -* whole package name instead of just the first level -* - Added interfaces matching support -* - Reformatted some name parameters: -* - Getters and setters: display either "get" or "set" in front -* of the property name -* - Todos & notes: made the name be the text that comes after the -* "todo" or "note" text -* - Variables: Moved the variable type after the name and separated -* them with " : " according to ActionScript syntax -* Modified March 6, 2009 by Chris Macksey (cmacksey(a)users.sourceforge.net) -* - Tweaked to work better with Geany -* -* This source code is released for free distribution under the terms of the -* GNU General Public License. -* -* This module contains functions for generating tags for ActionScript language -* files. -*/ - -/* -* INCLUDE FILES -*/ -#include "general.h" /* must always come first */ -#include "parse.h" -#include "routines.h" - -static tagRegexTable actionscriptTagRegexTable[] = { - /* Functions */ - {"^[ \t]*[(private|public|static|protected|internal|final|override)( \t)]*function[ \t]+([A-Za-z0-9_]+)[ \t]*\\(([^\\{]*)", - "\\1 (\\2", "f,function,functions,methods", NULL, NULL}, - - /* Getters and setters */ - {"^[ \t]*[(public|static|internal|final|override)( \t)]*function[ \t]+(set|get)[ \t]+([A-Za-z0-9_]+)[ \t]*\\(", - "\\2 \\1", "l,field,fields", NULL, NULL}, - - /* Variables */ - {"^[ \t]*[(private|public|static|protected|internal)( \t)]*var[ \t]+([A-Za-z0-9_]+)([ \t]*\\:[ \t]*([A-Za-z0-9_]+))*[ \t]*", - "\\1 \\: \\3", "v,variable,variables", NULL, NULL}, - - /* Constants */ - {"^[ \t]*[(private|public|static|protected|internal)( \t)]*const[ \t]+([A-Za-z0-9_]+)([ \t]*\\:[ \t]*([A-Za-z0-9_]+))*[ \t]*", - "\\1 : \\3", "m,macro,macros", NULL, NULL}, - - /* Classes */ - {"^[ \t]*[(private|public|static|dynamic|final|internal)( \t)]*class[ \t]+([A-Za-z0-9_]+)[ \t]*([^\\{]*)", - "\\1 (\\2)", "c,class,classes", NULL, NULL}, - - /* Interfaces */ - {"^[ \t]*[(private|public|static|dynamic|final|internal)( \t)]*interface[ \t]+([A-Za-z0-9_]+)[ \t]*([^\\{]*)", - "\\1 (\\2)", "i,interface,interfaces", NULL, NULL}, - - /* Packages */ - {"^[ \t]*[(private|public|static)( \t)]*package[ \t]+([A-Za-z0-9_.]+)[ \t]*", - "\\1", "p,package", NULL, NULL}, - - /* Notes */ - {"\\/\\/[ \t]*(NOTE|note|Note)[ \t]*\\:*(.*)", - "\\2", "o,other", NULL, NULL}, - - /* Todos */ - {"\\/\\/[ \t]*(TODO|todo|ToDo|Todo)[ \t]*\\:*(.*)", - "\\2", "o,other", NULL, NULL}, - - /* Prototypes (Put this in for AS1 compatibility...) */ - {".*\\.prototype\\.([A-Za-z0-9 ]+)[ \t]*\\=([ \t]*)function( [ \t]?)*\\(", - "\\1", "r,prototype", NULL, NULL} -}; - -/* -* FUNCTION DEFINITIONS -* -*/ - -/* Create parser definition structure */ -extern parserDefinition* ActionScriptParser (void) -{ - static const char *const extensions [] = { "as", NULL }; - parserDefinition *const def = parserNew ("ActionScript"); - def->extensions = extensions; - def->tagRegexTable = actionscriptTagRegexTable; - def->tagRegexCount = ARRAY_SIZE (actionscriptTagRegexTable); - def->method = METHOD_NOT_CRAFTED|METHOD_REGEX; - return def; -} - Modified: ctags/parsers/flex.c 2636 lines changed, 2636 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,2636 @@ +/* + * Copyright (c) 2008, David Fishburn + * + * This source code is released for free distribution under the terms of the + * GNU General Public License version 2 or (at your option) any later version. + * + * This module contains functions for generating tags for Adobe languages. + * There are a number of different ones, but this will begin with: + * Flex + * MXML files (*.mMacromedia XML) + * ActionScript files (*.as) + * + * The ActionScript code was copied from the JavaScript parser, with some + * adaptations e.g. for classes and type specifiers. + * + * Flex 3 language reference + * http://livedocs.adobe.com/flex/3/langref/index.html + * https://help.adobe.com/en_US/FlashPlatform/reference/actionscript/3/languag… + * https://www.adobe.com/devnet/actionscript/learning/as3-fundamentals/package… + */ + +/* + * INCLUDE FILES + */ +#include "general.h" /* must always come first */ +#include <ctype.h> /* to define isalpha () */ +#ifdef DEBUG +#include <stdio.h> +#endif + +#include "debug.h" +#include "entry.h" +#include "keyword.h" +#include "parse.h" +#include "read.h" +#include "routines.h" +#include "vstring.h" +#include "strlist.h" + +/* + * MACROS + */ +#define isType(token,t) (bool) ((token)->type == (t)) +#define isKeyword(token,k) (bool) ((token)->keyword == (k)) +#define isEOF(token) (isType ((token), TOKEN_EOF)) +#define isIdentChar(c) \ + (isalpha (c) || isdigit (c) || (c) == '$' || \ + (c) == '@' || (c) == '_' || (c) == '#' || \ + (c) >= 0x80) + +/* + * DATA DECLARATIONS + */ + +/* + * Tracks class and function names already created + */ +static stringList *ClassNames; +static stringList *FunctionNames; + +/* Used to specify type of keyword. +*/ +enum eKeywordId { + KEYWORD_function, + KEYWORD_capital_function, + KEYWORD_object, + KEYWORD_capital_object, + KEYWORD_prototype, + KEYWORD_var, + KEYWORD_const, + KEYWORD_new, + KEYWORD_this, + KEYWORD_for, + KEYWORD_while, + KEYWORD_do, + KEYWORD_if, + KEYWORD_else, + KEYWORD_switch, + KEYWORD_try, + KEYWORD_catch, + KEYWORD_finally, + KEYWORD_return, + KEYWORD_public, + KEYWORD_private, + KEYWORD_protected, + KEYWORD_internal, + KEYWORD_final, + KEYWORD_native, + KEYWORD_dynamic, + KEYWORD_class, + KEYWORD_interface, + KEYWORD_package, + KEYWORD_extends, + KEYWORD_static, + KEYWORD_implements, + KEYWORD_get, + KEYWORD_set, + KEYWORD_import, + KEYWORD_id, + KEYWORD_name, + KEYWORD_script, + KEYWORD_cdata, + KEYWORD_mx, + KEYWORD_fx, + KEYWORD_override +}; +typedef int keywordId; /* to allow KEYWORD_NONE */ + +typedef enum eTokenType { + TOKEN_UNDEFINED, + TOKEN_EOF, + TOKEN_CHARACTER, + TOKEN_CLOSE_PAREN, + TOKEN_SEMICOLON, + TOKEN_COLON, + TOKEN_COMMA, + TOKEN_KEYWORD, + TOKEN_OPEN_PAREN, + TOKEN_IDENTIFIER, + TOKEN_STRING, + TOKEN_PERIOD, + TOKEN_OPEN_CURLY, + TOKEN_CLOSE_CURLY, + TOKEN_EQUAL_SIGN, + TOKEN_EXCLAMATION, + TOKEN_FORWARD_SLASH, + TOKEN_OPEN_SQUARE, + TOKEN_CLOSE_SQUARE, + TOKEN_OPEN_MXML, + TOKEN_CLOSE_MXML, + TOKEN_CLOSE_SGML, + TOKEN_LESS_THAN, + TOKEN_GREATER_THAN, + TOKEN_QUESTION_MARK, + TOKEN_OPEN_NAMESPACE, + TOKEN_POSTFIX_OPERATOR, + TOKEN_STAR, + TOKEN_BINARY_OPERATOR +} tokenType; + +typedef struct sTokenInfo { + tokenType type; + keywordId keyword; + vString * string; + vString * scope; + unsigned long lineNumber; + MIOPos filePosition; + int nestLevel; + bool ignoreTag; + bool isClass; +} tokenInfo; + +/* + * DATA DEFINITIONS + */ +static tokenType LastTokenType; +static tokenInfo *NextToken; + +static langType Lang_flex; + +typedef enum { + FLEXTAG_FUNCTION, + FLEXTAG_CLASS, + FLEXTAG_INTERFACE, + FLEXTAG_PACKAGE, + FLEXTAG_METHOD, + FLEXTAG_PROPERTY, + FLEXTAG_VARIABLE, + FLEXTAG_LOCALVAR, + FLEXTAG_CONST, + FLEXTAG_IMPORT, + FLEXTAG_MXTAG, + FLEXTAG_COUNT +} flexKind; + +typedef enum { + FLEX_IMPORT_ROLE_IMPORTED, +} flexImportRole; + +static roleDefinition FlexImportRoles [] = { + { true, "import", "imports" }, +}; + +static kindDefinition FlexKinds [] = { + { true, 'f', "function", "functions" }, + { true, 'c', "class", "classes" }, + { true, 'i', "interface", "interfaces" }, + { true, 'P', "package", "packages" }, + { true, 'm', "method", "methods" }, + { true, 'p', "property", "properties" }, + { true, 'v', "variable", "global variables" }, + { /*false*/ true, 'l', "localvar", "local variables" }, + { true, 'C', "constant", "constants" }, + { true, 'I', "import", "imports", + .referenceOnly = true, ATTACH_ROLES (FlexImportRoles) }, + { true, 'x', "mxtag", "mxtags" } +}; + +/* Used to determine whether keyword is valid for the token language and + * what its ID is. + */ +static const keywordTable FlexKeywordTable [] = { + /* keyword keyword ID */ + { "function", KEYWORD_function }, + { "Function", KEYWORD_capital_function }, + { "object", KEYWORD_object }, + { "Object", KEYWORD_capital_object }, + { "prototype", KEYWORD_prototype }, + { "var", KEYWORD_var }, + { "const", KEYWORD_const }, + { "new", KEYWORD_new }, + { "this", KEYWORD_this }, + { "for", KEYWORD_for }, + { "while", KEYWORD_while }, + { "do", KEYWORD_do }, + { "if", KEYWORD_if }, + { "else", KEYWORD_else }, + { "switch", KEYWORD_switch }, + { "try", KEYWORD_try }, + { "catch", KEYWORD_catch }, + { "finally", KEYWORD_finally }, + { "return", KEYWORD_return }, + { "public", KEYWORD_public }, + { "private", KEYWORD_private }, + { "protected", KEYWORD_protected }, + { "internal", KEYWORD_internal }, + { "final", KEYWORD_final }, + { "native", KEYWORD_native }, + { "dynamic", KEYWORD_dynamic }, + { "class", KEYWORD_class }, + { "interface", KEYWORD_interface }, + { "package", KEYWORD_package }, + { "extends", KEYWORD_extends }, + { "static", KEYWORD_static }, + { "implements", KEYWORD_implements }, + { "get", KEYWORD_get }, + { "set", KEYWORD_set }, + { "import", KEYWORD_import }, + { "id", KEYWORD_id }, + { "name", KEYWORD_name }, + { "script", KEYWORD_script }, + { "cdata", KEYWORD_cdata }, + { "mx", KEYWORD_mx }, + { "fx", KEYWORD_fx }, + { "override", KEYWORD_override } +}; + +/* + * FUNCTION DEFINITIONS + */ + +/* Recursive functions */ +static void parseFunction (tokenInfo *const token); +static bool parseBlock (tokenInfo *const token, const vString *const parentScope); +static bool parseLine (tokenInfo *const token); +static bool parseActionScript (tokenInfo *const token, bool readNext); +static bool parseMXML (tokenInfo *const token); + +static tokenInfo *newToken (void) +{ + tokenInfo *const token = xMalloc (1, tokenInfo); + + token->type = TOKEN_UNDEFINED; + token->keyword = KEYWORD_NONE; + token->string = vStringNew (); + token->scope = vStringNew (); + token->nestLevel = 0; + token->isClass = false; + token->ignoreTag = false; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + + return token; +} + +static void deleteToken (tokenInfo *const token) +{ + vStringDelete (token->string); + vStringDelete (token->scope); + eFree (token); +} + +static void copyToken (tokenInfo *const dest, tokenInfo *const src, + bool const include_non_read_info) +{ + dest->lineNumber = src->lineNumber; + dest->filePosition = src->filePosition; + dest->type = src->type; + dest->keyword = src->keyword; + dest->isClass = src->isClass; + vStringCopy(dest->string, src->string); + if (include_non_read_info) + { + dest->nestLevel = src->nestLevel; + vStringCopy(dest->scope, src->scope); + } +} + +/* + * Tag generation functions + */ + +static vString *buildQualifiedName (const tokenInfo *const token) +{ + vString *qualified = vStringNew (); + + if (vStringLength (token->scope) > 0) + { + vStringCopy (qualified, token->scope); + vStringPut (qualified, '.'); + } + vStringCat (qualified, token->string); + + return qualified; +} + +static void makeConstTag (tokenInfo *const token, const flexKind kind) +{ + if (FlexKinds [kind].enabled && ! token->ignoreTag ) + { + const char *const name = vStringValue (token->string); + tagEntryInfo e; + int role = ROLE_INDEX_DEFINITION; + + /* Geany diff: reftags are not enabled but should be + if (kind == FLEXTAG_IMPORT) + role = FLEX_IMPORT_ROLE_IMPORTED; + */ + + initRefTagEntry (&e, name, kind, role); + + e.lineNumber = token->lineNumber; + e.filePosition = token->filePosition; + + if ( vStringLength(token->scope) > 0 ) + { + /* FIXME: proper parent type */ + flexKind parent_kind = FLEXTAG_CLASS; + + /* + * If we're creating a function (and not a method), + * guess we're inside another function + */ + if (kind == FLEXTAG_FUNCTION) + parent_kind = FLEXTAG_FUNCTION; + /* mxtags can only be nested inside other mxtags */ + else if (kind == FLEXTAG_MXTAG) + parent_kind = kind; + + e.extensionFields.scopeKindIndex = parent_kind; + e.extensionFields.scopeName = vStringValue (token->scope); + } + + makeTagEntry (&e); + + /* make qualified tags for compatibility if requested */ + if (isXtagEnabled (XTAG_QUALIFIED_TAGS)) + { + vString *qualified = buildQualifiedName (token); + + markTagExtraBit (&e, XTAG_QUALIFIED_TAGS); + e.name = vStringValue (qualified); + makeTagEntry (&e); + vStringDelete (qualified); + } + } +} + +static void makeFlexTag (tokenInfo *const token, flexKind kind) +{ + if (FlexKinds [kind].enabled && ! token->ignoreTag ) + { + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n makeFlexTag start: token isClass:%d scope:%s name:%s\n" + , token->isClass + , vStringValue(token->scope) + , vStringValue(token->string) + ); + ); + if (kind == FLEXTAG_FUNCTION && token->isClass ) + { + kind = FLEXTAG_METHOD; + } + makeConstTag (token, kind); + } +} + +static void makeClassTag (tokenInfo *const token) +{ + if ( ! token->ignoreTag ) + { + vString *fulltag = buildQualifiedName (token); + + if ( ! stringListHas(ClassNames, vStringValue (fulltag)) ) + { + stringListAdd (ClassNames, vStringNewCopy (fulltag)); + makeFlexTag (token, FLEXTAG_CLASS); + } + vStringDelete (fulltag); + } +} + +static void makeMXTag (tokenInfo *const token) +{ + if ( ! token->ignoreTag ) + { + makeFlexTag (token, FLEXTAG_MXTAG); + } +} + +static void makeFunctionTag (tokenInfo *const token) +{ + if ( ! token->ignoreTag ) + { + vString *fulltag = buildQualifiedName (token); + + if ( ! stringListHas(FunctionNames, vStringValue (fulltag)) ) + { + stringListAdd (FunctionNames, vStringNewCopy (fulltag)); + makeFlexTag (token, FLEXTAG_FUNCTION); + } + vStringDelete (fulltag); + } +} + +/* + * Parsing functions + */ + +static void parseString (vString *const string, const int delimiter) +{ + bool end = false; + while (! end) + { + int c = getcFromInputFile (); + if (c == EOF) + end = true; + else if (c == '\\') + { + c = getcFromInputFile(); /* This maybe a ' or ". */ + vStringPut(string, c); + } + else if (c == delimiter) + end = true; + else + vStringPut (string, c); + } +} + +/* Read a C identifier beginning with "firstChar" and places it into + * "name". + */ +static void parseIdentifier (vString *const string, const int firstChar) +{ + int c = firstChar; + Assert (isIdentChar (c)); + do + { + vStringPut (string, c); + c = getcFromInputFile (); + } while (isIdentChar (c)); + ungetcToInputFile (c); /* unget non-identifier character */ +} + +static void readTokenFull (tokenInfo *const token, bool include_newlines) +{ + int c; + int i; + bool newline_encountered = false; + + /* if we've got a token held back, emit it */ + if (NextToken) + { + copyToken (token, NextToken, false); + deleteToken (NextToken); + NextToken = NULL; + return; + } + + token->type = TOKEN_UNDEFINED; + token->keyword = KEYWORD_NONE; + vStringClear (token->string); + +getNextChar: + i = 0; + do + { + c = getcFromInputFile (); + if (include_newlines && (c == '\r' || c == '\n')) + newline_encountered = true; + i++; + } + while (c == '\t' || c == ' ' || c == '\r' || c == '\n'); + + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + + switch (c) + { + case EOF: token->type = TOKEN_EOF; break; + case '(': token->type = TOKEN_OPEN_PAREN; break; + case ')': token->type = TOKEN_CLOSE_PAREN; break; + case ';': token->type = TOKEN_SEMICOLON; break; + case ',': token->type = TOKEN_COMMA; break; + case '.': token->type = TOKEN_PERIOD; break; + case ':': token->type = TOKEN_COLON; break; + case '{': token->type = TOKEN_OPEN_CURLY; break; + case '}': token->type = TOKEN_CLOSE_CURLY; break; + case '=': token->type = TOKEN_EQUAL_SIGN; break; + case '[': token->type = TOKEN_OPEN_SQUARE; break; + case ']': token->type = TOKEN_CLOSE_SQUARE; break; + case '?': token->type = TOKEN_QUESTION_MARK; break; + + case '+': + case '-': + { + int d = getcFromInputFile (); + if (d == c) /* ++ or -- */ + token->type = TOKEN_POSTFIX_OPERATOR; + else + { + ungetcToInputFile (d); + token->type = TOKEN_BINARY_OPERATOR; + } + break; + } + + case '*': + token->type = TOKEN_STAR; + break; + case '%': + case '^': + case '|': + case '&': + token->type = TOKEN_BINARY_OPERATOR; + break; + + case '\'': + case '"': + token->type = TOKEN_STRING; + parseString (token->string, c); + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + + case '\\': + c = getcFromInputFile (); + if (c != '\\' && c != '"' && !isspace (c)) + ungetcToInputFile (c); + token->type = TOKEN_CHARACTER; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + + case '/': + { + int d = getcFromInputFile (); + if ( (d != '*') && /* is this the start of a comment? */ + (d != '/') && /* is a one line comment? */ + (d != '>') ) /* is this a close XML tag? */ + { + ungetcToInputFile (d); + token->type = TOKEN_FORWARD_SLASH; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + } + else + { + if (d == '*') + { + do + { + skipToCharacterInInputFile ('*'); + c = getcFromInputFile (); + if (c == '/') + break; + else + ungetcToInputFile (c); + } while (c != EOF); + goto getNextChar; + } + else if (d == '/') /* is this the start of a comment? */ + { + skipToCharacterInInputFile ('\n'); + /* if we care about newlines, put it back so it is seen */ + if (include_newlines) + ungetcToInputFile ('\n'); + goto getNextChar; + } + else if (d == '>') /* is this the start of a comment? */ + { + token->type = TOKEN_CLOSE_SGML; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + } + } + break; + } + + case '<': + { + /* + * An XML comment looks like this + *  + */ + int d = getcFromInputFile (); + + if ( (d != '!' ) && /* is this the start of a comment? */ + (d != '/' ) && /* is this the start of a closing mx tag */ + (d != 'm' ) && /* is this the start of a mx tag */ + (d != 'f' ) && /* is this the start of a fx tag */ + (d != 's' ) ) /* is this the start of a spark tag */ + { + ungetcToInputFile (d); + token->type = TOKEN_LESS_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + else + { + if (d == '!') + { + int e = getcFromInputFile (); + if ( e != '-' ) /* is this the start of a comment? */ + { + ungetcToInputFile (e); + ungetcToInputFile (d); + token->type = TOKEN_LESS_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + } + else + { + if (e == '-') + { + int f = getcFromInputFile (); + if ( f != '-' ) /* is this the start of a comment? */ + { + ungetcToInputFile (f); + ungetcToInputFile (e); + ungetcToInputFile (d); + token->type = TOKEN_LESS_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + } + else + { + if (f == '-') + { + do + { + skipToCharacterInInputFile ('-'); + c = getcFromInputFile (); + if (c == '-') + { + d = getcFromInputFile (); + if (d == '>') + break; + else + { + ungetcToInputFile (d); + ungetcToInputFile (c); + } + break; + } + else + ungetcToInputFile (c); + } while (c != EOF && c != '\0'); + goto getNextChar; + } + } + } + } + } + else if (d == 'm' || d == 'f' || d == 's' ) + { + int e = getcFromInputFile (); + if ( (d == 'm' || d == 'f') && e != 'x' ) /* continuing an mx or fx tag */ + { + ungetcToInputFile (e); + ungetcToInputFile (d); + token->type = TOKEN_LESS_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + else + { + if ( (d == 'm' || d == 'f') && e == 'x' ) + { + int f = getcFromInputFile (); + if ( f != ':' ) /* start of the tag */ + { + ungetcToInputFile (f); + ungetcToInputFile (e); + ungetcToInputFile (d); + token->type = TOKEN_LESS_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + else + { + token->type = TOKEN_OPEN_MXML; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + } + if ( d == 's' && e == ':') /* continuing a spark tag */ + { + token->type = TOKEN_OPEN_MXML; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + else + { + ungetcToInputFile (e); + ungetcToInputFile (d); + token->type = TOKEN_LESS_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + } + } + else if (d == '/') + { + int e = getcFromInputFile (); + if ( !(e == 'm' || e == 'f' || e == 's' )) + { + ungetcToInputFile (e); + ungetcToInputFile (d); + token->type = TOKEN_LESS_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + else + { + int f = getcFromInputFile (); + if ( (e == 'm' || e == 'f') && f != 'x' ) /* continuing an mx or fx tag */ + { + ungetcToInputFile (f); + ungetcToInputFile (e); + token->type = TOKEN_LESS_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + else + { + if (f == 'x') + { + int g = getcFromInputFile (); + if ( g != ':' ) /* is this the start of a comment? */ + { + ungetcToInputFile (g); + ungetcToInputFile (f); + ungetcToInputFile (e); + token->type = TOKEN_LESS_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + else + { + token->type = TOKEN_CLOSE_MXML; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + } + if ( e == 's' && f == ':') /* continuing a spark tag */ + { + token->type = TOKEN_CLOSE_MXML; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + else + { + ungetcToInputFile (f); + ungetcToInputFile (e); + token->type = TOKEN_LESS_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + } + } + } + } + } + break; + } + + case '>': + token->type = TOKEN_GREATER_THAN; + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + break; + + case '!': + token->type = TOKEN_EXCLAMATION; + /*token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition ();*/ + break; + + default: + if (! isIdentChar (c)) + token->type = TOKEN_UNDEFINED; + else + { + parseIdentifier (token->string, c); + token->lineNumber = getInputLineNumber (); + token->filePosition = getInputFilePosition (); + token->keyword = lookupCaseKeyword (vStringValue (token->string), Lang_flex); + if (isKeyword (token, KEYWORD_NONE)) + token->type = TOKEN_IDENTIFIER; + else + token->type = TOKEN_KEYWORD; + } + break; + } + + if (include_newlines && newline_encountered) + { + /* This isn't strictly correct per the standard, but following the + * real rules means understanding all statements, and that's not + * what the parser currently does. What we do here is a guess, by + * avoiding inserting semicolons that would make the statement on + * the left or right obviously invalid. Hopefully this should not + * have false negatives (e.g. should not miss insertion of a semicolon) + * but might have false positives (e.g. it will wrongfully emit a + * semicolon sometimes, i.e. for the newline in "foo\n(bar)"). + * This should however be mostly harmless as we only deal with + * newlines in specific situations where we know a false positive + * wouldn't hurt too bad. */ + + /* these already end a statement, so no need to duplicate it */ + #define IS_STMT_SEPARATOR(t) ((t) == TOKEN_SEMICOLON || \ + (t) == TOKEN_EOF || \ + (t) == TOKEN_COMMA || \ + (t) == TOKEN_OPEN_CURLY) + /* these cannot be the start or end of a statement */ + #define IS_BINARY_OPERATOR(t) ((t) == TOKEN_EQUAL_SIGN || \ + (t) == TOKEN_COLON || \ + (t) == TOKEN_PERIOD || \ + (t) == TOKEN_STAR || \ + (t) == TOKEN_FORWARD_SLASH || \ + (t) == TOKEN_QUESTION_MARK || \ + (t) == TOKEN_LESS_THAN || \ + (t) == TOKEN_GREATER_THAN || \ + (t) == TOKEN_BINARY_OPERATOR) + + if (! IS_STMT_SEPARATOR(LastTokenType) && + ! IS_STMT_SEPARATOR(token->type) && + ! IS_BINARY_OPERATOR(LastTokenType) && + ! IS_BINARY_OPERATOR(token->type) && + /* these cannot be followed by a semicolon */ + ! (LastTokenType == TOKEN_OPEN_PAREN || + LastTokenType == TOKEN_OPEN_SQUARE)) + { + /* hold the token... */ + Assert (NextToken == NULL); + NextToken = newToken (); + copyToken (NextToken, token, false); + + /* ...and emit a semicolon instead */ + token->type = TOKEN_SEMICOLON; + token->keyword = KEYWORD_NONE; + vStringClear (token->string); + } + + #undef IS_STMT_SEPARATOR + #undef IS_BINARY_OPERATOR + } + + LastTokenType = token->type; +} + +static void readToken (tokenInfo *const token) +{ + readTokenFull (token, false); +} + +/* + * Token parsing functions + */ + +static void skipArgumentList (tokenInfo *const token, bool include_newlines) +{ + int nest_level = 0; + + if (isType (token, TOKEN_OPEN_PAREN)) /* arguments? */ + { + nest_level++; + while (nest_level > 0 && ! isType (token, TOKEN_EOF)) + { + readToken (token); + if (isType (token, TOKEN_OPEN_PAREN)) + nest_level++; + else if (isType (token, TOKEN_CLOSE_PAREN)) + nest_level--; + } + readTokenFull (token, include_newlines); + } +} + +static void skipArrayList (tokenInfo *const token, bool include_newlines) +{ + int nest_level = 0; + + /* + * Handle square brackets + * var name[1] + * So we must check for nested open and closing square brackets + */ + + if (isType (token, TOKEN_OPEN_SQUARE)) /* arguments? */ + { + nest_level++; + while (nest_level > 0 && ! isType (token, TOKEN_EOF)) + { + readToken (token); + if (isType (token, TOKEN_OPEN_SQUARE)) + nest_level++; + else if (isType (token, TOKEN_CLOSE_SQUARE)) + nest_level--; + } + readTokenFull (token, include_newlines); + } +} + +static void addContext (tokenInfo* const parent, const tokenInfo* const child) +{ + if (vStringLength (parent->string) > 0) + { + vStringPut (parent->string, '.'); + } + vStringCat (parent->string, child->string); +} + +static void addToScope (tokenInfo* const token, const vString* const extra) +{ + if (vStringLength (token->scope) > 0) + { + vStringPut (token->scope, '.'); + } + vStringCat (token->scope, extra); +} + +/* + * Scanning functions + */ + +static bool findCmdTerm (tokenInfo *const token, bool include_newlines, + bool include_commas) +{ + /* + * Read until we find either a semicolon or closing brace. + * Any nested braces will be handled within. + */ + while (! isType (token, TOKEN_SEMICOLON) && + ! isType (token, TOKEN_CLOSE_CURLY) && + ! (include_commas && isType (token, TOKEN_COMMA)) && + ! isType (token, TOKEN_EOF)) + { + /* Handle nested blocks */ + if ( isType (token, TOKEN_OPEN_CURLY)) + { + parseBlock (token, NULL); + readTokenFull (token, include_newlines); + } + else if ( isType (token, TOKEN_OPEN_PAREN) ) + { + skipArgumentList(token, include_newlines); + } + else if ( isType (token, TOKEN_OPEN_SQUARE) ) + { + skipArrayList(token, include_newlines); + } + else + { + readTokenFull (token, include_newlines); + } + } + + return isType (token, TOKEN_SEMICOLON); +} + +static void parseSwitch (tokenInfo *const token) +{ + /* + * switch (expression) { + * case value1: + * statement; + * break; + * case value2: + * statement; + * break; + * default : statement; + * } + */ + + readToken (token); + + if (isType (token, TOKEN_OPEN_PAREN)) + { + skipArgumentList(token, false); + } + + if (isType (token, TOKEN_OPEN_CURLY)) + { + parseBlock (token, NULL); + } +} + +static bool parseLoop (tokenInfo *const token) +{ + /* + * Handles these statements + * for (x=0; x<3; x++) + * document.write("This text is repeated three times "); + * + * for (x=0; x<3; x++) + * { + * document.write("This text is repeated three times "); + * } + * + * while (number<5){ + * document.write(number+" "); + * number++; + * } + * + * do{ + * document.write(number+" "); + * number++; + * } + * while (number<5); + */ + bool is_terminated = true; + + if (isKeyword (token, KEYWORD_for) || isKeyword (token, KEYWORD_while)) + { + readToken(token); + + if (isType (token, TOKEN_OPEN_PAREN)) + { + skipArgumentList(token, false); + } + + if (isType (token, TOKEN_OPEN_CURLY)) + { + parseBlock (token, NULL); + } + else + { + is_terminated = parseLine(token); + } + } + else if (isKeyword (token, KEYWORD_do)) + { + readToken(token); + + if (isType (token, TOKEN_OPEN_CURLY)) + { + parseBlock (token, NULL); + } + else + { + is_terminated = parseLine(token); + } + + if (is_terminated) + readToken(token); + + if (isKeyword (token, KEYWORD_while)) + { + readToken(token); + + if (isType (token, TOKEN_OPEN_PAREN)) + { + skipArgumentList(token, true); + } + if (! isType (token, TOKEN_SEMICOLON)) + { + /* oddly enough, `do {} while (0) var foo = 42` is perfectly + * valid AS, so explicitly handle the remaining of the line + * for the sake of the root scope handling (as parseActionScript() + * always advances a token not to ever get stuck) */ + is_terminated = parseLine(token); + } + } + } + + return is_terminated; +} + +static bool parseIf (tokenInfo *const token) +{ + bool read_next_token = true; + /* + * If statements have two forms + * if ( ... ) + * one line; + * + * if ( ... ) + * statement; + * else + * statement + * + * if ( ... ) { + * multiple; + * statements; + * } + * + * + * if ( ... ) { + * return elem + * } + * + * This example if correctly written, but the + * else contains only 1 statement without a terminator + * since the function finishes with the closing brace. + * + * function a(flag){ + * if(flag) + * test(1); + * else + * test(2) + * } + * + * TODO: Deal with statements that can optional end + * without a semi-colon. Currently this messes up + * the parsing of blocks. + * Need to somehow detect this has happened, and either + * backup a token, or skip reading the next token if + * that is possible from all code locations. + * + */ + + readToken (token); + + if (isKeyword (token, KEYWORD_if)) + { + /* + * Check for an "else if" and consume the "if" + */ + readToken (token); + } + + if (isType (token, TOKEN_OPEN_PAREN)) + { + skipArgumentList(token, false); + } + + if (isType (token, TOKEN_OPEN_CURLY)) + { + parseBlock (token, NULL); + } + else + { + /* The next token should only be read if this statement had its own + * terminator */ + read_next_token = findCmdTerm (token, true, false); + } + return read_next_token; +} + +static bool parseImport (tokenInfo *const token) +{ + if (! isKeyword (token, KEYWORD_import)) + return false; + + readToken (token); + + if (isType (token, TOKEN_IDENTIFIER)) + { + tokenInfo *const name = newToken (); + + copyToken (name, token, true); + readToken (token); + while (isType (token, TOKEN_PERIOD)) + { + vStringPut (name->string, '.'); + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + vStringCat (name->string, token->string); + else if (isType (token, TOKEN_STAR)) + vStringPut (name->string, '*'); + if (isType (token, TOKEN_IDENTIFIER) || isType (token, TOKEN_STAR)) + readToken (token); + } + + makeFlexTag (name, FLEXTAG_IMPORT); + deleteToken (name); + } + + return isType (token, TOKEN_SEMICOLON); +} + +static void parseFunction (tokenInfo *const token) +{ + tokenInfo *const name = newToken (); + flexKind kind = FLEXTAG_FUNCTION; + + /* + * This deals with these formats + * private static function ioErrorHandler( event:IOErrorEvent ):void { + * public function get prop():String {} + * public function set prop(param:String):void {} + */ + + if ( isKeyword(token, KEYWORD_function) ) + { + readToken (token); + } + + /* getter and setter */ + if (isKeyword (token, KEYWORD_get) || + isKeyword (token, KEYWORD_set)) + { + kind = FLEXTAG_PROPERTY; + readToken (token); + } + + copyToken (name, token, true); + /* Add scope in case this is an INNER function + addToScope(name, token->scope); + */ + + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseFunction: token isClass:%d scope:%s name:%s\n" + , token->isClass + , vStringValue(token->scope) + , vStringValue(token->string) + ); + ); + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseFunction: name isClass:%d scope:%s name:%s\n" + , name->isClass + , vStringValue(name->scope) + , vStringValue(name->string) + ); + ); + + readToken (token); + + if ( isType (token, TOKEN_OPEN_PAREN) ) + skipArgumentList(token, false); + + if ( isType (token, TOKEN_COLON) ) + { + /* + * function fname ():ReturnType + */ + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + readToken (token); + } + + if ( isType (token, TOKEN_OPEN_CURLY) ) + { + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseFunction end: name isClass:%d scope:%s name:%s\n" + , name->isClass + , vStringValue(name->scope) + , vStringValue(name->string) + ); + ); + parseBlock (token, name->string); + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseFunction end2: token isClass:%d scope:%s name:%s\n" + , token->isClass + , vStringValue(token->scope) + , vStringValue(token->string) + ); + ); + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseFunction end2: token isClass:%d scope:%s name:%s\n" + , token->isClass + , vStringValue(token->scope) + , vStringValue(token->string) + ); + ); + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseFunction end3: name isClass:%d scope:%s name:%s\n" + , name->isClass + , vStringValue(name->scope) + , vStringValue(name->string) + ); + ); + if (kind == FLEXTAG_FUNCTION) + makeFunctionTag (name); + else + makeFlexTag (name, kind); + } + + findCmdTerm (token, false, false); + + deleteToken (name); +} + +/* Parses a block surrounded by curly braces. + * @p parentScope is the scope name for this block, or NULL for unnamed scopes */ +static bool parseBlock (tokenInfo *const token, const vString *const parentScope) +{ + bool read_next_token = true; + vString * saveScope = vStringNew (); + + vStringCopy (saveScope, token->scope); + if (parentScope) + { + addToScope (token, parentScope); + token->nestLevel++; + } + + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseBlock start: token isClass:%d scope:%s name:%s\n" + , token->isClass + , vStringValue(token->scope) + , vStringValue(token->string) + ); + ); + /* + * Make this routine a bit more forgiving. + * If called on an open_curly advance it + */ + if (isType (token, TOKEN_OPEN_CURLY)) + readToken(token); + + if (! isType (token, TOKEN_CLOSE_CURLY)) + { + /* + * Read until we find the closing brace, + * any nested braces will be handled within + */ + do + { + if (isType (token, TOKEN_OPEN_CURLY)) + { + /* Handle nested blocks */ + parseBlock (token, NULL); + } + else + { + /* + * It is possible for a line to have no terminator + * if the following line is a closing brace. + * parseLine will detect this case and indicate + * whether we should read an additional token. + */ + read_next_token = parseLine (token); + } + + /* + * Always read a new token unless we find a statement without + * a ending terminator + */ + if( read_next_token ) + readToken(token); + + /* + * If we find a statement without a terminator consider the + * block finished, otherwise the stack will be off by one. + */ + } while (! isType (token, TOKEN_EOF) && + ! isType (token, TOKEN_CLOSE_CURLY) && read_next_token); + } + + vStringCopy(token->scope, saveScope); + vStringDelete(saveScope); + if (parentScope) + token->nestLevel--; + + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseBlock end: token isClass:%d scope:%s name:%s\n" + , token->isClass + , vStringValue(token->scope) + , vStringValue(token->string) + ); + ); + return false; +} + +static void parseMethods (tokenInfo *const token, const tokenInfo *const class) +{ + tokenInfo *const name = newToken (); + vString *saveScope = vStringNew (); + + vStringCopy (saveScope, token->scope); + addToScope (token, class->string); + + /* + * This deals with these formats + * validProperty : 2, + * validMethod : function(a,b) {} + * 'validMethod2' : function(a,b) {} + * container.dirtyTab = {'url': false, 'title':false, 'snapshot':false, '*': false} + */ + + do + { + readToken (token); + if (isType (token, TOKEN_CLOSE_CURLY)) + { + goto cleanUp; + } + + if (isType (token, TOKEN_STRING) || isKeyword(token, KEYWORD_NONE)) + { + copyToken (name, token, true); + + readToken (token); + if ( isType (token, TOKEN_COLON) ) + { + readToken (token); + if ( isKeyword (token, KEYWORD_function) ) + { + readToken (token); + if ( isType (token, TOKEN_OPEN_PAREN) ) + { + skipArgumentList(token, false); + } + + if (isType (token, TOKEN_OPEN_CURLY)) + { + makeFlexTag (name, FLEXTAG_METHOD); + parseBlock (token, name->string); + + /* + * Read to the closing curly, check next + * token, if a comma, we must loop again + */ + readToken (token); + } + } + else + { + makeFlexTag (name, FLEXTAG_PROPERTY); + + /* + * Read the next token, if a comma + * we must loop again + */ + readToken (token); + } + } + } + } while ( isType(token, TOKEN_COMMA)); + + findCmdTerm (token, false, false); + +cleanUp: + vStringCopy (token->scope, saveScope); + vStringDelete (saveScope); + deleteToken (name); +} + +static bool parseVar (tokenInfo *const token, bool is_public) +{ + tokenInfo *const name = newToken (); + bool is_terminated = true; + flexKind kind = is_public ? FLEXTAG_VARIABLE : FLEXTAG_LOCALVAR; + + /* + * Variables are defined as: + * private static var lastFaultMessage:Date = new Date( 0 ); + * private static var webRequests:ArrayCollection = new ArrayCollection(); + */ + + if ( isKeyword(token, KEYWORD_var) ) + { + readToken(token); + } + else if (isKeyword(token, KEYWORD_const)) + { + kind = FLEXTAG_CONST; + readToken(token); + } + + /* Variable name */ + copyToken (name, token, true); + readToken(token); + + if ( isType (token, TOKEN_COLON) ) + { + /* + * var vname ():DataType = new Date(); + * var vname ():DataType; + */ + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + readToken (token); + } + + is_terminated = findCmdTerm (token, true, false); + + if ( isType (token, TOKEN_SEMICOLON) ) + { + makeFlexTag (name, kind); + } + + deleteToken (name); + + return is_terminated; +} + +static void parsePackage (tokenInfo *const token) +{ + tokenInfo *name = NULL; + + if (isKeyword (token, KEYWORD_package)) + readToken(token); + + /* name is optional and can be qualified */ + if (isType (token, TOKEN_IDENTIFIER)) + { + name = newToken (); + copyToken (name, token, true); + readToken (token); + + while (isType (token, TOKEN_PERIOD)) + { + vStringPut (name->string, '.'); + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + { + vStringCat (name->string, token->string); + readToken (token); + } + } + } + + if (isType (token, TOKEN_OPEN_CURLY)) + { + if (name) + makeFlexTag (name, FLEXTAG_PACKAGE); + parseBlock (token, name ? name->string : NULL); + } + + if (name) + deleteToken (name); +} + +static bool parseClass (tokenInfo *const token) +{ + tokenInfo *const name = newToken (); + bool saveIsClass = token->isClass; + + /* + * Variables are defined as: + * private static var lastFaultMessage:Date = new Date( 0 ); + * private static var webRequests:ArrayCollection = new ArrayCollection(); + */ + + if ( isKeyword(token, KEYWORD_class) ) + { + readToken(token); + } + + token->isClass = true; + /* Class name */ + copyToken (name, token, true); + readToken(token); + + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseClass start: token isClass:%d scope:%s name:%s\n" + , token->isClass + , vStringValue(token->scope) + , vStringValue(token->string) + ); + ); + + if (isKeyword (token, KEYWORD_extends)) + { + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + readToken (token); + } + + if (isKeyword (token, KEYWORD_implements)) + { + do + { + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + readToken (token); + } + while (isType (token, TOKEN_COMMA)); + } + + if ( isType (token, TOKEN_OPEN_CURLY) ) + { + makeClassTag (name); + parseBlock (token, name->string); + } + + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseClass end: token isClass:%d scope:%s name:%s\n" + , token->isClass + , vStringValue(token->scope) + , vStringValue(token->string) + ); + ); + token->isClass = saveIsClass; + deleteToken (name); + + return true; +} + +static void parseInterface (tokenInfo *const token) +{ + tokenInfo *const name = newToken (); + bool saveIsClass = token->isClass; + + if (isKeyword(token, KEYWORD_interface)) + readToken(token); + + token->isClass = true; + /* interface name */ + copyToken (name, token, true); + readToken (token); + + /* interfaces can extend multiple interfaces */ + if (isKeyword (token, KEYWORD_extends)) + { + do + { + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + readToken (token); + } + while (isType (token, TOKEN_COMMA)); + } + + if (isType (token, TOKEN_OPEN_CURLY)) + { + makeFlexTag (name, FLEXTAG_INTERFACE); + parseBlock (token, name->string); + } + + token->isClass = saveIsClass; + deleteToken (name); +} + +static bool parseStatement (tokenInfo *const token) +{ + tokenInfo *const name = newToken (); + tokenInfo *const secondary_name = newToken (); + vString * saveScope = vStringNew (); + bool is_public = false; + bool is_class = false; + bool is_terminated = true; + bool is_global = false; + /* bool is_prototype = false; */ + vString * fulltag; + + vStringCopy (saveScope, token->scope); + DebugStatement ( + debugPrintf (DEBUG_PARSE + , "\n parseStatement: token isClass:%d scope:%s name:%s\n" + , token->isClass + , vStringValue(token->scope) + , vStringValue(token->string) + ); + ); + /* + * Functions can be named or unnamed. + * This deals with these formats: + * Function + * validFunctionOne = function(a,b) {} + * testlib.validFunctionFive = function(a,b) {} + * var innerThree = function(a,b) {} + * var innerFour = (a,b) {} + * var D2 = secondary_fcn_name(a,b) {} + * var D3 = new Function("a", "b", "return a+b;"); + * Class + * testlib.extras.ValidClassOne = function(a,b) { + * this.a = a; + * } + * Class Methods + * testlib.extras.ValidClassOne.prototype = { + * 'validMethodOne' : function(a,b) {}, + * 'validMethodTwo' : function(a,b) {} + * } + * ValidClassTwo = function () + * { + * this.validMethodThree = function() {} + * // unnamed method + * this.validMethodFour = () {} + * } + * Database.prototype.validMethodThree = Database_getTodaysDate; + */ + + /* skip attributes */ + while (isKeyword (token, KEYWORD_public) || + isKeyword (token, KEYWORD_protected) || + isKeyword (token, KEYWORD_private) || + isKeyword (token, KEYWORD_override) || + isKeyword (token, KEYWORD_static) || + isKeyword (token, KEYWORD_internal) || + isKeyword (token, KEYWORD_native) || + isKeyword (token, KEYWORD_dynamic) || + isKeyword (token, KEYWORD_final)) + { + if (isKeyword(token, KEYWORD_public)) + is_public = true; + + readToken (token); + } + + if (isType(token, TOKEN_KEYWORD)) + { + switch (token->keyword) + { + case KEYWORD_for: + case KEYWORD_while: + case KEYWORD_do: + is_terminated = parseLoop (token); + break; + case KEYWORD_if: + case KEYWORD_else: + case KEYWORD_try: + case KEYWORD_catch: + case KEYWORD_finally: + /* Common semantics */ + is_terminated = parseIf (token); + break; + case KEYWORD_switch: + parseSwitch (token); + break; + case KEYWORD_package: + parsePackage (token); + goto cleanUp; + break; + case KEYWORD_class: + parseClass (token); + goto cleanUp; + break; + case KEYWORD_interface: + parseInterface (token); + goto cleanUp; + break; + case KEYWORD_function: + parseFunction (token); + goto cleanUp; + break; + case KEYWORD_var: + case KEYWORD_const: + is_terminated = parseVar (token, is_public); + goto cleanUp; + break; + default: + readToken(token); + break; + } + } + +nextVar: + copyToken (name, token, true); + + while (! isType (token, TOKEN_CLOSE_CURLY) && + ! isType (token, TOKEN_SEMICOLON) && + ! isType (token, TOKEN_EQUAL_SIGN) && + ! isType (token, TOKEN_COMMA) && + ! isType (token, TOKEN_EOF)) + { + if (isType (token, TOKEN_OPEN_CURLY)) + parseBlock (token, NULL); + + /* Potentially the name of the function */ + if (isType (token, TOKEN_PERIOD)) + { + /* + * Cannot be a global variable is it has dot references in the name + */ + is_global = false; + /* Assume it's an assignment to a global name (e.g. a class) using + * its fully qualified name, so strip the scope. + * FIXME: resolve the scope so we can make more than an assumption. */ + vStringClear (token->scope); + vStringClear (name->scope); + do + { + readToken (token); + if (! isType(token, TOKEN_KEYWORD)) + { + if ( is_class ) + { + addToScope(token, name->string); + } + else + addContext (name, token); + + readToken (token); + } + else if ( isKeyword(token, KEYWORD_prototype) ) + { + /* + * When we reach the "prototype" tag, we infer: + * "BindAgent" is a class + * "build" is a method + * + * function BindAgent( repeatableIdName, newParentIdName ) { + * } + * + * CASE 1 + * Specified function name: "build" + * BindAgent.prototype.build = function( mode ) { + * ignore everything within this function + * } + * + * CASE 2 + * Prototype listing + * ValidClassOne.prototype = { + * 'validMethodOne' : function(a,b) {}, + * 'validMethodTwo' : function(a,b) {} + * } + * + */ + makeClassTag (name); + is_class = true; + /* is_prototype = true; */ + + /* + * There should a ".function_name" next. + */ + readToken (token); + if (isType (token, TOKEN_PERIOD)) + { + /* + * Handle CASE 1 + */ + readToken (token); + if (! isType(token, TOKEN_KEYWORD)) + { + addToScope(token, name->string); + + makeFlexTag (token, FLEXTAG_METHOD); + /* + * We can read until the end of the block / statement. + * We need to correctly parse any nested blocks, but + * we do NOT want to create any tags based on what is + * within the blocks. + */ + token->ignoreTag = true; + /* + * Find to the end of the statement + */ + findCmdTerm (token, false, false); + token->ignoreTag = false; + is_terminated = true; + goto cleanUp; + } + } + else if (isType (token, TOKEN_EQUAL_SIGN)) + { + readToken (token); + if (isType (token, TOKEN_OPEN_CURLY)) + { + /* + * Handle CASE 2 + * + * Creates tags for each of these class methods + * ValidClassOne.prototype = { + * 'validMethodOne' : function(a,b) {}, + * 'validMethodTwo' : function(a,b) {} + * } + */ + parseMethods(token, name); + /* + * Find to the end of the statement + */ + findCmdTerm (token, false, false); + token->ignoreTag = false; + is_terminated = true; + goto cleanUp; + } + } + } + else + readToken (token); + } while (isType (token, TOKEN_PERIOD)); + } + else + readTokenFull (token, true); + + if ( isType (token, TOKEN_OPEN_PAREN) ) + skipArgumentList(token, false); + + if ( isType (token, TOKEN_COLON) ) + { + /* + * Functions are of this form: + * function fname ():ReturnType { + */ + readToken (token); + if (isType (token, TOKEN_IDENTIFIER)) + readToken (token); + } + + if ( isType (token, TOKEN_OPEN_SQUARE) ) + skipArrayList(token, false); + } + + if ( isType (token, TOKEN_CLOSE_CURLY) ) + { + /* + * Reaching this section without having + * processed an open curly brace indicates + * the statement is most likely not terminated. + */ + is_terminated = false; + goto cleanUp; + } + + if ( isType (token, TOKEN_SEMICOLON) || + isType (token, TOKEN_EOF) || + isType (token, TOKEN_COMMA) ) + { + /* + * Only create variables for global scope + */ + if ( token->nestLevel == 0 && is_global ) + { + /* + * Handles this syntax: + * var g_var2; + */ + makeFlexTag (name, FLEXTAG_VARIABLE); + } + /* + * Statement has ended. + * This deals with calls to functions, like: + * alert(..); + */ + if (isType (token, TOKEN_COMMA)) + { + readToken (token); + goto nextVar; + } + goto cleanUp; + } + + if ( isType (token, TOKEN_EQUAL_SIGN) ) + { + readToken (token); + + if ( isKeyword (token, KEYWORD_function) ) + { + readToken (token); + + if (! isType (token, TOKEN_KEYWORD) && + ! isType (token, TOKEN_OPEN_PAREN)) + { + /* + * Functions of this format: + * var D2A = function theAdd(a, b) + * { + * return a+b; + * } + * Are really two separate defined functions and + * can be referenced in two ways: + * alert( D2A(1,2) ); // produces 3 + * alert( theAdd(1,2) ); // also produces 3 + * So it must have two tags: + * D2A + * theAdd + * Save the reference to the name for later use, once + * we have established this is a valid function we will + * create the secondary reference to it. + */ + copyToken (secondary_name, token, true); + readToken (token); + } + + if ( isType (token, TOKEN_OPEN_PAREN) ) + skipArgumentList(token, false); + + if (isType (token, TOKEN_OPEN_CURLY)) + { + /* + * This will be either a function or a class. + * We can only determine this by checking the body + * of the function. If we find a "this." we know + * it is a class, otherwise it is a function. + */ + if ( token->isClass ) + { + makeFlexTag (name, FLEXTAG_METHOD); + if ( vStringLength(secondary_name->string) > 0 ) + makeFunctionTag (secondary_name); + parseBlock (token, name->string); + } + else + { + parseBlock (token, name->string); + makeFunctionTag (name); + + if ( vStringLength(secondary_name->string) > 0 ) + makeFunctionTag (secondary_name); + } + } + } + else if (isType (token, TOKEN_OPEN_PAREN)) + { + /* + * Handle nameless functions + * this.method_name = () {} + */ + skipArgumentList(token, false); + + if (isType (token, TOKEN_OPEN_CURLY)) + { + /* + * Nameless functions are only setup as methods. + */ + makeFlexTag (name, FLEXTAG_METHOD); + parseBlock (token, name->string); + } + } + else if (isType (token, TOKEN_OPEN_CURLY)) + { + /* + * Creates tags for each of these class methods + * ValidClassOne.prototype = { + * 'validMethodOne' : function(a,b) {}, + * 'validMethodTwo' : function(a,b) {} + * } + */ + parseMethods(token, name); + /* Here we should be at the end of the block, on the close curly. + * If so, read the next token not to confuse that close curly with + * the end of the current statement. */ + if (isType (token, TOKEN_CLOSE_CURLY)) + { + readTokenFull(token, true); + is_terminated = isType (token, TOKEN_SEMICOLON); + } + } + else if (isKeyword (token, KEYWORD_new)) + { + readToken (token); + if ( isKeyword (token, KEYWORD_function) || + isKeyword (token, KEYWORD_capital_function) || + isKeyword (token, KEYWORD_object) || + isKeyword (token, KEYWORD_capital_object) ) + { + if ( isKeyword (token, KEYWORD_object) || + isKeyword (token, KEYWORD_capital_object) ) + is_class = true; + + readToken (token); + if ( isType (token, TOKEN_OPEN_PAREN) ) + skipArgumentList(token, true); + + if (isType (token, TOKEN_SEMICOLON)) + { + if ( token->nestLevel == 0 ) + { + if ( is_class ) + { + makeClassTag (name); + } else { + makeFunctionTag (name); + } + } + } + else if (isType (token, TOKEN_CLOSE_CURLY)) + is_terminated = false; + } + } + else if (! isType (token, TOKEN_KEYWORD)) + { + /* + * Only create variables for global scope + */ + if ( token->nestLevel == 0 && is_global ) + { + /* + * A pointer can be created to the function. + * If we recognize the function/class name ignore the variable. + * This format looks identical to a variable definition. + * A variable defined outside of a block is considered + * a global variable: + * var g_var1 = 1; + * var g_var2; + * This is not a global variable: + * var g_var = function; + * This is a global variable: + * var g_var = different_var_name; + */ + fulltag = vStringNew (); + if (vStringLength (token->scope) > 0) + { + vStringCopy(fulltag, token->scope); + vStringPut (fulltag, '.'); + vStringCat (fulltag, token->string); + } + else + { + vStringCopy(fulltag, token->string); + } + if ( ! stringListHas(FunctionNames, vStringValue (fulltag)) && + ! stringListHas(ClassNames, vStringValue (fulltag)) ) + { + makeFlexTag (name, FLEXTAG_VARIABLE); + } + vStringDelete (fulltag); + } + } + } + /* if we aren't already at the cmd end, advance to it and check whether + * the statement was terminated */ + if (! isType (token, TOKEN_CLOSE_CURLY) && + ! isType (token, TOKEN_SEMICOLON)) + { + /* + * Statements can be optionally terminated in the case of + * statement prior to a close curly brace as in the + * document.write line below: + * + * function checkForUpdate() { + * if( 1==1 ) { + * document.write("hello from checkForUpdate ") + * } + * return 1; + * } + */ + is_terminated = findCmdTerm (token, true, true); + /* if we're at a comma, try and read a second var */ + if (isType (token, TOKEN_COMMA)) + { + readToken (token); + goto nextVar; + } + } + +cleanUp: + vStringCopy(token->scope, saveScope); + deleteToken (name); + deleteToken (secondary_name); + vStringDelete(saveScope); + + return is_terminated; +} + +static bool parseLine (tokenInfo *const token) +{ + bool is_terminated = true; + /* + * Detect the common statements, if, while, for, do, ... + * This is necessary since the last statement within a block "{}" + * can be optionally terminated. + * + * If the statement is not terminated, we need to tell + * the calling routine to prevent reading an additional token + * looking for the end of the statement. + */ + + if (isType(token, TOKEN_KEYWORD)) + { + switch (token->keyword) + { + case KEYWORD_for: + case KEYWORD_while: + case KEYWORD_do: + is_terminated = parseLoop (token); + break; + case KEYWORD_if: + case KEYWORD_else: + case KEYWORD_try: + case KEYWORD_catch: + case KEYWORD_finally: + /* Common semantics */ + is_terminated = parseIf (token); + break; + case KEYWORD_switch: + parseSwitch (token); + break; + case KEYWORD_return: + readToken (token); + is_terminated = parseLine (token); + break; + case KEYWORD_function: + parseFunction (token); + break; + case KEYWORD_import: + is_terminated = parseImport (token); + /* to properly support unterminated imports at top level, + * recurse here because parseActionScript() will *always* + * advance to avoid ever getting stuck. */ + if (! is_terminated) + return parseLine (token); + break; + default: + is_terminated = parseStatement (token); + break; + } + } + else + { + /* + * Special case where single line statements may not be + * SEMICOLON terminated. parseBlock needs to know this + * so that it does not read the next token. + */ + is_terminated = parseStatement (token); + } + return is_terminated; +} + +static bool parseCDATA (tokenInfo *const token) +{ + if (isType (token, TOKEN_LESS_THAN)) + { + /* + * Handle these tags + * <![CDATA[ + * ... + * ]]> + */ + readToken (token); + if (isType (token, TOKEN_EXCLAMATION)) + { + readToken (token); + if (isType (token, TOKEN_OPEN_SQUARE)) + { + readToken (token); + if (isKeyword (token, KEYWORD_cdata)) + { + readToken (token); + if (isType (token, TOKEN_OPEN_SQUARE)) + { + parseActionScript (token, true); + if (isType (token, TOKEN_CLOSE_SQUARE)) + { + readToken (token); + if (isType (token, TOKEN_CLOSE_SQUARE)) + { + readToken (token); + } + } + } + } + } + } + } + else + { + parseActionScript (token, false); + } + return true; +} + +static bool parseNamespace (tokenInfo *const token) +{ + /* + * If we have found a <, we know it is not a TOKEN_OPEN_MXML + * but it could potentially be a different namespace. + * This means it will also have a closing tag, which will + * mess up the parser if we do not properly recurse + * through these tags. + */ + + if (isType (token, TOKEN_LESS_THAN)) + { + readToken (token); + } + + /* + * Check if we have reached a other namespace tag + * <views:Object ... /> + * or + * <views:Object ... > + * </views:Object> + */ + if (isType (token, TOKEN_IDENTIFIER)) + { + readToken (token); + if (isType (token, TOKEN_COLON)) + { + readToken (token); + if ( ! isType (token, TOKEN_IDENTIFIER)) + { + return true; + } + } + else + { + return true; + } + } + else + { + return true; + } + + /* + * Confirmed we are inside a namespace tag, so + * process it until the close tag. + * + * But also check for new tags, which will either + * be recursive namespaces or MXML tags + */ + do + { + if (isType (token, TOKEN_LESS_THAN)) + { + parseNamespace (token); + readToken (token); + } + if (isType (token, TOKEN_OPEN_MXML)) + { + parseMXML (token); + } + else + { + readToken (token); + } + } while (! (isType (token, TOKEN_CLOSE_SGML) || + isType (token, TOKEN_CLOSE_MXML) || + isEOF (token)) ); + return true; +} + +static bool parseMXML (tokenInfo *const token) +{ + tokenInfo *const name = newToken (); + tokenInfo *const type = newToken (); + bool inside_attributes = true; + /* + * Detect the common statements, if, while, for, do, ... + * This is necessary since the last statement within a block "{}" + * can be optionally terminated. + * + * If the statement is not terminated, we need to tell + * the calling routine to prevent reading an additional token + * looking for the end of the statement. + */ + + readToken (token); + + if (isKeyword (token, KEYWORD_script)) + { + /* + * These tags can be of this form: + * <mx:Script src="filename.as" /> + */ + do + { + readToken (token); + } while (! (isType (token, TOKEN_CLOSE_SGML) || + isType (token, TOKEN_CLOSE_MXML) || + isType (token, TOKEN_GREATER_THAN) || + isEOF (token)) ); + + if (isType (token, TOKEN_CLOSE_MXML)) + { + /* + * We have found a </mx:type> tag + * Finish reading the "type" and ">" + */ + readToken (token); + readToken (token); + goto cleanUp; + } + if (isType (token, TOKEN_CLOSE_SGML)) + { + /* + * We have found a <mx:Script src="filename.as" /> + */ + goto cleanUp; + } + + /* + * This is a beginning of an embedded script. + * These typically are of this format: + * <mx:Script> + * <![CDATA[ + * ... ActionScript ... + * ]]> + * </mx:Script> + */ + readToken (token); + parseCDATA (token); + + readToken (token); + if (isType (token, TOKEN_CLOSE_MXML)) + { + /* + * We have found a </mx:type> tag + * Finish reading the "type" and ">" + */ + readToken (token); + readToken (token); + } + goto cleanUp; + } + + copyToken (type, token, true); + + readToken (token); + do + { + if (isType (token, TOKEN_GREATER_THAN)) + { + inside_attributes = false; + } + if (isType (token, TOKEN_LESS_THAN)) + { + parseNamespace (token); + readToken (token); + } + else if (isType (token, TOKEN_OPEN_MXML)) + { + parseMXML (token); + readToken (token); + } + else if (inside_attributes && (isKeyword (token, KEYWORD_id) || isKeyword (token, KEYWORD_name))) + { + if (vStringLength(name->string) == 0 ) + { + /* + * If we have already created the tag based on either "name" + * or "id" do not do it again. + */ + readToken (token); + readToken (token); + + copyToken (name, token, true); + addToScope (name, type->string); + makeMXTag (name); + } + else + { + readToken (token); + } + } + else + { + readToken (token); + } + } while (! (isType (token, TOKEN_CLOSE_SGML) || + isType (token, TOKEN_CLOSE_MXML) || + isEOF (token)) ); + + if (isType (token, TOKEN_CLOSE_MXML)) + { + /* + * We have found a </mx:type> tag + * Finish reading the "type" and ">" + */ + readToken (token); + readToken (token); + } + +cleanUp: + deleteToken (name); + deleteToken (type); + return true; +} + +static bool parseActionScript (tokenInfo *const token, bool readNext) +{ + LastTokenType = TOKEN_UNDEFINED; + + do + { + if (! readNext) + readNext = true; + else + readToken (token); + + if (isType (token, TOKEN_LESS_THAN)) + { + /* + * Handle these tags + * <![CDATA[ + * ... + * ]]> + */ + readToken (token); + if (isType (token, TOKEN_EQUAL_SIGN)) + { + if (isType (token, TOKEN_OPEN_SQUARE)) + { + readToken (token); + if (isKeyword (token, KEYWORD_cdata)) + { + readToken (token); + } + } + } + } + if (isType (token, TOKEN_CLOSE_SQUARE)) + { + /* + * Handle these tags + * <![CDATA[ + * ... + * ]]> + */ + readToken (token); + if (isType (token, TOKEN_CLOSE_SQUARE)) + { + readToken (token); + if (isType (token, TOKEN_GREATER_THAN)) + { + return true; + } + } + } + else if (isType (token, TOKEN_CLOSE_MXML)) + { + /* + * Read the Script> tags + */ + readToken (token); + readToken (token); + return true; + } + else if (isType (token, TOKEN_OPEN_MXML)) + { + parseMXML (token); + } + else + { + parseLine (token); + } + } while (!isEOF (token)); + return true; +} + +static void parseFlexFile (tokenInfo *const token) +{ + do + { + readToken (token); + + if (isType (token, TOKEN_OPEN_MXML)) + { + parseMXML (token); + } + else if (isType (token, TOKEN_LESS_THAN)) + { + readToken (token); + if (isType (token, TOKEN_QUESTION_MARK)) + { + /* + * <?xml version="1.0" encoding="utf-8"?> + */ + readToken (token); + while (! (isType (token, TOKEN_QUESTION_MARK) || isEOF (token))) + { + readToken (token); + } + readToken (token); + } + else if (isKeyword (token, KEYWORD_NONE)) + { + /* + * This is a simple XML tag, read until the closing statement + * <something .... > + * </something> + */ + readToken (token); + while (! (isType (token, TOKEN_GREATER_THAN) || isEOF (token))) + { + readToken (token); + } + } + } + else + { + parseActionScript (token, false); + } + } while (!isEOF (token)); +} + +static void initialize (const langType language) +{ + Assert (ARRAY_SIZE (FlexKinds) == FLEXTAG_COUNT); + Lang_flex = language; +} + +static void findFlexTags (void) +{ + tokenInfo *const token = newToken (); + + NextToken = NULL; + ClassNames = stringListNew (); + FunctionNames = stringListNew (); + + parseFlexFile (token); + + stringListDelete (ClassNames); + stringListDelete (FunctionNames); + ClassNames = NULL; + FunctionNames = NULL; + deleteToken (token); +} + +/* Create parser definition structure */ +extern parserDefinition* FlexParser (void) +{ + static const char *const extensions [] = { "as", "mxml", NULL }; + parserDefinition *const def = parserNew ("Flex"); + def->extensions = extensions; + /* + * New definitions for parsing instead of regex + */ + def->kindTable = FlexKinds; + def->kindCount = ARRAY_SIZE (FlexKinds); + def->parser = findFlexTags; + def->initialize = initialize; + def->keywordTable = FlexKeywordTable; + def->keywordCount = ARRAY_SIZE (FlexKeywordTable); + + return def; +} Modified: src/symbols.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -720,6 +720,7 @@ static void add_top_level_items(GeanyDocument *doc) case GEANY_FILETYPES_AS: { tag_list_add_groups(tag_store, + &(tv_iters.tag_externvar), _("Imports"), ICON_NAMESPACE, &(tv_iters.tag_namespace), _("Package"), ICON_NAMESPACE, &(tv_iters.tag_interface), _("Interfaces"), ICON_STRUCT, &(tv_iters.tag_class), _("Classes"), ICON_CLASS, Modified: src/tagmanager/tm_parser.c 15 lines changed, 9 insertions(+), 6 deletions(-) =================================================================== @@ -371,14 +371,16 @@ static TMParserMapEntry map_VALA[] = { /* not in universal-ctags */ static TMParserMapEntry map_ACTIONSCRIPT[] = { {'f', tm_tag_function_t}, - {'l', tm_tag_field_t}, - {'v', tm_tag_variable_t}, - {'m', tm_tag_macro_t}, {'c', tm_tag_class_t}, {'i', tm_tag_interface_t}, - {'p', tm_tag_package_t}, - {'o', tm_tag_other_t}, - {'r', tm_tag_prototype_t}, + {'P', tm_tag_package_t}, + {'m', tm_tag_method_t}, + {'p', tm_tag_member_t}, + {'v', tm_tag_variable_t}, + {'l', tm_tag_variable_t}, + {'C', tm_tag_macro_t}, + {'I', tm_tag_externvar_t}, + {'x', tm_tag_other_t}, }; /* not in universal-ctags */ @@ -767,6 +769,7 @@ gboolean tm_parser_has_full_context(TMParserType lang) switch (lang) { /* These parsers include full hierarchy in the tag scope, separated by tm_parser_context_separator() */ + case TM_PARSER_ACTIONSCRIPT: case TM_PARSER_C: case TM_PARSER_CPP: case TM_PARSER_CSHARP: Modified: tests/ctags/Makefile.am 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -12,6 +12,13 @@ test_sources = \ 3470609.js \ 3526726.tex \ 68hc11.asm \ + actionscript/as-first-token.as \ + actionscript/classes.as \ + actionscript/const2.as \ + actionscript/const.as \ + actionscript/method-attributes.as \ + actionscript/packages.as \ + actionscript/sampler.as \ angle_bracket.cpp \ anonymous_functions.php \ arraylist.js \ Modified: tests/ctags/actionscript/as-first-token.as 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1 @@ +function f1():void {} Modified: tests/ctags/actionscript/as-first-token.as.tags 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,2 @@ +# format=tagmanager +f1�16�0 Modified: tests/ctags/actionscript/classes.as 16 lines changed, 16 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,16 @@ +package { + class C1 { + public function m1():Boolean { return 0; } + } + class C2 extends C1 {} + class C3 {} + interface I1 {} + interface I2 {} + interface I3 extends I1, I2 {} + interface I4 extends I3 {} + class C4 implements I1 {} + class C5 extends C3 implements I1 {} + class C6 extends C3 implements I1, I2 {} + + dynamic class C7{} +} Modified: tests/ctags/actionscript/classes.as.tags 13 lines changed, 13 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,13 @@ +# format=tagmanager +C1�1�0 +C2�1�0 +C3�1�0 +C4�1�0 +C5�1�0 +C6�1�0 +C7�1�0 +I1�32�0 +I2�32�0 +I3�32�0 +I4�32�0 +m1�128�C1�0 Modified: tests/ctags/actionscript/const.as 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,8 @@ +// https://www.oreilly.com/library/view/essential-actionscript-30/0596526946/c… +public class AlarmClock { + public static const MODE_VISUAL = 1; + public static const MODE_AUDIO = 2; + public static const MODE_BOTH = 3; + + private var mode = AlarmClock.MODE_AUDIO; +} Modified: tests/ctags/actionscript/const.as.tags 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,6 @@ +# format=tagmanager +AlarmClock�1�0 +MODE_AUDIO�65536�AlarmClock�0 +MODE_BOTH�65536�AlarmClock�0 +MODE_VISUAL�65536�AlarmClock�0 +mode�16384�AlarmClock�0 Modified: tests/ctags/actionscript/const2.as 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,7 @@ +// https://help.adobe.com/en_US/FlashPlatform/reference/actionscript/3/stateme… +const MIN_AGE:int = 21; + +const product_array:Array = new Array("Studio", "Dreamweaver", "Flash", "ColdFusion", "Contribute", "Breeze"); +product_array.push("Flex"); // array operations are allowed +product_array = ["Other"]; // assignment is an error +trace(product_array); Modified: tests/ctags/actionscript/const2.as.tags 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,3 @@ +# format=tagmanager +MIN_AGE�65536�0 +product_array�65536�0 Modified: tests/ctags/actionscript/method-attributes.as 12 lines changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,12 @@ +/* Not sure it's really valid, but the goal is to check not choking on + * attributes, so so long as it's valid attributes it's fine */ +class C { + public function f1():void {} + private function f2():void {} + protected function f3():void {} + internal function f4():void {} + public function f5():void {} + public override function f6():void {} + final function f7():void {} + native function f8():void {} +} Modified: tests/ctags/actionscript/method-attributes.as.tags 10 lines changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,10 @@ +# format=tagmanager +C�1�0 +f1�128�C�0 +f2�128�C�0 +f3�128�C�0 +f4�128�C�0 +f5�128�C�0 +f6�128�C�0 +f7�128�C�0 +f8�128�C�0 Modified: tests/ctags/actionscript/packages.as 9 lines changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,9 @@ +package P1 {} +package P2 { + function f1() {} +} +package P3 { + class C1 {} +} +package qualified.test . pkg { +} Modified: tests/ctags/actionscript/packages.as.tags 7 lines changed, 7 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,7 @@ +# format=tagmanager +C1�1�P3�0 +P1�512�0 +P2�512�0 +P3�512�0 +f1�16�P2�0 +qualified.test.pkg�512�0 Modified: tests/ctags/actionscript/sampler.as 66 lines changed, 66 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,66 @@ +// https://help.adobe.com/en_US/FlashPlatform/reference/actionscript/3/flash/s… +package +{ + import flash.sampler.* + import flash.system.* + import flash.utils.* + import flash.display.Sprite + public class sampleTypes extends Sprite + { + var b:Boolean = true + public function sampleTypes() { + flash.sampler.startSampling(); + for(var i:int=0;i<10000;i++) + new Object(); + + var cpuSamples:Array=[]; + var newSamples:Array=[]; + var delSamples:Array=[]; + var ids:Array=[] + + var lastTime:Number=0; + for each(var s:Sample in getSamples()) { + + assert(s.time > 0); // positive + assert(Math.floor(s.time) == s.time, s.time); // integral + assert(s.time >= lastTime, s.time + ":" + lastTime); // ascending + assert(s.stack == null || s.stack is Array) + if(s.stack) { + assert(s.stack[0] is StackFrame); + assert(s.stack[0].name is String); + } + + if(s is NewObjectSample) { + var nos = NewObjectSample(s); + assert(s.id > 0, s.id); + assert(s.type is Class, getQualifiedClassName(s.type)); + newSamples.push(s); + ids[s.id] = "got one"; + } else if(s is DeleteObjectSample) { + var dos = DeleteObjectSample(s); + delSamples.push(s); + assert(ids[dos.id] == "got one"); + } else if(s is Sample) + cpuSamples.push(s); + else { + assert(false); + } + lastTime = s.time; + } + + trace(b) + trace(newSamples.length > 0) + trace(cpuSamples.length > 0) + trace(delSamples.length > 0) + + } + + private function assert(e:Boolean, mess:String=null):void { + b = e && b; + if(true && !e) { + if(mess) trace(mess); + trace(new Error().getStackTrace()); + } + } + } +} Modified: tests/ctags/actionscript/sampler.as.tags 16 lines changed, 16 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,16 @@ +# format=tagmanager +assert�128�sampleTypes�0 +b�16384�sampleTypes�0 +cpuSamples�16384�sampleTypes.sampleTypes�0 +delSamples�16384�sampleTypes.sampleTypes�0 +dos�16384�sampleTypes.sampleTypes�0 +flash.display.Sprite�32768�0 +flash.sampler.*�32768�0 +flash.system.*�32768�0 +flash.utils.*�32768�0 +ids�16384�sampleTypes.sampleTypes�0 +lastTime�16384�sampleTypes.sampleTypes�0 +newSamples�16384�sampleTypes.sampleTypes�0 +nos�16384�sampleTypes.sampleTypes�0 +sampleTypes�1�0 +sampleTypes�128�sampleTypes�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] de097d: Restart the shell if VTE restart is requested
by Enrico Tröger 28 Apr '19

28 Apr '19

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 31 Mar 2019 13:26:34 UTC Commit: de097ddf693e26c008d13d0a1f36fb06609bbcad https://github.com/geany/geany/commit/de097ddf693e26c008d13d0a1f36fb06609bb… Log Message: ----------- Restart the shell if VTE restart is requested This happened in the past until d35e66493c7f80768dc5b8761d62ec74434bfdae because of https://sourceforge.net/p/geany/bugs/163/ and https://bugzilla.gnome.org/show_bug.cgi?id=540161. But since the VTE bug has been fixed for long, we can remove the workaround. Closes #352. Modified Paths: -------------- src/vte.c Modified: src/vte.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -526,6 +526,7 @@ static void vte_restart(GtkWidget *widget) pid = 0; } vf->vte_terminal_reset(VTE_TERMINAL(widget), TRUE, TRUE); + vte_start(widget); set_clean(TRUE); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 12f03f: Merge pull request #2116 from eht16/issue352_vte_full_restart
by Enrico Tröger 28 Apr '19

28 Apr '19

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 28 Apr 2019 08:59:12 UTC Commit: 12f03f67737ea018620dfff7f15c7a02023af6b6 https://github.com/geany/geany/commit/12f03f67737ea018620dfff7f15c7a02023af… Log Message: ----------- Merge pull request #2116 from eht16/issue352_vte_full_restart Restart the shell if VTE restart is requested Modified Paths: -------------- src/vte.c Modified: src/vte.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -525,6 +525,7 @@ static void vte_restart(GtkWidget *widget) pid = 0; } vf->vte_terminal_reset(VTE_TERMINAL(widget), TRUE, TRUE); + vte_start(widget); set_clean(TRUE); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e696a6: Add notes about updated transaltions to NEWS
by Frank Lanitz 28 Apr '19

28 Apr '19

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 28 Apr 2019 08:56:02 UTC Commit: e696a680f46bf2f9c92a19787e67c51c75f1916f https://github.com/geany/geany/commit/e696a680f46bf2f9c92a19787e67c51c75f19… Log Message: ----------- Add notes about updated transaltions to NEWS Modified Paths: -------------- NEWS Modified: NEWS 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -1,5 +1,8 @@ Geany 1.35 (unreleased) + Internationalization + * Updated translations: da, de, es, fr, ja, lv, pt, ru, sk, zh_CN + Geany 1.34.1 (January 4, 2019) -------------- 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 April 2019