Commits May 2016

commits@lists.geany.org

1 participants
37 discussions

[geany/geany] d95111: Merge pull request #1039 from techee/highlight_fix2
by Colomban Wendling 31 May '16

31 May '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 31 May 2016 14:53:29 UTC Commit: d95111d4cd02e51eac90f814c4cd24ed8014a4c6 https://github.com/geany/geany/commit/d95111d4cd02e51eac90f814c4cd24ed8014a… Log Message: ----------- Merge pull request #1039 from techee/highlight_fix2 Fix inconsistent typename highlighting updating. Closes #1020, #1022. Modified Paths: -------------- src/document.c src/documentprivate.h src/editor.c Modified: src/document.c 22 lines changed, 14 insertions(+), 8 deletions(-) =================================================================== @@ -510,11 +510,10 @@ static gint document_get_new_idx(void) } -static void queue_colourise(GeanyDocument *doc, gboolean full_colourise) +static void queue_colourise(GeanyDocument *doc) { - /* make sure we don't override previously set full_colourise=TRUE by FALSE */ - if (!doc->priv->colourise_needed || !doc->priv->full_colourise) - doc->priv->full_colourise = full_colourise; + if (doc->priv->colourise_needed) + return; /* Colourise the editor before it is next drawn */ doc->priv->colourise_needed = TRUE; @@ -1398,7 +1397,7 @@ GeanyDocument *document_open_file_full(GeanyDocument *doc, const gchar *filename /* add the text to the ScintillaObject */ sci_set_readonly(doc->editor->sci, FALSE); /* to allow replacing text */ sci_set_text(doc->editor->sci, filedata.data); /* NULL terminated data */ - queue_colourise(doc, TRUE); /* Ensure the document gets colourised. */ + queue_colourise(doc); /* Ensure the document gets colourised. */ /* detect & set line endings */ editor_mode = utils_get_line_endings(filedata.data, filedata.len); @@ -2751,10 +2750,17 @@ void document_highlight_tags(GeanyDocument *doc) keywords_str = symbols_find_typenames_as_string(doc->file_type->lang, FALSE); if (keywords_str) { + guint hash; + keywords = g_string_free(keywords_str, FALSE); - sci_set_keywords(doc->editor->sci, keyword_idx, keywords); + hash = g_str_hash(keywords); + if (hash != doc->priv->keyword_hash) + { + sci_set_keywords(doc->editor->sci, keyword_idx, keywords); + queue_colourise(doc); /* force re-highlighting the entire document */ + doc->priv->keyword_hash = hash; + } g_free(keywords); - queue_colourise(doc, FALSE); /* re-highlight the visible area */ } } @@ -2815,7 +2821,7 @@ static void document_load_config(GeanyDocument *doc, GeanyFiletype *type, highlighting_set_styles(doc->editor->sci, type); editor_set_indentation_guides(doc->editor); build_menu_update(doc); - queue_colourise(doc, TRUE); + queue_colourise(doc); if (type->priv->symbol_list_sort_mode == SYMBOLS_SORT_USE_PREVIOUS) doc->priv->symbol_list_sort_mode = interface_prefs.symbols_sort_mode; else Modified: src/documentprivate.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -90,7 +90,7 @@ typedef struct GeanyDocumentPrivate /* Used so Undo/Redo works for encoding changes. */ FileEncoding saved_encoding; gboolean colourise_needed; /* use document.c:queue_colourise() instead */ - gboolean full_colourise; + guint keyword_hash; /* hash of keyword string used for typename colourisation */ gint line_count; /* Number of lines in the document. */ gint symbol_list_sort_mode; /* indicates whether a file is on a remote filesystem, works only with GIO/GVfs */ Modified: src/editor.c 26 lines changed, 5 insertions(+), 21 deletions(-) =================================================================== @@ -4760,28 +4760,12 @@ static gboolean editor_check_colourise(GeanyEditor *editor) return FALSE; doc->priv->colourise_needed = FALSE; + sci_colourise(editor->sci, 0, -1); - if (doc->priv->full_colourise) - { - sci_colourise(editor->sci, 0, -1); - - /* now that the current document is colourised, fold points are now accurate, - * so force an update of the current function/tag. */ - symbols_get_current_function(NULL, NULL); - ui_update_statusbar(NULL, -1); - } - else - { - gint start_line, end_line, start, end; - - start_line = SSM(doc->editor->sci, SCI_GETFIRSTVISIBLELINE, 0, 0); - end_line = start_line + SSM(editor->sci, SCI_LINESONSCREEN, 0, 0); - start_line = SSM(editor->sci, SCI_DOCLINEFROMVISIBLE, start_line, 0); - end_line = SSM(editor->sci, SCI_DOCLINEFROMVISIBLE, end_line, 0); - start = sci_get_position_from_line(editor->sci, start_line); - end = sci_get_line_end_position(editor->sci, end_line); - sci_colourise(editor->sci, start, end); - } + /* now that the current document is colourised, fold points are now accurate, + * so force an update of the current function/tag. */ + symbols_get_current_function(NULL, NULL); + ui_update_statusbar(NULL, -1); return TRUE; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 9bc585: make: fix a typo in parenthesis handling
by Masatake YAMATO 31 May '16

31 May '16

Branch: refs/heads/master Author: Masatake YAMATO <yamato(a)redhat.com> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 31 May 2016 13:35:49 UTC Commit: 9bc5857f899016efab507419e538fe67c0118c09 https://github.com/geany/geany/commit/9bc5857f899016efab507419e538fe67c0118… Log Message: ----------- make: fix a typo in parenthesis handling Signed-off-by: Masatake YAMATO <yamato(a)redhat.com> Signed-off-by: Colomban Wendling <ban(a)herbesfolles.org> X-Universal-CTags-Commit-ID: 39c1236cc1a40aac6b93c60537d30489912bbbb2 X-Universal-CTags-Issue: universal-ctags/ctags#944 Modified Paths: -------------- tagmanager/ctags/make.c tests/ctags/Makefile.am tests/ctags/make-parentheses.mak tests/ctags/make-parentheses.mak.tags Modified: tagmanager/ctags/make.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -110,7 +110,7 @@ static void readIdentifier (const int first, vString *const id) vStringClear (id); while (isIdentifier (c) || (depth > 0 && c != EOF && c != '\n')) { - if (c == '(' || c == '}') + if (c == '(' || c == '{') depth++; else if (depth > 0 && (c == ')' || c == '}')) depth--; Modified: tests/ctags/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -211,6 +211,7 @@ test_sources = \ make-comment-in-rule.mak \ make-gnumake-pattern-rules.mak \ make-multi-target.mak \ + make-parentheses.mak \ make-target-with-parentheses.mak \ make-variable-on-cmdline.mak \ masm.asm \ Modified: tests/ctags/make-parentheses.mak 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,6 @@ +A=X.c +B=Y.c +$(A)-$(A:.c=.o): + echo $@ +${B}-${B:.c=.o}: + echo $@ Modified: tests/ctags/make-parentheses.mak.tags 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,5 @@ +# format=tagmanager +$(A)-$(A:.c=.o)�16�0 +${B}-${B:.c=.o}�16�0 +A�65536�0 +B�65536�0 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b007cc: Remove redundant typedef with new Scintilla that breaks Windows builds
by Colomban Wendling 30 May '16

30 May '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 30 May 2016 10:22:24 UTC Commit: b007cc009ef609a4b7fc77876113b906eb5e52b2 https://github.com/geany/geany/commit/b007cc009ef609a4b7fc77876113b906eb5e5… Log Message: ----------- Remove redundant typedef with new Scintilla that breaks Windows builds Modified Paths: -------------- src/editor.h Modified: src/editor.h 2 lines changed, 0 insertions(+), 2 deletions(-) =================================================================== @@ -154,8 +154,6 @@ typedef struct GeanyEditor } GeanyEditor; -typedef struct SCNotification SCNotification; - const GeanyIndentPrefs *editor_get_indent_prefs(GeanyEditor *editor); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 916c41: Merge branch 'scintilla/update-366'
by Colomban Wendling 26 May '16

26 May '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 26 May 2016 17:23:08 UTC Commit: 916c41e1e6eb8603078f18dfba3645a40f178e8a https://github.com/geany/geany/commit/916c41e1e6eb8603078f18dfba3645a40f178… Log Message: ----------- Merge branch 'scintilla/update-366' Modified Paths: -------------- scintilla/Makefile.am scintilla/gtk/Converter.h scintilla/gtk/PlatGTK.cxx scintilla/gtk/ScintillaGTK.cxx scintilla/gtk/makefile.win32 scintilla/gtk/scintilla-marshal.c scintilla/gtk/scintilla-marshal.h scintilla/gtk/scintilla-marshal.list scintilla/include/Scintilla.h scintilla/include/Scintilla.iface scintilla/include/ScintillaWidget.h scintilla/scintilla_changes.patch scintilla/src/Document.cxx scintilla/src/Editor.cxx scintilla/src/Editor.h scintilla/version.txt Modified: scintilla/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -3,7 +3,7 @@ SUBDIRS = include noinst_LTLIBRARIES=libscintilla.la -AM_CXXFLAGS = -DNDEBUG -DGTK -DSCI_LEXER -DG_THREADS_IMPL_NONE +AM_CXXFLAGS = -DNDEBUG -DGTK -DSCI_LEXER -DNO_CXX11_REGEX LEXER_SRCS= \ lexers/LexAbaqus.cxx \ Modified: scintilla/gtk/Converter.h 31 lines changed, 11 insertions(+), 20 deletions(-) =================================================================== @@ -10,21 +10,13 @@ namespace Scintilla { #endif -typedef GIConv ConverterHandle; -const ConverterHandle iconvhBad = (ConverterHandle)(-1); -// Since various versions of iconv can not agree on whether the src argument -// is char ** or const char ** provide a templatised adaptor. -template<typename T> -size_t iconv_adaptor(size_t(*f_iconv)(ConverterHandle, T, size_t *, char **, size_t *), - ConverterHandle cd, char** src, size_t *srcleft, - char **dst, size_t *dstleft) { - return f_iconv(cd, (T)src, srcleft, dst, dstleft); -} +const GIConv iconvhBad = (GIConv)(-1); +const gsize sizeFailure = static_cast<gsize>(-1); /** - * Encapsulate iconv safely and avoid iconv_adaptor complexity in client code. + * Encapsulate g_iconv safely. */ class Converter { - ConverterHandle iconvh; + GIConv iconvh; void OpenHandle(const char *fullDestination, const char *charSetSource) { iconvh = g_iconv_open(fullDestination, charSetSource); } @@ -45,15 +37,14 @@ class Converter { operator bool() const { return Succeeded(); } - void Open(const char *charSetDestination, const char *charSetSource, bool transliterations=true) { + void Open(const char *charSetDestination, const char *charSetSource, bool transliterations) { Close(); if (*charSetSource) { // Try allowing approximate transliterations if (transliterations) { - char fullDest[200]; - g_strlcpy(fullDest, charSetDestination, sizeof(fullDest)); - g_strlcat(fullDest, "//TRANSLIT", sizeof(fullDest)); - OpenHandle(fullDest, charSetSource); + std::string fullDest(charSetDestination); + fullDest.append("//TRANSLIT"); + OpenHandle(fullDest.c_str(), charSetSource); } if (!Succeeded()) { // Transliterations failed so try basic name @@ -67,11 +58,11 @@ class Converter { iconvh = iconvhBad; } } - size_t Convert(char** src, size_t *srcleft, char **dst, size_t *dstleft) const { + gsize Convert(char** src, gsize *srcleft, char **dst, gsize *dstleft) const { if (!Succeeded()) { - return (size_t)(-1); + return sizeFailure; } else { - return iconv_adaptor(g_iconv, iconvh, src, srcleft, dst, dstleft); + return g_iconv(iconvh, src, srcleft, dst, dstleft); } } }; Modified: scintilla/gtk/PlatGTK.cxx 16 lines changed, 8 insertions(+), 8 deletions(-) =================================================================== @@ -655,12 +655,12 @@ static std::string UTF8FromIconv(const Converter &conv, const char *s, int len) if (conv) { std::string utfForm(len*3+1, '\0'); char *pin = const_cast<char *>(s); - size_t inLeft = len; + gsize inLeft = len; char *putf = &utfForm[0]; char *pout = putf; - size_t outLeft = len*3+1; - size_t conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); - if (conversions != ((size_t)(-1))) { + gsize outLeft = len*3+1; + gsize conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); + if (conversions != sizeFailure) { *pout = '\0'; utfForm.resize(pout - putf); return utfForm; @@ -675,11 +675,11 @@ static size_t MultiByteLenFromIconv(const Converter &conv, const char *s, size_t for (size_t lenMB=1; (lenMB<4) && (lenMB <= len); lenMB++) { char wcForm[2]; char *pin = const_cast<char *>(s); - size_t inLeft = lenMB; + gsize inLeft = lenMB; char *pout = wcForm; - size_t outLeft = 2; - size_t conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); - if (conversions != ((size_t)(-1))) { + gsize outLeft = 2; + gsize conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); + if (conversions != sizeFailure) { return lenMB; } } Modified: scintilla/gtk/ScintillaGTK.cxx 60 lines changed, 41 insertions(+), 19 deletions(-) =================================================================== @@ -933,15 +933,15 @@ static std::string ConvertText(const char *s, size_t len, const char *charSetDes std::string destForm; Converter conv(charSetDest, charSetSource, transliterations); if (conv) { - size_t outLeft = len*3+1; + gsize outLeft = len*3+1; destForm = std::string(outLeft, '\0'); // g_iconv does not actually write to its input argument so safe to cast away const char *pin = const_cast<char *>(s); - size_t inLeft = len; + gsize inLeft = len; char *putf = &destForm[0]; char *pout = putf; - size_t conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); - if (conversions == ((size_t)(-1))) { + gsize conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); + if (conversions == sizeFailure) { if (!silent) { if (len == 1) fprintf(stderr, "iconv %s->%s failed for %0x '%s'\n", @@ -1181,7 +1181,7 @@ void ScintillaGTK::FullPaint() { } PRectangle ScintillaGTK::GetClientRectangle() const { - Window &win = const_cast<Window &>(wMain); + Window win = wMain; PRectangle rc = win.GetClientPosition(); if (verticalScrollBarVisible) rc.right -= verticalScrollBarWidth; @@ -1736,14 +1736,21 @@ void ScintillaGTK::Resize(int width, int height) { //Platform::DebugPrintf("Resize %d %d\n", width, height); //printf("Resize %d %d\n", width, height); + // GTK+ 3 warns when we allocate smaller than the minimum allocation, + // so we use these variables to store the minimum scrollbar lengths. + int minVScrollBarHeight, minHScrollBarWidth; + // Not always needed, but some themes can have different sizes of scrollbars #if GTK_CHECK_VERSION(3,0,0) - GtkRequisition requisition; - gtk_widget_get_preferred_size(PWidget(scrollbarv), NULL, &requisition); + GtkRequisition minimum, requisition; + gtk_widget_get_preferred_size(PWidget(scrollbarv), &minimum, &requisition); + minVScrollBarHeight = minimum.height; verticalScrollBarWidth = requisition.width; - gtk_widget_get_preferred_size(PWidget(scrollbarh), NULL, &requisition); + gtk_widget_get_preferred_size(PWidget(scrollbarh), &minimum, &requisition); + minHScrollBarWidth = minimum.height; horizontalScrollBarHeight = requisition.height; #else + minVScrollBarHeight = minHScrollBarWidth = 1; verticalScrollBarWidth = GTK_WIDGET(PWidget(scrollbarv))->requisition.width; horizontalScrollBarHeight = GTK_WIDGET(PWidget(scrollbarh))->requisition.height; #endif @@ -1757,7 +1764,7 @@ void ScintillaGTK::Resize(int width, int height) { gtk_widget_show(GTK_WIDGET(PWidget(scrollbarh))); alloc.x = 0; alloc.y = height - horizontalScrollBarHeight; - alloc.width = Platform::Maximum(1, width - verticalScrollBarWidth); + alloc.width = Platform::Maximum(minHScrollBarWidth, width - verticalScrollBarWidth); alloc.height = horizontalScrollBarHeight; gtk_widget_size_allocate(GTK_WIDGET(PWidget(scrollbarh)), &alloc); } else { @@ -1770,7 +1777,7 @@ void ScintillaGTK::Resize(int width, int height) { alloc.x = width - verticalScrollBarWidth; alloc.y = 0; alloc.width = verticalScrollBarWidth; - alloc.height = Platform::Maximum(1, height - horizontalScrollBarHeight); + alloc.height = Platform::Maximum(minVScrollBarHeight, height - horizontalScrollBarHeight); gtk_widget_size_allocate(GTK_WIDGET(PWidget(scrollbarv)), &alloc); } else { gtk_widget_hide(GTK_WIDGET(PWidget(scrollbarv))); @@ -3166,9 +3173,6 @@ void ScintillaGTK::ClassInit(OBJECT_CLASS* object_class, GtkWidgetClass *widget_ container_class->forall = MainForAll; } -#define SIG_MARSHAL scintilla_marshal_NONE__INT_POINTER -#define MARSHAL_ARGUMENTS G_TYPE_INT, G_TYPE_POINTER - static void scintilla_class_init(ScintillaClass *klass) { try { OBJECT_CLASS *object_class = (OBJECT_CLASS*) klass; @@ -3183,20 +3187,20 @@ static void scintilla_class_init(ScintillaClass *klass) { G_STRUCT_OFFSET(ScintillaClass, command), NULL, //(GSignalAccumulator) NULL, //(gpointer) - SIG_MARSHAL, + scintilla_marshal_VOID__INT_OBJECT, G_TYPE_NONE, - 2, MARSHAL_ARGUMENTS); + 2, G_TYPE_INT, GTK_TYPE_WIDGET); scintilla_signals[NOTIFY_SIGNAL] = g_signal_new( SCINTILLA_NOTIFY, G_TYPE_FROM_CLASS(object_class), sigflags, G_STRUCT_OFFSET(ScintillaClass, notify), - NULL, - NULL, - SIG_MARSHAL, + NULL, //(GSignalAccumulator) + NULL, //(gpointer) + scintilla_marshal_VOID__INT_BOXED, G_TYPE_NONE, - 2, MARSHAL_ARGUMENTS); + 2, G_TYPE_INT, SCINTILLA_TYPE_NOTIFICATION); klass->command = NULL; klass->notify = NULL; @@ -3239,3 +3243,21 @@ void scintilla_release_resources(void) { } catch (...) { } } + +/* Define a dummy boxed type because g-ir-scanner is unable to + * recognize gpointer-derived types. Note that SCNotificaiton + * is always allocated on stack so copying is not appropriate. */ +static void *copy_(void *src) { return src; } +static void free_(void *doc) { } + +GType scnotification_get_type(void) { + static gsize type_id = 0; + if (g_once_init_enter(&type_id)) { + gsize id = (gsize) g_boxed_type_register_static( + g_intern_static_string("SCNotification"), + (GBoxedCopyFunc) copy_, + (GBoxedFreeFunc) free_); + g_once_init_leave(&type_id, id); + } + return (GType) type_id; +} Modified: scintilla/gtk/makefile.win32 14 lines changed, 5 insertions(+), 9 deletions(-) =================================================================== @@ -32,21 +32,17 @@ vpath %.h ../src ../include ../lexlib vpath %.cxx ../src ../lexlib ../lexers INCLUDEDIRS=-I ../include -I ../src -I ../lexlib -CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -DGTK -DSCI_LEXER $(INCLUDEDIRS) \ +CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts \ + -DGTK -DSCI_LEXER -DNO_CXX11_REGEX \ + $(INCLUDEDIRS) \ -DGEANY_EXPORT_SYMBOL="__declspec(dllexport)" \ -DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL -ifdef THREADS -THREADFLAGS= -else -THREADFLAGS=-DG_THREADS_IMPL_NONE -endif - ifdef DEBUG -CTFLAGS=-DDEBUG -g -O0 $(CXXBASEFLAGS) $(THREADFLAGS) +CTFLAGS=-DDEBUG -g -O0 $(CXXBASEFLAGS) else -CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) +CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) endif CFLAGS:=$(CTFLAGS) Modified: scintilla/gtk/scintilla-marshal.c 73 lines changed, 56 insertions(+), 17 deletions(-) =================================================================== @@ -4,7 +4,7 @@ #ifdef G_ENABLE_DEBUG #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) +#define g_marshal_value_peek_char(v) g_value_get_schar (v) #define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) #define g_marshal_value_peek_int(v) g_value_get_int (v) #define g_marshal_value_peek_uint(v) g_value_get_uint (v) @@ -21,6 +21,7 @@ #define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) #define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) #define g_marshal_value_peek_object(v) g_value_get_object (v) +#define g_marshal_value_peek_variant(v) g_value_get_variant (v) #else /* !G_ENABLE_DEBUG */ /* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. * Do not access GValues directly in your code. Instead, use the @@ -44,25 +45,26 @@ #define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer #define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer #define g_marshal_value_peek_object(v) (v)->data[0].v_pointer +#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer #endif /* !G_ENABLE_DEBUG */ -/* NONE:INT,POINTER (scintilla-marshal.list:1) */ +/* NONE:INT,OBJECT (scintilla-marshal.list:1) */ void -scintilla_marshal_VOID__INT_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) +scintilla_marshal_VOID__INT_OBJECT (GClosure *closure, + GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) { - typedef void (*GMarshalFunc_VOID__INT_POINTER) (gpointer data1, - gint arg_1, - gpointer arg_2, - gpointer data2); - register GMarshalFunc_VOID__INT_POINTER callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; + typedef void (*GMarshalFunc_VOID__INT_OBJECT) (gpointer data1, + gint arg_1, + gpointer arg_2, + gpointer data2); + GMarshalFunc_VOID__INT_OBJECT callback; + GCClosure *cc = (GCClosure*) closure; + gpointer data1, data2; g_return_if_fail (n_param_values == 3); @@ -76,11 +78,48 @@ scintilla_marshal_VOID__INT_POINTER (GClosure *closure, data1 = g_value_peek_pointer (param_values + 0); data2 = closure->data; } - callback = (GMarshalFunc_VOID__INT_POINTER) (marshal_data ? marshal_data : cc->callback); + callback = (GMarshalFunc_VOID__INT_OBJECT) (marshal_data ? marshal_data : cc->callback); callback (data1, g_marshal_value_peek_int (param_values + 1), - g_marshal_value_peek_pointer (param_values + 2), + g_marshal_value_peek_object (param_values + 2), + data2); +} + +/* NONE:INT,BOXED (scintilla-marshal.list:2) */ +void +scintilla_marshal_VOID__INT_BOXED (GClosure *closure, + GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) +{ + typedef void (*GMarshalFunc_VOID__INT_BOXED) (gpointer data1, + gint arg_1, + gpointer arg_2, + gpointer data2); + GMarshalFunc_VOID__INT_BOXED callback; + GCClosure *cc = (GCClosure*) closure; + gpointer data1, data2; + + g_return_if_fail (n_param_values == 3); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); + } + else + { + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_VOID__INT_BOXED) (marshal_data ? marshal_data : cc->callback); + + callback (data1, + g_marshal_value_peek_int (param_values + 1), + g_marshal_value_peek_boxed (param_values + 2), data2); } Modified: scintilla/gtk/scintilla-marshal.h 25 lines changed, 17 insertions(+), 8 deletions(-) =================================================================== @@ -6,14 +6,23 @@ G_BEGIN_DECLS -/* NONE:INT,POINTER (scintilla-marshal.list:1) */ -extern void scintilla_marshal_VOID__INT_POINTER (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); -#define scintilla_marshal_NONE__INT_POINTER scintilla_marshal_VOID__INT_POINTER +/* NONE:INT,OBJECT (scintilla-marshal.list:1) */ +extern void scintilla_marshal_VOID__INT_OBJECT (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); +#define scintilla_marshal_NONE__INT_OBJECT scintilla_marshal_VOID__INT_OBJECT + +/* NONE:INT,BOXED (scintilla-marshal.list:2) */ +extern void scintilla_marshal_VOID__INT_BOXED (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); +#define scintilla_marshal_NONE__INT_BOXED scintilla_marshal_VOID__INT_BOXED G_END_DECLS Modified: scintilla/gtk/scintilla-marshal.list 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1 +1,2 @@ -NONE:INT,POINTER +NONE:INT,OBJECT +NONE:INT,BOXED Modified: scintilla/include/Scintilla.h 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -1121,6 +1121,13 @@ struct Sci_RangeToFormat { #define RangeToFormat Sci_RangeToFormat +#ifndef __cplusplus +/* For the GTK+ platform, g-ir-scanner needs to have these typedefs. This + * is not required in C++ code and actually seems to break ScintillaEditPy */ +typedef struct Sci_NotifyHeader Sci_NotifyHeader; +typedef struct SCNotification SCNotification; +#endif + struct Sci_NotifyHeader { /* Compatible with Windows NMHDR. * hwndFrom is really an environment specific window handle or pointer @@ -1133,7 +1140,7 @@ struct Sci_NotifyHeader { #define NotifyHeader Sci_NotifyHeader struct SCNotification { - struct Sci_NotifyHeader nmhdr; + Sci_NotifyHeader nmhdr; Sci_Position position; /* SCN_STYLENEEDED, SCN_DOUBLECLICK, SCN_MODIFIED, SCN_MARGINCLICK, */ /* SCN_NEEDSHOWN, SCN_DWELLSTART, SCN_DWELLEND, SCN_CALLTIPCLICK, */ Modified: scintilla/include/Scintilla.iface 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4729,7 +4729,7 @@ evt void FocusIn=2028(void) evt void FocusOut=2029(void) evt void AutoCCompleted=2030(string text, int position, int ch, CompletionMethods listCompletionMethod) -# There are no provisional features currently +# There are no provisional APIs currently, but some arguments to SCI_SETTECHNOLOGY are provisional. cat Provisional Modified: scintilla/include/ScintillaWidget.h 8 lines changed, 6 insertions(+), 2 deletions(-) =================================================================== @@ -38,14 +38,18 @@ struct _ScintillaObject { struct _ScintillaClass { GtkContainerClass parent_class; - void (* command) (ScintillaObject *ttt); - void (* notify) (ScintillaObject *ttt); + void (* command) (ScintillaObject *sci, int cmd, GtkWidget *window); + void (* notify) (ScintillaObject *sci, int id, SCNotification *scn); }; GType scintilla_object_get_type (void); GtkWidget* scintilla_object_new (void); gintptr scintilla_object_send_message (ScintillaObject *sci, unsigned int iMessage, guintptr wParam, gintptr lParam); + +GType scnotification_get_type (void); +#define SCINTILLA_TYPE_NOTIFICATION (scnotification_get_type()) + #ifndef G_IR_SCANNING /* The legacy names confuse the g-ir-scanner program */ typedef struct _ScintillaClass ScintillaClass; Modified: scintilla/scintilla_changes.patch 28 lines changed, 0 insertions(+), 28 deletions(-) =================================================================== @@ -50,34 +50,6 @@ index 0871ca2..49dc278 100644 GtkWidget *scintilla_object_new() { return scintilla_new(); } -diff --git scintilla/gtk/scintilla-marshal.c scintilla/gtk/scintilla-marshal.c -index be57b7c..cee3e73 100644 ---- scintilla/gtk/scintilla-marshal.c -+++ scintilla/gtk/scintilla-marshal.c -@@ -35,8 +35,8 @@ - #define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong - #define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 - #define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 --#define g_marshal_value_peek_enum(v) (v)->data[0].v_int --#define g_marshal_value_peek_flags(v) (v)->data[0].v_uint -+#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -+#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong - #define g_marshal_value_peek_float(v) (v)->data[0].v_float - #define g_marshal_value_peek_double(v) (v)->data[0].v_double - #define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -@@ -50,10 +50,10 @@ - /* NONE:INT,POINTER (scintilla-marshal.list:1) */ - void - scintilla_marshal_VOID__INT_POINTER (GClosure *closure, -- GValue *return_value, -+ GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, -- gpointer invocation_hint, -+ gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) - { - typedef void (*GMarshalFunc_VOID__INT_POINTER) (gpointer data1, diff --git scintilla/src/Catalogue.cxx scintilla/src/Catalogue.cxx index ed47aa8..e58f1ab 100644 --- scintilla/src/Catalogue.cxx Modified: scintilla/src/Document.cxx 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -16,7 +16,7 @@ #include <vector> #include <algorithm> -#ifdef CXX11_REGEX +#ifndef NO_CXX11_REGEX #include <regex> #endif @@ -2336,7 +2336,7 @@ class DocumentIndexer : public CharacterIndexer { } }; -#ifdef CXX11_REGEX +#ifndef NO_CXX11_REGEX class ByteIterator : public std::iterator<std::bidirectional_iterator_tag, char> { public: @@ -2696,7 +2696,7 @@ long BuiltinRegex::FindText(Document *doc, int minPos, int maxPos, const char *s bool caseSensitive, bool, bool, int flags, int *length) { -#ifdef CXX11_REGEX +#ifndef NO_CXX11_REGEX if (flags & SCFIND_CXX11REGEX) { return Cxx11RegexFindText(doc, minPos, maxPos, s, caseSensitive, length, search); Modified: scintilla/src/Editor.cxx 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -303,7 +303,7 @@ int Editor::TopLineOfMain() const { } PRectangle Editor::GetClientRectangle() const { - Window &win = const_cast<Window &>(wMain); + Window win = wMain; return win.GetClientPosition(); } @@ -828,6 +828,7 @@ void Editor::MovedCaret(SelectionPosition newPos, SelectionPosition previousPos, } ShowCaretAtCurrentPosition(); + NotifyCaretMove(); ClaimSelection(); SetHoverIndicatorPosition(sel.MainCaret()); @@ -1437,6 +1438,9 @@ void Editor::InvalidateCaret() { UpdateSystemCaret(); } +void Editor::NotifyCaretMove() { +} + void Editor::UpdateSystemCaret() { } Modified: scintilla/src/Editor.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -365,6 +365,7 @@ class Editor : public EditModel, public DocWatcher { void DropCaret(); void CaretSetPeriod(int period); void InvalidateCaret(); + virtual void NotifyCaretMove(); virtual void UpdateSystemCaret(); bool Wrapping() const; Modified: scintilla/version.txt 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1 +1 @@ -365 +366 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 042963: scintilla: Don't build with C++11 regex support
by Colomban Wendling 26 May '16

26 May '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 26 May 2016 17:22:27 UTC Commit: 04296390dea9d7e288adb7b559badf803b60dff8 https://github.com/geany/geany/commit/04296390dea9d7e288adb7b559badf803b60d… Log Message: ----------- scintilla: Don't build with C++11 regex support It seems to cause some compatibility issues with some current compilers and we don't use it nor need it for extended regex support, so stay on the safe side at least for the moment. Modified Paths: -------------- scintilla/Makefile.am scintilla/gtk/makefile.win32 Modified: scintilla/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -3,7 +3,7 @@ SUBDIRS = include noinst_LTLIBRARIES=libscintilla.la -AM_CXXFLAGS = -DNDEBUG -DGTK -DSCI_LEXER +AM_CXXFLAGS = -DNDEBUG -DGTK -DSCI_LEXER -DNO_CXX11_REGEX LEXER_SRCS= \ lexers/LexAbaqus.cxx \ Modified: scintilla/gtk/makefile.win32 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -32,7 +32,9 @@ vpath %.h ../src ../include ../lexlib vpath %.cxx ../src ../lexlib ../lexers INCLUDEDIRS=-I ../include -I ../src -I ../lexlib -CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -DGTK -DSCI_LEXER $(INCLUDEDIRS) \ +CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts \ + -DGTK -DSCI_LEXER -DNO_CXX11_REGEX \ + $(INCLUDEDIRS) \ -DGEANY_EXPORT_SYMBOL="__declspec(dllexport)" \ -DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 934b47: scintilla: Remove obsolete flag building Scintilla
by Colomban Wendling 26 May '16

26 May '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 26 May 2016 17:21:49 UTC Commit: 934b47158cb0a45457949ebd541ba9457a172721 https://github.com/geany/geany/commit/934b47158cb0a45457949ebd541ba9457a172… Log Message: ----------- scintilla: Remove obsolete flag building Scintilla `-DG_THREADS_IMPL_NONE` was a hack, and it has no effect since 3.6.5, so drop it altogether. Modified Paths: -------------- scintilla/Makefile.am scintilla/gtk/makefile.win32 Modified: scintilla/Makefile.am 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -3,7 +3,7 @@ SUBDIRS = include noinst_LTLIBRARIES=libscintilla.la -AM_CXXFLAGS = -DNDEBUG -DGTK -DSCI_LEXER -DG_THREADS_IMPL_NONE +AM_CXXFLAGS = -DNDEBUG -DGTK -DSCI_LEXER LEXER_SRCS= \ lexers/LexAbaqus.cxx \ Modified: scintilla/gtk/makefile.win32 10 lines changed, 2 insertions(+), 8 deletions(-) =================================================================== @@ -36,17 +36,11 @@ CXXBASEFLAGS=-Wall -Wno-missing-braces -Wno-char-subscripts -DGTK -DSCI_LEXER $( -DGEANY_EXPORT_SYMBOL="__declspec(dllexport)" \ -DGEANY_API_SYMBOL=GEANY_EXPORT_SYMBOL -ifdef THREADS -THREADFLAGS= -else -THREADFLAGS=-DG_THREADS_IMPL_NONE -endif - ifdef DEBUG -CTFLAGS=-DDEBUG -g -O0 $(CXXBASEFLAGS) $(THREADFLAGS) +CTFLAGS=-DDEBUG -g -O0 $(CXXBASEFLAGS) else -CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) $(THREADFLAGS) +CTFLAGS=-DNDEBUG -Os $(CXXBASEFLAGS) endif CFLAGS:=$(CTFLAGS) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 64025c: Update Scintilla to version 3.6.6
by Colomban Wendling 26 May '16

26 May '16

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 26 May 2016 17:21:38 UTC Commit: 64025cfcfc1582f2aff58f9933f0d49ba080a6cf https://github.com/geany/geany/commit/64025cfcfc1582f2aff58f9933f0d49ba080a… Log Message: ----------- Update Scintilla to version 3.6.6 Modified Paths: -------------- scintilla/gtk/Converter.h scintilla/gtk/PlatGTK.cxx scintilla/gtk/ScintillaGTK.cxx scintilla/gtk/scintilla-marshal.c scintilla/gtk/scintilla-marshal.h scintilla/gtk/scintilla-marshal.list scintilla/include/Scintilla.h scintilla/include/Scintilla.iface scintilla/include/ScintillaWidget.h scintilla/scintilla_changes.patch scintilla/src/Document.cxx scintilla/src/Editor.cxx scintilla/src/Editor.h scintilla/version.txt Modified: scintilla/gtk/Converter.h 31 lines changed, 11 insertions(+), 20 deletions(-) =================================================================== @@ -10,21 +10,13 @@ namespace Scintilla { #endif -typedef GIConv ConverterHandle; -const ConverterHandle iconvhBad = (ConverterHandle)(-1); -// Since various versions of iconv can not agree on whether the src argument -// is char ** or const char ** provide a templatised adaptor. -template<typename T> -size_t iconv_adaptor(size_t(*f_iconv)(ConverterHandle, T, size_t *, char **, size_t *), - ConverterHandle cd, char** src, size_t *srcleft, - char **dst, size_t *dstleft) { - return f_iconv(cd, (T)src, srcleft, dst, dstleft); -} +const GIConv iconvhBad = (GIConv)(-1); +const gsize sizeFailure = static_cast<gsize>(-1); /** - * Encapsulate iconv safely and avoid iconv_adaptor complexity in client code. + * Encapsulate g_iconv safely. */ class Converter { - ConverterHandle iconvh; + GIConv iconvh; void OpenHandle(const char *fullDestination, const char *charSetSource) { iconvh = g_iconv_open(fullDestination, charSetSource); } @@ -45,15 +37,14 @@ class Converter { operator bool() const { return Succeeded(); } - void Open(const char *charSetDestination, const char *charSetSource, bool transliterations=true) { + void Open(const char *charSetDestination, const char *charSetSource, bool transliterations) { Close(); if (*charSetSource) { // Try allowing approximate transliterations if (transliterations) { - char fullDest[200]; - g_strlcpy(fullDest, charSetDestination, sizeof(fullDest)); - g_strlcat(fullDest, "//TRANSLIT", sizeof(fullDest)); - OpenHandle(fullDest, charSetSource); + std::string fullDest(charSetDestination); + fullDest.append("//TRANSLIT"); + OpenHandle(fullDest.c_str(), charSetSource); } if (!Succeeded()) { // Transliterations failed so try basic name @@ -67,11 +58,11 @@ class Converter { iconvh = iconvhBad; } } - size_t Convert(char** src, size_t *srcleft, char **dst, size_t *dstleft) const { + gsize Convert(char** src, gsize *srcleft, char **dst, gsize *dstleft) const { if (!Succeeded()) { - return (size_t)(-1); + return sizeFailure; } else { - return iconv_adaptor(g_iconv, iconvh, src, srcleft, dst, dstleft); + return g_iconv(iconvh, src, srcleft, dst, dstleft); } } }; Modified: scintilla/gtk/PlatGTK.cxx 16 lines changed, 8 insertions(+), 8 deletions(-) =================================================================== @@ -655,12 +655,12 @@ static std::string UTF8FromIconv(const Converter &conv, const char *s, int len) if (conv) { std::string utfForm(len*3+1, '\0'); char *pin = const_cast<char *>(s); - size_t inLeft = len; + gsize inLeft = len; char *putf = &utfForm[0]; char *pout = putf; - size_t outLeft = len*3+1; - size_t conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); - if (conversions != ((size_t)(-1))) { + gsize outLeft = len*3+1; + gsize conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); + if (conversions != sizeFailure) { *pout = '\0'; utfForm.resize(pout - putf); return utfForm; @@ -675,11 +675,11 @@ static size_t MultiByteLenFromIconv(const Converter &conv, const char *s, size_t for (size_t lenMB=1; (lenMB<4) && (lenMB <= len); lenMB++) { char wcForm[2]; char *pin = const_cast<char *>(s); - size_t inLeft = lenMB; + gsize inLeft = lenMB; char *pout = wcForm; - size_t outLeft = 2; - size_t conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); - if (conversions != ((size_t)(-1))) { + gsize outLeft = 2; + gsize conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); + if (conversions != sizeFailure) { return lenMB; } } Modified: scintilla/gtk/ScintillaGTK.cxx 60 lines changed, 41 insertions(+), 19 deletions(-) =================================================================== @@ -933,15 +933,15 @@ static std::string ConvertText(const char *s, size_t len, const char *charSetDes std::string destForm; Converter conv(charSetDest, charSetSource, transliterations); if (conv) { - size_t outLeft = len*3+1; + gsize outLeft = len*3+1; destForm = std::string(outLeft, '\0'); // g_iconv does not actually write to its input argument so safe to cast away const char *pin = const_cast<char *>(s); - size_t inLeft = len; + gsize inLeft = len; char *putf = &destForm[0]; char *pout = putf; - size_t conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); - if (conversions == ((size_t)(-1))) { + gsize conversions = conv.Convert(&pin, &inLeft, &pout, &outLeft); + if (conversions == sizeFailure) { if (!silent) { if (len == 1) fprintf(stderr, "iconv %s->%s failed for %0x '%s'\n", @@ -1181,7 +1181,7 @@ void ScintillaGTK::FullPaint() { } PRectangle ScintillaGTK::GetClientRectangle() const { - Window &win = const_cast<Window &>(wMain); + Window win = wMain; PRectangle rc = win.GetClientPosition(); if (verticalScrollBarVisible) rc.right -= verticalScrollBarWidth; @@ -1736,14 +1736,21 @@ void ScintillaGTK::Resize(int width, int height) { //Platform::DebugPrintf("Resize %d %d\n", width, height); //printf("Resize %d %d\n", width, height); + // GTK+ 3 warns when we allocate smaller than the minimum allocation, + // so we use these variables to store the minimum scrollbar lengths. + int minVScrollBarHeight, minHScrollBarWidth; + // Not always needed, but some themes can have different sizes of scrollbars #if GTK_CHECK_VERSION(3,0,0) - GtkRequisition requisition; - gtk_widget_get_preferred_size(PWidget(scrollbarv), NULL, &requisition); + GtkRequisition minimum, requisition; + gtk_widget_get_preferred_size(PWidget(scrollbarv), &minimum, &requisition); + minVScrollBarHeight = minimum.height; verticalScrollBarWidth = requisition.width; - gtk_widget_get_preferred_size(PWidget(scrollbarh), NULL, &requisition); + gtk_widget_get_preferred_size(PWidget(scrollbarh), &minimum, &requisition); + minHScrollBarWidth = minimum.height; horizontalScrollBarHeight = requisition.height; #else + minVScrollBarHeight = minHScrollBarWidth = 1; verticalScrollBarWidth = GTK_WIDGET(PWidget(scrollbarv))->requisition.width; horizontalScrollBarHeight = GTK_WIDGET(PWidget(scrollbarh))->requisition.height; #endif @@ -1757,7 +1764,7 @@ void ScintillaGTK::Resize(int width, int height) { gtk_widget_show(GTK_WIDGET(PWidget(scrollbarh))); alloc.x = 0; alloc.y = height - horizontalScrollBarHeight; - alloc.width = Platform::Maximum(1, width - verticalScrollBarWidth); + alloc.width = Platform::Maximum(minHScrollBarWidth, width - verticalScrollBarWidth); alloc.height = horizontalScrollBarHeight; gtk_widget_size_allocate(GTK_WIDGET(PWidget(scrollbarh)), &alloc); } else { @@ -1770,7 +1777,7 @@ void ScintillaGTK::Resize(int width, int height) { alloc.x = width - verticalScrollBarWidth; alloc.y = 0; alloc.width = verticalScrollBarWidth; - alloc.height = Platform::Maximum(1, height - horizontalScrollBarHeight); + alloc.height = Platform::Maximum(minVScrollBarHeight, height - horizontalScrollBarHeight); gtk_widget_size_allocate(GTK_WIDGET(PWidget(scrollbarv)), &alloc); } else { gtk_widget_hide(GTK_WIDGET(PWidget(scrollbarv))); @@ -3166,9 +3173,6 @@ void ScintillaGTK::ClassInit(OBJECT_CLASS* object_class, GtkWidgetClass *widget_ container_class->forall = MainForAll; } -#define SIG_MARSHAL scintilla_marshal_NONE__INT_POINTER -#define MARSHAL_ARGUMENTS G_TYPE_INT, G_TYPE_POINTER - static void scintilla_class_init(ScintillaClass *klass) { try { OBJECT_CLASS *object_class = (OBJECT_CLASS*) klass; @@ -3183,20 +3187,20 @@ static void scintilla_class_init(ScintillaClass *klass) { G_STRUCT_OFFSET(ScintillaClass, command), NULL, //(GSignalAccumulator) NULL, //(gpointer) - SIG_MARSHAL, + scintilla_marshal_VOID__INT_OBJECT, G_TYPE_NONE, - 2, MARSHAL_ARGUMENTS); + 2, G_TYPE_INT, GTK_TYPE_WIDGET); scintilla_signals[NOTIFY_SIGNAL] = g_signal_new( SCINTILLA_NOTIFY, G_TYPE_FROM_CLASS(object_class), sigflags, G_STRUCT_OFFSET(ScintillaClass, notify), - NULL, - NULL, - SIG_MARSHAL, + NULL, //(GSignalAccumulator) + NULL, //(gpointer) + scintilla_marshal_VOID__INT_BOXED, G_TYPE_NONE, - 2, MARSHAL_ARGUMENTS); + 2, G_TYPE_INT, SCINTILLA_TYPE_NOTIFICATION); klass->command = NULL; klass->notify = NULL; @@ -3239,3 +3243,21 @@ void scintilla_release_resources(void) { } catch (...) { } } + +/* Define a dummy boxed type because g-ir-scanner is unable to + * recognize gpointer-derived types. Note that SCNotificaiton + * is always allocated on stack so copying is not appropriate. */ +static void *copy_(void *src) { return src; } +static void free_(void *doc) { } + +GType scnotification_get_type(void) { + static gsize type_id = 0; + if (g_once_init_enter(&type_id)) { + gsize id = (gsize) g_boxed_type_register_static( + g_intern_static_string("SCNotification"), + (GBoxedCopyFunc) copy_, + (GBoxedFreeFunc) free_); + g_once_init_leave(&type_id, id); + } + return (GType) type_id; +} Modified: scintilla/gtk/scintilla-marshal.c 73 lines changed, 56 insertions(+), 17 deletions(-) =================================================================== @@ -4,7 +4,7 @@ #ifdef G_ENABLE_DEBUG #define g_marshal_value_peek_boolean(v) g_value_get_boolean (v) -#define g_marshal_value_peek_char(v) g_value_get_char (v) +#define g_marshal_value_peek_char(v) g_value_get_schar (v) #define g_marshal_value_peek_uchar(v) g_value_get_uchar (v) #define g_marshal_value_peek_int(v) g_value_get_int (v) #define g_marshal_value_peek_uint(v) g_value_get_uint (v) @@ -21,6 +21,7 @@ #define g_marshal_value_peek_boxed(v) g_value_get_boxed (v) #define g_marshal_value_peek_pointer(v) g_value_get_pointer (v) #define g_marshal_value_peek_object(v) g_value_get_object (v) +#define g_marshal_value_peek_variant(v) g_value_get_variant (v) #else /* !G_ENABLE_DEBUG */ /* WARNING: This code accesses GValues directly, which is UNSUPPORTED API. * Do not access GValues directly in your code. Instead, use the @@ -44,25 +45,26 @@ #define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer #define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer #define g_marshal_value_peek_object(v) (v)->data[0].v_pointer +#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer #endif /* !G_ENABLE_DEBUG */ -/* NONE:INT,POINTER (scintilla-marshal.list:1) */ +/* NONE:INT,OBJECT (scintilla-marshal.list:1) */ void -scintilla_marshal_VOID__INT_POINTER (GClosure *closure, - GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) +scintilla_marshal_VOID__INT_OBJECT (GClosure *closure, + GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) { - typedef void (*GMarshalFunc_VOID__INT_POINTER) (gpointer data1, - gint arg_1, - gpointer arg_2, - gpointer data2); - register GMarshalFunc_VOID__INT_POINTER callback; - register GCClosure *cc = (GCClosure*) closure; - register gpointer data1, data2; + typedef void (*GMarshalFunc_VOID__INT_OBJECT) (gpointer data1, + gint arg_1, + gpointer arg_2, + gpointer data2); + GMarshalFunc_VOID__INT_OBJECT callback; + GCClosure *cc = (GCClosure*) closure; + gpointer data1, data2; g_return_if_fail (n_param_values == 3); @@ -76,11 +78,48 @@ scintilla_marshal_VOID__INT_POINTER (GClosure *closure, data1 = g_value_peek_pointer (param_values + 0); data2 = closure->data; } - callback = (GMarshalFunc_VOID__INT_POINTER) (marshal_data ? marshal_data : cc->callback); + callback = (GMarshalFunc_VOID__INT_OBJECT) (marshal_data ? marshal_data : cc->callback); callback (data1, g_marshal_value_peek_int (param_values + 1), - g_marshal_value_peek_pointer (param_values + 2), + g_marshal_value_peek_object (param_values + 2), + data2); +} + +/* NONE:INT,BOXED (scintilla-marshal.list:2) */ +void +scintilla_marshal_VOID__INT_BOXED (GClosure *closure, + GValue *return_value G_GNUC_UNUSED, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint G_GNUC_UNUSED, + gpointer marshal_data) +{ + typedef void (*GMarshalFunc_VOID__INT_BOXED) (gpointer data1, + gint arg_1, + gpointer arg_2, + gpointer data2); + GMarshalFunc_VOID__INT_BOXED callback; + GCClosure *cc = (GCClosure*) closure; + gpointer data1, data2; + + g_return_if_fail (n_param_values == 3); + + if (G_CCLOSURE_SWAP_DATA (closure)) + { + data1 = closure->data; + data2 = g_value_peek_pointer (param_values + 0); + } + else + { + data1 = g_value_peek_pointer (param_values + 0); + data2 = closure->data; + } + callback = (GMarshalFunc_VOID__INT_BOXED) (marshal_data ? marshal_data : cc->callback); + + callback (data1, + g_marshal_value_peek_int (param_values + 1), + g_marshal_value_peek_boxed (param_values + 2), data2); } Modified: scintilla/gtk/scintilla-marshal.h 25 lines changed, 17 insertions(+), 8 deletions(-) =================================================================== @@ -6,14 +6,23 @@ G_BEGIN_DECLS -/* NONE:INT,POINTER (scintilla-marshal.list:1) */ -extern void scintilla_marshal_VOID__INT_POINTER (GClosure *closure, - GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data); -#define scintilla_marshal_NONE__INT_POINTER scintilla_marshal_VOID__INT_POINTER +/* NONE:INT,OBJECT (scintilla-marshal.list:1) */ +extern void scintilla_marshal_VOID__INT_OBJECT (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); +#define scintilla_marshal_NONE__INT_OBJECT scintilla_marshal_VOID__INT_OBJECT + +/* NONE:INT,BOXED (scintilla-marshal.list:2) */ +extern void scintilla_marshal_VOID__INT_BOXED (GClosure *closure, + GValue *return_value, + guint n_param_values, + const GValue *param_values, + gpointer invocation_hint, + gpointer marshal_data); +#define scintilla_marshal_NONE__INT_BOXED scintilla_marshal_VOID__INT_BOXED G_END_DECLS Modified: scintilla/gtk/scintilla-marshal.list 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -1 +1,2 @@ -NONE:INT,POINTER +NONE:INT,OBJECT +NONE:INT,BOXED Modified: scintilla/include/Scintilla.h 9 lines changed, 8 insertions(+), 1 deletions(-) =================================================================== @@ -1121,6 +1121,13 @@ struct Sci_RangeToFormat { #define RangeToFormat Sci_RangeToFormat +#ifndef __cplusplus +/* For the GTK+ platform, g-ir-scanner needs to have these typedefs. This + * is not required in C++ code and actually seems to break ScintillaEditPy */ +typedef struct Sci_NotifyHeader Sci_NotifyHeader; +typedef struct SCNotification SCNotification; +#endif + struct Sci_NotifyHeader { /* Compatible with Windows NMHDR. * hwndFrom is really an environment specific window handle or pointer @@ -1133,7 +1140,7 @@ struct Sci_NotifyHeader { #define NotifyHeader Sci_NotifyHeader struct SCNotification { - struct Sci_NotifyHeader nmhdr; + Sci_NotifyHeader nmhdr; Sci_Position position; /* SCN_STYLENEEDED, SCN_DOUBLECLICK, SCN_MODIFIED, SCN_MARGINCLICK, */ /* SCN_NEEDSHOWN, SCN_DWELLSTART, SCN_DWELLEND, SCN_CALLTIPCLICK, */ Modified: scintilla/include/Scintilla.iface 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -4729,7 +4729,7 @@ evt void FocusIn=2028(void) evt void FocusOut=2029(void) evt void AutoCCompleted=2030(string text, int position, int ch, CompletionMethods listCompletionMethod) -# There are no provisional features currently +# There are no provisional APIs currently, but some arguments to SCI_SETTECHNOLOGY are provisional. cat Provisional Modified: scintilla/include/ScintillaWidget.h 8 lines changed, 6 insertions(+), 2 deletions(-) =================================================================== @@ -38,14 +38,18 @@ struct _ScintillaObject { struct _ScintillaClass { GtkContainerClass parent_class; - void (* command) (ScintillaObject *ttt); - void (* notify) (ScintillaObject *ttt); + void (* command) (ScintillaObject *sci, int cmd, GtkWidget *window); + void (* notify) (ScintillaObject *sci, int id, SCNotification *scn); }; GType scintilla_object_get_type (void); GtkWidget* scintilla_object_new (void); gintptr scintilla_object_send_message (ScintillaObject *sci, unsigned int iMessage, guintptr wParam, gintptr lParam); + +GType scnotification_get_type (void); +#define SCINTILLA_TYPE_NOTIFICATION (scnotification_get_type()) + #ifndef G_IR_SCANNING /* The legacy names confuse the g-ir-scanner program */ typedef struct _ScintillaClass ScintillaClass; Modified: scintilla/scintilla_changes.patch 28 lines changed, 0 insertions(+), 28 deletions(-) =================================================================== @@ -50,34 +50,6 @@ index 0871ca2..49dc278 100644 GtkWidget *scintilla_object_new() { return scintilla_new(); } -diff --git scintilla/gtk/scintilla-marshal.c scintilla/gtk/scintilla-marshal.c -index be57b7c..cee3e73 100644 ---- scintilla/gtk/scintilla-marshal.c -+++ scintilla/gtk/scintilla-marshal.c -@@ -35,8 +35,8 @@ - #define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong - #define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 - #define g_marshal_value_peek_uint64(v) (v)->data[0].v_uint64 --#define g_marshal_value_peek_enum(v) (v)->data[0].v_int --#define g_marshal_value_peek_flags(v) (v)->data[0].v_uint -+#define g_marshal_value_peek_enum(v) (v)->data[0].v_long -+#define g_marshal_value_peek_flags(v) (v)->data[0].v_ulong - #define g_marshal_value_peek_float(v) (v)->data[0].v_float - #define g_marshal_value_peek_double(v) (v)->data[0].v_double - #define g_marshal_value_peek_string(v) (v)->data[0].v_pointer -@@ -50,10 +50,10 @@ - /* NONE:INT,POINTER (scintilla-marshal.list:1) */ - void - scintilla_marshal_VOID__INT_POINTER (GClosure *closure, -- GValue *return_value, -+ GValue *return_value G_GNUC_UNUSED, - guint n_param_values, - const GValue *param_values, -- gpointer invocation_hint, -+ gpointer invocation_hint G_GNUC_UNUSED, - gpointer marshal_data) - { - typedef void (*GMarshalFunc_VOID__INT_POINTER) (gpointer data1, diff --git scintilla/src/Catalogue.cxx scintilla/src/Catalogue.cxx index ed47aa8..e58f1ab 100644 --- scintilla/src/Catalogue.cxx Modified: scintilla/src/Document.cxx 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -16,7 +16,7 @@ #include <vector> #include <algorithm> -#ifdef CXX11_REGEX +#ifndef NO_CXX11_REGEX #include <regex> #endif @@ -2336,7 +2336,7 @@ class DocumentIndexer : public CharacterIndexer { } }; -#ifdef CXX11_REGEX +#ifndef NO_CXX11_REGEX class ByteIterator : public std::iterator<std::bidirectional_iterator_tag, char> { public: @@ -2696,7 +2696,7 @@ long BuiltinRegex::FindText(Document *doc, int minPos, int maxPos, const char *s bool caseSensitive, bool, bool, int flags, int *length) { -#ifdef CXX11_REGEX +#ifndef NO_CXX11_REGEX if (flags & SCFIND_CXX11REGEX) { return Cxx11RegexFindText(doc, minPos, maxPos, s, caseSensitive, length, search); Modified: scintilla/src/Editor.cxx 6 lines changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -303,7 +303,7 @@ int Editor::TopLineOfMain() const { } PRectangle Editor::GetClientRectangle() const { - Window &win = const_cast<Window &>(wMain); + Window win = wMain; return win.GetClientPosition(); } @@ -828,6 +828,7 @@ void Editor::MovedCaret(SelectionPosition newPos, SelectionPosition previousPos, } ShowCaretAtCurrentPosition(); + NotifyCaretMove(); ClaimSelection(); SetHoverIndicatorPosition(sel.MainCaret()); @@ -1437,6 +1438,9 @@ void Editor::InvalidateCaret() { UpdateSystemCaret(); } +void Editor::NotifyCaretMove() { +} + void Editor::UpdateSystemCaret() { } Modified: scintilla/src/Editor.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -365,6 +365,7 @@ class Editor : public EditModel, public DocWatcher { void DropCaret(); void CaretSetPeriod(int period); void InvalidateCaret(); + virtual void NotifyCaretMove(); virtual void UpdateSystemCaret(); bool Wrapping() const; Modified: scintilla/version.txt 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1 +1 @@ -365 +366 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 69345e: Add initial version of GTK 3 bundling script
by Jiří Techet 22 May '16

22 May '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sun, 22 May 2016 10:18:15 UTC Commit: 69345eeaf9ec3641d71aef0b496b9d17cd444fa1 https://github.com/geany/geany-osx/commit/69345eeaf9ec3641d71aef0b496b9d17c… Log Message: ----------- Add initial version of GTK 3 bundling script Not using custom theme yet. Clean up GTK 2 bundling script on the way a bit. Modified Paths: -------------- geany-gtk3.bundle geany.bundle launcher-gtk3.sh Modified: geany-gtk3.bundle 149 lines changed, 149 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,149 @@ +<?xml version="1.0" standalone="no"?>  +<app-bundle> + + <meta> +  + <prefix name="default">${env:JHBUILD_PREFIX}</prefix> + +  + <destination overwrite="yes">${project}</destination> + + <image> +  + </image> + +  + <run-install-name-tool/> + +  + <launcher-script>${project}/launcher-gtk3.sh</launcher-script > + +  +  +  + <gtk>gtk+-3.0</gtk> + </meta> + +  + <plist>${project}/Info.plist</plist> + + <main-binary>${prefix}/bin/geany</main-binary> + +  + <binary> + ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/immodules/*.so + </binary> + + + <binary> + ${prefix}/lib/${gtkdir}/${pkg:${gtk}:gtk_binary_version}/printbackends/*.so + </binary> + + + <binary> + ${prefix}/lib/gdk-pixbuf-2.0/${pkg:gdk-pixbuf-2.0:gdk_pixbuf_binary_version}/loaders/*.so + </binary> + +  + <binary> + ${prefix}/lib/libvte2_90*.dylib + </binary> + <binary dest="${bundle}/Contents/Resources/libexec/gnome-pty-helper"> + ${prefix}/libexec/gnome-pty-helper + </binary> + +  + <binary> + ${prefix}/lib/geany/*.so + </binary> + +  + <translations name="gtk30"> + ${prefix}/share/locale + </translations> + <translations name="vte-2.90"> + ${prefix}/share/locale + </translations> + <translations name="geany"> + ${prefix}/share/locale + </translations> + <translations name="geany-plugins"> + ${prefix}/share/locale + </translations> + + +  + +  + <data dest="${bundle}/Contents/Resources/share/geany"> + ${prefix}/share/geany + </data> +  + <data dest="${bundle}/Contents/Resources/share/geany-plugins"> + ${prefix}/share/geany-plugins + </data> +  + <data dest="${bundle}/Contents/Resources/share/doc/geany"> + ${prefix}/share/doc/geany + </data> +  + <data dest="${bundle}/Contents/Resources/share/doc/geany-plugins"> + ${prefix}/share/doc/geany-plugins + </data> +  + <data dest="${bundle}/Contents/Resources/share/mime"> + ${prefix}/share/mime + </data> + +  + <data> + ${prefix}/share/themes + </data> + + <data> + ${prefix}/share/icons + </data> + +  + <data dest="${bundle}/Contents/Resources"> + ${project}/Geany.icns + </data> + + </app-bundle> Modified: geany.bundle 15 lines changed, 4 insertions(+), 11 deletions(-) =================================================================== @@ -83,9 +83,9 @@ ${prefix}/lib/gdk-pixbuf-2.0/${pkg:${gtk}:gtk_binary_version}/loaders/*.so </binary> - @@ -97,13 +97,6 @@ ${prefix}/libexec/gnome-pty-helper </binary> - - -  <binary> ${prefix}/lib/geany/*.so @@ -113,10 +106,10 @@ want to copy in to the bundle. The "dest" attribute is optional, as usual. Bundler will find all translations of that library/program under the indicated directory and copy them.--> - <translations name="vte-0.0"> + <translations name="gtk20"> ${prefix}/share/locale </translations> - <translations name="gtk20"> + <translations name="vte-0.0"> ${prefix}/share/locale </translations> <translations name="geany"> Modified: launcher-gtk3.sh 198 lines changed, 198 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,198 @@ +#!/bin/bash -l + +if test "x$GTK_DEBUG_LAUNCHER" != x; then + set -x +fi + +if test "x$GTK_DEBUG_GDB" != x; then + EXEC="gdb --args" +else + EXEC=exec +fi + +ORIG_DIR=`pwd` + +# simulate readlink -f which isn't present on OS X +TARGET_FILE=$0 +cd `dirname $TARGET_FILE` +TARGET_FILE=`basename $TARGET_FILE` +while [ -L "$TARGET_FILE" ] +do + TARGET_FILE=`readlink $TARGET_FILE` + cd `dirname $TARGET_FILE` + TARGET_FILE=`basename $TARGET_FILE` +done +PHYS_DIR=`pwd -P` + +cd "$ORIG_DIR" + +tmp=$PHYS_DIR/$TARGET_FILE +name=`basename "$tmp"` +tmp=`dirname "$tmp"` +tmp=`dirname "$tmp"` +bundle=`dirname "$tmp"` +bundle_contents="$bundle"/Contents +bundle_res="$bundle_contents"/Resources +bundle_lib="$bundle_res"/lib +bundle_bin="$bundle_res"/bin +bundle_data="$bundle_res"/share +bundle_etc="$bundle_res"/etc + +export DYLD_LIBRARY_PATH="$bundle_lib" +export XDG_CONFIG_DIRS="$bundle_etc"/xdg +export XDG_DATA_DIRS="$bundle_data" +export GTK_DATA_PREFIX="$bundle_res" +export GTK_EXE_PREFIX="$bundle_res" +export GTK_PATH="$bundle_res" + +# PANGO_* is no longer needed for pango >= 1.38 +export PANGO_RC_FILE="$bundle_etc/pango/pangorc" +export PANGO_SYSCONFDIR="$bundle_etc" +export PANGO_LIBDIR="$bundle_lib" + +export GDK_PIXBUF_MODULE_FILE="$bundle_lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" +if [ `uname -r | cut -d . -f 1` -ge 10 ]; then + export GTK_IM_MODULE_FILE="$bundle_etc/gtk-3.0/gtk.immodules" +fi + +if test -e ~/.config/geany/use_locale; then + +APP=$name +I18NDIR="$bundle_data/locale" +# Set the locale-related variables appropriately: +unset LANG LC_MESSAGES LC_MONETARY LC_COLLATE + +# Has a language ordering been set? +# If so, set LC_MESSAGES and LANG accordingly; otherwise skip it. +# First step uses sed to clean off the quotes and commas, to change - to _, and change the names for the chinese scripts from "Hans" to CN and "Hant" to TW. +APPLELANGUAGES=`defaults read .GlobalPreferences AppleLanguages | sed -En -e 's/\-/_/' -e 's/Hant/TW/' -e 's/Hans/CN/' -e 's/[[:space:]]*\"?([[:alnum:]_]+)\"?,?/\1/p' ` +if test "$APPLELANGUAGES"; then + # A language ordering exists. + # Test, item per item, to see whether there is an corresponding locale. + for L in $APPLELANGUAGES; do + #test for exact matches: + if test -f "$I18NDIR/${L}/LC_MESSAGES/$APP.mo"; then + export LANG=$L + break + fi + #This is a special case, because often the original strings are in US + #English and there is no translation file. + if test "x$L" == "xen_US"; then + export LANG=$L + break + fi + #OK, now test for just the first two letters: + if test -f "$I18NDIR/${L:0:2}/LC_MESSAGES/$APP.mo"; then + export LANG=${L:0:2} + break + fi + #Same thing, but checking for any english variant. + if test "x${L:0:2}" == "xen"; then + export LANG=$L + break + fi; + done +fi +unset APPLELANGUAGES L + +# If we didn't get a language from the language list, try the Collation preference, in case it's the only setting that exists. +APPLECOLLATION=`defaults read .GlobalPreferences AppleCollationOrder` +if test -z ${LANG} -a -n $APPLECOLLATION; then + if test -f "$I18NDIR/${APPLECOLLATION:0:2}/LC_MESSAGES/$APP.mo"; then + export LANG=${APPLECOLLATION:0:2} + fi +fi +if test ! -z $APPLECOLLATION; then + export LC_COLLATE=$APPLECOLLATION +fi +unset APPLECOLLATION + +# Continue by attempting to find the Locale preference. +APPLELOCALE=`defaults read .GlobalPreferences AppleLocale` + +if test -f "$I18NDIR/${APPLELOCALE:0:5}/LC_MESSAGES/$APP.mo"; then + if test -z $LANG; then + export LANG="${APPLELOCALE:0:5}" + fi + +elif test -z $LANG -a -f "$I18NDIR/${APPLELOCALE:0:2}/LC_MESSAGES/$APP.mo"; then + export LANG="${APPLELOCALE:0:2}" +fi + +#Next we need to set LC_MESSAGES. If at all possilbe, we want a full +#5-character locale to avoid the "Locale not supported by C library" +#warning from Gtk -- even though Gtk will translate with a +#two-character code. +if test -n $LANG; then +#If the language code matches the applelocale, then that's the message +#locale; otherwise, if it's longer than two characters, then it's +#probably a good message locale and we'll go with it. + if test $LANG == ${APPLELOCALE:0:5} -o $LANG != ${LANG:0:2}; then + export LC_MESSAGES=$LANG +#Next try if the Applelocale is longer than 2 chars and the language +#bit matches $LANG + elif test $LANG == ${APPLELOCALE:0:2} -a $APPLELOCALE > ${APPLELOCALE:0:2}; then + export LC_MESSAGES=${APPLELOCALE:0:5} +#Fail. Get a list of the locales in $PREFIX/share/locale that match +#our two letter language code and pick the first one, special casing +#english to set en_US + elif test $LANG == "en"; then + export LC_MESSAGES="en_US" + else + LOC=`find $PREFIX/share/locale -name $LANG???` + for L in $LOC; do + export LC_MESSAGES=$L + done + fi +else +#All efforts have failed, so default to US english + export LANG="en_US" + export LC_MESSAGES="en_US" +fi +CURRENCY=`echo $APPLELOCALE | sed -En 's/.*currency=([[:alpha:]]+).*/\1/p'` +if test "x$CURRENCY" != "x"; then +#The user has set a special currency. Gtk doesn't install LC_MONETARY files, but Apple does in /usr/share/locale, so we're going to look there for a locale to set LC_CURRENCY to. + if test -f /usr/local/share/$LC_MESSAGES/LC_MONETARY; then + if test -a `cat /usr/local/share/$LC_MESSAGES/LC_MONETARY` == $CURRENCY; then + export LC_MONETARY=$LC_MESSAGES + fi + fi + if test -z "$LC_MONETARY"; then + FILES=`find /usr/share/locale -name LC_MONETARY -exec grep -H $CURRENCY {} \;` + if test -n "$FILES"; then + export LC_MONETARY=`echo $FILES | sed -En 's%/usr/share/locale/([[:alpha:]_]+)/LC_MONETARY.*%\1%p'` + fi + fi +fi +#No currency value means that the AppleLocale governs: +if test -z "$LC_MONETARY"; then + LC_MONETARY=${APPLELOCALE:0:5} +fi +#For Gtk, which only looks at LC_ALL: +export LC_ALL=$LC_MESSAGES + +unset APPLELOCALE FILES LOC + +#~/.config/geany/use_locale doesn't exist +else + export LANG="en_US" + export LC_MESSAGES="en_US" + export LC_ALL="en_US.UTF-8" +fi + +if test -f "$bundle_lib/charset.alias"; then + export CHARSETALIASDIR="$bundle_lib" +fi + +# Extra arguments can be added in environment.sh. +EXTRA_ARGS= +if test -f "$bundle_res/environment.sh"; then + source "$bundle_res/environment.sh" +fi + +# Strip out the argument added by the OS. +if /bin/expr "x$1" : '^x-psn_' > /dev/null; then + shift 1 +fi + +$EXEC "$bundle_contents/MacOS/$name-bin" "$@" $EXTRA_ARGS -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] b97656: Add gtk 3 modules and fix VTE 0.34 to work correctly on OS X
by Jiří Techet 21 May '16

21 May '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sat, 21 May 2016 20:34:51 UTC Commit: b976568e1ebde608a653d592a15cebdb1ad8b717 https://github.com/geany/geany-osx/commit/b976568e1ebde608a653d592a15cebdb1… Log Message: ----------- Add gtk 3 modules and fix VTE 0.34 to work correctly on OS X Modified Paths: -------------- geany.modules patches/01-vte_0.28_fix.diff patches/02-vte_0.28_relpath.diff patches/03-vte_0.34_noatime.diff patches/04-vte_0.34_relpath.diff Modified: geany.modules 88 lines changed, 86 insertions(+), 2 deletions(-) =================================================================== @@ -33,9 +33,22 @@ <branch module="vte/0.28/vte-0.28.2.tar.xz" version="0.28.2">  - <patch file="https://github.com/geany/geany-osx/raw/master/patches/01-vte_fix.diff" strip="1" /> + <patch file="https://github.com/geany/geany-osx/raw/master/patches/01-vte_0.28_fix.diff" strip="1" />  - <patch file="https://github.com/geany/geany-osx/raw/master/patches/02-vte_relpath.diff" strip="1" /> + <patch file="https://github.com/geany/geany-osx/raw/master/patches/02-vte_0.28_relpath.d…" strip="1" /> + </branch> + </autotools> + +  + <autotools id="vte34" + autogenargs="--disable-Bsymbolic" + autogen-sh="configure"> + <branch module="vte/0.34/vte-0.34.9.tar.xz" + version="0.34.9"> +  + <patch file="https://github.com/geany/geany-osx/raw/master/patches/03-vte_0.34_noatime.d…" strip="1" /> +  + <patch file="https://github.com/geany/geany-osx/raw/master/patches/04-vte_0.34_relpath.d…" strip="1" /> </branch> </autotools> @@ -87,6 +100,17 @@ </dependencies> </metamodule> + <metamodule id="geany-deps-gtk3"> + <dependencies> + <dep package="vte34" /> + <dep package="docutils" /> + <dep package="gtk-mac-bundler" /> + <dep package="gtk-mac-integration-fixed" /> +  + <dep package="shared-mime-info" /> + </dependencies> + </metamodule> +  <autotools id="geany" autogenargs="--enable-mac-integration"> @@ -98,6 +122,17 @@ </dependencies> </autotools> +  + <autotools id="geany-gtk3" + autogenargs="--enable-mac-integration --enable-gtk3"> + <branch repo="github.com" + module="geany/geany.git" + revision="master" /> + <dependencies> + <dep package="geany-deps-gtk3" /> + </dependencies> + </autotools> +  <autotools id="geany-release" autogenargs="--enable-mac-integration"> @@ -109,6 +144,17 @@ </dependencies> </autotools> +  + <autotools id="geany-release-gtk3" + autogenargs="--enable-mac-integration --enable-gtk3"> + <branch repo="download.geany.org" + module="geany-1.27.tar.bz2" + version="1.27"/> + <dependencies> + <dep package="geany-deps-gtk3" /> + </dependencies> + </autotools> +  <metamodule id="geany-plugins-deps"> <dependencies> @@ -130,6 +176,17 @@ </dependencies> </autotools> +  + <autotools id="geany-plugins-gtk3"> + <branch repo="github.com" + module="geany/geany-plugins.git" + revision="master" /> + <dependencies> + <dep package="geany-gtk3" /> + <dep package="geany-plugins-deps" /> + </dependencies> + </autotools> +  <autotools id="geany-plugins-release"> <branch repo="download.geany.org" @@ -141,6 +198,17 @@ </dependencies> </autotools> +  + <autotools id="geany-plugins-release-gtk3"> + <branch repo="download.geany.org" + module="geany-plugins/geany-plugins-1.27.tar.bz2" + version="1.27"/> + <dependencies> + <dep package="geany-release-gtk3" /> + <dep package="geany-plugins-deps" /> + </dependencies> + </autotools> +  <metamodule id="geany-bundle"> <dependencies> @@ -149,6 +217,14 @@ </dependencies> </metamodule> +  + <metamodule id="geany-bundle-gtk3"> + <dependencies> + <dep package="geany-gtk3" /> + <dep package="geany-plugins-gtk3" /> + </dependencies> + </metamodule> +  <metamodule id="geany-bundle-release"> <dependencies> @@ -157,4 +233,12 @@ </dependencies> </metamodule> +  + <metamodule id="geany-bundle-release-gtk3"> + <dependencies> + <dep package="geany-release-gtk3" /> + <dep package="geany-plugins-release-gtk3" /> + </dependencies> + </metamodule> + </moduleset> Modified: patches/01-vte_0.28_fix.diff 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: patches/02-vte_0.28_relpath.diff 0 lines changed, 0 insertions(+), 0 deletions(-) =================================================================== No diff available, check online Modified: patches/03-vte_0.34_noatime.diff 34 lines changed, 34 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,34 @@ +From b5c8bf99d6bac7617c5eea557fafebb2b4e7eb39 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= <techet(a)gmail.com> +Date: Sat, 21 May 2016 20:16:58 +0200 +Subject: [PATCH] Don't use O_NOATIME as it doesn't exist on OS X + +--- + src/vteutils.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/vteutils.c b/src/vteutils.c +index 1371cb2..c552ada 100644 +--- a/src/vteutils.c ++++ b/src/vteutils.c +@@ -48,7 +48,7 @@ _vte_mkstemp (void) + + #ifdef O_TMPFILE + fd = open (g_get_tmp_dir (), +- O_TMPFILE | O_EXCL | O_RDWR | O_NOATIME, ++ O_TMPFILE | O_EXCL | O_RDWR, + 0600); + if (fd != -1) + goto done; +@@ -63,8 +63,6 @@ _vte_mkstemp (void) + unlink (file_name); + g_free (file_name); + +- do { } while (fcntl (fd, F_SETFL, O_NOATIME) == -1 && errno == EINTR); +- + #ifdef O_TMPFILE + done: + #endif +-- +2.8.1 + Modified: patches/04-vte_0.34_relpath.diff 63 lines changed, 63 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,63 @@ +From b6b98bc5860f7c02f77d9584e00681089af67485 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jir=CC=8Ci=CC=81=20Techet?= <techet(a)gmail.com> +Date: Sat, 21 May 2016 20:42:30 +0200 +Subject: [PATCH] Make VTE independent of installation path when bundling + +The wrapper shell script defines the GTK_PATH to point to +the resources directory - use this path to avoid absolute paths +in the source. +--- + src/pty.c | 13 +++++++++++-- + src/vte.c | 12 +++++++++++- + 2 files changed, 22 insertions(+), 3 deletions(-) + +diff --git a/src/pty.c b/src/pty.c +index 5c6afd5..f9d9c36 100644 +--- a/src/pty.c ++++ b/src/pty.c +@@ -1265,8 +1265,17 @@ _vte_pty_start_helper(GError **error) + close(tunnel); + close(_vte_pty_helper_tunnel); + /* Exec our helper. */ +- execl(LIBEXECDIR "/gnome-pty-helper", +- "gnome-pty-helper", NULL); ++ gchar *path = g_build_filename(g_getenv("GTK_PATH"), ++ "libexec", ++ "gnome-pty-helper", ++ NULL); ++ if (!g_file_test(path, G_FILE_TEST_EXISTS)) ++ { ++ g_free(path); ++ path = g_strdup(LIBEXECDIR "/gnome-pty-helper"); ++ } ++ execl(path, "gnome-pty-helper", NULL); ++ g_free(path); + /* Bail. */ + _exit(1); + } +diff --git a/src/vte.c b/src/vte.c +index 3227b07..b2b2e4e 100644 +--- a/src/vte.c ++++ b/src/vte.c +@@ -11761,7 +11761,17 @@ vte_terminal_class_init(VteTerminalClass *klass) + } + #endif + +- bindtextdomain(GETTEXT_PACKAGE, LOCALEDIR); ++ gchar *localedir = g_build_filename(g_getenv("GTK_PATH"), ++ "share", ++ "locale", ++ NULL); ++ if (!g_file_test(localedir, G_FILE_TEST_IS_DIR)) ++ { ++ g_free(localedir); ++ localedir = g_strdup(LOCALEDIR); ++ } ++ bindtextdomain(GETTEXT_PACKAGE, localedir); ++ g_free(localedir); + #ifdef HAVE_DECL_BIND_TEXTDOMAIN_CODESET + bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8"); + #endif +-- +2.8.1 + -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-osx] 209c95: Use $HOME when setting PATH
by Jiří Techet 21 May '16

21 May '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Sat, 21 May 2016 20:33:37 UTC Commit: 209c954085e34012d5292a57ca890f72d6249e2f https://github.com/geany/geany-osx/commit/209c954085e34012d5292a57ca890f72d… Log Message: ----------- Use $HOME when setting PATH ~ seems not to always work right. Modified Paths: -------------- README.md Modified: README.md 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -79,7 +79,7 @@ To create the bundle, you need to first install JHBuild and GTK as described bel 3. Run ``` - export PATH=$PATH:"~/.local/bin" + export PATH=$PATH:"$HOME/.local/bin" ``` to set path to jhbuild installed in the previous step. -------------- 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 May 2016