Commits January 2015

commits@lists.geany.org

1 participants
39 discussions

[geany/geany] d5cca3: Change donate link to our own redirection
by Enrico Tröger 31 Jan '15

31 Jan '15

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sat, 31 Jan 2015 17:44:10 UTC Commit: d5cca3792269160d19530b3af1c63c880adef2d4 https://github.com/geany/geany/commit/d5cca3792269160d19530b3af1c63c880adef… Log Message: ----------- Change donate link to our own redirection As discussed in #410, the previous SF redirect is better replaced by a redirect on www.geany.org which we can control. This way we can also quickly change the target URL if it changes at Paypal. Modified Paths: -------------- src/geany.h Modified: src/geany.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -45,7 +45,7 @@ G_BEGIN_DECLS #define GEANY_HOMEPAGE "http://www.geany.org/" #define GEANY_WIKI "http://wiki.geany.org/" #define GEANY_BUG_REPORT "http://www.geany.org/Support/Bugs" -#define GEANY_DONATE "https://sourceforge.net/donate/index.php?group_id=153444" +#define GEANY_DONATE "http://www.geany.org/service/donate/" #define GEANY_STRING_UNTITLED _("untitled") #define GEANY_DEFAULT_DIALOG_HEIGHT 350 #define GEANY_WINDOW_DEFAULT_WIDTH 900 -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 7229aa: SaveActions: Set file permissions of backup copies to 0600
by Enrico Tröger 31 Jan '15

31 Jan '15

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Sat, 31 Jan 2015 15:11:48 UTC Commit: 7229aa9cff84b6d42f75edba5b26babd2f6b8b64 https://github.com/geany/geany/commit/7229aa9cff84b6d42f75edba5b26babd2f6b8… Log Message: ----------- SaveActions: Set file permissions of backup copies to 0600 As discussed in SF bug #125, it might be dangerous to store backup copies in a publicly accessable directory like /tmp with default permissions, especially on multi-user systems. So set the file permissions on non-Windows systems to 0600 by default. Also improve the documentation of the save Actions plugin to reflect this change. Modified Paths: -------------- doc/geany.txt plugins/saveactions.c Modified: doc/geany.txt 19 lines changed, 17 insertions(+), 2 deletions(-) =================================================================== @@ -5176,8 +5176,23 @@ you can configure the automatically added extension in the configure dialog in Geany's plugin manager. After the plugin was loaded in Geany's plugin manager, every file is -copied into the configured backup directory when the file is saved in Geany. - +copied into the configured backup directory *after* the file has been saved +in Geany. + +The created backup copy file permissions are set to read-write only for +the user. This should help to not create world-readable files on possibly +unsecure destination directories like /tmp (especially useful +on multi-user systems). +This applies only to non-Windows systems. On Windows, no explicit file +permissions are set. + + +Additionally, you can define how many levels of the original file's +directory structure should be replicated in the backup copy path. +For example, setting the option +*Directory levels to include in the backup destination* to *2* +cause the plugin to create the last two components of the original +file's path in the backup copy path and place the new file there. Contributing to this document Modified: plugins/saveactions.c 14 lines changed, 14 insertions(+), 0 deletions(-) =================================================================== @@ -27,6 +27,8 @@ #include "geanyplugin.h" #include "gtkcompat.h" +#include <stdio.h> +#include <fcntl.h> #include <unistd.h> #include <errno.h> #include <glib/gstdio.h> @@ -195,6 +197,7 @@ static void backupcopy_document_save_cb(GObject *obj, GeanyDocument *doc, gpoint gchar *dir_parts_src; gchar *stamp; gchar buf[512]; + gint fd_dst = -1; if (! enable_backupcopy) return; @@ -220,7 +223,14 @@ static void backupcopy_document_save_cb(GObject *obj, GeanyDocument *doc, gpoint g_free(basename_src); g_free(dir_parts_src); +#ifdef G_OS_WIN32 if ((dst = g_fopen(locale_filename_dst, "wb")) == NULL) +#else + /* Use g_open() on non-Windows to set file permissions to 600 atomically. + * On Windows, seting file permissions would require specific Windows API. */ + fd_dst = g_open(locale_filename_dst, O_CREAT | O_WRONLY, S_IWUSR | S_IRUSR); + if (fd_dst == -1 || (dst = fdopen(fd_dst, "w")) == NULL) +#endif { ui_set_statusbar(FALSE, _("Backup Copy: File could not be saved (%s)."), g_strerror(errno)); @@ -228,6 +238,8 @@ static void backupcopy_document_save_cb(GObject *obj, GeanyDocument *doc, gpoint g_free(locale_filename_dst); g_free(stamp); fclose(src); + if (fd_dst != -1) + close(fd_dst); return; } @@ -238,6 +250,8 @@ static void backupcopy_document_save_cb(GObject *obj, GeanyDocument *doc, gpoint fclose(src); fclose(dst); + if (fd_dst != -1) + close(fd_dst); g_free(locale_filename_src); g_free(locale_filename_dst); g_free(stamp); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] d33a23: Add missing documentation for message window orientation setting
by Colomban Wendling 28 Jan '15

28 Jan '15

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Wed, 28 Jan 2015 14:55:33 UTC Commit: d33a23c40c4297c9ea8c2b53a4033a34db0cd10e https://github.com/geany/geany/commit/d33a23c40c4297c9ea8c2b53a4033a34db0cd… Log Message: ----------- Add missing documentation for message window orientation setting Modified Paths: -------------- doc/geany.txt Modified: doc/geany.txt 6 lines changed, 6 insertions(+), 0 deletions(-) =================================================================== @@ -1973,6 +1973,12 @@ Show documents list Position Whether to place the sidebar on the left or right of the editor window. +Message window +`````````````` + +Position + Whether to place the message window on the bottom or right of the editor window. + Fonts ````` -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 322fa6: Maintain undo stack when reloading a document
by Arthur Rosenstein 28 Jan '15

28 Jan '15

Branch: refs/heads/master Author: Arthur Rosenstein <artros.misc(a)gmail.com> Committer: Arthur Rosenstein <artros.misc(a)gmail.com> Date: Sun, 10 Nov 2013 09:11:37 UTC Commit: 322fa65ff555be84dee05761665fe87d0daa9432 https://github.com/geany/geany/commit/322fa65ff555be84dee05761665fe87d0daa9… Log Message: ----------- Maintain undo stack when reloading a document Modified Paths: -------------- src/document.c Modified: src/document.c 75 lines changed, 72 insertions(+), 3 deletions(-) =================================================================== @@ -1100,6 +1100,8 @@ GeanyDocument *document_open_file_full(GeanyDocument *doc, const gchar *filename gchar *locale_filename = NULL; GeanyFiletype *use_ft; FileData filedata; + UndoReloadData *undo_reload_data; + gboolean add_undo_reload_action; if (reload) { @@ -1157,8 +1159,31 @@ GeanyDocument *document_open_file_full(GeanyDocument *doc, const gchar *filename monitor_file_setup(doc); } - sci_set_undo_collection(doc->editor->sci, FALSE); /* avoid creation of an undo action */ - sci_empty_undo_buffer(doc->editor->sci); + if (! reload || ! file_prefs.keep_edit_history_on_reload) + { + sci_set_undo_collection(doc->editor->sci, FALSE); /* avoid creation of an undo action */ + sci_empty_undo_buffer(doc->editor->sci); + undo_reload_data = NULL; + } + else + { + undo_reload_data = (UndoReloadData*) g_malloc(sizeof(UndoReloadData)); + + /* We will be adding a UNDO_RELOAD action to the undo stack that undoes + * this reload. To do that, we keep collecting undo actions during + * reloading, and at the end add an UNDO_RELOAD action that performs + * all these actions in bulk. To keep track of how many undo actions + * were added during this time, we compare the current undo-stack height + * with its height at the end of the process. Note that g_trash_stack_height() + * is O(N), which is a little ugly, but this seems like the most maintainable + * option. */ + undo_reload_data->actions_count = g_trash_stack_height(&doc->priv->undo_actions); + + /* We use add_undo_reload_action to track any changes to the document that + * require adding an undo action to revert the reload, but that do not + * generate an undo action themselves. */ + add_undo_reload_action = FALSE; + } /* add the text to the ScintillaObject */ sci_set_readonly(doc->editor->sci, FALSE); /* to allow replacing text */ @@ -1167,11 +1192,28 @@ GeanyDocument *document_open_file_full(GeanyDocument *doc, const gchar *filename /* detect & set line endings */ editor_mode = utils_get_line_endings(filedata.data, filedata.len); + if (undo_reload_data) + { + undo_reload_data->eol_mode = editor_get_eol_char_mode(doc->editor); + /* Force adding an undo-reload action if the EOL mode changed. */ + if (editor_mode != undo_reload_data->eol_mode) + add_undo_reload_action = TRUE; + } sci_set_eol_mode(doc->editor->sci, editor_mode); g_free(filedata.data); sci_set_undo_collection(doc->editor->sci, TRUE); + /* If reloading and the current and new encodings or BOM states differ, + * add appropriate undo actions. */ + if (undo_reload_data) + { + if (! utils_str_equal(doc->encoding, filedata.enc)) + document_undo_add(doc, UNDO_ENCODING, g_strdup(doc->encoding)); + if (doc->has_bom != filedata.bom) + document_undo_add(doc, UNDO_BOM, GINT_TO_POINTER(doc->has_bom)); + } + doc->priv->mtime = filedata.mtime; /* get the modification time from file and keep it */ g_free(doc->encoding); /* if reloading, free old encoding */ doc->encoding = filedata.enc; @@ -1196,7 +1238,34 @@ GeanyDocument *document_open_file_full(GeanyDocument *doc, const gchar *filename } else { /* reloading */ - document_undo_clear(doc); + if (undo_reload_data) + { + /* Calculate the number of undo actions that are part of the reloading + * process, and add the UNDO_RELOAD action. */ + undo_reload_data->actions_count = + g_trash_stack_height(&doc->priv->undo_actions) - undo_reload_data->actions_count; + + /* We only add an undo-reload action if the document has actually changed. + * At the time of writing, this condition is moot because sci_set_text + * generates an undo action even when the text hasn't really changed, so + * actions_count is always greater than zero. In the future this might change. + * It's arguable whether we should add an undo-reload action unconditionally, + * especially since it's possible (if unlikely) that there had only + * been "invisible" changes to the document, such as changes in encoding and + * EOL mode, but for the time being that's how we roll. */ + if (undo_reload_data->actions_count > 0 || add_undo_reload_action) + document_undo_add(doc, UNDO_RELOAD, undo_reload_data); + else + g_free(undo_reload_data); + + /* We didn't save the document per-se, but its contents are now + * synchronized with the file on disk, hence set a save point here. + * We need to do this in this case only, because we don't clear + * Scintilla's undo stack. */ + sci_set_savepoint(doc->editor->sci); + } + else + document_undo_clear(doc); use_ft = ft; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 660c44: Don't prompt for reload confirmation if keeping edit history
by Arthur Rosenstein 28 Jan '15

28 Jan '15

1 0

[geany/geany] 6f6dfd: Add documentation for keep_edit_history_on_reload option
by Arthur Rosenstein 28 Jan '15

28 Jan '15

1 0

[geany/geany] 1b338d: Add UNDO_RELOAD action
by Arthur Rosenstein 28 Jan '15

28 Jan '15

Branch: refs/heads/master Author: Arthur Rosenstein <artros.misc(a)gmail.com> Committer: Arthur Rosenstein <artros.misc(a)gmail.com> Date: Sun, 10 Nov 2013 09:11:36 UTC Commit: 1b338d9d7dd23c1dc0828408e6687a9b47e94fc1 https://github.com/geany/geany/commit/1b338d9d7dd23c1dc0828408e6687a9b47e94… Log Message: ----------- Add UNDO_RELOAD action Modified Paths: -------------- src/document.c src/documentprivate.h Modified: src/document.c 50 lines changed, 49 insertions(+), 1 deletions(-) =================================================================== @@ -2496,7 +2496,9 @@ void document_undo_clear_stack(GTrashStack **stack) { switch (a->type) { - case UNDO_ENCODING: g_free(a->data); break; + case UNDO_ENCODING: + case UNDO_RELOAD: + g_free(a->data); break; default: break; } g_free(a); @@ -2618,6 +2620,29 @@ void document_undo(GeanyDocument *doc) g_free(action->data); break; } + case UNDO_RELOAD: + { + UndoReloadData *data = (UndoReloadData*)action->data; + gint eol_mode = data->eol_mode; + guint i; + + /* We reuse 'data' for the redo action, so read the current EOL mode + * into it before proceeding. */ + data->eol_mode = editor_get_eol_char_mode(doc->editor); + + /* Undo the rest of the actions which are part of the reloading process. */ + for (i = data->actions_count; i; --i) + document_undo(doc); + + /* Restore the previous EOL mode. */ + sci_set_eol_mode(doc->editor->sci, eol_mode); + /* This might affect the status bar and document meny, so update them. */ + ui_update_statusbar(doc, -1); + ui_document_show_hide(doc); + + document_redo_add(doc, UNDO_RELOAD, data); + break; + } default: break; } } @@ -2686,6 +2711,29 @@ void document_redo(GeanyDocument *doc) g_free(action->data); break; } + case UNDO_RELOAD: + { + UndoReloadData *data = (UndoReloadData*)action->data; + gint eol_mode = data->eol_mode; + guint i; + + /* We reuse 'data' for the undo action, so read the current EOL mode + * into it before proceeding. */ + data->eol_mode = editor_get_eol_char_mode(doc->editor); + + /* Redo the rest of the actions which are part of the reloading process. */ + for (i = data->actions_count; i; --i) + document_redo(doc); + + /* Restore the previous EOL mode. */ + sci_set_eol_mode(doc->editor->sci, eol_mode); + /* This might affect the status bar and document meny, so update them. */ + ui_update_statusbar(doc, -1); + ui_document_show_hide(doc); + + document_undo_add_internal(doc, UNDO_RELOAD, data); + break; + } default: break; } } Modified: src/documentprivate.h 8 lines changed, 8 insertions(+), 0 deletions(-) =================================================================== @@ -31,9 +31,17 @@ enum UNDO_SCINTILLA = 0, UNDO_ENCODING, UNDO_BOM, + UNDO_RELOAD, UNDO_ACTIONS_MAX }; +typedef struct UndoReloadData +{ + guint actions_count; /* How many following undo/redo actions need to be applied. */ + gint eol_mode; /* End-Of-Line mode before/after reloading. */ +} +UndoReloadData; + typedef enum { FILE_OK, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 9a03d3: Add keep_edit_history_on_reload option
by Arthur Rosenstein 28 Jan '15

28 Jan '15

Branch: refs/heads/master Author: Arthur Rosenstein <artros.misc(a)gmail.com> Committer: Arthur Rosenstein <artros.misc(a)gmail.com> Date: Sun, 10 Nov 2013 09:11:35 UTC Commit: 9a03d32449b5d8c831d2b53a264db56ab57e8699 https://github.com/geany/geany/commit/9a03d32449b5d8c831d2b53a264db56ab57e8… Log Message: ----------- Add keep_edit_history_on_reload option When this option is set, the undo stack is maintained when reloading a document. Modified Paths: -------------- src/document.h src/keyfile.c Modified: src/document.h 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -66,6 +66,7 @@ typedef struct GeanyFilePrefs gboolean use_gio_unsafe_file_saving; /* whether to use GIO as the unsafe backend */ gchar *extract_filetype_regex; /* regex to extract filetype on opening */ gboolean tab_close_switch_to_mru; + gboolean keep_edit_history_on_reload; /* Keep undo stack upon, and allow undoing of, document reloading. */ } GeanyFilePrefs; Modified: src/keyfile.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -220,6 +220,8 @@ static void init_pref_groups(void) "gio_unsafe_save_backup", FALSE); stash_group_add_boolean(group, &file_prefs.use_gio_unsafe_file_saving, "use_gio_unsafe_file_saving", TRUE); + stash_group_add_boolean(group, &file_prefs.keep_edit_history_on_reload, + "keep_edit_history_on_reload", TRUE); /* for backwards-compatibility */ stash_group_add_integer(group, &editor_prefs.indentation->hard_tab_width, "indent_hard_tab_width", 8); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 0a5378: Add document_undo_clear_stack()
by Arthur Rosenstein 28 Jan '15

28 Jan '15

Branch: refs/heads/master Author: Arthur Rosenstein <artros.misc(a)gmail.com> Committer: Arthur Rosenstein <artros.misc(a)gmail.com> Date: Sat, 09 Nov 2013 13:13:34 UTC Commit: 0a5378134a0f93569d86890762963e6b48bb758f https://github.com/geany/geany/commit/0a5378134a0f93569d86890762963e6b48bb7… Log Message: ----------- Add document_undo_clear_stack() This function clears a single undo/redo stack. Modified Paths: -------------- src/document.c Modified: src/document.c 31 lines changed, 12 insertions(+), 19 deletions(-) =================================================================== @@ -102,6 +102,7 @@ typedef struct } undo_action; +static void document_undo_clear_stack(GTrashStack **stack); static void document_undo_clear(GeanyDocument *doc); static void document_redo_add(GeanyDocument *doc, guint type, gpointer data); static gboolean remove_page(guint page_num); @@ -2482,14 +2483,14 @@ void document_set_encoding(GeanyDocument *doc, const gchar *new_encoding) * to the encoding or the Unicode BOM (which are Scintilla independet). * All Scintilla events are stored in the undo / redo buffer and are passed through. */ -/* Clears the Undo and Redo buffer (to be called when reloading or closing the document) */ -void document_undo_clear(GeanyDocument *doc) +/* Clears an Undo or Redo buffer. */ +void document_undo_clear_stack(GTrashStack **stack) { undo_action *a; - while (g_trash_stack_height(&doc->priv->undo_actions) > 0) + while (g_trash_stack_height(stack) > 0) { - a = g_trash_stack_pop(&doc->priv->undo_actions); + a = g_trash_stack_pop(stack); if (G_LIKELY(a != NULL)) { switch (a->type) @@ -2500,22 +2501,14 @@ void document_undo_clear(GeanyDocument *doc) g_free(a); } } - doc->priv->undo_actions = NULL; + *stack = NULL; +} - while (g_trash_stack_height(&doc->priv->redo_actions) > 0) - { - a = g_trash_stack_pop(&doc->priv->redo_actions); - if (G_LIKELY(a != NULL)) - { - switch (a->type) - { - case UNDO_ENCODING: g_free(a->data); break; - default: break; - } - g_free(a); - } - } - doc->priv->redo_actions = NULL; +/* Clears the Undo and Redo buffer (to be called when reloading or closing the document) */ +void document_undo_clear(GeanyDocument *doc) +{ + document_undo_clear_stack(&doc->priv->undo_actions); + document_undo_clear_stack(&doc->priv->redo_actions); if (! main_status.quitting && doc->editor != NULL) document_set_text_changed(doc, FALSE); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany] 1b1a1d: Clear redo stack when adding undo action
by Arthur Rosenstein 28 Jan '15

28 Jan '15

Branch: refs/heads/master Author: Arthur Rosenstein <artros.misc(a)gmail.com> Committer: Arthur Rosenstein <artros.misc(a)gmail.com> Date: Sun, 10 Nov 2013 09:08:52 UTC Commit: 1b1a1da4edfbf7168dd9afa8593cab77aca7f3a3 https://github.com/geany/geany/commit/1b1a1da4edfbf7168dd9afa8593cab77aca7f… Log Message: ----------- Clear redo stack when adding undo action This fixes a bug in Geany where modifying the document does not clear the redo actions stack. Modified Paths: -------------- src/document.c Modified: src/document.c 23 lines changed, 18 insertions(+), 5 deletions(-) =================================================================== @@ -104,6 +104,7 @@ typedef struct static void document_undo_clear_stack(GTrashStack **stack); static void document_undo_clear(GeanyDocument *doc); +static void document_undo_add_internal(GeanyDocument *doc, guint type, gpointer data); static void document_redo_add(GeanyDocument *doc, guint type, gpointer data); static gboolean remove_page(guint page_num); @@ -2515,8 +2516,11 @@ void document_undo_clear(GeanyDocument *doc) } -/* note: this is called on SCN_MODIFIED notifications */ -void document_undo_add(GeanyDocument *doc, guint type, gpointer data) +/* Adds an undo action without clearing the redo stack. This function should + * not be called directly, generally (use document_undo_add() instead), but is + * used by document_redo() in order not to erase the redo stack while moving + * an action from the redo stack to the undo stack. */ +void document_undo_add_internal(GeanyDocument *doc, guint type, gpointer data) { undo_action *action; @@ -2535,6 +2539,15 @@ void document_undo_add(GeanyDocument *doc, guint type, gpointer data) ui_update_popup_reundo_items(doc); } +/* note: this is called on SCN_MODIFIED notifications */ +void document_undo_add(GeanyDocument *doc, guint type, gpointer data) +{ + /* Clear the redo actions stack before adding the undo action. */ + document_undo_clear_stack(&doc->priv->redo_actions); + + document_undo_add_internal(doc, type, data); +} + gboolean document_can_undo(GeanyDocument *doc) { @@ -2646,14 +2659,14 @@ void document_redo(GeanyDocument *doc) { case UNDO_SCINTILLA: { - document_undo_add(doc, UNDO_SCINTILLA, NULL); + document_undo_add_internal(doc, UNDO_SCINTILLA, NULL); sci_redo(doc->editor->sci); break; } case UNDO_BOM: { - document_undo_add(doc, UNDO_BOM, GINT_TO_POINTER(doc->has_bom)); + document_undo_add_internal(doc, UNDO_BOM, GINT_TO_POINTER(doc->has_bom)); doc->has_bom = GPOINTER_TO_INT(action->data); ui_update_statusbar(doc, -1); @@ -2662,7 +2675,7 @@ void document_redo(GeanyDocument *doc) } case UNDO_ENCODING: { - document_undo_add(doc, UNDO_ENCODING, g_strdup(doc->encoding)); + document_undo_add_internal(doc, UNDO_ENCODING, g_strdup(doc->encoding)); document_set_encoding(doc, (const gchar*)action->data); -------------- 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 January 2015