Plugins-Commits February 2017

plugins-commits@lists.geany.org

1 participants
30 discussions

[geany/geany-plugins] 2a87f0: treebrowser: Don't change directory on project save
by Jiří Techet 20 Feb '17

20 Feb '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Mon, 20 Feb 2017 15:41:29 UTC Commit: 2a87f09123bfb45d8664718f22c8f69fa23884b4 https://github.com/geany/geany-plugins/commit/2a87f09123bfb45d8664718f22c8f… Log Message: ----------- treebrowser: Don't change directory on project save This behavior might be unwanted when changing project settings which is unrelated to project base path and also fixes filebrowser behavior with the updated way project-save signal is emitted. Modified Paths: -------------- treebrowser/src/treebrowser.c Modified: treebrowser/src/treebrowser.c 7 lines changed, 3 insertions(+), 4 deletions(-) =================================================================== @@ -151,7 +151,7 @@ _gtk_cell_layout_get_cells(GtkTreeViewColumn *column) * PROTOTYPES * ------------------ */ -static void project_change_cb(G_GNUC_UNUSED GObject *obj, G_GNUC_UNUSED GKeyFile *config, G_GNUC_UNUSED gpointer data); +static void project_open_cb(G_GNUC_UNUSED GObject *obj, G_GNUC_UNUSED GKeyFile *config, G_GNUC_UNUSED gpointer data); static void treebrowser_browse(gchar *directory, gpointer parent); static void treebrowser_bookmarks_set_state(void); static void treebrowser_load_bookmarks(void); @@ -168,8 +168,7 @@ static gboolean save_settings(void); PluginCallback plugin_callbacks[] = { - { "project-open", (GCallback) &project_change_cb, TRUE, NULL }, - { "project-save", (GCallback) &project_change_cb, TRUE, NULL }, + { "project-open", (GCallback) &project_open_cb, TRUE, NULL }, { NULL, NULL, FALSE, NULL } }; @@ -2072,7 +2071,7 @@ plugin_configure(GtkDialog *dialog) * ------------------ */ static void -project_change_cb(G_GNUC_UNUSED GObject *obj, G_GNUC_UNUSED GKeyFile *config, G_GNUC_UNUSED gpointer data) +project_open_cb(G_GNUC_UNUSED GObject *obj, G_GNUC_UNUSED GKeyFile *config, G_GNUC_UNUSED gpointer data) { gchar *uri; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 2a3ff8: Add a additional checks for doc != NULL and removing such ones later to ensure
by Frank Lanitz 20 Feb '17

20 Feb '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 20 Feb 2017 08:40:04 UTC Commit: 2a3ff8cf630499e7a94c6bec7a6739a96b0ca37d https://github.com/geany/geany-plugins/commit/2a3ff8cf630499e7a94c6bec7a673… Log Message: ----------- Add a additional checks for doc != NULL and removing such ones later to ensure there is no access of doc before it has been checked against NULL. Modified Paths: -------------- lineoperations/src/lineoperations.c Modified: lineoperations/src/lineoperations.c 14 lines changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -160,6 +160,8 @@ action_indir_manip_item(GtkMenuItem *menuitem, gpointer gdata) gint (*func)(gchar **lines, gint num_lines, gchar *new_file) = gdata; GeanyDocument *doc = document_get_current(); + g_return_if_fail(doc != NULL); + struct lo_lines sel = get_current_sel_lines(doc->editor->sci); gint num_lines = (sel.end_line - sel.start_line) + 1; @@ -191,10 +193,7 @@ action_indir_manip_item(GtkMenuItem *menuitem, gpointer gdata) sci_start_undo_action(doc->editor->sci); - - if(doc) - lines_affected = func(lines, num_lines, new_file); - + lines_affected = func(lines, num_lines, new_file); /* set new document */ sci_replace_sel(doc->editor->sci, new_file); @@ -223,14 +222,15 @@ action_sci_manip_item(GtkMenuItem *menuitem, gpointer gdata) /* function pointer to gdata -- function to be used */ gint (*func)(ScintillaObject *, gint, gint) = gdata; GeanyDocument *doc = document_get_current(); + + g_return_if_fail(doc != NULL); + struct lo_lines sel = get_current_sel_lines(doc->editor->sci); gint lines_affected = 0; - sci_start_undo_action(doc->editor->sci); - if(doc) - lines_affected = func(doc->editor->sci, sel.start_line, sel.end_line); + lines_affected = func(doc->editor->sci, sel.start_line, sel.end_line); /* put message in ui_statusbar, and highlight lines that were affected */ user_indicate(doc->editor, lines_affected, sel); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] ca0ec9: Update of NEWS
by Frank Lanitz 20 Feb '17

20 Feb '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 20 Feb 2017 08:25:09 UTC Commit: ca0ec91e76ab263c96ac951e43f1e58f55e153e0 https://github.com/geany/geany-plugins/commit/ca0ec91e76ab263c96ac951e43f1e… Log Message: ----------- Update of NEWS Modified Paths: -------------- NEWS Modified: NEWS 8 lines changed, 7 insertions(+), 1 deletions(-) =================================================================== @@ -20,11 +20,14 @@ Geany Plugins 1.30 (not yet released) * Improve compatibility with Gtk3 * Allow to use current word as initial text in interactive mode (PR##457 - GeanyLua + GeanyLua: * Remove deprecated GeanyFunctions from interface provided by this plugin (PR##439) * Fix build with latest Scintilla (PR##510) + GeanyPy: + * Sync with upstream GeanyPy version (PR##527) + Lineoperations: * Add support for selections (PR##378) @@ -41,6 +44,7 @@ Geany Plugins 1.30 (not yet released) ProjectOrganizer: * Show online help via help button (PR##521) + * Remember expanded directories in the sidebar when reloading (PR##528) Spellcheck: * Treat underscore as word seperator (PR##512) @@ -52,6 +56,8 @@ Geany Plugins 1.30 (not yet released) * Fix a possible memory leak (PR##478) * Add a keybinding to follow current file (PR##524 * Allow to show menu also with Shift+F10 (PR##523) + * Fix a bug addding files to file list again and again when using + refresh-function and no file is selected (PR##525) Internationalization: * Updated translations: de -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 67fcad: Merge pull request #528 from techee/expand
by Frank Lanitz 19 Feb '17

19 Feb '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 19 Feb 2017 19:37:03 UTC Commit: 67fcade153b4e252b98f2997cc91b9d6659d3649 https://github.com/geany/geany-plugins/commit/67fcade153b4e252b98f2997cc91b… Log Message: ----------- Merge pull request #528 from techee/expand projectorganizer: Remember expanded directories in the sidebar when reloading Modified Paths: -------------- projectorganizer/src/prjorg-sidebar.c Modified: projectorganizer/src/prjorg-sidebar.c 107 lines changed, 88 insertions(+), 19 deletions(-) =================================================================== @@ -1139,8 +1139,7 @@ static gboolean find_in_tree(GtkTreeIter *parent, gchar **path_split, gint level g_free(name); if (cmpres == 0) { - GtkTreeIter foo; - if (path_split[level+1] == NULL && !gtk_tree_model_iter_children (model, &foo, &iter)) + if (path_split[level+1] == NULL) { *ret = iter; return TRUE; @@ -1156,27 +1155,21 @@ static gboolean find_in_tree(GtkTreeIter *parent, gchar **path_split, gint level } -static gboolean follow_editor_on_idle(gpointer foo) +static gboolean expand_path(gchar *utf8_expanded_path, gboolean select) { GtkTreeIter root_iter, found_iter; gchar *utf8_path = NULL; gchar **path_split; - GeanyDocument *doc; GSList *elem; GtkTreeModel *model; - doc = document_get_current(); - - if (!doc || !doc->file_name || !geany_data->app->project || !prj_org) - return FALSE; - model = GTK_TREE_MODEL(s_file_store); gtk_tree_model_iter_children(model, &root_iter, NULL); foreach_slist (elem, prj_org->roots) { PrjOrgRoot *root = elem->data; - utf8_path = get_relative_path(root->base_dir, doc->file_name); + utf8_path = get_relative_path(root->base_dir, utf8_expanded_path); if (utf8_path) break; @@ -1197,14 +1190,17 @@ static gboolean follow_editor_on_idle(gpointer foo) GtkTreeSelection *treesel; tree_path = gtk_tree_model_get_path (model, &found_iter); - gtk_tree_view_expand_to_path(GTK_TREE_VIEW(s_file_view), tree_path); - gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(s_file_view), tree_path, - NULL, FALSE, 0.0, 0.0); - treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(s_file_view)); - gtk_tree_selection_select_iter(treesel, &found_iter); - gtk_tree_path_free(tree_path); + if (select) + { + gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(s_file_view), tree_path, + NULL, FALSE, 0.0, 0.0); + + treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(s_file_view)); + gtk_tree_selection_select_iter(treesel, &found_iter); + gtk_tree_path_free(tree_path); + } } g_free(utf8_path); @@ -1214,19 +1210,92 @@ static gboolean follow_editor_on_idle(gpointer foo) } +static gboolean expand_on_idle(gpointer ptr) +{ + GeanyDocument *doc = document_get_current(); + + if (ptr) + { + GPtrArray *expanded_paths = ptr; + gchar *item; + guint i; + + foreach_ptr_array(item, i, expanded_paths) + expand_path(item, FALSE); + g_ptr_array_free(expanded_paths, TRUE); + } + + if (!s_follow_editor || !doc || !doc->file_name || !geany_data->app->project || !prj_org) + return FALSE; + + expand_path(doc->file_name, TRUE); + + return FALSE; +} + + +static void on_map_expanded(GtkTreeView *tree_view, GtkTreePath *tree_path, GPtrArray *path_arr) +{ + GtkTreeIter iter; + + if (gtk_tree_model_get_iter(GTK_TREE_MODEL(s_file_store), &iter, tree_path)) + { + gchar *utf8_path = build_path(&iter); + gboolean replaced = FALSE; + + if (path_arr->len > 0) + { + gchar *previous = path_arr->pdata[path_arr->len-1]; + gchar *rel_path = get_relative_path(previous, utf8_path); + + /* Filter-out redundant parent paths. gtk_tree_view_map_expanded_rows() + * returns first parent paths and then nested paths so we can just + * check if the last stored path is a parent of current path and + * if so, replace it with curent path. */ + if (rel_path) + { + g_free(previous); + path_arr->pdata[path_arr->len-1] = utf8_path; + replaced = TRUE; + } + + g_free(rel_path); + } + + if (!replaced) + g_ptr_array_add(path_arr, utf8_path); + } +} + + +static GPtrArray *get_expanded_paths(void) +{ + GPtrArray *expanded_paths = g_ptr_array_new_with_free_func(g_free); + + gtk_tree_view_map_expanded_rows(GTK_TREE_VIEW(s_file_view), + (GtkTreeViewMappingFunc)on_map_expanded, expanded_paths); + + return expanded_paths; +} + + void prjorg_sidebar_update(gboolean reload) { + GPtrArray *expanded_paths = NULL; + if (reload) { + expanded_paths = get_expanded_paths(); + load_project(); /* we get color information only after the sidebar is realized - * perform reload later if this is not the case yet */ if (!gtk_widget_get_realized(s_toolbar)) s_pending_reload = TRUE; } - if (s_follow_editor) - /* perform on idle - avoids unnecessary jumps on project load */ - plugin_idle_add(geany_plugin, (GSourceFunc)follow_editor_on_idle, NULL); + + /* perform on idle - avoids unnecessary jumps on project load */ + plugin_idle_add(geany_plugin, (GSourceFunc)expand_on_idle, expanded_paths); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 59e740: Merge pull request #527 from codebrainz/upstream-sync
by Frank Lanitz 19 Feb '17

19 Feb '17

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 19 Feb 2017 19:35:54 UTC Commit: 59e74092d60efcd9006006ae82819757868e6502 https://github.com/geany/geany-plugins/commit/59e74092d60efcd9006006ae82819… Log Message: ----------- Merge pull request #527 from codebrainz/upstream-sync Sync with latest upstream Modified Paths: -------------- geanypy/geany/Makefile.am geanypy/geany/__init__.py geanypy/geany/logger.py geanypy/geany/plugin.py geanypy/src/Makefile.am geanypy/src/geanypy-app.c geanypy/src/geanypy-document.c geanypy/src/geanypy-editor.c geanypy/src/geanypy-glog.c geanypy/src/geanypy-plugin.c geanypy/src/makefile.win32 Modified: geanypy/geany/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,5 +1,6 @@ geanypy_sources = __init__.py \ console.py \ + logger.py \ plugin.py \ signalmanager.py geanypy_objects = $(geanypy_sources:.py=.pyc) Modified: geanypy/geany/__init__.py 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -15,6 +15,7 @@ import encoding import filetypes import highlighting +import glog import main import msgwindow import navqueue @@ -42,6 +43,7 @@ "main_widgets", "interface_prefs", "app", + "glog", "keybindings", "general_prefs", "search_prefs", Modified: geanypy/geany/logger.py 74 lines changed, 74 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,74 @@ +# -*- coding: utf-8 -*- + +from geany import glog +from traceback import format_exception +import logging +import sys + + +GLIB_LOG_LEVEL_MAP = { + logging.DEBUG: glog.LOG_LEVEL_DEBUG, + logging.INFO: glog.LOG_LEVEL_INFO, + logging.WARNING: glog.LOG_LEVEL_WARNING, + # error and critical levels are swapped on purpose because + # GLib interprets CRITICAL less fatal than Python and additionally + # GLib abort()s the program on G_LOG_LEVEL_ERROR which is uncommon + # in Python + logging.ERROR: glog.LOG_LEVEL_CRITICAL, + logging.CRITICAL: glog.LOG_LEVEL_ERROR, +} + + +class PluginLogger(object): + """ + Convenience wrapper softly emulating Python's logging interface. + Any log messages are passed to the GLib log system using g_log() + and the LOG_DOMAIN is set automatically to the plugin's name for convenience. + """ + + def __init__(self, plugin_name): + self._log_domain = u'geanypy-%s' % plugin_name + + def debug(self, msg_format, *args, **kwargs): + self.log(logging.DEBUG, msg_format, *args, **kwargs) + + def info(self, msg_format, *args, **kwargs): + self.log(logging.INFO, msg_format, *args, **kwargs) + + def message(self, msg_format, *args, **kwargs): + self.log(glog.LOG_LEVEL_MESSAGE, msg_format, *args, **kwargs) + + def warning(self, msg_format, *args, **kwargs): + self.log(logging.WARNING, msg_format, *args, **kwargs) + + def error(self, msg_format, *args, **kwargs): + self.log(logging.ERROR, msg_format, *args, **kwargs) + + def exception(self, msg_format, *args, **kwargs): + kwargs['exc_info'] = True + self.error(msg_format, *args, **kwargs) + + def critical(self, msg_format, *args, **kwargs): + self.log(logging.CRITICAL, msg_format, *args, **kwargs) + + warn = warning + fatal = critical + + def log(self, level, msg_format, *args, **kwargs): + # map log level from Python to GLib + glib_log_level = GLIB_LOG_LEVEL_MAP.get(level, glog.LOG_LEVEL_MESSAGE) + # format message + log_message = msg_format % args + # log exception information if requested + exc_info = kwargs.get('exc_info', False) + if exc_info: + traceback_text = self._format_exception(exc_info) + log_message = '%s\n%s' % (log_message, traceback_text) + + glog.glog(self._log_domain, glib_log_level, log_message) + + def _format_exception(self, exc_info): + if not isinstance(exc_info, tuple): + exc_info = sys.exc_info() + exc_text_lines = format_exception(*exc_info) + return ''.join(exc_text_lines) Modified: geanypy/geany/plugin.py 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -35,6 +35,8 @@ def cleanup(self): ~/.config/geany/plugins). Only files with a `.py` extension will be loaded. """ + +from geany.logger import PluginLogger import keybindings class Plugin(object): @@ -60,7 +62,7 @@ def __init__(self): When the plugin is loaded its __init__() function will be called so that's a good place to put plugin initialization code. """ - + self.logger = PluginLogger(self.name) def cleanup(self): Modified: geanypy/src/Makefile.am 7 lines changed, 4 insertions(+), 3 deletions(-) =================================================================== @@ -5,11 +5,11 @@ geanyplugin_LTLIBRARIES = geanypy.la geanyplugindir = $(libdir)/geany geanypy_la_LDFLAGS = -module -avoid-version -Wl,--export-dynamic -geanypy_la_CPPFLAGS = @GEANY_CFLAGS@ @PYGTK_CFLAGS@ @PYTHON_CPPFLAGS@ \ +geanypy_la_CPPFLAGS = @PYTHON_CPPFLAGS@ \ -DGEANYPY_PYTHON_DIR="\"$(libdir)/geany/geanypy\"" \ -DGEANYPY_PLUGIN_DIR="\"$(libdir)/geany\"" \ -DG_LOG_DOMAIN=\"GeanyPy\" -geanypy_la_CFLAGS = @GEANYPY_CFLAGS@ @GMODULE_CFLAGS@ +geanypy_la_CFLAGS = @PYGTK_CFLAGS@ @GEANY_CFLAGS@ @GEANYPY_CFLAGS@ @GMODULE_CFLAGS@ geanypy_la_LIBADD = @GEANY_LIBS@ @PYGTK_LIBS@ \ $(PYTHON_LDFLAGS) $(PYTHON_LIBS) \ @PYTHON_EXTRA_LIBS@ @PYTHON_EXTRA_LDFLAGS@ \ @@ -20,11 +20,12 @@ geanypy_la_SOURCES = geanypy-app.c \ geanypy-editor.c geanypy-editor.h \ geanypy-encoding.c geanypy-encoding.h \ geanypy-filetypes.c geanypy-filetypes.h \ + geanypy-glog.c \ geanypy.h \ geanypy-highlighting.c \ geanypy-indentprefs.c \ geanypy-interfaceprefs.c \ - geanypy-keybindings.c geanypy-keybindings.h\ + geanypy-keybindings.c geanypy-keybindings.h \ geanypy-main.c \ geanypy-mainwidgets.c \ geanypy-msgwindow.c \ Modified: geanypy/src/geanypy-app.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -4,7 +4,6 @@ #include "geanypy.h" - typedef struct { PyObject_HEAD Modified: geanypy/src/geanypy-document.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -118,9 +118,9 @@ Document_get_property(Document *self, const gchar *prop_name) else if (g_str_equal(prop_name, "text_changed")) { if (self->doc->changed) - Py_RETURN_NONE; + Py_RETURN_TRUE; else - Py_RETURN_NONE; + Py_RETURN_FALSE; } Py_RETURN_NONE; Modified: geanypy/src/geanypy-editor.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -62,7 +62,7 @@ Editor_get_property(Editor *self, const gchar *prop_name) PyObject *py_doc; py_doc = (PyObject *) Document_create_new_from_geany_document( self->editor->document); - if (py_doc && py_doc != Py_None) + if (!py_doc || py_doc == Py_None) Py_RETURN_NONE; return py_doc; } @@ -296,7 +296,7 @@ static PyMethodDef Editor_methods[] = { { "indicator_set_on_range", (PyCFunction) Editor_indicator_set_on_range, METH_KEYWORDS, "Sets an indicator on the range specified." }, { "insert_snippet", (PyCFunction) Editor_insert_snippet, METH_KEYWORDS, - "Replces all special sequences in snippet and inserts it at " + "Replaces all special sequences in snippet and inserts it at " "the specified position." }, { "insert_text_block", (PyCFunction) Editor_insert_text_block, METH_KEYWORDS, "Inserts text, replacing tab chars and newline chars accordingly " Modified: geanypy/src/geanypy-glog.c 45 lines changed, 45 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,45 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + +#include "geanypy.h" + + +static PyObject * +Glog_glog(PyObject *module, PyObject *args, PyObject *kwargs) +{ + static gchar *kwlist[] = { "log_domain", "log_level", "message", NULL }; + gchar *log_domain, *message; + GLogLevelFlags log_level; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "sis", kwlist, &log_domain, &log_level, &message)) + { + g_log(log_domain, log_level, "%s", message); + } + Py_RETURN_NONE; +} + + +static +PyMethodDef GlogModule_methods[] = { + { "glog", (PyCFunction) Glog_glog, METH_KEYWORDS, "Wrapper around g_log()." }, + { NULL } +}; + + +PyMODINIT_FUNC initglog(void) +{ + PyObject *m; + + m = Py_InitModule3("glog", GlogModule_methods, "GLib Log utility functions."); + + /* TODO: These constants are for the geany.logger.GLIB_LOG_LEVEL_MAP mapping. + * It would be better to build this mapping on the C layer but how to + * access the Python logging.* level constants here? */ + PyModule_AddIntConstant(m, "LOG_LEVEL_DEBUG", G_LOG_LEVEL_DEBUG); + PyModule_AddIntConstant(m, "LOG_LEVEL_INFO", G_LOG_LEVEL_INFO); + PyModule_AddIntConstant(m, "LOG_LEVEL_MESSAGE", G_LOG_LEVEL_MESSAGE); + PyModule_AddIntConstant(m, "LOG_LEVEL_WARNING", G_LOG_LEVEL_WARNING); + PyModule_AddIntConstant(m, "LOG_LEVEL_ERROR", G_LOG_LEVEL_ERROR); + PyModule_AddIntConstant(m, "LOG_LEVEL_CRITICAL", G_LOG_LEVEL_CRITICAL); +} Modified: geanypy/src/geanypy-plugin.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -40,6 +40,7 @@ PyMODINIT_FUNC initdocument(void); PyMODINIT_FUNC initeditor(void); PyMODINIT_FUNC initencoding(void); PyMODINIT_FUNC initfiletypes(void); +PyMODINIT_FUNC initglog(void); PyMODINIT_FUNC inithighlighting(void); PyMODINIT_FUNC initmain(void); PyMODINIT_FUNC initmsgwin(void); @@ -81,6 +82,7 @@ GeanyPy_start_interpreter(void) initeditor(); initencoding(); initfiletypes(); + initglog(); inithighlighting(); initmain(); initmsgwin(); Modified: geanypy/src/makefile.win32 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -10,6 +10,7 @@ SOURCES = \ geanypy-highlighting.c \ geanypy-indentprefs.c \ geanypy-interfaceprefs.c \ + geanypy-glog.c \ geanypy-main.c \ geanypy-mainwidgets.c \ geanypy-msgwindow.c \ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 8e511d: Remove -Werror=aggregate-return from travis flags (#529)
by Jiří Techet 19 Feb '17

19 Feb '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 19 Feb 2017 18:45:23 UTC Commit: 8e511d19073c97ba249bdb3781a51deb786dc433 https://github.com/geany/geany-plugins/commit/8e511d19073c97ba249bdb3781a51… Log Message: ----------- Remove -Werror=aggregate-return from travis flags (#529) While in general one should avoid returning big structs for performance reasons, it's no big problem for small structs and it can lead to more readable code. Having this check on for everything seems to be too strict - if someone is returning big structs like crazy, someone will probably notice during the review. Otherwise it's no problem. Modified Paths: -------------- .travis.yml Modified: .travis.yml 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -125,7 +125,7 @@ before_install: before_script: # prepare for GP - - export CFLAGS="-g -O2 -Werror=pointer-arith -Werror=aggregate-return -Werror=implicit-function-declaration" + - export CFLAGS="-g -O2 -Werror=pointer-arith -Werror=implicit-function-declaration" script: - NOCONFIGURE=1 ./autogen.sh -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 811151: projectorganizer: Remember expanded directories in the sidebar when reloading
by Jiří Techet 17 Feb '17

17 Feb '17

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Fri, 17 Feb 2017 18:14:34 UTC Commit: 8111515e7ce4bbc991f31e497a978cb0c56d9b90 https://github.com/geany/geany-plugins/commit/8111515e7ce4bbc991f31e497a978… Log Message: ----------- projectorganizer: Remember expanded directories in the sidebar when reloading Modified Paths: -------------- projectorganizer/src/prjorg-sidebar.c Modified: projectorganizer/src/prjorg-sidebar.c 107 lines changed, 88 insertions(+), 19 deletions(-) =================================================================== @@ -1139,8 +1139,7 @@ static gboolean find_in_tree(GtkTreeIter *parent, gchar **path_split, gint level g_free(name); if (cmpres == 0) { - GtkTreeIter foo; - if (path_split[level+1] == NULL && !gtk_tree_model_iter_children (model, &foo, &iter)) + if (path_split[level+1] == NULL) { *ret = iter; return TRUE; @@ -1156,27 +1155,21 @@ static gboolean find_in_tree(GtkTreeIter *parent, gchar **path_split, gint level } -static gboolean follow_editor_on_idle(gpointer foo) +static gboolean expand_path(gchar *utf8_expanded_path, gboolean select) { GtkTreeIter root_iter, found_iter; gchar *utf8_path = NULL; gchar **path_split; - GeanyDocument *doc; GSList *elem; GtkTreeModel *model; - doc = document_get_current(); - - if (!doc || !doc->file_name || !geany_data->app->project || !prj_org) - return FALSE; - model = GTK_TREE_MODEL(s_file_store); gtk_tree_model_iter_children(model, &root_iter, NULL); foreach_slist (elem, prj_org->roots) { PrjOrgRoot *root = elem->data; - utf8_path = get_relative_path(root->base_dir, doc->file_name); + utf8_path = get_relative_path(root->base_dir, utf8_expanded_path); if (utf8_path) break; @@ -1197,14 +1190,17 @@ static gboolean follow_editor_on_idle(gpointer foo) GtkTreeSelection *treesel; tree_path = gtk_tree_model_get_path (model, &found_iter); - gtk_tree_view_expand_to_path(GTK_TREE_VIEW(s_file_view), tree_path); - gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(s_file_view), tree_path, - NULL, FALSE, 0.0, 0.0); - treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(s_file_view)); - gtk_tree_selection_select_iter(treesel, &found_iter); - gtk_tree_path_free(tree_path); + if (select) + { + gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(s_file_view), tree_path, + NULL, FALSE, 0.0, 0.0); + + treesel = gtk_tree_view_get_selection(GTK_TREE_VIEW(s_file_view)); + gtk_tree_selection_select_iter(treesel, &found_iter); + gtk_tree_path_free(tree_path); + } } g_free(utf8_path); @@ -1214,19 +1210,92 @@ static gboolean follow_editor_on_idle(gpointer foo) } +static gboolean expand_on_idle(gpointer ptr) +{ + GeanyDocument *doc = document_get_current(); + + if (ptr) + { + GPtrArray *expanded_paths = ptr; + gchar *item; + guint i; + + foreach_ptr_array(item, i, expanded_paths) + expand_path(item, FALSE); + g_ptr_array_free(expanded_paths, TRUE); + } + + if (!s_follow_editor || !doc || !doc->file_name || !geany_data->app->project || !prj_org) + return FALSE; + + expand_path(doc->file_name, TRUE); + + return FALSE; +} + + +static void on_map_expanded(GtkTreeView *tree_view, GtkTreePath *tree_path, GPtrArray *path_arr) +{ + GtkTreeIter iter; + + if (gtk_tree_model_get_iter(GTK_TREE_MODEL(s_file_store), &iter, tree_path)) + { + gchar *utf8_path = build_path(&iter); + gboolean replaced = FALSE; + + if (path_arr->len > 0) + { + gchar *previous = path_arr->pdata[path_arr->len-1]; + gchar *rel_path = get_relative_path(previous, utf8_path); + + /* Filter-out redundant parent paths. gtk_tree_view_map_expanded_rows() + * returns first parent paths and then nested paths so we can just + * check if the last stored path is a parent of current path and + * if so, replace it with curent path. */ + if (rel_path) + { + g_free(previous); + path_arr->pdata[path_arr->len-1] = utf8_path; + replaced = TRUE; + } + + g_free(rel_path); + } + + if (!replaced) + g_ptr_array_add(path_arr, utf8_path); + } +} + + +static GPtrArray *get_expanded_paths(void) +{ + GPtrArray *expanded_paths = g_ptr_array_new_with_free_func(g_free); + + gtk_tree_view_map_expanded_rows(GTK_TREE_VIEW(s_file_view), + (GtkTreeViewMappingFunc)on_map_expanded, expanded_paths); + + return expanded_paths; +} + + void prjorg_sidebar_update(gboolean reload) { + GPtrArray *expanded_paths = NULL; + if (reload) { + expanded_paths = get_expanded_paths(); + load_project(); /* we get color information only after the sidebar is realized - * perform reload later if this is not the case yet */ if (!gtk_widget_get_realized(s_toolbar)) s_pending_reload = TRUE; } - if (s_follow_editor) - /* perform on idle - avoids unnecessary jumps on project load */ - plugin_idle_add(geany_plugin, (GSourceFunc)follow_editor_on_idle, NULL); + + /* perform on idle - avoids unnecessary jumps on project load */ + plugin_idle_add(geany_plugin, (GSourceFunc)expand_on_idle, expanded_paths); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] ea0a63: Fix typo on untested win32 build
by Matthew Brush 17 Feb '17

17 Feb '17

Branch: refs/heads/master Author: Matthew Brush <mbrush(a)codebrainz.ca> Committer: Matthew Brush <mbrush(a)codebrainz.ca> Date: Fri, 17 Feb 2017 06:05:47 UTC Commit: ea0a634f33ca809f76d5b3c59d52c34470c8ee91 https://github.com/geany/geany-plugins/commit/ea0a634f33ca809f76d5b3c59d52c… Log Message: ----------- Fix typo on untested win32 build Modified Paths: -------------- geanypy/src/makefile.win32 Modified: geanypy/src/makefile.win32 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -10,7 +10,7 @@ SOURCES = \ geanypy-highlighting.c \ geanypy-indentprefs.c \ geanypy-interfaceprefs.c \ - geanypy-log.c \ + geanypy-glog.c \ geanypy-main.c \ geanypy-mainwidgets.c \ geanypy-msgwindow.c \ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 10e2c7: Sync with latest upstream
by Matthew Brush 17 Feb '17

17 Feb '17

Branch: refs/heads/master Author: Matthew Brush <mbrush(a)codebrainz.ca> Committer: Matthew Brush <mbrush(a)codebrainz.ca> Date: Fri, 17 Feb 2017 05:40:53 UTC Commit: 10e2c7ef4c7868055735675d705989972fd221d1 https://github.com/geany/geany-plugins/commit/10e2c7ef4c7868055735675d70598… Log Message: ----------- Sync with latest upstream Closes #526 Modified Paths: -------------- geanypy/geany/Makefile.am geanypy/geany/__init__.py geanypy/geany/logger.py geanypy/geany/plugin.py geanypy/src/Makefile.am geanypy/src/geanypy-app.c geanypy/src/geanypy-document.c geanypy/src/geanypy-editor.c geanypy/src/geanypy-glog.c geanypy/src/geanypy-plugin.c geanypy/src/makefile.win32 Modified: geanypy/geany/Makefile.am 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,5 +1,6 @@ geanypy_sources = __init__.py \ console.py \ + logger.py \ plugin.py \ signalmanager.py geanypy_objects = $(geanypy_sources:.py=.pyc) Modified: geanypy/geany/__init__.py 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -15,6 +15,7 @@ import encoding import filetypes import highlighting +import glog import main import msgwindow import navqueue @@ -42,6 +43,7 @@ "main_widgets", "interface_prefs", "app", + "glog", "keybindings", "general_prefs", "search_prefs", Modified: geanypy/geany/logger.py 74 lines changed, 74 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,74 @@ +# -*- coding: utf-8 -*- + +from geany import glog +from traceback import format_exception +import logging +import sys + + +GLIB_LOG_LEVEL_MAP = { + logging.DEBUG: glog.LOG_LEVEL_DEBUG, + logging.INFO: glog.LOG_LEVEL_INFO, + logging.WARNING: glog.LOG_LEVEL_WARNING, + # error and critical levels are swapped on purpose because + # GLib interprets CRITICAL less fatal than Python and additionally + # GLib abort()s the program on G_LOG_LEVEL_ERROR which is uncommon + # in Python + logging.ERROR: glog.LOG_LEVEL_CRITICAL, + logging.CRITICAL: glog.LOG_LEVEL_ERROR, +} + + +class PluginLogger(object): + """ + Convenience wrapper softly emulating Python's logging interface. + Any log messages are passed to the GLib log system using g_log() + and the LOG_DOMAIN is set automatically to the plugin's name for convenience. + """ + + def __init__(self, plugin_name): + self._log_domain = u'geanypy-%s' % plugin_name + + def debug(self, msg_format, *args, **kwargs): + self.log(logging.DEBUG, msg_format, *args, **kwargs) + + def info(self, msg_format, *args, **kwargs): + self.log(logging.INFO, msg_format, *args, **kwargs) + + def message(self, msg_format, *args, **kwargs): + self.log(glog.LOG_LEVEL_MESSAGE, msg_format, *args, **kwargs) + + def warning(self, msg_format, *args, **kwargs): + self.log(logging.WARNING, msg_format, *args, **kwargs) + + def error(self, msg_format, *args, **kwargs): + self.log(logging.ERROR, msg_format, *args, **kwargs) + + def exception(self, msg_format, *args, **kwargs): + kwargs['exc_info'] = True + self.error(msg_format, *args, **kwargs) + + def critical(self, msg_format, *args, **kwargs): + self.log(logging.CRITICAL, msg_format, *args, **kwargs) + + warn = warning + fatal = critical + + def log(self, level, msg_format, *args, **kwargs): + # map log level from Python to GLib + glib_log_level = GLIB_LOG_LEVEL_MAP.get(level, glog.LOG_LEVEL_MESSAGE) + # format message + log_message = msg_format % args + # log exception information if requested + exc_info = kwargs.get('exc_info', False) + if exc_info: + traceback_text = self._format_exception(exc_info) + log_message = '%s\n%s' % (log_message, traceback_text) + + glog.glog(self._log_domain, glib_log_level, log_message) + + def _format_exception(self, exc_info): + if not isinstance(exc_info, tuple): + exc_info = sys.exc_info() + exc_text_lines = format_exception(*exc_info) + return ''.join(exc_text_lines) Modified: geanypy/geany/plugin.py 4 lines changed, 3 insertions(+), 1 deletions(-) =================================================================== @@ -35,6 +35,8 @@ def cleanup(self): ~/.config/geany/plugins). Only files with a `.py` extension will be loaded. """ + +from geany.logger import PluginLogger import keybindings class Plugin(object): @@ -60,7 +62,7 @@ def __init__(self): When the plugin is loaded its __init__() function will be called so that's a good place to put plugin initialization code. """ - + self.logger = PluginLogger(self.name) def cleanup(self): Modified: geanypy/src/Makefile.am 7 lines changed, 4 insertions(+), 3 deletions(-) =================================================================== @@ -5,11 +5,11 @@ geanyplugin_LTLIBRARIES = geanypy.la geanyplugindir = $(libdir)/geany geanypy_la_LDFLAGS = -module -avoid-version -Wl,--export-dynamic -geanypy_la_CPPFLAGS = @GEANY_CFLAGS@ @PYGTK_CFLAGS@ @PYTHON_CPPFLAGS@ \ +geanypy_la_CPPFLAGS = @PYTHON_CPPFLAGS@ \ -DGEANYPY_PYTHON_DIR="\"$(libdir)/geany/geanypy\"" \ -DGEANYPY_PLUGIN_DIR="\"$(libdir)/geany\"" \ -DG_LOG_DOMAIN=\"GeanyPy\" -geanypy_la_CFLAGS = @GEANYPY_CFLAGS@ @GMODULE_CFLAGS@ +geanypy_la_CFLAGS = @PYGTK_CFLAGS@ @GEANY_CFLAGS@ @GEANYPY_CFLAGS@ @GMODULE_CFLAGS@ geanypy_la_LIBADD = @GEANY_LIBS@ @PYGTK_LIBS@ \ $(PYTHON_LDFLAGS) $(PYTHON_LIBS) \ @PYTHON_EXTRA_LIBS@ @PYTHON_EXTRA_LDFLAGS@ \ @@ -20,11 +20,12 @@ geanypy_la_SOURCES = geanypy-app.c \ geanypy-editor.c geanypy-editor.h \ geanypy-encoding.c geanypy-encoding.h \ geanypy-filetypes.c geanypy-filetypes.h \ + geanypy-glog.c \ geanypy.h \ geanypy-highlighting.c \ geanypy-indentprefs.c \ geanypy-interfaceprefs.c \ - geanypy-keybindings.c geanypy-keybindings.h\ + geanypy-keybindings.c geanypy-keybindings.h \ geanypy-main.c \ geanypy-mainwidgets.c \ geanypy-msgwindow.c \ Modified: geanypy/src/geanypy-app.c 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -4,7 +4,6 @@ #include "geanypy.h" - typedef struct { PyObject_HEAD Modified: geanypy/src/geanypy-document.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -118,9 +118,9 @@ Document_get_property(Document *self, const gchar *prop_name) else if (g_str_equal(prop_name, "text_changed")) { if (self->doc->changed) - Py_RETURN_NONE; + Py_RETURN_TRUE; else - Py_RETURN_NONE; + Py_RETURN_FALSE; } Py_RETURN_NONE; Modified: geanypy/src/geanypy-editor.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -62,7 +62,7 @@ Editor_get_property(Editor *self, const gchar *prop_name) PyObject *py_doc; py_doc = (PyObject *) Document_create_new_from_geany_document( self->editor->document); - if (py_doc && py_doc != Py_None) + if (!py_doc || py_doc == Py_None) Py_RETURN_NONE; return py_doc; } @@ -296,7 +296,7 @@ static PyMethodDef Editor_methods[] = { { "indicator_set_on_range", (PyCFunction) Editor_indicator_set_on_range, METH_KEYWORDS, "Sets an indicator on the range specified." }, { "insert_snippet", (PyCFunction) Editor_insert_snippet, METH_KEYWORDS, - "Replces all special sequences in snippet and inserts it at " + "Replaces all special sequences in snippet and inserts it at " "the specified position." }, { "insert_text_block", (PyCFunction) Editor_insert_text_block, METH_KEYWORDS, "Inserts text, replacing tab chars and newline chars accordingly " Modified: geanypy/src/geanypy-glog.c 45 lines changed, 45 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,45 @@ +#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS) +# include "config.h" +#endif + +#include "geanypy.h" + + +static PyObject * +Glog_glog(PyObject *module, PyObject *args, PyObject *kwargs) +{ + static gchar *kwlist[] = { "log_domain", "log_level", "message", NULL }; + gchar *log_domain, *message; + GLogLevelFlags log_level; + + if (PyArg_ParseTupleAndKeywords(args, kwargs, "sis", kwlist, &log_domain, &log_level, &message)) + { + g_log(log_domain, log_level, "%s", message); + } + Py_RETURN_NONE; +} + + +static +PyMethodDef GlogModule_methods[] = { + { "glog", (PyCFunction) Glog_glog, METH_KEYWORDS, "Wrapper around g_log()." }, + { NULL } +}; + + +PyMODINIT_FUNC initglog(void) +{ + PyObject *m; + + m = Py_InitModule3("glog", GlogModule_methods, "GLib Log utility functions."); + + /* TODO: These constants are for the geany.logger.GLIB_LOG_LEVEL_MAP mapping. + * It would be better to build this mapping on the C layer but how to + * access the Python logging.* level constants here? */ + PyModule_AddIntConstant(m, "LOG_LEVEL_DEBUG", G_LOG_LEVEL_DEBUG); + PyModule_AddIntConstant(m, "LOG_LEVEL_INFO", G_LOG_LEVEL_INFO); + PyModule_AddIntConstant(m, "LOG_LEVEL_MESSAGE", G_LOG_LEVEL_MESSAGE); + PyModule_AddIntConstant(m, "LOG_LEVEL_WARNING", G_LOG_LEVEL_WARNING); + PyModule_AddIntConstant(m, "LOG_LEVEL_ERROR", G_LOG_LEVEL_ERROR); + PyModule_AddIntConstant(m, "LOG_LEVEL_CRITICAL", G_LOG_LEVEL_CRITICAL); +} Modified: geanypy/src/geanypy-plugin.c 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -40,6 +40,7 @@ PyMODINIT_FUNC initdocument(void); PyMODINIT_FUNC initeditor(void); PyMODINIT_FUNC initencoding(void); PyMODINIT_FUNC initfiletypes(void); +PyMODINIT_FUNC initglog(void); PyMODINIT_FUNC inithighlighting(void); PyMODINIT_FUNC initmain(void); PyMODINIT_FUNC initmsgwin(void); @@ -81,6 +82,7 @@ GeanyPy_start_interpreter(void) initeditor(); initencoding(); initfiletypes(); + initglog(); inithighlighting(); initmain(); initmsgwin(); Modified: geanypy/src/makefile.win32 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -10,6 +10,7 @@ SOURCES = \ geanypy-highlighting.c \ geanypy-indentprefs.c \ geanypy-interfaceprefs.c \ + geanypy-log.c \ geanypy-main.c \ geanypy-mainwidgets.c \ geanypy-msgwindow.c \ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 4144a7: TreeBrowser: fix refreshing without selection (#525)
by Vasiliy Faronov 15 Feb '17

15 Feb '17

Branch: refs/heads/master Author: Vasiliy Faronov <vfaronov(a)gmail.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 15 Feb 2017 22:22:37 UTC Commit: 4144a719be86a708c5741812e26f1d128227539f https://github.com/geany/geany-plugins/commit/4144a719be86a708c5741812e26f1… Log Message: ----------- TreeBrowser: fix refreshing without selection (#525) This fixes a bug that could be reproduced as follows: 1. ensure that *no* item in the tree is selected (highlighted); 2. press the "Refresh" keybinding. Without this fix, the contents of the tree are duplicated. Modified Paths: -------------- treebrowser/src/treebrowser.c Modified: treebrowser/src/treebrowser.c 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -461,7 +461,6 @@ treebrowser_chroot(const gchar *dir) treebrowser_bookmarks_set_state(); - gtk_tree_store_clear(treestore); setptr(addressbar_last_address, directory); treebrowser_browse(addressbar_last_address, NULL); @@ -499,6 +498,8 @@ treebrowser_browse(gchar *directory, gpointer parent) if (parent) gtk_tree_store_iter_clear_nodes(parent, FALSE); + else + gtk_tree_store_clear(treestore); list = utils_get_file_list(directory, NULL, NULL); if (list != NULL) -------------- 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

Plugins-Commits February 2017