Commits March 2013

commits@lists.geany.org

1 participants
95 discussions

[geany/geany] b1fb2a: Fix various line length computation issues for the last line
by Colomban Wendling 20 Mar '13

20 Mar '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 20 Mar 2013 22:17:19 UTC Commit: b1fb2ab053acb084483630c31d6f88621000c563 https://github.com/geany/geany/commit/b1fb2ab053acb084483630c31d6f88621000c… Log Message: ----------- Fix various line length computation issues for the last line The last line doesn't have EOL characters, so computing (line_length() - eol_length()) is wrong on the last line. Instead, use (line_end_pos() - line_start_pos()) as suggests Scintilla's documentation. Closes PR#124 Modified Paths: -------------- src/editor.c Modified: src/editor.c 38 files changed, 15 insertions(+), 23 deletions(-) =================================================================== @@ -1555,7 +1555,7 @@ static void close_block(GeanyEditor *editor, gint pos) { const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); gint x = 0, cnt = 0; - gint line, line_len, eol_char_len; + gint line, line_len; gchar *text, *line_buf; ScintillaObject *sci; gint line_indent, last_indent; @@ -1570,15 +1570,12 @@ static void close_block(GeanyEditor *editor, gint pos) return; line = sci_get_line_from_position(sci, pos); - line_len = sci_get_line_length(sci, line); - /* set eol_char_len to 0 if on last line, because there is no EOL char */ - eol_char_len = (line == (sci_get_line_count(sci) - 1)) ? 0 : - editor_get_eol_char_len(editor); + line_len = sci_get_line_end_position(sci, line) - sci_get_position_from_line(sci, line); /* check that the line is empty, to not kill text in the line */ line_buf = sci_get_line(sci, line); - line_buf[line_len - eol_char_len] = '\0'; - while (x < (line_len - eol_char_len)) + line_buf[line_len] = '\0'; + while (x < line_len) { if (isspace(line_buf[x])) cnt++; @@ -1586,7 +1583,7 @@ static void close_block(GeanyEditor *editor, gint pos) } g_free(line_buf); - if ((line_len - eol_char_len - 1) != cnt) + if ((line_len - 1) != cnt) return; if (iprefs->auto_indent_mode == GEANY_AUTOINDENT_MATCHBRACES) @@ -2923,7 +2920,7 @@ static gint get_multiline_comment_style(GeanyEditor *editor, gint line_start) * it returns just 1 */ gint editor_do_uncomment(GeanyEditor *editor, gint line, gboolean toggle) { - gint first_line, last_line, eol_char_len; + gint first_line, last_line; gint x, i, line_start, line_len; gint sel_start, sel_end; gint count = 0; @@ -2953,7 +2950,6 @@ gint editor_do_uncomment(GeanyEditor *editor, gint line, gboolean toggle) } ft = editor_get_filetype_at_line(editor, first_line); - eol_char_len = editor_get_eol_char_len(editor); if (! filetype_get_comment_open_close(ft, TRUE, &co, &cc)) return 0; @@ -2969,10 +2965,10 @@ gint editor_do_uncomment(GeanyEditor *editor, gint line, gboolean toggle) gint buf_len; line_start = sci_get_position_from_line(editor->sci, i); - line_len = sci_get_line_length(editor->sci, i); + line_len = sci_get_line_end_position(editor->sci, i) - line_start; x = 0; - buf_len = MIN((gint)sizeof(sel) - 1, line_len - eol_char_len); + buf_len = MIN((gint)sizeof(sel) - 1, line_len); if (buf_len <= 0) continue; sci_get_text_range(editor->sci, line_start, line_start + buf_len, sel); @@ -3050,7 +3046,7 @@ gint editor_do_uncomment(GeanyEditor *editor, gint line, gboolean toggle) void editor_do_comment_toggle(GeanyEditor *editor) { - gint first_line, last_line, eol_char_len; + gint first_line, last_line; gint x, i, line_start, line_len, first_line_start; gint sel_start, sel_end; gint count_commented = 0, count_uncommented = 0; @@ -3067,8 +3063,6 @@ void editor_do_comment_toggle(GeanyEditor *editor) sel_start = sci_get_selection_start(editor->sci); sel_end = sci_get_selection_end(editor->sci); - eol_char_len = editor_get_eol_char_len(editor); - first_line = sci_get_line_from_position(editor->sci, sel_start); /* Find the last line with chars selected (not EOL char) */ last_line = sci_get_line_from_position(editor->sci, @@ -3093,10 +3087,10 @@ void editor_do_comment_toggle(GeanyEditor *editor) gint buf_len; line_start = sci_get_position_from_line(editor->sci, i); - line_len = sci_get_line_length(editor->sci, i); + line_len = sci_get_line_end_position(editor->sci, i) - line_start; x = 0; - buf_len = MIN((gint)sizeof(sel) - 1, line_len - eol_char_len); + buf_len = MIN((gint)sizeof(sel) - 1, line_len); if (buf_len < 0) continue; sci_get_text_range(editor->sci, line_start, line_start + buf_len, sel); @@ -3199,7 +3193,7 @@ void editor_do_comment_toggle(GeanyEditor *editor) void editor_do_comment(GeanyEditor *editor, gint line, gboolean allow_empty_lines, gboolean toggle, gboolean single_comment) { - gint first_line, last_line, eol_char_len; + gint first_line, last_line; gint x, i, line_start, line_len; gint sel_start, sel_end, co_len; gchar sel[256]; @@ -3226,8 +3220,6 @@ void editor_do_comment(GeanyEditor *editor, gint line, gboolean allow_empty_line sel_start = sel_end = sci_get_position_from_line(editor->sci, line); } - eol_char_len = editor_get_eol_char_len(editor); - ft = editor_get_filetype_at_line(editor, first_line); if (! filetype_get_comment_open_close(ft, single_comment, &co, &cc)) @@ -3244,10 +3236,10 @@ void editor_do_comment(GeanyEditor *editor, gint line, gboolean allow_empty_line gint buf_len; line_start = sci_get_position_from_line(editor->sci, i); - line_len = sci_get_line_length(editor->sci, i); + line_len = sci_get_line_end_position(editor->sci, i) - line_start; x = 0; - buf_len = MIN((gint)sizeof(sel) - 1, line_len - eol_char_len); + buf_len = MIN((gint)sizeof(sel) - 1, line_len); if (buf_len < 0) continue; sci_get_text_range(editor->sci, line_start, line_start + buf_len, sel); @@ -4097,7 +4089,7 @@ void editor_indicator_set_on_line(GeanyEditor *editor, gint indic, gint line) /* skip blank lines */ if ((start + 1) == end || start > end || - sci_get_line_length(editor->sci, line) == editor_get_eol_char_len(editor)) + (sci_get_line_end_position(editor->sci, line) - start) == 0) { return; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 2cdfee: Adding hint for installation via sudo to documentation
by Frank Lanitz 20 Mar '13

20 Mar '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 20 Mar 2013 20:20:35 UTC Commit: 2cdfeed69e8f7d3ace144df6b3bf2eee00103b93 https://github.com/geany/geany/commit/2cdfeed69e8f7d3ace144df6b3bf2eee00103… Log Message: ----------- Adding hint for installation via sudo to documentation Modified Paths: -------------- doc/geany.txt Modified: doc/geany.txt 4 files changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -143,6 +143,10 @@ Then as root:: % make install +Or via sudo:: + + % sudo make install + Waf based build system ^^^^^^^^^^^^^^^^^^^^^^ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 57940e: Windows: use absolute path to the icons directory
by Colomban Wendling 19 Mar '13

19 Mar '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 19 Mar 2013 15:59:32 UTC Commit: 57940e67a30238eaeba85714fcba7750663e7d75 https://github.com/geany/geany/commit/57940e67a30238eaeba85714fcba7750663e7… Log Message: ----------- Windows: use absolute path to the icons directory Modified Paths: -------------- src/main.c Modified: src/main.c 13 files changed, 8 insertions(+), 5 deletions(-) =================================================================== @@ -228,13 +228,16 @@ static void apply_settings(void) static void main_init(void) { /* add our icon path in case we aren't installed in the system prefix */ -#ifndef G_OS_WIN32 - gchar *path = g_build_filename(GEANY_DATADIR, "icons", NULL); - gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), path); - g_free(path); + gchar *path; +#ifdef G_OS_WIN32 + gchar *install_dir = win32_get_installation_dir(); + path = g_build_filename(install_dir, "share", "icons", NULL); + g_free(install_dir); #else - gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), "share\\icons"); + path = g_build_filename(GEANY_DATADIR, "icons", NULL); #endif + gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), path); + g_free(path); /* inits */ ui_init_stock_items(); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 68f3a9: Filetypes: Add some Ruby file extensions
by Igor Shaula 19 Mar '13

19 Mar '13

Branch: refs/heads/master Author: Igor Shaula <gentoo90(a)gmail.com> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 19 Mar 2013 14:07:43 UTC Commit: 68f3a9fe5a73fa3c98a62e56d5e96307ee9e8b71 https://github.com/geany/geany/commit/68f3a9fe5a73fa3c98a62e56d5e96307ee9e8… Log Message: ----------- Filetypes: Add some Ruby file extensions Modified Paths: -------------- data/filetype_extensions.conf Modified: data/filetype_extensions.conf 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -50,7 +50,7 @@ Python=*.py;*.pyw;SConstruct;SConscript; reStructuredText=*.rest;*.reST;*.rst; R=*.R;*.r; Rust=*.rs -Ruby=*.rb;*.rhtml;*.ruby; +Ruby=*.rb;*.rhtml;*.ruby;*.gemspec;Gemfile;rakefile;Rakefile; Scala=*.scala;*.scl; Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.zsh;*.ash;*.bash;*.m4; SQL=*.sql; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] b7485c: Merge "Improve GTK compatibility macros for GTK 2.16" from eht16/master
by Colomban Wendling 19 Mar '13

19 Mar '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 19 Mar 2013 13:58:50 UTC Commit: b7485c19259fe90b5c2c9ed2245ab3d65af34682 https://github.com/geany/geany/commit/b7485c19259fe90b5c2c9ed2245ab3d65af34… Log Message: ----------- Merge "Improve GTK compatibility macros for GTK 2.16" from eht16/master Modified Paths: -------------- src/gtkcompat.h Modified: src/gtkcompat.h 12 files changed, 10 insertions(+), 2 deletions(-) =================================================================== @@ -72,14 +72,22 @@ /* GtkWidget */ #if ! GTK_CHECK_VERSION(2, 18, 0) -# define compat_widget_set_flag(widget, flag, enable) \ - ((enable) ? GTK_WIDGET_SET_FLAGS((widget), (flag)) : GTK_WIDGET_UNSET_FLAGS((widget), (flag))) +# define compat_widget_set_flag(widget, flag, enable) \ + do { \ + GtkWidget *set_flag__widget = (widget); \ + GtkWidgetFlags set_flag__flag = (flag); \ + if (enable) \ + GTK_WIDGET_SET_FLAGS(set_flag__widget, set_flag__flag); \ + else \ + GTK_WIDGET_UNSET_FLAGS(set_flag__widget, set_flag__flag); \ + } while (0) # define gtk_widget_set_can_default(widget, can_default) \ compat_widget_set_flag((widget), GTK_CAN_DEFAULT, (can_default)) # define gtk_widget_is_toplevel(widget) GTK_WIDGET_TOPLEVEL(widget) # define gtk_widget_is_sensitive(widget) GTK_WIDGET_IS_SENSITIVE(widget) # define gtk_widget_has_focus(widget) GTK_WIDGET_HAS_FOCUS(widget) # define gtk_widget_get_sensitive(widget) GTK_WIDGET_SENSITIVE(widget) +# define gtk_widget_get_visible(widget) GTK_WIDGET_VISIBLE(widget) # define gtk_widget_set_has_window(widget, has_window) \ compat_widget_set_flag((widget), GTK_NO_WINDOW, !(has_window)) # define gtk_widget_set_can_focus(widget, can_focus) \ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 9d4127: Make the compat_widget_set_flag macro more robust
by Enrico Tröger 19 Mar '13

19 Mar '13

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Tue, 19 Mar 2013 13:43:12 UTC Commit: 9d412702e8c26e3ce7cc16445d292be003eb3a5f https://github.com/geany/geany/commit/9d412702e8c26e3ce7cc16445d292be003eb3… Log Message: ----------- Make the compat_widget_set_flag macro more robust Modified Paths: -------------- src/gtkcompat.h Modified: src/gtkcompat.h 14 files changed, 9 insertions(+), 5 deletions(-) =================================================================== @@ -72,11 +72,15 @@ /* GtkWidget */ #if ! GTK_CHECK_VERSION(2, 18, 0) -# define compat_widget_set_flag(widget, flag, enable) \ - if ((enable)) \ - GTK_WIDGET_SET_FLAGS((widget), (flag)); \ - else \ - GTK_WIDGET_UNSET_FLAGS((widget), (flag)); +# define compat_widget_set_flag(widget, flag, enable) \ + do { \ + GtkWidget *set_flag__widget = (widget); \ + GtkWidgetFlags set_flag__flag = (flag); \ + if (enable) \ + GTK_WIDGET_SET_FLAGS(set_flag__widget, set_flag__flag); \ + else \ + GTK_WIDGET_UNSET_FLAGS(set_flag__widget, set_flag__flag); \ + } while (0) # define gtk_widget_set_can_default(widget, can_default) \ compat_widget_set_flag((widget), GTK_CAN_DEFAULT, (can_default)) # define gtk_widget_is_toplevel(widget) GTK_WIDGET_TOPLEVEL(widget) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] de0363: Add a note to update http://download.geany.org/MD5SUMS
by Enrico Tröger 19 Mar '13

19 Mar '13

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Tue, 19 Mar 2013 13:27:31 UTC Commit: de03636e5cf83f8dd3de5570d1e1f3ec965ba753 https://github.com/geany/geany/commit/de03636e5cf83f8dd3de5570d1e1f3ec965ba… Log Message: ----------- Add a note to update http://download.geany.org/MD5SUMS Modified Paths: -------------- doc/making-a-release Modified: doc/making-a-release 4 files changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -3,7 +3,7 @@ For major releases: * Agree string freeze period for translations. * Try to synchronize release date with geany-plugins. -Update NEWS file - ideally each committer should review their changes +Update NEWS file - ideally each committer should review their changes and summarize the interesting ones. Use `git log --author='name'` to filter commits by a particular developer name. @@ -25,6 +25,8 @@ to home directory and after the upload is finished move them into /srv/www/download.geany.org/. Rename LATEST-IS-... to the new version number in /srv/www/download.geany.org/ and /srv/www/www.geany.org/files. +Execute (as user geany) /home/geany/md5sums to update +/srv/www/download.geany.org/MD5SUMS. Make sure the public part of the GPG key used to sign the archives can be found on the download page. -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d9c7f5: Improve GTK compatibility macros for GTK 2.16
by Enrico Tröger 19 Mar '13

19 Mar '13

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Tue, 19 Mar 2013 13:17:25 UTC Commit: d9c7f59b4187d3b24deae12865fafb5841029b36 https://github.com/geany/geany/commit/d9c7f59b4187d3b24deae12865fafb5841029… Log Message: ----------- Improve GTK compatibility macros for GTK 2.16 On GTK 2.16 GTK_WIDGET_[UN]SET_FLAGS resolves to a do-while construct which raises a syntax error when embedded into a ? operator. Also gtk_widget_get_visible() is only available since GTK 2.18, so add a fallback to the old variant. Modified Paths: -------------- src/gtkcompat.h Modified: src/gtkcompat.h 6 files changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -73,13 +73,17 @@ /* GtkWidget */ #if ! GTK_CHECK_VERSION(2, 18, 0) # define compat_widget_set_flag(widget, flag, enable) \ - ((enable) ? GTK_WIDGET_SET_FLAGS((widget), (flag)) : GTK_WIDGET_UNSET_FLAGS((widget), (flag))) + if ((enable)) \ + GTK_WIDGET_SET_FLAGS((widget), (flag)); \ + else \ + GTK_WIDGET_UNSET_FLAGS((widget), (flag)); # define gtk_widget_set_can_default(widget, can_default) \ compat_widget_set_flag((widget), GTK_CAN_DEFAULT, (can_default)) # define gtk_widget_is_toplevel(widget) GTK_WIDGET_TOPLEVEL(widget) # define gtk_widget_is_sensitive(widget) GTK_WIDGET_IS_SENSITIVE(widget) # define gtk_widget_has_focus(widget) GTK_WIDGET_HAS_FOCUS(widget) # define gtk_widget_get_sensitive(widget) GTK_WIDGET_SENSITIVE(widget) +# define gtk_widget_get_visible(widget) GTK_WIDGET_VISIBLE(widget) # define gtk_widget_set_has_window(widget, has_window) \ compat_widget_set_flag((widget), GTK_NO_WINDOW, !(has_window)) # define gtk_widget_set_can_focus(widget, can_focus) \ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 3291c3: Fix utils_parse_and_format_build_date()
by Colomban Wendling 17 Mar '13

17 Mar '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 17 Mar 2013 18:36:17 UTC Commit: 3291c30de570cc49a60fb270c952199a8acbc63d https://github.com/geany/geany/commit/3291c30de570cc49a60fb270c952199a8acbc… Log Message: ----------- Fix utils_parse_and_format_build_date() Modified Paths: -------------- src/utils.c Modified: src/utils.c 3 files changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -2126,8 +2126,11 @@ gchar *utils_parse_and_format_build_date(const gchar *input) GDate *date = utils_parse_date(input); if (date != NULL) + { g_date_strftime(date_buf, sizeof(date_buf), GEANY_TEMPLATES_FORMAT_DATE, date); + g_date_free(date); return g_strdup(date_buf); + } return g_strdup(input); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] e409b7: Fix various TMTag leaks
by Colomban Wendling 17 Mar '13

17 Mar '13

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 17 Mar 2013 16:31:36 UTC Commit: e409b70fab4f01a5e35db06d1ba6aa8ecd97b230 https://github.com/geany/geany/commit/e409b70fab4f01a5e35db06d1ba6aa8ecd97b… Log Message: ----------- Fix various TMTag leaks Modified Paths: -------------- src/document.c src/symbols.c Modified: src/document.c 3 files changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -605,6 +605,9 @@ static gboolean remove_page(guint page_num) g_free(doc->real_path); tm_workspace_remove_object(doc->tm_file, TRUE, TRUE); + if (doc->priv->tag_tree) + gtk_widget_destroy(doc->priv->tag_tree); + editor_destroy(doc->editor); doc->editor = NULL; /* needs to be NULL for document_undo_clear() call below */ Modified: src/symbols.c 6 files changed, 5 insertions(+), 1 deletions(-) =================================================================== @@ -1525,6 +1525,7 @@ static void update_tree_tags(GeanyDocument *doc, GList **tags) delta = d; parent_search = node->data; } + tm_tag_unref(parent_tag); } } @@ -2300,7 +2301,7 @@ static void on_find_usage(GtkWidget *widget, gboolean in_session) GtkTreeSelection *selection; GtkTreeModel *model; GeanyDocument *doc; - const TMTag *tag = NULL; + TMTag *tag = NULL; doc = document_get_current(); if (!doc) @@ -2310,7 +2311,10 @@ static void on_find_usage(GtkWidget *widget, gboolean in_session) if (gtk_tree_selection_get_selected(selection, &model, &iter)) gtk_tree_model_get(model, &iter, SYMBOLS_COLUMN_TAG, &tag, -1); if (tag) + { search_find_usage(tag->name, tag->name, SCFIND_WHOLEWORD | SCFIND_MATCHCASE, in_session); + tm_tag_unref(tag); + } } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2013