Commits September 2014

commits@lists.geany.org

1 participants
47 discussions

[geany/geany] 541cb8: Force disk check before save to prevent accidental overwriting
by Nick Treleaven 30 Sep '14

30 Sep '14

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Tue, 30 Sep 2014 16:10:53 UTC Commit: 541cb8dbccdab127a08e63855cea00f0f5608787 https://github.com/geany/geany/commit/541cb8dbccdab127a08e63855cea00f0f5608… Log Message: ----------- Force disk check before save to prevent accidental overwriting Useful e.g. with Save All when the modified file is not the current tab. Modified Paths: -------------- src/document.c Modified: src/document.c 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -1937,10 +1937,9 @@ gboolean document_save_file(GeanyDocument *doc, gboolean force) _("Cannot save read-only document '%s'!"), DOC_FILENAME(doc)); return FALSE; } + document_check_disk_status(doc, TRUE); if (doc->priv->protected) - { return save_file_handle_infobars(doc, force); - } fp = project_get_file_prefs(); /* replaces tabs with spaces but only if the current file is not a Makefile */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 5df59c: Fix build with GLib 2.20
by Colomban Wendling 30 Sep '14

30 Sep '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 30 Sep 2014 14:31:44 UTC Commit: 5df59cefcb5ce45c13b4f35dc52bfa8680abbe22 https://github.com/geany/geany/commit/5df59cefcb5ce45c13b4f35dc52bfa8680abb… Log Message: ----------- Fix build with GLib 2.20 Don't use `g_regex_get_compile_flags()` that is new in 2.26, but we only depend on 2.20. Closes #340. Modified Paths: -------------- src/search.c Modified: src/search.c 10 lines changed, 5 insertions(+), 5 deletions(-) =================================================================== @@ -1964,7 +1964,7 @@ static gchar *get_regex_match_string(const gchar *text, const GeanyMatchInfo *ma } -static gint find_regex(ScintillaObject *sci, guint pos, GRegex *regex, GeanyMatchInfo *match) +static gint find_regex(ScintillaObject *sci, guint pos, GRegex *regex, gboolean multiline, GeanyMatchInfo *match) { const gchar *text; GMatchInfo *minfo; @@ -1978,7 +1978,7 @@ static gint find_regex(ScintillaObject *sci, guint pos, GRegex *regex, GeanyMatc g_return_val_if_fail(pos <= document_length, -1); - if (g_regex_get_compile_flags(regex) & G_REGEX_MULTILINE) + if (multiline) { /* Warning: any SCI calls will invalidate 'text' after calling SCI_GETCHARACTERPOINTER */ text = (void*)scintilla_send_message(sci, SCI_GETCHARACTERPOINTER, 0, 0); @@ -2082,10 +2082,10 @@ gint search_find_next(ScintillaObject *sci, const gchar *str, GeanyFindFlags fla match = match_info_new(flags, 0, 0); pos = sci_get_current_position(sci); - ret = find_regex(sci, pos, regex, match); + ret = find_regex(sci, pos, regex, flags & GEANY_FIND_MULTILINE, match); /* avoid re-matching the same position in case of empty matches */ if (ret == pos && match->matches[0].start == match->matches[0].end) - ret = find_regex(sci, pos + 1, regex, match); + ret = find_regex(sci, pos + 1, regex, flags & GEANY_FIND_MULTILINE, match); if (ret >= 0) sci_set_selection(sci, match->start, match->end); @@ -2165,7 +2165,7 @@ gint search_find_text(ScintillaObject *sci, GeanyFindFlags flags, struct Sci_Tex match = match_info_new(flags, 0, 0); - ret = find_regex(sci, ttf->chrg.cpMin, regex, match); + ret = find_regex(sci, ttf->chrg.cpMin, regex, flags & GEANY_FIND_MULTILINE, match); if (ret >= ttf->chrg.cpMax) ret = -1; else if (ret >= 0) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 52a0c3: Update of German translation
by Frank Lanitz 29 Sep '14

29 Sep '14

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 29 Sep 2014 21:34:14 UTC Commit: 52a0c3160673b9a019f9a7d09485dee1d881d4e4 https://github.com/geany/geany/commit/52a0c3160673b9a019f9a7d09485dee1d881d… Log Message: ----------- Update of German translation Modified Paths: -------------- po/de.po Modified: po/de.po 71 lines changed, 38 insertions(+), 33 deletions(-) =================================================================== @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: Geany 1.24\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-09-24 20:06+0200\n" -"PO-Revision-Date: 2014-09-24 20:09+0200\n" +"POT-Creation-Date: 2014-09-29 23:33+0200\n" +"PO-Revision-Date: 2014-09-29 23:34+0200\n" "Last-Translator: Frank Lanitz <frlan@trabant>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" "Language: de\n" @@ -1683,7 +1683,7 @@ msgstr "Speichern _unter" msgid "Sa_ve All" msgstr "A_lle speichern" -#: ../data/geany.glade.h:345 ../src/document.c:1457 ../src/document.c:3328 +#: ../data/geany.glade.h:345 ../src/document.c:1457 ../src/document.c:3344 #: ../src/sidebar.c:709 msgid "_Reload" msgstr "Neu _laden" @@ -2578,8 +2578,8 @@ msgstr "Keine weiteren Nachrichten." msgid "Could not open file %s (File not found)" msgstr "Konnte Datei »%s« nicht öffnen (Datei nicht gefunden)." -#: ../src/dialogs.c:160 ../src/document.c:2110 ../src/document.c:2175 -#: ../src/document.c:2183 +#: ../src/dialogs.c:160 ../src/document.c:2114 ../src/document.c:2179 +#: ../src/document.c:2187 #, c-format msgid "\"%s\" was not found." msgstr "»%s« wurde nicht gefunden." @@ -2660,7 +2660,7 @@ msgstr "" "Öffnet die Datei schreibgeschützt. Bei Auswahl mehrerer Dateien, werden alle " "schreibgeschützt geöffnet." -#: ../src/dialogs.c:532 ../src/document.c:1864 +#: ../src/dialogs.c:532 ../src/document.c:1865 msgid "Overwrite?" msgstr "Überschreiben?" @@ -2837,7 +2837,7 @@ msgstr "Möchten Sie »%s« wirklich neu laden?" msgid "Error renaming file." msgstr "Fehler beim Umbenennen der Datei." -#: ../src/document.c:1696 +#: ../src/document.c:1697 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file " @@ -2846,7 +2846,7 @@ msgstr "" "Beim Konvertieren der Datei von UTF-8 nach »%s« ist ein Fehler aufgetreten. " "Die Datei wird <i>nicht</i> gespeichert." -#: ../src/document.c:1717 +#: ../src/document.c:1718 #, c-format msgid "" "Error message: %s\n" @@ -2855,55 +2855,60 @@ msgstr "" "Fehlermeldung: %s\n" "Der Fehler trat bei »%s« (Zeile: %d, Spalte: %d) auf." -#: ../src/document.c:1721 +#: ../src/document.c:1722 #, c-format msgid "Error message: %s." msgstr "Fehlermeldung: %s." -#: ../src/document.c:1781 +#: ../src/document.c:1782 #, c-format msgid "Failed to open file '%s' for writing: fopen() failed: %s" msgstr "" "Konnte Datei »%s« nicht zum Schreiben öffnen: fopen() fehlgeschlagen: %s" -#: ../src/document.c:1799 +#: ../src/document.c:1800 #, c-format msgid "Failed to write file '%s': fwrite() failed: %s" msgstr "" "Konnte Datei »%s« nicht zum Schreiben öffnen: fwrite() fehlgeschlagen: %s" -#: ../src/document.c:1813 +#: ../src/document.c:1814 #, c-format msgid "Failed to close file '%s': fclose() failed: %s" msgstr "" "Konnte Datei »%s« nicht zum Schreiben öffnen: fclose() fehlgeschlagen: %s" -#: ../src/document.c:1863 ../src/document.c:3329 +#: ../src/document.c:1864 ../src/document.c:3345 msgid "_Overwrite" msgstr "Ü_berschreiben?" -#: ../src/document.c:1865 ../src/document.c:3332 +#: ../src/document.c:1866 ../src/document.c:3348 #, c-format msgid "The file '%s' on the disk is more recent than the current buffer." msgstr "" "Die Datei »%s« auf dem Datenträger ist aktueller als die momentan geöffnete " "Version." -#: ../src/document.c:1873 ../src/document.c:3370 +#: ../src/document.c:1874 ../src/document.c:3386 msgid "Try to resave the file?" msgstr "Versuchen die Datei erneut zu speichern?" -#: ../src/document.c:1874 ../src/document.c:3371 +#: ../src/document.c:1875 ../src/document.c:3387 #, c-format msgid "File \"%s\" was not found on disk!" msgstr "»%s« wurde nicht auf dem Datenträger gefunden." -#: ../src/document.c:2002 +#: ../src/document.c:1937 +#, c-format +msgid "Cannot save read-only document '%s'!" +msgstr "Kann das nur zum Lesen geöffnete Dokument »%s« nicht speichern!" + +#: ../src/document.c:2006 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." -#: ../src/document.c:2007 +#: ../src/document.c:2011 #, c-format msgid "" "%s\n" @@ -2914,47 +2919,47 @@ msgstr "" "\n" "Die Datei ist möglicherweise nicht vollständig auf der Festplatte gespeichert" -#: ../src/document.c:2009 +#: ../src/document.c:2013 msgid "Error saving file." msgstr "Fehler beim Speichern der Datei." -#: ../src/document.c:2033 +#: ../src/document.c:2037 #, c-format msgid "File %s saved." msgstr "Datei »%s« wurde gespeichert." -#: ../src/document.c:2183 +#: ../src/document.c:2187 msgid "Wrap search and find again?" msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" -#: ../src/document.c:2272 ../src/search.c:1368 ../src/search.c:1419 +#: ../src/document.c:2276 ../src/search.c:1368 ../src/search.c:1419 #: ../src/search.c:2263 ../src/search.c:2264 #, c-format msgid "No matches found for \"%s\"." msgstr "Keine Treffer für »%s« gefunden." -#: ../src/document.c:2278 +#: ../src/document.c:2282 #, c-format msgid "%s: replaced %d occurrence of \"%s\" with \"%s\"." msgid_plural "%s: replaced %d occurrences of \"%s\" with \"%s\"." msgstr[0] "%s: %d mal wurde »%s« mit »%s« ersetzt." msgstr[1] "%s: %d mal wurde »%s« mit »%s« ersetzt." -#: ../src/document.c:3331 +#: ../src/document.c:3347 msgid "Do you want to reload it?" msgstr "Möchten Sie die Datei neu laden?" -#: ../src/editor.c:4367 +#: ../src/editor.c:4374 msgid "Enter Tab Width" msgstr "Tabulatorbreite:" -#: ../src/editor.c:4368 +#: ../src/editor.c:4375 msgid "Enter the amount of spaces which should be replaced by a tab character." msgstr "" "Geben Sie die Anzahl der Leerzeichen an, welche durch den Tabulator ersetzt " "werden sollen." -#: ../src/editor.c:4531 +#: ../src/editor.c:4538 #, c-format msgid "Warning: non-standard hard tab width: %d != 8!" msgstr "Achtung: Keine gewöhnliche harte Tabulatorbreite:: %d != 8!" @@ -3912,29 +3917,29 @@ msgstr "Soll Geany wirklich beendet werden?" msgid "Configuration files reloaded." msgstr "Einstellungen erneut geladen." -#: ../src/msgwindow.c:169 +#: ../src/msgwindow.c:176 msgid "Status messages" msgstr "Meldungen" -#: ../src/msgwindow.c:569 +#: ../src/msgwindow.c:578 msgid "C_opy" msgstr "_Kopieren" -#: ../src/msgwindow.c:578 +#: ../src/msgwindow.c:587 msgid "Copy _All" msgstr "_Alles kopieren" -#: ../src/msgwindow.c:608 +#: ../src/msgwindow.c:617 msgid "_Hide Message Window" msgstr "Meldungs_fenster ausblenden" -#: ../src/msgwindow.c:664 +#: ../src/msgwindow.c:673 #, c-format msgid "Could not find file '%s' - trying the current document path." msgstr "" "Konnte die Datei »%s« nicht finden - Versuche den aktuellen Dokumentenpfad." -#: ../src/msgwindow.c:1096 +#: ../src/msgwindow.c:1105 msgid "The document has been closed." msgstr "Das Dokument wurde bereits geschlossen." -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 9eb865: Merge pull request #337 from ntrel/project-line-wrap
by Nick Treleaven 29 Sep '14

29 Sep '14

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Mon, 29 Sep 2014 15:16:50 UTC Commit: 9eb865dab366ca8de07b7d1ff34cef71d092b513 https://github.com/geany/geany/commit/9eb865dab366ca8de07b7d1ff34cef71d092b… Log Message: ----------- Merge pull request #337 from ntrel/project-line-wrap Project line wrapping pref Modified Paths: -------------- data/geany.glade src/editor.c src/project.c src/projectprivate.h Modified: data/geany.glade 16 lines changed, 16 insertions(+), 0 deletions(-) =================================================================== @@ -9029,6 +9029,22 @@ <property name="position">0</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="check_line_wrapping1"> + <property name="label" translatable="yes">Line wrapping</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines.</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> </object> <packing> <property name="position">2</property> Modified: src/editor.c 15 lines changed, 11 insertions(+), 4 deletions(-) =================================================================== @@ -404,6 +404,12 @@ static gint editor_get_long_line_column(void) } +static gboolean editor_get_line_wrapping(void) +{ + return app->project ? app->project->priv->line_wrapping : editor_prefs.line_wrapping; +} + + static const GeanyEditorPrefs * get_default_prefs(void) { @@ -415,6 +421,7 @@ get_default_prefs(void) eprefs.indentation = (GeanyIndentPrefs*)editor_get_indent_prefs(NULL); eprefs.long_line_type = editor_get_long_line_type(); eprefs.long_line_column = editor_get_long_line_column(); + eprefs.line_wrapping = editor_get_line_wrapping(); return &eprefs; } @@ -4755,7 +4762,7 @@ static gboolean register_named_icon(ScintillaObject *sci, guint id, const gchar * @note The @c "sci-notify" signal is connected separately. */ static ScintillaObject *create_new_sci(GeanyEditor *editor) { - ScintillaObject *sci; + ScintillaObject *sci; sci = SCINTILLA(scintilla_new()); @@ -4774,7 +4781,7 @@ static ScintillaObject *create_new_sci(GeanyEditor *editor) setup_sci_keys(sci); sci_set_symbol_margin(sci, editor_prefs.show_markers_margin); - sci_set_lines_wrapped(sci, editor_prefs.line_wrapping); + sci_set_lines_wrapped(sci, editor->line_wrapping); sci_set_caret_policy_x(sci, CARET_JUMPS | CARET_EVEN, 0); /*sci_set_caret_policy_y(sci, CARET_JUMPS | CARET_EVEN, 0);*/ SSM(sci, SCI_AUTOCSETSEPARATOR, '\n', 0); @@ -4843,7 +4850,7 @@ GeanyEditor *editor_create(GeanyDocument *doc) doc->editor = editor; /* needed in case some editor functions/callbacks expect it */ editor->auto_indent = (iprefs->auto_indent_mode != GEANY_AUTOINDENT_NONE); - editor->line_wrapping = editor_prefs.line_wrapping; + editor->line_wrapping = editor_get_line_wrapping(); editor->scroll_percent = -1.0F; editor->line_breaking = FALSE; @@ -4982,7 +4989,7 @@ void editor_set_indentation_guides(GeanyEditor *editor) } -/* Apply just the prefs that can change in the Preferences dialog */ +/* Apply non-document prefs that can change in the Preferences dialog */ void editor_apply_update_prefs(GeanyEditor *editor) { ScintillaObject *sci; Modified: src/project.c 25 lines changed, 17 insertions(+), 8 deletions(-) =================================================================== @@ -1129,6 +1129,7 @@ static gboolean write_config(gboolean emit_signal) g_key_file_set_string_list(config, "project", "file_patterns", (const gchar**) p->file_patterns, g_strv_length(p->file_patterns)); + // editor settings g_key_file_set_integer(config, "long line marker", "long_line_behaviour", p->priv->long_line_behaviour); g_key_file_set_integer(config, "long line marker", "long_line_column", p->priv->long_line_column); @@ -1245,22 +1246,29 @@ void project_apply_prefs(void) } -static void add_stash_group(StashGroup *group) +static void add_stash_group(StashGroup *group, gboolean apply_defaults) { + GKeyFile *kf; + stash_groups = g_slist_prepend(stash_groups, group); + if (!apply_defaults) + return; + + kf = g_key_file_new(); + stash_group_load_from_key_file(group, kf); + g_key_file_free(kf); } static void init_stash_prefs(void) { StashGroup *group; - GKeyFile *kf; group = stash_group_new("indentation"); /* copy global defaults */ indentation = *editor_get_indent_prefs(NULL); stash_group_set_use_defaults(group, FALSE); - add_stash_group(group); + add_stash_group(group, FALSE); stash_group_add_spin_button_integer(group, &indentation.width, "indent_width", 4, "spin_indent_width_project"); @@ -1289,11 +1297,12 @@ static void init_stash_prefs(void) "strip_trailing_spaces", file_prefs.strip_trailing_spaces, "check_trailing_spaces1"); stash_group_add_toggle_button(group, &priv.replace_tabs, "replace_tabs", file_prefs.replace_tabs, "check_replace_tabs1"); - add_stash_group(group); - /* apply defaults */ - kf = g_key_file_new(); - stash_group_load_from_key_file(group, kf); - g_key_file_free(kf); + add_stash_group(group, TRUE); + + group = stash_group_new("editor"); + stash_group_add_toggle_button(group, &priv.line_wrapping, + "line_wrapping", editor_prefs.line_wrapping, "check_line_wrapping1"); + add_stash_group(group, TRUE); } Modified: src/projectprivate.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -39,6 +39,7 @@ typedef struct GeanyProjectPrivate GPtrArray *build_filetypes_list; /* Project has custom filetype builds for these. */ gint long_line_behaviour; /* 0 - disabled, 1 - follow global settings, 2 - enabled (custom) */ gint long_line_column; /* Long line marker position. */ + gboolean line_wrapping; } GeanyProjectPrivate; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] bbf63d: Fixups
by Nick Treleaven 29 Sep '14

29 Sep '14

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Mon, 29 Sep 2014 15:12:57 UTC Commit: bbf63d131a84a099c9e1627ac5ec321985052fb4 https://github.com/geany/geany/commit/bbf63d131a84a099c9e1627ac5ec321985052… Log Message: ----------- Fixups Fix adding stash group and applying defaults. Don't let Properties dialog override per-document line wrapping state. Use "editor" for key group name. Remove code already handled by stash group. Modified Paths: -------------- src/editor.c src/project.c Modified: src/editor.c 26 lines changed, 10 insertions(+), 16 deletions(-) =================================================================== @@ -375,17 +375,6 @@ static gboolean is_style_php(gint style) } -static gint editor_get_line_wrapping(void) -{ - if (app->project) - return app->project->priv->line_wrapping; - if (!editor_prefs.line_wrapping) - return 0; - else - return editor_prefs.line_wrapping; -} - - static gint editor_get_long_line_type(void) { if (app->project) @@ -415,6 +404,12 @@ static gint editor_get_long_line_column(void) } +static gboolean editor_get_line_wrapping(void) +{ + return app->project ? app->project->priv->line_wrapping : editor_prefs.line_wrapping; +} + + static const GeanyEditorPrefs * get_default_prefs(void) { @@ -4767,7 +4762,7 @@ static gboolean register_named_icon(ScintillaObject *sci, guint id, const gchar * @note The @c "sci-notify" signal is connected separately. */ static ScintillaObject *create_new_sci(GeanyEditor *editor) { - ScintillaObject *sci; + ScintillaObject *sci; sci = SCINTILLA(scintilla_new()); @@ -4786,7 +4781,7 @@ static ScintillaObject *create_new_sci(GeanyEditor *editor) setup_sci_keys(sci); sci_set_symbol_margin(sci, editor_prefs.show_markers_margin); - sci_set_lines_wrapped(sci, editor_prefs.line_wrapping); + sci_set_lines_wrapped(sci, editor->line_wrapping); sci_set_caret_policy_x(sci, CARET_JUMPS | CARET_EVEN, 0); /*sci_set_caret_policy_y(sci, CARET_JUMPS | CARET_EVEN, 0);*/ SSM(sci, SCI_AUTOCSETSEPARATOR, '\n', 0); @@ -4855,7 +4850,7 @@ GeanyEditor *editor_create(GeanyDocument *doc) doc->editor = editor; /* needed in case some editor functions/callbacks expect it */ editor->auto_indent = (iprefs->auto_indent_mode != GEANY_AUTOINDENT_NONE); - editor->line_wrapping = editor_prefs.line_wrapping; + editor->line_wrapping = editor_get_line_wrapping(); editor->scroll_percent = -1.0F; editor->line_breaking = FALSE; @@ -4994,7 +4989,7 @@ void editor_set_indentation_guides(GeanyEditor *editor) } -/* Apply just the prefs that can change in the Preferences dialog */ +/* Apply non-document prefs that can change in the Preferences dialog */ void editor_apply_update_prefs(GeanyEditor *editor) { ScintillaObject *sci; @@ -5021,7 +5016,6 @@ void editor_apply_update_prefs(GeanyEditor *editor) sci_set_autoc_max_height(sci, editor_prefs.symbolcompletion_max_height); SSM(sci, SCI_AUTOCSETDROPRESTOFWORD, editor_prefs.completion_drops_rest_of_word, 0); - editor_set_line_wrapping(editor, editor_get_line_wrapping()); editor_set_indentation_guides(editor); sci_set_visible_white_spaces(sci, editor_prefs.show_white_space); Modified: src/project.c 29 lines changed, 14 insertions(+), 15 deletions(-) =================================================================== @@ -684,7 +684,6 @@ static GeanyProject *create_project(void) project->priv->long_line_behaviour = 1 /* use global settings */; project->priv->long_line_column = editor_prefs.long_line_column; - project->priv->line_wrapping = editor_prefs.line_wrapping; app->project = project; return project; @@ -1064,8 +1063,6 @@ static gboolean load_config(const gchar *filename) "long_line_behaviour", 1 /* follow global */); p->priv->long_line_column = utils_get_setting_integer(config, "long line marker", "long_line_column", editor_prefs.long_line_column); - p->priv->line_wrapping = utils_get_setting_boolean(config, "line_wrapping", - "line_wrapping", editor_prefs.line_wrapping); apply_editor_prefs(); build_load_menu(config, GEANY_BCS_PROJ, (gpointer)p); @@ -1132,10 +1129,10 @@ static gboolean write_config(gboolean emit_signal) g_key_file_set_string_list(config, "project", "file_patterns", (const gchar**) p->file_patterns, g_strv_length(p->file_patterns)); + // editor settings g_key_file_set_integer(config, "long line marker", "long_line_behaviour", p->priv->long_line_behaviour); g_key_file_set_integer(config, "long line marker", "long_line_column", p->priv->long_line_column); - g_key_file_set_boolean(config, "line_wrapping", "line_wrapping", p->priv->line_wrapping); /* store the session files into the project too */ if (project_prefs.project_session) configuration_save_session_files(config); @@ -1249,22 +1246,29 @@ void project_apply_prefs(void) } -static void add_stash_group(StashGroup *group) +static void add_stash_group(StashGroup *group, gboolean apply_defaults) { + GKeyFile *kf; + stash_groups = g_slist_prepend(stash_groups, group); + if (!apply_defaults) + return; + + kf = g_key_file_new(); + stash_group_load_from_key_file(group, kf); + g_key_file_free(kf); } static void init_stash_prefs(void) { StashGroup *group; - GKeyFile *kf; group = stash_group_new("indentation"); /* copy global defaults */ indentation = *editor_get_indent_prefs(NULL); stash_group_set_use_defaults(group, FALSE); - add_stash_group(group); + add_stash_group(group, FALSE); stash_group_add_spin_button_integer(group, &indentation.width, "indent_width", 4, "spin_indent_width_project"); @@ -1293,17 +1297,12 @@ static void init_stash_prefs(void) "strip_trailing_spaces", file_prefs.strip_trailing_spaces, "check_trailing_spaces1"); stash_group_add_toggle_button(group, &priv.replace_tabs, "replace_tabs", file_prefs.replace_tabs, "check_replace_tabs1"); - group = stash_group_new("file_prefs"); - add_stash_group(group); + add_stash_group(group, TRUE); - group = stash_group_new("line_wrapping"); + group = stash_group_new("editor"); stash_group_add_toggle_button(group, &priv.line_wrapping, "line_wrapping", editor_prefs.line_wrapping, "check_line_wrapping1"); - add_stash_group(group); - /* apply defaults */ - kf = g_key_file_new(); - stash_group_load_from_key_file(group, kf); - g_key_file_free(kf); + add_stash_group(group, TRUE); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] cb2aeb: Enable per-project line wrapping
by Tim Tassonis 29 Sep '14

29 Sep '14

Branch: refs/heads/master Author: Tim Tassonis <stuff(a)decentral.ch> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Mon, 29 Sep 2014 15:12:55 UTC Commit: cb2aebcfd98c8c53a98ffe00f33b7497c9c3f34a https://github.com/geany/geany/commit/cb2aebcfd98c8c53a98ffe00f33b7497c9c3f… Log Message: ----------- Enable per-project line wrapping Modified Paths: -------------- data/geany.glade src/editor.c src/project.c src/projectprivate.h Modified: data/geany.glade 16 lines changed, 16 insertions(+), 0 deletions(-) =================================================================== @@ -9029,6 +9029,22 @@ <property name="position">0</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="check_line_wrapping1"> + <property name="label" translatable="yes">Line wrapping</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="tooltip_text" translatable="yes">Wrap the line at the window border and continue it on the next line. Note: line wrapping has a high performance cost for large documents so should be disabled on slow machines.</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> </object> <packing> <property name="position">2</property> Modified: src/editor.c 13 lines changed, 13 insertions(+), 0 deletions(-) =================================================================== @@ -375,6 +375,17 @@ static gboolean is_style_php(gint style) } +static gint editor_get_line_wrapping(void) +{ + if (app->project) + return app->project->priv->line_wrapping; + if (!editor_prefs.line_wrapping) + return 0; + else + return editor_prefs.line_wrapping; +} + + static gint editor_get_long_line_type(void) { if (app->project) @@ -415,6 +426,7 @@ get_default_prefs(void) eprefs.indentation = (GeanyIndentPrefs*)editor_get_indent_prefs(NULL); eprefs.long_line_type = editor_get_long_line_type(); eprefs.long_line_column = editor_get_long_line_column(); + eprefs.line_wrapping = editor_get_line_wrapping(); return &eprefs; } @@ -5009,6 +5021,7 @@ void editor_apply_update_prefs(GeanyEditor *editor) sci_set_autoc_max_height(sci, editor_prefs.symbolcompletion_max_height); SSM(sci, SCI_AUTOCSETDROPRESTOFWORD, editor_prefs.completion_drops_rest_of_word, 0); + editor_set_line_wrapping(editor, editor_get_line_wrapping()); editor_set_indentation_guides(editor); sci_set_visible_white_spaces(sci, editor_prefs.show_white_space); Modified: src/project.c 10 lines changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -684,6 +684,7 @@ static GeanyProject *create_project(void) project->priv->long_line_behaviour = 1 /* use global settings */; project->priv->long_line_column = editor_prefs.long_line_column; + project->priv->line_wrapping = editor_prefs.line_wrapping; app->project = project; return project; @@ -1063,6 +1064,8 @@ static gboolean load_config(const gchar *filename) "long_line_behaviour", 1 /* follow global */); p->priv->long_line_column = utils_get_setting_integer(config, "long line marker", "long_line_column", editor_prefs.long_line_column); + p->priv->line_wrapping = utils_get_setting_boolean(config, "line_wrapping", + "line_wrapping", editor_prefs.line_wrapping); apply_editor_prefs(); build_load_menu(config, GEANY_BCS_PROJ, (gpointer)p); @@ -1132,6 +1135,7 @@ static gboolean write_config(gboolean emit_signal) g_key_file_set_integer(config, "long line marker", "long_line_behaviour", p->priv->long_line_behaviour); g_key_file_set_integer(config, "long line marker", "long_line_column", p->priv->long_line_column); + g_key_file_set_boolean(config, "line_wrapping", "line_wrapping", p->priv->line_wrapping); /* store the session files into the project too */ if (project_prefs.project_session) configuration_save_session_files(config); @@ -1289,6 +1293,12 @@ static void init_stash_prefs(void) "strip_trailing_spaces", file_prefs.strip_trailing_spaces, "check_trailing_spaces1"); stash_group_add_toggle_button(group, &priv.replace_tabs, "replace_tabs", file_prefs.replace_tabs, "check_replace_tabs1"); + group = stash_group_new("file_prefs"); + add_stash_group(group); + + group = stash_group_new("line_wrapping"); + stash_group_add_toggle_button(group, &priv.line_wrapping, + "line_wrapping", editor_prefs.line_wrapping, "check_line_wrapping1"); add_stash_group(group); /* apply defaults */ kf = g_key_file_new(); Modified: src/projectprivate.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -39,6 +39,7 @@ typedef struct GeanyProjectPrivate GPtrArray *build_filetypes_list; /* Project has custom filetype builds for these. */ gint long_line_behaviour; /* 0 - disabled, 1 - follow global settings, 2 - enabled (custom) */ gint long_line_column; /* Long line marker position. */ + gboolean line_wrapping; } GeanyProjectPrivate; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 2b9848: Merge pull request #335 from ntrel/save-cleanup
by Nick Treleaven 26 Sep '14

26 Sep '14

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Fri, 26 Sep 2014 10:45:27 UTC Commit: 2b98487a70953fc268a5fa76c774f1c676adf0d2 https://github.com/geany/geany/commit/2b98487a70953fc268a5fa76c774f1c676adf… Log Message: ----------- Merge pull request #335 from ntrel/save-cleanup Notify user when trying to save read-only document Modified Paths: -------------- src/document.c src/documentprivate.h Modified: src/document.c 10 lines changed, 7 insertions(+), 3 deletions(-) =================================================================== @@ -1655,6 +1655,7 @@ gboolean document_save_file_as(GeanyDocument *doc, const gchar *utf8_fname) if (new_file) { + // assume user wants to throw away read-only setting sci_set_readonly(doc->editor->sci, FALSE); doc->readonly = FALSE; if (doc->priv->protected > 0) @@ -1928,11 +1929,14 @@ gboolean document_save_file(GeanyDocument *doc, gboolean force) return dialogs_show_save_as(); } - /* the "changed" flag should exclude the "readonly" flag, but check it anyway for safety */ - if (doc->readonly) - return FALSE; if (!force && !doc->changed) return FALSE; + if (doc->readonly) + { + ui_set_statusbar(TRUE, + _("Cannot save read-only document '%s'!"), DOC_FILENAME(doc)); + return FALSE; + } if (doc->priv->protected) { return save_file_handle_infobars(doc, force); Modified: src/documentprivate.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -93,7 +93,7 @@ typedef struct GeanyDocumentPrivate time_t mtime; /* ID of the idle callback updating the tag list */ guint tag_list_update_source; - /* Whether it's temoporarily protected (read-only and saving is prevented). Does + /* Whether it's temporarily protected (read-only and saving needs confirmation). Does * not imply doc->readonly as writable files can be protected */ gint protected; /* Save pointer to info bars allowing to cancel them programatically (to avoid multiple ones) */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 3ab657: Notify user when trying to save read-only document
by Nick Treleaven 26 Sep '14

26 Sep '14

1 0

[geany/geany] 4ceb9f: Add comment about throwing away read-only for renamed documents
by Nick Treleaven 26 Sep '14

26 Sep '14

Branch: refs/heads/master Author: Nick Treleaven <nick.treleaven(a)btinternet.com> Committer: Nick Treleaven <nick.treleaven(a)btinternet.com> Date: Fri, 26 Sep 2014 10:44:05 UTC Commit: 4ceb9fb1f27b7a73631566bf0f3df273fe16f7db https://github.com/geany/geany/commit/4ceb9fb1f27b7a73631566bf0f3df273fe16f… Log Message: ----------- Add comment about throwing away read-only for renamed documents Modified Paths: -------------- src/document.c src/documentprivate.h Modified: src/document.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1655,6 +1655,7 @@ gboolean document_save_file_as(GeanyDocument *doc, const gchar *utf8_fname) if (new_file) { + // assume user wants to throw away read-only setting sci_set_readonly(doc->editor->sci, FALSE); doc->readonly = FALSE; if (doc->priv->protected > 0) Modified: src/documentprivate.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -93,7 +93,7 @@ typedef struct GeanyDocumentPrivate time_t mtime; /* ID of the idle callback updating the tag list */ guint tag_list_update_source; - /* Whether it's temoporarily protected (read-only and saving is prevented). Does + /* Whether it's temporarily protected (read-only and saving needs confirmation). Does * not imply doc->readonly as writable files can be protected */ gint protected; /* Save pointer to info bars allowing to cancel them programatically (to avoid multiple ones) */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 96806b: Merge branch 'scintilla-update-351-pre'
by Colomban Wendling 26 Sep '14

26 Sep '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Thu, 25 Sep 2014 22:31:03 UTC Commit: 96806bf639d08038c1406854c7e031bdc18b3313 https://github.com/geany/geany/commit/96806bf639d08038c1406854c7e031bdc18b3… Log Message: ----------- Merge branch 'scintilla-update-351-pre' Modified Paths: -------------- data/filetypes.sql data/filetypes.vhdl scintilla/gtk/PlatGTK.cxx scintilla/gtk/ScintillaGTK.cxx scintilla/include/SciLexer.h scintilla/include/Scintilla.h scintilla/include/Scintilla.iface scintilla/lexers/LexSQL.cxx scintilla/lexers/LexVHDL.cxx scintilla/scintilla_changes.patch scintilla/src/Document.cxx scintilla/src/EditModel.cxx scintilla/src/EditModel.h scintilla/src/EditView.cxx scintilla/src/EditView.h scintilla/src/Editor.cxx scintilla/src/Editor.h scintilla/src/Indicator.h scintilla/src/RESearch.cxx scintilla/src/ViewStyle.cxx scintilla/version.txt src/highlightingmappings.h Modified: data/filetypes.sql 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -19,6 +19,7 @@ sqlplus=default sqlplus_prompt=default sqlplus_comment=comment quotedidentifier=identifier_2 +qoperator=operator [keywords] # all items must be in one line Modified: data/filetypes.vhdl 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -4,6 +4,7 @@ default=default comment=comment comment_line_bang=comment_line +block_comment=comment number=number_1 string=string_1 operator=operator Modified: scintilla/gtk/PlatGTK.cxx 29 lines changed, 19 insertions(+), 10 deletions(-) =================================================================== @@ -811,9 +811,9 @@ void SurfaceImpl::DrawRGBAImage(PRectangle rc, int width, int height, const unsi #endif int ucs = stride * height; std::vector<unsigned char> image(ucs); - for (int y=0; y<height; y++) { - for (int x=0; x<width; x++) { - unsigned char *pixel = &image[0] + y*stride + x * 4; + 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]; pixel[2] = (*pixelsImage++) * alpha / 255; pixel[1] = (*pixelsImage++) * alpha / 255; @@ -822,12 +822,12 @@ void SurfaceImpl::DrawRGBAImage(PRectangle rc, int width, int height, const unsi } } - cairo_surface_t *psurf = cairo_image_surface_create_for_data(&image[0], CAIRO_FORMAT_ARGB32, width, height, stride); - cairo_set_source_surface(context, psurf, rc.left, rc.top); + cairo_surface_t *psurfImage = cairo_image_surface_create_for_data(&image[0], CAIRO_FORMAT_ARGB32, width, height, stride); + cairo_set_source_surface(context, psurfImage, rc.left, rc.top); cairo_rectangle(context, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top); cairo_fill(context); - cairo_surface_destroy(psurf); + cairo_surface_destroy(psurfImage); } void SurfaceImpl::Ellipse(PRectangle rc, ColourDesired fore, ColourDesired back) { @@ -1625,10 +1625,10 @@ void ListBoxX::Create(Window &, int, Point, int, bool, int) { 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); - GtkWidget *wid = PWidget(list); // No code inside the G_OBJECT macro - gtk_container_add(GTK_CONTAINER(PWidget(scroller)), wid); - gtk_widget_show(wid); - g_signal_connect(G_OBJECT(wid), "button_press_event", + GtkWidget *widget = PWidget(list); // No code inside the G_OBJECT macro + gtk_container_add(GTK_CONTAINER(PWidget(scroller)), widget); + gtk_widget_show(widget); + g_signal_connect(G_OBJECT(widget), "button_press_event", G_CALLBACK(ButtonPress), this); } @@ -1658,6 +1658,14 @@ int ListBoxX::GetVisibleRows() const { int ListBoxX::GetRowHeight() { +#if GTK_CHECK_VERSION(3,0,0) + // This version sometimes reports erroneous results on GTK2, but the GTK2 + // version is inaccurate for GTK 3.14. + GdkRectangle rect; + GtkTreePath *path = gtk_tree_path_new_first(); + gtk_tree_view_get_background_area(GTK_TREE_VIEW(list), path, NULL, &rect); + return rect.height; +#else int row_height=0; int vertical_separator=0; int expander_size=0; @@ -1669,6 +1677,7 @@ int ListBoxX::GetRowHeight() row_height += vertical_separator; row_height = Platform::Maximum(row_height, expander_size); return row_height; +#endif } PRectangle ListBoxX::GetDesiredRect() { Modified: scintilla/gtk/ScintillaGTK.cxx 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -55,6 +55,7 @@ #include "Document.h" #include "CaseConvert.h" #include "UniConversion.h" +#include "UnicodeFromUTF8.h" #include "Selection.h" #include "PositionCache.h" #include "EditModel.h" @@ -63,7 +64,6 @@ #include "Editor.h" #include "AutoComplete.h" #include "ScintillaBase.h" -#include "UnicodeFromUTF8.h" #ifdef SCI_LEXER #include "ExternalLexer.h" Modified: scintilla/include/SciLexer.h 10 lines changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -128,6 +128,7 @@ #define SCLEX_AS 113 #define SCLEX_DMIS 114 #define SCLEX_REGISTRY 115 +#define SCLEX_BIBTEX 116 #define SCLEX_AUTOMATIC 1000 #define SCE_P_DEFAULT 0 #define SCE_P_COMMENTLINE 1 @@ -1004,6 +1005,7 @@ #define SCE_VHDL_STDPACKAGE 12 #define SCE_VHDL_STDTYPE 13 #define SCE_VHDL_USERWORD 14 +#define SCE_VHDL_BLOCK_COMMENT 15 #define SCE_CAML_DEFAULT 0 #define SCE_CAML_IDENTIFIER 1 #define SCE_CAML_TAGNAME 2 @@ -1115,6 +1117,7 @@ #define SCE_SQL_USER3 21 #define SCE_SQL_USER4 22 #define SCE_SQL_QUOTEDIDENTIFIER 23 +#define SCE_SQL_QOPERATOR 24 #define SCE_ST_DEFAULT 0 #define SCE_ST_STRING 1 #define SCE_ST_NUMBER 2 @@ -1731,6 +1734,13 @@ #define SCE_REG_STRING_GUID 10 #define SCE_REG_PARAMETER 11 #define SCE_REG_OPERATOR 12 +#define SCE_BIBTEX_DEFAULT 0 +#define SCE_BIBTEX_ENTRY 1 +#define SCE_BIBTEX_UNKNOWN_ENTRY 2 +#define SCE_BIBTEX_KEY 3 +#define SCE_BIBTEX_PARAMETER 4 +#define SCE_BIBTEX_VALUE 5 +#define SCE_BIBTEX_COMMENT 6 /* --Autogenerated -- end of section automatically generated from Scintilla.iface */ #endif Modified: scintilla/include/Scintilla.h 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -97,6 +97,10 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define SCI_GETNEXTTABSTOP 2677 #define SC_CP_UTF8 65001 #define SCI_SETCODEPAGE 2037 +#define SC_IME_WINDOWED 0 +#define SC_IME_INLINE 1 +#define SCI_GETIMEINTERACTION 2678 +#define SCI_SETIMEINTERACTION 2679 #define MARKER_MAX 31 #define SC_MARK_CIRCLE 0 #define SC_MARK_ROUNDRECT 1 @@ -888,6 +892,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define SCI_SCROLLTOEND 2629 #define SC_TECHNOLOGY_DEFAULT 0 #define SC_TECHNOLOGY_DIRECTWRITE 1 +#define SC_TECHNOLOGY_DIRECTWRITERETAIN 2 #define SCI_SETTECHNOLOGY 2630 #define SCI_GETTECHNOLOGY 2631 #define SCI_CREATELOADER 2632 Modified: scintilla/include/Scintilla.iface 23 lines changed, 23 insertions(+), 0 deletions(-) =================================================================== @@ -243,6 +243,16 @@ val SC_CP_UTF8=65001 # The SC_CP_UTF8 value can be used to enter Unicode mode. set void SetCodePage=2037(int codePage,) +enu IMEInteraction=SC_IME_ +val SC_IME_WINDOWED=0 +val SC_IME_INLINE=1 + +# Is the IME displayed in a winow or inline? +get int GetIMEInteraction=2678(,) + +# Choose to display the the IME in a winow or inline. +set void SetIMEInteraction=2679(int imeInteraction,) + enu MarkerSymbol=SC_MARK_ val MARKER_MAX=31 val SC_MARK_CIRCLE=0 @@ -2349,6 +2359,7 @@ fun void ScrollToEnd=2629(,) val SC_TECHNOLOGY_DEFAULT=0 val SC_TECHNOLOGY_DIRECTWRITE=1 +val SC_TECHNOLOGY_DIRECTWRITERETAIN=2 # Set the technology used. set void SetTechnology=2630(int technology,) @@ -2700,6 +2711,7 @@ val SCLEX_DMAP=112 val SCLEX_AS=113 val SCLEX_DMIS=114 val SCLEX_REGISTRY=115 +val SCLEX_BIBTEX=116 # When a lexer specifies its language as SCLEX_AUTOMATIC it receives a # value assigned in sequence from SCLEX_AUTOMATIC+1. @@ -3703,6 +3715,7 @@ val SCE_VHDL_STDFUNCTION=11 val SCE_VHDL_STDPACKAGE=12 val SCE_VHDL_STDTYPE=13 val SCE_VHDL_USERWORD=14 +val SCE_VHDL_BLOCK_COMMENT=15 # Lexical states for SCLEX_CAML lex Caml=SCLEX_CAML SCE_CAML_ val SCE_CAML_DEFAULT=0 @@ -3824,6 +3837,7 @@ val SCE_SQL_USER2=20 val SCE_SQL_USER3=21 val SCE_SQL_USER4=22 val SCE_SQL_QUOTEDIDENTIFIER=23 +val SCE_SQL_QOPERATOR=24 # Lexical states for SCLEX_SMALLTALK lex Smalltalk=SCLEX_SMALLTALK SCE_ST_ val SCE_ST_DEFAULT=0 @@ -4512,6 +4526,15 @@ val SCE_REG_KEYPATH_GUID=9 val SCE_REG_STRING_GUID=10 val SCE_REG_PARAMETER=11 val SCE_REG_OPERATOR=12 +# Lexical state for SCLEX_BIBTEX +lex BibTeX=SCLEX_BIBTEX SCE_BIBTEX_ +val SCE_BIBTEX_DEFAULT=0 +val SCE_BIBTEX_ENTRY=1 +val SCE_BIBTEX_UNKNOWN_ENTRY=2 +val SCE_BIBTEX_KEY=3 +val SCE_BIBTEX_PARAMETER=4 +val SCE_BIBTEX_VALUE=5 +val SCE_BIBTEX_COMMENT=6 # Events Modified: scintilla/lexers/LexSQL.cxx 32 lines changed, 31 insertions(+), 1 deletions(-) =================================================================== @@ -444,6 +444,8 @@ void SCI_METHOD LexerSQL::Lex(unsigned int startPos, int length, int initStyle, StyleContext sc(startPos, length, initStyle, styler); int styleBeforeDCKeyword = SCE_SQL_DEFAULT; int offset = 0; + char qOperator = 0x00; + for (; sc.More(); sc.Forward(), offset++) { // Determine if the current state should terminate. switch (sc.state) { @@ -556,11 +558,39 @@ void SCI_METHOD LexerSQL::Lex(unsigned int startPos, int length, int initStyle, } } break; + case SCE_SQL_QOPERATOR: + if (qOperator == 0x00) { + qOperator = sc.ch; + } else { + char qComplement = 0x00; + + if (qOperator == '<') { + qComplement = '>'; + } else if (qOperator == '(') { + qComplement = ')'; + } else if (qOperator == '{') { + qComplement = '}'; + } else if (qOperator == '[') { + qComplement = ']'; + } else { + qComplement = qOperator; + } + + if (sc.Match(qComplement, '\'')) { + sc.Forward(); + sc.ForwardSetState(SCE_SQL_DEFAULT); + qOperator = 0x00; + } + } + break; } // Determine if a new state should be entered. if (sc.state == SCE_SQL_DEFAULT) { - if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) { + if (sc.Match('q', '\'') || sc.Match('Q', '\'')) { + sc.SetState(SCE_SQL_QOPERATOR); + sc.Forward(); + } else if (IsADigit(sc.ch) || (sc.ch == '.' && IsADigit(sc.chNext))) { sc.SetState(SCE_SQL_NUMBER); } else if (IsAWordStart(sc.ch)) { sc.SetState(SCE_SQL_IDENTIFIER); Modified: scintilla/lexers/LexVHDL.cxx 124 lines changed, 101 insertions(+), 23 deletions(-) =================================================================== @@ -119,6 +119,11 @@ static void ColouriseVHDLDoc( sc.ChangeState(SCE_VHDL_STRINGEOL); sc.ForwardSetState(SCE_VHDL_DEFAULT); } + } else if (sc.state == SCE_VHDL_BLOCK_COMMENT){ + if(sc.ch == '*' && sc.chNext == '/'){ + sc.Forward(); + sc.ForwardSetState(SCE_VHDL_DEFAULT); + } } // Determine if a new state should be entered. @@ -132,6 +137,8 @@ static void ColouriseVHDLDoc( sc.SetState(SCE_VHDL_COMMENTLINEBANG); else sc.SetState(SCE_VHDL_COMMENT); + } else if (sc.Match('/', '*')){ + sc.SetState(SCE_VHDL_BLOCK_COMMENT); } else if (sc.ch == '\"') { sc.SetState(SCE_VHDL_STRING); } else if (isoperator(static_cast<char>(sc.ch))) { @@ -155,6 +162,39 @@ static bool IsCommentLine(int line, Accessor &styler) { } return false; } +static bool IsCommentBlockStart(int line, Accessor &styler) +{ + int pos = styler.LineStart(line); + int eol_pos = styler.LineStart(line + 1) - 1; + for (int i = pos; i < eol_pos; i++) { + char ch = styler[i]; + char chNext = styler[i+1]; + char style = styler.StyleAt(i); + if ((style == SCE_VHDL_BLOCK_COMMENT) && (ch == '/') && (chNext == '*')) + return true; + } + return false; +} + +static bool IsCommentBlockEnd(int line, Accessor &styler) +{ + int pos = styler.LineStart(line); + int eol_pos = styler.LineStart(line + 1) - 1; + + for (int i = pos; i < eol_pos; i++) { + char ch = styler[i]; + char chNext = styler[i+1]; + char style = styler.StyleAt(i); + if ((style == SCE_VHDL_BLOCK_COMMENT) && (ch == '*') && (chNext == '/')) + return true; + } + return false; +} + +static bool IsCommentStyle(char style) +{ + return style == SCE_VHDL_BLOCK_COMMENT || style == SCE_VHDL_COMMENT || style == SCE_VHDL_COMMENTLINEBANG; +} //============================================================================= // Folding the code @@ -207,14 +247,14 @@ static void FoldNoBoxVHDLDoc( char chPrev = styler.SafeGetCharAt(j-1); int style = styler.StyleAt(j); int stylePrev = styler.StyleAt(j-1); - if ((stylePrev != SCE_VHDL_COMMENT) && (stylePrev != SCE_VHDL_STRING)) + if ((!IsCommentStyle(style)) && (stylePrev != SCE_VHDL_STRING)) { if(IsAWordChar(chPrev) && !IsAWordChar(ch)) { end = j-1; } } - if ((style != SCE_VHDL_COMMENT) && (style != SCE_VHDL_STRING)) + if ((!IsCommentStyle(style)) && (style != SCE_VHDL_STRING)) { if(!IsAWordChar(chPrev) && IsAWordStart(ch) && (end != 0)) { @@ -236,7 +276,7 @@ static void FoldNoBoxVHDLDoc( { char ch = styler.SafeGetCharAt(j); int style = styler.StyleAt(j); - if ((style != SCE_VHDL_COMMENT) && (style != SCE_VHDL_STRING)) + if ((!IsCommentStyle(style)) && (style != SCE_VHDL_STRING)) { if((ch == ';') && (strcmp(prevWord, "end") == 0)) { @@ -268,15 +308,29 @@ static void FoldNoBoxVHDLDoc( styleNext = styler.StyleAt(i + 1); bool atEOL = (ch == '\r' && chNext != '\n') || (ch == '\n'); - if (foldComment && atEOL && IsCommentLine(lineCurrent, styler)) + if (foldComment && atEOL) { - if(!IsCommentLine(lineCurrent-1, styler) && IsCommentLine(lineCurrent+1, styler)) + if(IsCommentLine(lineCurrent, styler)) { - levelNext++; + if(!IsCommentLine(lineCurrent-1, styler) && IsCommentLine(lineCurrent+1, styler)) + { + levelNext++; + } + else if(IsCommentLine(lineCurrent-1, styler) && !IsCommentLine(lineCurrent+1, styler)) + { + levelNext--; + } } - else if(IsCommentLine(lineCurrent-1, styler) && !IsCommentLine(lineCurrent+1, styler)) + else { - levelNext--; + if (IsCommentBlockStart(lineCurrent, styler) && !IsCommentBlockEnd(lineCurrent, styler)) + { + levelNext++; + } + else if (IsCommentBlockEnd(lineCurrent, styler) && !IsCommentBlockStart(lineCurrent, styler)) + { + levelNext--; + } } } @@ -289,7 +343,7 @@ static void FoldNoBoxVHDLDoc( } } - if ((style != SCE_VHDL_COMMENT) && (style != SCE_VHDL_STRING)) + if ((!IsCommentStyle(style)) && (style != SCE_VHDL_STRING)) { if((ch == ';') && (strcmp(prevWord, "end") == 0)) { @@ -301,7 +355,7 @@ static void FoldNoBoxVHDLDoc( lastStart = i; } - if(iswordchar(ch) && !iswordchar(chNext)) { + if(IsAWordChar(ch) && !IsAWordChar(chNext)) { char s[32]; unsigned int k; for(k=0; (k<31 ) && (k<i-lastStart+1 ); k++) { @@ -314,8 +368,6 @@ static void FoldNoBoxVHDLDoc( if ( strcmp(s, "architecture") == 0 || strcmp(s, "case") == 0 || - strcmp(s, "component") == 0 || - strcmp(s, "entity") == 0 || strcmp(s, "generate") == 0 || strcmp(s, "loop") == 0 || strcmp(s, "package") ==0 || @@ -331,6 +383,32 @@ static void FoldNoBoxVHDLDoc( levelNext++; } } else if ( + strcmp(s, "component") == 0 || + strcmp(s, "entity") == 0 || + strcmp(s, "configuration") == 0 ) + { + if (strcmp(prevWord, "end") != 0) + { // check for instantiated unit by backward searching for the colon. + unsigned pos = lastStart-1; + char chAtPos, styleAtPos; + do{// skip white spaces + styleAtPos = styler.StyleAt(pos); + chAtPos = styler.SafeGetCharAt(pos--); + }while(pos>0 && + (chAtPos == ' ' || chAtPos == '\t' || + chAtPos == '\n' || chAtPos == '\r' || + IsCommentStyle(styleAtPos))); + + // check for a colon (':') before the instantiated units "entity", "component" or "configuration". Don't fold thereafter. + if (chAtPos != ':') + { + if (levelMinCurrentElse > levelNext) { + levelMinCurrentElse = levelNext; + } + levelNext++; + } + } + } else if ( strcmp(s, "procedure") == 0 || strcmp(s, "function") == 0) { @@ -338,19 +416,19 @@ static void FoldNoBoxVHDLDoc( { // This code checks to see if the procedure / function is a definition within a "package" // rather than the actual code in the body. int BracketLevel = 0; - for(int j=i+1; j<styler.Length(); j++) + for(int pos=i+1; pos<styler.Length(); pos++) { - int LocalStyle = styler.StyleAt(j); - char LocalCh = styler.SafeGetCharAt(j); - if(LocalCh == '(') BracketLevel++; - if(LocalCh == ')') BracketLevel--; + int styleAtPos = styler.StyleAt(pos); + char chAtPos = styler.SafeGetCharAt(pos); + if(chAtPos == '(') BracketLevel++; + if(chAtPos == ')') BracketLevel--; if( (BracketLevel == 0) && - (LocalStyle != SCE_VHDL_COMMENT) && - (LocalStyle != SCE_VHDL_STRING) && - !iswordchar(styler.SafeGetCharAt(j-1)) && - styler.Match(j, "is") && - !iswordchar(styler.SafeGetCharAt(j+2))) + (!IsCommentStyle(styleAtPos)) && + (styleAtPos != SCE_VHDL_STRING) && + !iswordchar(styler.SafeGetCharAt(pos-1)) && + styler.Match(pos, "is") && + !iswordchar(styler.SafeGetCharAt(pos+2))) { if (levelMinCurrentElse > levelNext) { levelMinCurrentElse = levelNext; @@ -358,7 +436,7 @@ static void FoldNoBoxVHDLDoc( levelNext++; break; } - if((BracketLevel == 0) && (LocalCh == ';')) + if((BracketLevel == 0) && (chAtPos == ';')) { break; } Modified: scintilla/scintilla_changes.patch 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -31,7 +31,7 @@ diff --git b/scintilla/src/Catalogue.cxx a/scintilla/src/Catalogue.cxx index 41d5d54..70ce3bc 100644 --- scintilla/src/Catalogue.cxx +++ scintilla/src/Catalogue.cxx -@@ -76,116 +76,48 @@ int Scintilla_LinkLexers() { +@@ -76,117 +76,48 @@ int Scintilla_LinkLexers() { //++Autogenerated -- run scripts/LexGen.py to regenerate //**$\tLINK_LEXER(\*);\n$ @@ -49,6 +49,7 @@ index 41d5d54..70ce3bc 100644 - LINK_LEXER(lmBaan); LINK_LEXER(lmBash); LINK_LEXER(lmBatch); +- LINK_LEXER(lmBibTeX); - LINK_LEXER(lmBlitzBasic); - LINK_LEXER(lmBullant); LINK_LEXER(lmCaml); Modified: scintilla/src/Document.cxx 14 lines changed, 8 insertions(+), 6 deletions(-) =================================================================== @@ -937,6 +937,8 @@ void Document::CheckReadOnly() { // SetStyleAt does not change the persistent state of a document bool Document::DeleteChars(int pos, int len) { + if (pos < 0) + return false; if (len <= 0) return false; if ((pos + len) > Length()) @@ -2198,8 +2200,8 @@ class DocumentIndexer : public CharacterIndexer { long BuiltinRegex::FindText(Document *doc, int minPos, int maxPos, const char *s, bool caseSensitive, bool, bool, int flags, int *length) { - bool posix = (flags & SCFIND_POSIX) != 0; - int increment = (minPos <= maxPos) ? 1 : -1; + const bool posix = (flags & SCFIND_POSIX) != 0; + const int increment = (minPos <= maxPos) ? 1 : -1; int startPos = minPos; int endPos = maxPos; @@ -2217,7 +2219,7 @@ long BuiltinRegex::FindText(Document *doc, int minPos, int maxPos, const char *s // Search: \$($[A-Za-z0-9_-]+$\.$[A-Za-z0-9_.]+$) // Replace: $(\1-\2) int lineRangeStart = doc->LineFromPosition(startPos); - int lineRangeEnd = doc->LineFromPosition(endPos); + const int lineRangeEnd = doc->LineFromPosition(endPos); if ((increment == 1) && (startPos >= doc->LineEnd(lineRangeStart)) && (lineRangeStart < lineRangeEnd)) { @@ -2233,9 +2235,9 @@ long BuiltinRegex::FindText(Document *doc, int minPos, int maxPos, const char *s } int pos = -1; int lenRet = 0; - char searchEnd = s[*length - 1]; - char searchEndPrev = (*length > 1) ? s[*length - 2] : '\0'; - int lineRangeBreak = lineRangeEnd + increment; + const char searchEnd = s[*length - 1]; + const char searchEndPrev = (*length > 1) ? s[*length - 2] : '\0'; + const int lineRangeBreak = lineRangeEnd + increment; for (int line = lineRangeStart; line != lineRangeBreak; line += increment) { int startOfLine = doc->LineStart(line); int endOfLine = doc->LineEnd(line); Modified: scintilla/src/EditModel.cxx 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -61,6 +61,7 @@ EditModel::EditModel() { bracesMatchStyle = STYLE_BRACEBAD; highlightGuideColumn = 0; primarySelection = true; + imeInteraction = imeWindowed; foldFlags = 0; hotspot = Range(invalidPosition); wrapWidth = LineLayout::wrapWidthInfinite; Modified: scintilla/src/EditModel.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -42,6 +42,8 @@ class EditModel { Selection sel; bool primarySelection; + enum IMEInteraction { imeWindowed, imeInline } imeInteraction; + int foldFlags; ContractionState cs; // Hotspot support Modified: scintilla/src/EditView.cxx 13 lines changed, 6 insertions(+), 7 deletions(-) =================================================================== @@ -215,11 +215,11 @@ void EditView::ClearAllTabstops() { ldTabstops = 0; } -int EditView::NextTabstopPos(int line, int x, int tabWidth) const { - int next = GetNextTabstop(line, x); +XYPOSITION EditView::NextTabstopPos(int line, XYPOSITION x, XYPOSITION tabWidth) const { + int next = GetNextTabstop(line, static_cast<int>(x + 2)); if (next > 0) - return next; - return ((((x + 2) / tabWidth) + 1) * tabWidth); + return static_cast<XYPOSITION>(next); + return (static_cast<int>((x + 2) / tabWidth) + 1) * tabWidth; } bool EditView::ClearTabstops(int line) { @@ -452,9 +452,8 @@ void EditView::LayoutLine(const EditModel &model, int line, Surface *surface, co XYPOSITION representationWidth = vstyle.controlCharWidth; if (ll->chars[ts.start] == '\t') { // Tab is a special case of representation, taking a variable amount of space - const int x = static_cast<int>(ll->positions[ts.start]); - const int tabWidth = static_cast<int>(vstyle.tabWidth); - representationWidth = static_cast<XYPOSITION>(NextTabstopPos(line, x, tabWidth) - ll->positions[ts.start]); + const XYPOSITION x = ll->positions[ts.start]; + representationWidth = NextTabstopPos(line, x, vstyle.tabWidth) - ll->positions[ts.start]; } else { if (representationWidth <= 0.0) { XYPOSITION positionsRepr[256]; // Should expand when needed Modified: scintilla/src/EditView.h 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -32,7 +32,7 @@ enum DrawPhase { drawLineTranslucent = 0x40, drawFoldLines = 0x80, drawCarets = 0x100, - drawAll = 0x1FF, + drawAll = 0x1FF }; bool ValidStyledText(const ViewStyle &vs, size_t styleOffset, const StyledText &st); @@ -86,7 +86,7 @@ class EditView { bool LinesOverlap() const; void ClearAllTabstops(); - int NextTabstopPos(int line, int x, int tabWidth) const; + XYPOSITION NextTabstopPos(int line, XYPOSITION x, XYPOSITION tabWidth) const; bool ClearTabstops(int line); bool AddTabstop(int line, int x); int GetNextTabstop(int line, int x) const; Modified: scintilla/src/Editor.cxx 17 lines changed, 8 insertions(+), 9 deletions(-) =================================================================== @@ -2132,14 +2132,6 @@ void Editor::Redo() { } } -void Editor::DelChar() { - if (!RangeContainsProtected(sel.MainCaret(), sel.MainCaret() + 1)) { - pdoc->DelChar(sel.MainCaret()); - } - // Avoid blinking during rapid typing: - ShowCaretAtCurrentPosition(); -} - void Editor::DelCharBack(bool allowLineStartDeletion) { RefreshStyleData(); if (!sel.IsRectangular()) @@ -4284,7 +4276,7 @@ void Editor::ButtonDown(Point pt, unsigned int curTime, bool shift, bool ctrl, b } bool Editor::PositionIsHotspot(int position) const { - return vs.styles[pdoc->StyleAt(position)].hotspot; + return vs.styles[static_cast<unsigned char>(pdoc->StyleAt(position))].hotspot; } bool Editor::PointIsHotspot(Point pt) { @@ -6259,6 +6251,13 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) { case SCI_GETCODEPAGE: return pdoc->dbcsCodePage; + case SCI_SETIMEINTERACTION: + imeInteraction = static_cast<EditModel::IMEInteraction>(wParam); + break; + + case SCI_GETIMEINTERACTION: + return imeInteraction; + #ifdef INCLUDE_DEPRECATED_FEATURES case SCI_SETUSEPALETTE: InvalidateStyleRedraw(); Modified: scintilla/src/Editor.h 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -403,7 +403,6 @@ class Editor : public EditModel, public DocWatcher { void SelectAll(); void Undo(); void Redo(); - void DelChar(); void DelCharBack(bool allowLineStartDeletion); virtual void ClaimSelection() = 0; Modified: scintilla/src/Indicator.h 7 lines changed, 5 insertions(+), 2 deletions(-) =================================================================== @@ -17,11 +17,14 @@ namespace Scintilla { class Indicator { public: int style; - bool under; ColourDesired fore; + bool under; int fillAlpha; int outlineAlpha; - Indicator() : style(INDIC_PLAIN), under(false), fore(ColourDesired(0,0,0)), fillAlpha(30), outlineAlpha(50) { + Indicator() : style(INDIC_PLAIN), fore(ColourDesired(0,0,0)), under(false), fillAlpha(30), outlineAlpha(50) { + } + Indicator(int style_, ColourDesired fore_=ColourDesired(0,0,0), bool under_=false, int fillAlpha_=30, int outlineAlpha_=50) : + style(style_), fore(fore_), under(under_), fillAlpha(fillAlpha_), outlineAlpha(outlineAlpha_) { } void Draw(Surface *surface, const PRectangle &rc, const PRectangle &rcLine) const; }; Modified: scintilla/src/RESearch.cxx 3 lines changed, 1 insertions(+), 2 deletions(-) =================================================================== @@ -276,10 +276,9 @@ void RESearch::GrabMatches(CharacterIndexer &ci) { for (unsigned int i = 0; i < MAXTAG; i++) { if ((bopat[i] != NOTFOUND) && (eopat[i] != NOTFOUND)) { unsigned int len = eopat[i] - bopat[i]; - pat[i] = std::string(len+1, '\0'); + pat[i].resize(len); for (unsigned int j = 0; j < len; j++) pat[i][j] = ci.CharAt(bopat[i] + j); - pat[i][len] = '\0'; } } } Modified: scintilla/src/ViewStyle.cxx 12 lines changed, 3 insertions(+), 9 deletions(-) =================================================================== @@ -192,15 +192,9 @@ void ViewStyle::Init(size_t stylesSize_) { // There are no image markers by default, so no need for calling CalcLargestMarkerHeight() largestMarkerHeight = 0; - indicators[0].style = INDIC_SQUIGGLE; - indicators[0].under = false; - indicators[0].fore = ColourDesired(0, 0x7f, 0); - indicators[1].style = INDIC_TT; - indicators[1].under = false; - indicators[1].fore = ColourDesired(0, 0, 0xff); - indicators[2].style = INDIC_PLAIN; - indicators[2].under = false; - indicators[2].fore = ColourDesired(0xff, 0, 0); + indicators[0] = Indicator(INDIC_SQUIGGLE, ColourDesired(0, 0x7f, 0)); + indicators[1] = Indicator(INDIC_TT, ColourDesired(0, 0, 0xff)); + indicators[2] = Indicator(INDIC_PLAIN, ColourDesired(0xff, 0, 0)); technology = SC_TECHNOLOGY_DEFAULT; lineHeight = 1; Modified: scintilla/version.txt 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1 +1 @@ -350 +351 Modified: src/highlightingmappings.h 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -1388,7 +1388,8 @@ static const HLStyle highlighting_styles_SQL[] = { SCE_SQL_SQLPLUS, "sqlplus", FALSE }, { SCE_SQL_SQLPLUS_PROMPT, "sqlplus_prompt", FALSE }, { SCE_SQL_SQLPLUS_COMMENT, "sqlplus_comment", FALSE }, - { SCE_SQL_QUOTEDIDENTIFIER, "quotedidentifier", FALSE } + { SCE_SQL_QUOTEDIDENTIFIER, "quotedidentifier", FALSE }, + { SCE_SQL_QOPERATOR, "qoperator", FALSE } /* these are for user-defined keywords we don't set yet */ /*{ SCE_SQL_USER1, "user1", FALSE }, { SCE_SQL_USER2, "user2", FALSE }, @@ -1483,6 +1484,7 @@ static const HLStyle highlighting_styles_VHDL[] = { SCE_VHDL_DEFAULT, "default", FALSE }, { SCE_VHDL_COMMENT, "comment", FALSE }, { SCE_VHDL_COMMENTLINEBANG, "comment_line_bang", FALSE }, + { SCE_VHDL_BLOCK_COMMENT, "block_comment", FALSE }, { SCE_VHDL_NUMBER, "number", FALSE }, { SCE_VHDL_STRING, "string", FALSE }, { SCE_VHDL_OPERATOR, "operator", FALSE }, -------------- 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 September 2014