Commits October 2020

commits@lists.geany.org

1 participants
80 discussions

[geany/geany] e42a96: Merge pull request #1738 from b4n/symbols-margin-auto-width
by Colomban Wendling 25 Oct '20

25 Oct '20

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 25 Oct 2020 17:01:38 UTC Commit: e42a963d6b4f1b2ef2063e59fc4139a250dfe709 https://github.com/geany/geany/commit/e42a963d6b4f1b2ef2063e59fc4139a250dfe… Log Message: ----------- Merge pull request #1738 from b4n/symbols-margin-auto-width Size symbols and fold margins proportional to line height Replaces #2140. Modified Paths: -------------- data/filedefs/filetypes.common src/editor.c src/highlighting.c src/sciwrappers.c src/sciwrappers.h Modified: data/filedefs/filetypes.common 3 lines changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -19,9 +19,6 @@ margin_linenumber=margin_line_number margin_folding=margin_folding fold_symbol_highlight=fold_symbol_highlight -# width of the folding margin on the right of the line numbers -folding_margin_width=12 - # background colour of the current line, only the second and third argument is interpreted # use the third argument to enable or disable the highlighting of the current line (has to be true/false) current_line=current_line Modified: src/editor.c 15 lines changed, 13 insertions(+), 2 deletions(-) =================================================================== @@ -1065,6 +1065,15 @@ void editor_sci_notify_cb(G_GNUC_UNUSED GtkWidget *widget, G_GNUC_UNUSED gint sc } +/* recalculate margins width */ +static void update_margins(ScintillaObject *sci) +{ + sci_set_line_numbers(sci, editor_prefs.show_linenumber_margin); + sci_set_symbol_margin(sci, editor_prefs.show_markers_margin); + sci_set_folding_margin_visible(sci, editor_prefs.folding); +} + + static gboolean on_editor_notify(G_GNUC_UNUSED GObject *object, GeanyEditor *editor, SCNotification *nt, G_GNUC_UNUSED gpointer data) { @@ -1185,8 +1194,7 @@ static gboolean on_editor_notify(G_GNUC_UNUSED GObject *object, GeanyEditor *edi break; case SCN_ZOOM: - /* recalculate line margin width */ - sci_set_line_numbers(sci, editor_prefs.show_linenumber_margin); + update_margins(sci); break; } /* we always return FALSE here to let plugins handle the event too */ @@ -4608,6 +4616,7 @@ void editor_set_font(GeanyEditor *editor, const gchar *font) g_free(font_name); + update_margins(editor->sci); /* zoom to 100% to prevent confusion */ sci_zoom_off(editor->sci); } @@ -5189,6 +5198,8 @@ void editor_apply_update_prefs(GeanyEditor *editor) sci_set_symbol_margin(sci, editor_prefs.show_markers_margin); sci_set_line_numbers(sci, editor_prefs.show_linenumber_margin); + sci_set_folding_margin_visible(sci, editor_prefs.folding); + /* virtual space */ SSM(sci, SCI_SETVIRTUALSPACEOPTIONS, editor_prefs.show_virtual_space, 0); Modified: src/highlighting.c 21 lines changed, 0 insertions(+), 21 deletions(-) =================================================================== @@ -96,7 +96,6 @@ enum /* Geany common styling */ GCS_LINE_HEIGHT, GCS_CALLTIPS, GCS_INDICATOR_ERROR, - GCS_FOLDING_MARGIN_WIDTH, GCS_MAX }; @@ -565,8 +564,6 @@ static void styleset_common_init(GKeyFile *config, GKeyFile *config_home) 1, 1, &common_style_set.fold_marker, &common_style_set.fold_lines); get_keyfile_ints(config, config_home, "styling", "folding_horiz_line", 2, 0, &common_style_set.fold_draw_line, NULL); - get_keyfile_ints(config, config_home, "styling", "folding_margin_width", - 1, 0, &common_style_set.styling[GCS_FOLDING_MARGIN_WIDTH].background, NULL); get_keyfile_ints(config, config_home, "styling", "caret_width", 1, 0, &common_style_set.styling[GCS_CARET].background, NULL); /* caret.foreground used earlier */ get_keyfile_int(config, config_home, "styling", "line_wrap_visuals", @@ -808,22 +805,6 @@ static void styleset_common(ScintillaObject *sci, guint ft_id) } -/* folding margin visibility */ -static void set_folding_margin_visible(ScintillaObject *sci, gboolean set) -{ - if (set) - { - SSM(sci, SCI_SETMARGINWIDTHN, 2, common_style_set.styling[GCS_FOLDING_MARGIN_WIDTH].background); - SSM(sci, SCI_SETMARGINSENSITIVEN, 2, TRUE); - } - else - { - SSM(sci, SCI_SETMARGINSENSITIVEN, 2, FALSE); - SSM(sci, SCI_SETMARGINWIDTHN, 2, 0); - } -} - - /* Merge & assign global typedefs and user secondary keywords. * keyword_idx is used for both style_sets[].keywords and scintilla keyword style number */ static void merge_type_keywords(ScintillaObject *sci, guint ft_id, guint keyword_idx) @@ -899,8 +880,6 @@ static void styleset_from_mapping(ScintillaObject *sci, guint ft_id, guint lexer } } - set_folding_margin_visible(sci, editor_prefs.folding); - /* keywords */ foreach_range(i, n_keywords) { Modified: src/sciwrappers.c 39 lines changed, 38 insertions(+), 1 deletions(-) =================================================================== @@ -144,12 +144,31 @@ void sci_set_mark_long_lines(ScintillaObject *sci, gint type, gint column, const } +/* compute margin width based on ratio of line height */ +static gint margin_width_from_line_height(ScintillaObject *sci, gdouble ratio, gint threshold) +{ + const gint line_height = SSM(sci, SCI_TEXTHEIGHT, 0, 0); + gint width; + + width = line_height * ratio; + /* round down to an even size */ + width = width - (width % 2); + /* if under threshold, just use the line height */ + if (width < threshold) + width = MIN(threshold, line_height); + + return width; +} + + /* symbol margin visibility */ void sci_set_symbol_margin(ScintillaObject *sci, gboolean set) { if (set) { - SSM(sci, SCI_SETMARGINWIDTHN, 1, 16); + const gint width = margin_width_from_line_height(sci, 0.88, 16); + + SSM(sci, SCI_SETMARGINWIDTHN, 1, width); SSM(sci, SCI_SETMARGINSENSITIVEN, 1, TRUE); } else @@ -160,6 +179,24 @@ void sci_set_symbol_margin(ScintillaObject *sci, gboolean set) } +/* folding margin visibility */ +void sci_set_folding_margin_visible(ScintillaObject *sci, gboolean set) +{ + if (set) + { + const gint width = margin_width_from_line_height(sci, 0.66, 12); + + SSM(sci, SCI_SETMARGINWIDTHN, 2, width); + SSM(sci, SCI_SETMARGINSENSITIVEN, 2, TRUE); + } + else + { + SSM(sci, SCI_SETMARGINSENSITIVEN, 2, FALSE); + SSM(sci, SCI_SETMARGINWIDTHN, 2, 0); + } +} + + /* end of lines */ void sci_set_visible_eols(ScintillaObject *sci, gboolean set) { Modified: src/sciwrappers.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -157,6 +157,7 @@ void sci_toggle_fold (ScintillaObject *sci, gint line); gint sci_get_fold_level (ScintillaObject *sci, gint line); gint sci_get_fold_parent (ScintillaObject *sci, gint start_line); +void sci_set_folding_margin_visible (ScintillaObject *sci, gboolean set); gboolean sci_get_fold_expanded (ScintillaObject *sci, gint line); void sci_colourise (ScintillaObject *sci, gint start, gint end); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] cef52a: Set release date
by Enrico Tröger 25 Oct '20

25 Oct '20

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sun, 25 Oct 2020 13:07:55 UTC Commit: cef52a830fbd2daa89d68e32987fec9c91b3d643 https://github.com/geany/geany/commit/cef52a830fbd2daa89d68e32987fec9c91b3d… Log Message: ----------- Set release date Modified Paths: -------------- NEWS doc/geany.1.in doc/geany.txt Modified: NEWS 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ -Geany 1.37 (unreleased) +Geany 1.37 (October 25, 2020) General * Build with GTK3 by default. Modified: doc/geany.1.in 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ -.TH "GEANY" "1" "September 28, 2019" "geany @VERSION@" "" +.TH "GEANY" "1" "October 25, 2020" "geany @VERSION@" "" .SH "NAME" Geany \(em a small and lightweight IDE .SH "SYNOPSIS" Modified: doc/geany.txt 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -14,7 +14,7 @@ Frank Lanitz, Colomban Wendling, Matthew Brush -:Date: 2019-09-28 +:Date: 2020-10-25 :Version: |(version)| Copyright © 2005 The Geany contributors -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7dbf23: Remove intl_stats.sh script
by Frank Lanitz 25 Oct '20

25 Oct '20

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 25 Oct 2020 10:20:18 UTC Commit: 7dbf234b69ade1294d5e1dbcf765b21db0e57baf https://github.com/geany/geany/commit/7dbf234b69ade1294d5e1dbcf765b21db0e57… Log Message: ----------- Remove intl_stats.sh script It's not working anymore and most functionaly can be founda at https://www.geany.org/contribute/translation/statistics/ anyway Modified Paths: -------------- Makefile.am po/intl_stats.sh Modified: Makefile.am 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -21,7 +21,6 @@ EXTRA_DIST = \ HACKING \ README.I18N \ README.Packagers \ - po/intl_stats.sh \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ Modified: po/intl_stats.sh 99 lines changed, 0 insertions(+), 99 deletions(-) =================================================================== @@ -1,99 +0,0 @@ -#!/bin/sh - -# Little shell script to display some basic statistics about Geany's translation -# files. It also checks the menu accelerators. -# -# Copyright 2007 The Geany contributors -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - -check_accelerators="" -linguas="" -me=`basename $0` - - -usage() -{ - echo "usage: $me [OPTION] [languages...]" - echo - echo "OPTIONs are:" - echo "-h --help this help screen" - echo "-a --accelerators check also for menu accelerators" - echo "languages list of language codes which should be tested" - echo - echo "example: $me -a de fr hu" -} - - -# parse cmd line arguments -while [ $# -gt 0 ] -do - case $1 in - --accelerators) - check_accelerators="--check-accelerators=_" - ;; - -a) - check_accelerators="--check-accelerators=_" - ;; - --help) - usage; - exit 1; - ;; - -h) - usage; - exit 1; - ;; - *) - linguas="$linguas "$1 - ;; - esac - shift -done - - - -# if no languages where specified on the command line, take all listed languages in LINGUAS -if [ -z "$linguas" ] -then - linguas=`sed -e '/^#/d' po/LINGUAS` -fi - -# dash and zsh don't need the -e switch to echo, bash does -# maybe there is a better way to detect whether we are running on a bash -eswitch="" -if [ "$BASH" ] -then - eswitch="-e" -fi - -# do the work -if [ $check_accelerators ] -then - for lang in $linguas - do - msgfmt --check --statistics $check_accelerators po/$lang.po; - done -else - for lang in $linguas - do - # maybe the regexp can be optimized, regexps are not my best friends - creationdate=`grep "PO-Revision-Date:" po/$lang.po | sed 's/.*: $[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\} [0-9]\{2\}:[0-9]\{2\}[+|-][0-9]\{4\}$.*/\1/'` - printf "%s %s\t(%s):\t" "$eswitch" "$lang" "$creationdate" - msgfmt --check --statistics po/$lang.po; - done -fi - - -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] f10eb7: Update NEWS
by Colomban Wendling 25 Oct '20

25 Oct '20

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 25 Oct 2020 10:09:43 UTC Commit: f10eb7679767d1c561e6970e2cb37a78704cefb5 https://github.com/geany/geany/commit/f10eb7679767d1c561e6970e2cb37a78704ce… Log Message: ----------- Update NEWS Modified Paths: -------------- NEWS Modified: NEWS 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -10,6 +10,8 @@ Geany 1.37 (unreleased) Bug Fixes * Fix main window name as seen by accessibility tools (Issue#2421). * Add missing include (Pino Toscano, PR#2402). + * Fix a possible crash when quitting (Hodong & Guido Falsi, Issue#2457, + PR#2634). Interface * Allow to cancel Open Project and New Project dialogs without closing the -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 6673ea: Size symbols and fold margins proportional to line height
by Colomban Wendling 25 Oct '20

25 Oct '20

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 25 Oct 2020 09:50:08 UTC Commit: 6673ea5b49260beffe2c258889f9bd1427f33bac https://github.com/geany/geany/commit/6673ea5b49260beffe2c258889f9bd1427f33… Log Message: ----------- Size symbols and fold margins proportional to line height This makes those margin better adapt larger font sizes and zooms. Fixes #1733. Modified Paths: -------------- src/editor.c src/sciwrappers.c Modified: src/editor.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -1187,6 +1187,8 @@ static gboolean on_editor_notify(G_GNUC_UNUSED GObject *object, GeanyEditor *edi case SCN_ZOOM: /* recalculate line margin width */ sci_set_line_numbers(sci, editor_prefs.show_linenumber_margin); + sci_set_symbol_margin(sci, editor_prefs.show_markers_margin); + sci_set_folding_margin_visible(sci, editor_prefs.folding); break; } /* we always return FALSE here to let plugins handle the event too */ Modified: src/sciwrappers.c 25 lines changed, 23 insertions(+), 2 deletions(-) =================================================================== @@ -144,12 +144,31 @@ void sci_set_mark_long_lines(ScintillaObject *sci, gint type, gint column, const } +/* compute margin width based on ratio of line height */ +static gint margin_width_from_line_height(ScintillaObject *sci, gdouble ratio, gint threshold) +{ + const gint line_height = SSM(sci, SCI_TEXTHEIGHT, 0, 0); + gint width; + + width = line_height * ratio; + /* round down to an even size */ + width = width - (width % 2); + /* if under threshold, just use the line height */ + if (width < threshold) + width = MIN(threshold, line_height); + + return width; +} + + /* symbol margin visibility */ void sci_set_symbol_margin(ScintillaObject *sci, gboolean set) { if (set) { - SSM(sci, SCI_SETMARGINWIDTHN, 1, 16); + const gint width = margin_width_from_line_height(sci, 0.88, 16); + + SSM(sci, SCI_SETMARGINWIDTHN, 1, width); SSM(sci, SCI_SETMARGINSENSITIVEN, 1, TRUE); } else @@ -165,7 +184,9 @@ void sci_set_folding_margin_visible(ScintillaObject *sci, gboolean set) { if (set) { - SSM(sci, SCI_SETMARGINWIDTHN, 2, 12); + const gint width = margin_width_from_line_height(sci, 0.66, 12); + + SSM(sci, SCI_SETMARGINWIDTHN, 2, width); SSM(sci, SCI_SETMARGINSENSITIVEN, 2, TRUE); } else -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ca2c90: Recalculate margins size when changing font
by Colomban Wendling 25 Oct '20

25 Oct '20

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 25 Oct 2020 09:50:08 UTC Commit: ca2c904e47295b54f57555849695801c670a23b3 https://github.com/geany/geany/commit/ca2c904e47295b54f57555849695801c670a2… Log Message: ----------- Recalculate margins size when changing font Modified Paths: -------------- src/editor.c Modified: src/editor.c 15 lines changed, 11 insertions(+), 4 deletions(-) =================================================================== @@ -1065,6 +1065,15 @@ void editor_sci_notify_cb(G_GNUC_UNUSED GtkWidget *widget, G_GNUC_UNUSED gint sc } +/* recalculate margins width */ +static void update_margins(ScintillaObject *sci) +{ + sci_set_line_numbers(sci, editor_prefs.show_linenumber_margin); + sci_set_symbol_margin(sci, editor_prefs.show_markers_margin); + sci_set_folding_margin_visible(sci, editor_prefs.folding); +} + + static gboolean on_editor_notify(G_GNUC_UNUSED GObject *object, GeanyEditor *editor, SCNotification *nt, G_GNUC_UNUSED gpointer data) { @@ -1185,10 +1194,7 @@ static gboolean on_editor_notify(G_GNUC_UNUSED GObject *object, GeanyEditor *edi break; case SCN_ZOOM: - /* recalculate line margin width */ - sci_set_line_numbers(sci, editor_prefs.show_linenumber_margin); - sci_set_symbol_margin(sci, editor_prefs.show_markers_margin); - sci_set_folding_margin_visible(sci, editor_prefs.folding); + update_margins(sci); break; } /* we always return FALSE here to let plugins handle the event too */ @@ -4610,6 +4616,7 @@ void editor_set_font(GeanyEditor *editor, const gchar *font) g_free(font_name); + update_margins(editor->sci); /* zoom to 100% to prevent confusion */ sci_zoom_off(editor->sci); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 97f8f3: Revert "add 'folding margin width setting' (#2140)"
by Colomban Wendling 25 Oct '20

25 Oct '20

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 25 Oct 2020 09:33:19 UTC Commit: 97f8f3c7afea387adbfa91df04de006f6af0c6d7 https://github.com/geany/geany/commit/97f8f3c7afea387adbfa91df04de006f6af0c… Log Message: ----------- Revert "add 'folding margin width setting' (#2140)" This reverts commit d8f532b5adf41ae57b99b6ac95d336401ba15e35. Modified Paths: -------------- data/filedefs/filetypes.common src/editor.c src/highlighting.c src/sciwrappers.c src/sciwrappers.h Modified: data/filedefs/filetypes.common 3 lines changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -19,9 +19,6 @@ margin_linenumber=margin_line_number margin_folding=margin_folding fold_symbol_highlight=fold_symbol_highlight -# width of the folding margin on the right of the line numbers -folding_margin_width=12 - # background colour of the current line, only the second and third argument is interpreted # use the third argument to enable or disable the highlighting of the current line (has to be true/false) current_line=current_line Modified: src/editor.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -5189,6 +5189,8 @@ void editor_apply_update_prefs(GeanyEditor *editor) sci_set_symbol_margin(sci, editor_prefs.show_markers_margin); sci_set_line_numbers(sci, editor_prefs.show_linenumber_margin); + sci_set_folding_margin_visible(sci, editor_prefs.folding); + /* virtual space */ SSM(sci, SCI_SETVIRTUALSPACEOPTIONS, editor_prefs.show_virtual_space, 0); Modified: src/highlighting.c 21 lines changed, 0 insertions(+), 21 deletions(-) =================================================================== @@ -96,7 +96,6 @@ enum /* Geany common styling */ GCS_LINE_HEIGHT, GCS_CALLTIPS, GCS_INDICATOR_ERROR, - GCS_FOLDING_MARGIN_WIDTH, GCS_MAX }; @@ -565,8 +564,6 @@ static void styleset_common_init(GKeyFile *config, GKeyFile *config_home) 1, 1, &common_style_set.fold_marker, &common_style_set.fold_lines); get_keyfile_ints(config, config_home, "styling", "folding_horiz_line", 2, 0, &common_style_set.fold_draw_line, NULL); - get_keyfile_ints(config, config_home, "styling", "folding_margin_width", - 1, 0, &common_style_set.styling[GCS_FOLDING_MARGIN_WIDTH].background, NULL); get_keyfile_ints(config, config_home, "styling", "caret_width", 1, 0, &common_style_set.styling[GCS_CARET].background, NULL); /* caret.foreground used earlier */ get_keyfile_int(config, config_home, "styling", "line_wrap_visuals", @@ -808,22 +805,6 @@ static void styleset_common(ScintillaObject *sci, guint ft_id) } -/* folding margin visibility */ -static void set_folding_margin_visible(ScintillaObject *sci, gboolean set) -{ - if (set) - { - SSM(sci, SCI_SETMARGINWIDTHN, 2, common_style_set.styling[GCS_FOLDING_MARGIN_WIDTH].background); - SSM(sci, SCI_SETMARGINSENSITIVEN, 2, TRUE); - } - else - { - SSM(sci, SCI_SETMARGINSENSITIVEN, 2, FALSE); - SSM(sci, SCI_SETMARGINWIDTHN, 2, 0); - } -} - - /* Merge & assign global typedefs and user secondary keywords. * keyword_idx is used for both style_sets[].keywords and scintilla keyword style number */ static void merge_type_keywords(ScintillaObject *sci, guint ft_id, guint keyword_idx) @@ -899,8 +880,6 @@ static void styleset_from_mapping(ScintillaObject *sci, guint ft_id, guint lexer } } - set_folding_margin_visible(sci, editor_prefs.folding); - /* keywords */ foreach_range(i, n_keywords) { Modified: src/sciwrappers.c 16 lines changed, 16 insertions(+), 0 deletions(-) =================================================================== @@ -160,6 +160,22 @@ void sci_set_symbol_margin(ScintillaObject *sci, gboolean set) } +/* folding margin visibility */ +void sci_set_folding_margin_visible(ScintillaObject *sci, gboolean set) +{ + if (set) + { + SSM(sci, SCI_SETMARGINWIDTHN, 2, 12); + SSM(sci, SCI_SETMARGINSENSITIVEN, 2, TRUE); + } + else + { + SSM(sci, SCI_SETMARGINSENSITIVEN, 2, FALSE); + SSM(sci, SCI_SETMARGINWIDTHN, 2, 0); + } +} + + /* end of lines */ void sci_set_visible_eols(ScintillaObject *sci, gboolean set) { Modified: src/sciwrappers.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -157,6 +157,7 @@ void sci_toggle_fold (ScintillaObject *sci, gint line); gint sci_get_fold_level (ScintillaObject *sci, gint line); gint sci_get_fold_parent (ScintillaObject *sci, gint start_line); +void sci_set_folding_margin_visible (ScintillaObject *sci, gboolean set); gboolean sci_get_fold_expanded (ScintillaObject *sci, gint line); void sci_colourise (ScintillaObject *sci, gint start, gint end); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] ad54ee: Merge pull request #2618 from codebrainz/os-info-improvements
by Colomban Wendling 25 Oct '20

25 Oct '20

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sun, 25 Oct 2020 09:25:26 UTC Commit: ad54ee5999d41e635f46a131b62067bb145c6050 https://github.com/geany/geany/commit/ad54ee5999d41e635f46a131b62067bb145c6… Log Message: ----------- Merge pull request #2618 from codebrainz/os-info-improvements OS Info Improvements Modified Paths: -------------- src/libmain.c src/utils.c src/utils.h Modified: src/libmain.c 16 lines changed, 7 insertions(+), 9 deletions(-) =================================================================== @@ -1068,6 +1068,7 @@ gint main_lib(gint argc, gchar **argv) gint config_dir_result; const gchar *locale; gchar *utf8_configdir; + gchar *os_info; #if ! GLIB_CHECK_VERSION(2, 36, 0) g_type_init(); @@ -1161,15 +1162,12 @@ gint main_lib(gint argc, gchar **argv) gtk_major_version, gtk_minor_version, gtk_micro_version, glib_major_version, glib_minor_version, glib_micro_version); -#if GLIB_CHECK_VERSION(2, 64, 0) - gchar *os_prettyname = g_get_os_info(G_OS_INFO_KEY_PRETTY_NAME); - gchar *os_codename = g_get_os_info(G_OS_INFO_KEY_VERSION_CODENAME); - geany_debug("OS: %s (%s)", - os_prettyname ? os_prettyname : "Unknown", - os_codename ? os_codename : "Unknown"); - g_free(os_prettyname); - g_free(os_codename); -#endif + os_info = utils_get_os_info_string(); + if (os_info != NULL) + { + geany_debug("OS: %s", os_info); + g_free(os_info); + } geany_debug("System data dir: %s", app->datadir); utf8_configdir = utils_get_utf8_from_locale(app->configdir); Modified: src/utils.c 68 lines changed, 68 insertions(+), 0 deletions(-) =================================================================== @@ -2406,3 +2406,71 @@ gchar *utils_get_real_path(const gchar *file_name) { return tm_get_real_path(file_name); } + + +/* + * Get a string describing the OS. + * + * If the OS can be determined, a string which describes the OS will + * be returned. If no OS can be determined then `NULL` will be returned. + * + * @note The format of the returned string is unspecified and is only + * meant to provide diagnostic information to the user. + * + * @return A newly-allocated string containing a description of the + * OS if it can be determined or `NULL` if it cannot. + * + * @since 1.37 + */ +gchar *utils_get_os_info_string(void) +{ + gchar *os_info = NULL; + +#if GLIB_CHECK_VERSION(2, 64, 0) +# if ! defined(__APPLE__) + /* on non-macOS operating systems */ + { + GString *os_str; + gchar *pretty_name; + gchar *code_name; + + pretty_name = g_get_os_info(G_OS_INFO_KEY_PRETTY_NAME); + if (pretty_name == NULL) + return NULL; + + os_str = g_string_new(pretty_name); + g_free(pretty_name); + + code_name = g_get_os_info(G_OS_INFO_KEY_VERSION_CODENAME); + if (code_name != NULL) + { + g_string_append_printf(os_str, " (%s)", code_name); + g_free(code_name); + } + + os_info = g_string_free(os_str, FALSE); + } +# else + /* on macOS, only `G_OS_INFO_KEY_NAME` is supported and returns the + * fixed string `macOS` */ + os_info = g_get_os_info(G_OS_INFO_KEY_NAME); +# endif +#else + /* if g_get_os_info() is not available, do it the old-fashioned way */ +# if defined(_WIN64) + os_info = g_strdup("Microsoft Windows (64-bit)"); +# elif defined(_WIN32) + os_info = g_strdup("Microsoft Windows"); +# elif defined(__APPLE__) + os_info = g_strdup("Apple macOS"); +# elif defined(__linux__) + os_info = g_strdup("Linux"); +# elif defined(__FreeBSD__) + os_info = g_strdup("FreeBSD"); +# elif defined(__ANDROID__) + os_info = g_strdup("Android"); +# endif +#endif + + return os_info; +} Modified: src/utils.h 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -332,6 +332,8 @@ const gchar *utils_resource_dir(GeanyResourceDirType type); void utils_start_new_geany_instance(const gchar *doc_path); +gchar *utils_get_os_info_string(void); + #endif /* GEANY_PRIVATE */ G_END_DECLS -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 110b7c: vte: Free VteFunctions after destroying the widget
by Colomban Wendling 24 Oct '20

24 Oct '20

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 24 Oct 2020 20:39:16 UTC Commit: 110b7c839b70c10cebed676434a5e4bef89b2dbc https://github.com/geany/geany/commit/110b7c839b70c10cebed676434a5e4bef89b2… Log Message: ----------- vte: Free VteFunctions after destroying the widget The widget could possibly still emit signal or otherwise lead to calling our code, which might still use VteFunctions pointers. So, move the freeing of it after other cleanups. Modified Paths: -------------- src/vte.c Modified: src/vte.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -396,7 +396,6 @@ static void create_vte(void) void vte_close(void) { - g_free(vf); /* free the vte widget before unloading vte module * this prevents a segfault on X close window if the message window is hidden */ g_signal_handlers_disconnect_by_func(vc->vte, G_CALLBACK(vte_start), NULL); @@ -407,6 +406,7 @@ void vte_close(void) g_free(vc->font); g_free(vc->send_cmd_prefix); g_free(vc); + g_free(vf); g_free(gtk_menu_key_accel); /* Don't unload the module explicitly because it causes a segfault on FreeBSD. The segfault * happens when the app really exits, not directly on g_module_close(). This still needs to -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 35d27a: Merge pull request #2634 from madpilot78/FreeBSD_crash_on_close_fix
by Colomban Wendling 24 Oct '20

24 Oct '20

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 24 Oct 2020 20:34:22 UTC Commit: 35d27a4a2809e2c9ae9da2ae2c00eaebc74904ba https://github.com/geany/geany/commit/35d27a4a2809e2c9ae9da2ae2c00eaebc7490… Log Message: ----------- Merge pull request #2634 from madpilot78/FreeBSD_crash_on_close_fix Disconnect signal handler from vte before destroying the widget. Modified Paths: -------------- src/vte.c Modified: src/vte.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -399,6 +399,7 @@ void vte_close(void) g_free(vf); /* free the vte widget before unloading vte module * this prevents a segfault on X close window if the message window is hidden */ + g_signal_handlers_disconnect_by_func(vc->vte, G_CALLBACK(vte_start), NULL); gtk_widget_destroy(vc->vte); gtk_widget_destroy(vc->menu); g_object_unref(vc->menu); -------------- 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 October 2020