Plugins-Commits December 2016

plugins-commits@lists.geany.org

1 participants
12 discussions

[geany/geany-plugins] 446a0b: SpellCheck: Reset wordchars only if we modified it before
by Enrico Tröger 29 Dec '16

29 Dec '16

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Wed, 28 Dec 2016 21:37:33 UTC Commit: 446a0bf57ad42f9edcd441315eb492d50e73636a https://github.com/geany/geany-plugins/commit/446a0bf57ad42f9edcd441315eb49… Log Message: ----------- SpellCheck: Reset wordchars only if we modified it before Modified Paths: -------------- spellcheck/src/speller.c Modified: spellcheck/src/speller.c 14 lines changed, 7 insertions(+), 7 deletions(-) =================================================================== @@ -256,15 +256,15 @@ gint sc_speller_process_line(GeanyDocument *doc, gint line_number) g_free(word); } - if (underscore_in_wordchars != NULL) + if (wordchars_modified) { - /* re-add underscore if we removed it above */ - *underscore_in_wordchars = '_'; + if (underscore_in_wordchars != NULL) + /* re-add underscore if we removed it above */ + *underscore_in_wordchars = '_'; + /* reset wordchars for the current document */ + wordchars[wordchars_len] = '\0'; + scintilla_send_message(doc->editor->sci, SCI_SETWORDCHARS, 0, (sptr_t)wordchars); } - /* reset wordchars for the current document */ - wordchars[wordchars_len] = '\0'; - scintilla_send_message(doc->editor->sci, SCI_SETWORDCHARS, 0, (sptr_t)wordchars); - g_free(wordchars); return suggestions_found; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 02494d: SpellCheck: Treat underscore as word seperator
by Enrico Tröger 29 Dec '16

29 Dec '16

Branch: refs/heads/master Author: Enrico Tröger <enrico.troeger(a)uvena.de> Committer: Enrico Tröger <enrico.troeger(a)uvena.de> Date: Wed, 28 Dec 2016 21:34:00 UTC Commit: 02494df3a85f9ef8d03d8bd19b6bc3a280176955 https://github.com/geany/geany-plugins/commit/02494df3a85f9ef8d03d8bd19b6bc… Log Message: ----------- SpellCheck: Treat underscore as word seperator We remove the underscore character temporarily from the wordchars to make Scintilla split words on underscore. After splitting the current line into words, we add the underscore again to the document's wordchars setting if it was in before. Fixes #496. Modified Paths: -------------- spellcheck/src/speller.c Modified: spellcheck/src/speller.c 21 lines changed, 20 insertions(+), 1 deletions(-) =================================================================== @@ -205,6 +205,8 @@ gint sc_speller_process_line(GeanyDocument *doc, gint line_number) gint suggestions_found = 0; gint wordchars_len; gchar *wordchars; + gchar *underscore_in_wordchars = NULL; + gboolean wordchars_modified = FALSE; g_return_val_if_fail(sc_speller_dict != NULL, 0); g_return_val_if_fail(doc != NULL, 0); @@ -218,9 +220,21 @@ gint sc_speller_process_line(GeanyDocument *doc, gint line_number) { /* temporarily add "'" to the wordchars */ wordchars[wordchars_len] = '\''; + wordchars_modified = TRUE; + } + underscore_in_wordchars = strchr(wordchars, '_'); + if (underscore_in_wordchars != NULL) + { + /* Temporarily remove underscore from the wordchars to treat + * it as a word seperator. Replace it by a "'" which we added already above. */ + *underscore_in_wordchars = '\''; + wordchars_modified = TRUE; + } + if (wordchars_modified) + { + /* apply previously changed WORDCHARS setting */ scintilla_send_message(doc->editor->sci, SCI_SETWORDCHARS, 0, (sptr_t)wordchars); } - pos_start = sci_get_position_from_line(doc->editor->sci, line_number); pos_end = sci_get_position_from_line(doc->editor->sci, line_number + 1); @@ -242,6 +256,11 @@ gint sc_speller_process_line(GeanyDocument *doc, gint line_number) g_free(word); } + if (underscore_in_wordchars != NULL) + { + /* re-add underscore if we removed it above */ + *underscore_in_wordchars = '_'; + } /* reset wordchars for the current document */ wordchars[wordchars_len] = '\0'; scintilla_send_message(doc->editor->sci, SCI_SETWORDCHARS, 0, (sptr_t)wordchars); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] c5ec89: Debugger: Move debug output accessing after check whether err != Null (#511)
by Frank Lanitz 18 Dec '16

18 Dec '16

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 18 Dec 2016 10:02:22 UTC Commit: c5ec8911ecbd09ffa6e513ce19d3c34ea3340b6c https://github.com/geany/geany-plugins/commit/c5ec8911ecbd09ffa6e513ce19d3c… Log Message: ----------- Debugger: Move debug output accessing after check whether err != Null (#511) Modified Paths: -------------- debugger/src/dbm_gdb.c Modified: debugger/src/dbm_gdb.c 164 lines changed, 84 insertions(+), 80 deletions(-) =================================================================== @@ -1,18 +1,18 @@ /* * dbm_gdm.c - * + * * Copyright 2010 Alexander Petukhov <devel(at)apetukhov.ru> - * + * * 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, @@ -144,7 +144,7 @@ static void colorize_message(gchar *message) color = "grey"; else color = "red"; - + dbg_cbs->send_message(message, color); } @@ -175,25 +175,25 @@ static void on_gdb_exit(GPid pid, gint status, gpointer data) g_spawn_close_pid(pid); shutdown_channel(&gdb_ch_in); shutdown_channel(&gdb_ch_out); - + /* delete autos */ g_list_foreach(autos, (GFunc)g_free, NULL); g_list_free(autos); autos = NULL; - + /* delete watches */ g_list_foreach(watches, (GFunc)g_free, NULL); g_list_free(watches); watches = NULL; - + /* delete files */ g_list_foreach(files, (GFunc)g_free, NULL); g_list_free(files); files = NULL; - + g_source_remove(gdb_src_id); gdb_src_id = 0; - + dbg_cbs->set_exited(0); } @@ -214,12 +214,12 @@ static GList* read_until_prompt(void) line[terminator] = '\0'; lines = g_list_prepend (lines, line); } - + return g_list_reverse(lines); } /* - * write a command to a gdb channel and flush with a newlinw character + * write a command to a gdb channel and flush with a newlinw character */ static void gdb_input_write_line(const gchar *line) { @@ -229,34 +229,38 @@ static void gdb_input_write_line(const gchar *line) const char *p; char command[1000]; g_snprintf(command, sizeof command, "%s\n", line); - + for (p = command; *p; p += count) { st = g_io_channel_write_chars(gdb_ch_in, p, strlen(p), &count, &err); if (err || (st == G_IO_STATUS_ERROR) || (st == G_IO_STATUS_EOF)) { + if (err) + { #ifdef DEBUG_OUTPUT - dbg_cbs->send_message(err->message, "red"); + dbg_cbs->send_message(err->message, "red"); #endif - if (err) g_clear_error(&err); + } break; } } st = g_io_channel_flush(gdb_ch_in, &err); if (err || (st == G_IO_STATUS_ERROR) || (st == G_IO_STATUS_EOF)) { -#ifdef DEBUG_OUTPUT - dbg_cbs->send_message(err->message, "red"); -#endif if (err) + { + #ifdef DEBUG_OUTPUT + dbg_cbs->send_message(err->message, "red"); + #endif g_clear_error(&err); + } } } /* - * free memory occupied by a queue item + * free memory occupied by a queue item */ static void free_queue_item(queue_item *item) { @@ -267,7 +271,7 @@ static void free_queue_item(queue_item *item) } /* - * free a list of "queue_item" structures + * free a list of "queue_item" structures */ static void free_commands_queue(GList *queue) { @@ -278,7 +282,7 @@ static void free_commands_queue(GList *queue) } /* - * add a new command ("queue_item" structure) to a list + * add a new command ("queue_item" structure) to a list */ static GList* add_to_queue(GList* queue, const gchar *message, const gchar *command, const gchar *error_message, gboolean format_error_message) { @@ -292,7 +296,7 @@ static GList* add_to_queue(GList* queue, const gchar *message, const gchar *comm item->format_error_message = format_error_message; return g_list_append(queue, (gpointer)item); -} +} /* * asyncronous output reader @@ -305,9 +309,9 @@ static gboolean on_read_async_output(GIOChannel * src, GIOCondition cond, gpoint gchar *line; gsize length; struct gdb_mi_record *record; - + if (G_IO_STATUS_NORMAL != g_io_channel_read_line(src, &line, NULL, &length, NULL)) - return TRUE; + return TRUE; record = gdb_mi_record_parse(line); @@ -386,7 +390,7 @@ static gboolean on_read_async_output(GIOChannel * src, GIOCondition cond, gpoint dbg_cbs->report_error(item->error_message); } } - + /* free commands queue */ free_commands_queue(commands); @@ -411,9 +415,9 @@ static gboolean on_read_from_gdb(GIOChannel * src, GIOCondition cond, gpointer d gsize length; const gchar *id; struct gdb_mi_record *record; - + if (G_IO_STATUS_NORMAL != g_io_channel_read_line(src, &line, NULL, &length, NULL)) - return TRUE; + return TRUE; record = gdb_mi_record_parse(line); @@ -493,7 +497,7 @@ static gboolean on_read_from_gdb(GIOChannel * src, GIOCondition cond, gpointer d /* somehow, sometimes there can be no stop reason */ stop_reason = SR_EXITED_NORMALLY; } - + if (SR_BREAKPOINT_HIT == stop_reason || SR_END_STEPPING_RANGE == stop_reason || SR_SIGNAL_RECIEVED == stop_reason) { const gchar *thread_id = gdb_mi_result_var(record->first, "thread-id", GDB_MI_VAL_STRING); @@ -596,7 +600,7 @@ static gboolean on_read_from_gdb(GIOChannel * src, GIOCondition cond, gpointer d * after writing command to an input channel * connects reader to output channel and exits * after execution - */ + */ static void exec_async_command(const gchar* command) { #ifdef DEBUG_OUTPUT @@ -613,7 +617,7 @@ static void exec_async_command(const gchar* command) * execute "command" syncronously * i.e. reading output right * after execution - */ + */ static result_class exec_sync_command(const gchar* command, gboolean wait4prompt, struct gdb_mi_record ** command_record) { GList *lines, *iter; @@ -625,10 +629,10 @@ static result_class exec_sync_command(const gchar* command, gboolean wait4prompt /* write command to gdb input channel */ gdb_input_write_line(command); - + if (!wait4prompt) return RC_DONE; - + if (command_record) *command_record = NULL; @@ -657,7 +661,7 @@ static result_class exec_sync_command(const gchar* command, gboolean wait4prompt /* save error message */ const gchar *msg = gdb_mi_result_var(record->first, "msg", GDB_MI_VAL_STRING); strncpy(err_message, msg ? msg : "", G_N_ELEMENTS(err_message) - 1); - + rc = RC_ERROR; } else if (gdb_mi_record_matches(record, '^', "exit", NULL)) @@ -675,10 +679,10 @@ static result_class exec_sync_command(const gchar* command, gboolean wait4prompt } gdb_mi_record_free(record); } - + g_list_foreach(lines, (GFunc)g_free, NULL); g_list_free(lines); - + return rc; } @@ -737,11 +741,11 @@ static gboolean run(const gchar* file, const gchar* commandline, GList* env, GLi } g_free(working_directory); g_strfreev(gdb_env); - + /* move gdb to it's own process group */ setpgid(gdb_pid, 0); - - /* set handler for gdb process exit event */ + + /* set handler for gdb process exit event */ gdb_src_id = g_child_watch_add(gdb_pid, on_gdb_exit, NULL); /* create GDB GIO chanels */ @@ -768,7 +772,7 @@ static gboolean run(const gchar* file, const gchar* commandline, GList* env, GLi variable *var = variable_new(name, VT_WATCH); watches = g_list_append(watches, var); - + witer = witer->next; } @@ -889,7 +893,7 @@ static void restart(void) dbg_cbs->clear_messages(); exec_async_command("-exec-run"); } - + /* * stops GDB */ @@ -964,7 +968,7 @@ static int get_break_number(char* file, int line) if (! number || ! location) continue; - + colon = strrchr(location, ':'); if (colon && atoi(colon + 1) == line) { @@ -984,9 +988,9 @@ static int get_break_number(char* file, int line) break; } } - + gdb_mi_record_free(record); - + return break_number; } @@ -1045,7 +1049,7 @@ static gboolean set_break(breakpoint* bp, break_set_activity bsa) g_snprintf(command, sizeof command, "-break-disable %i", num); exec_sync_command(command, TRUE, NULL); } - + return TRUE; } else @@ -1064,7 +1068,7 @@ static gboolean set_break(breakpoint* bp, break_set_activity bsa) return RC_DONE == exec_sync_command(command, TRUE, NULL); } - + return FALSE; } @@ -1082,7 +1086,7 @@ static gboolean remove_break(breakpoint* bp) g_snprintf(command, sizeof command, "-break-delete %i", number); rc = exec_sync_command(command, TRUE, NULL); - + return RC_DONE == rc; } return FALSE; @@ -1177,7 +1181,7 @@ static GList* get_stack(void) { f->file = g_strdup(""); } - + /* whether source is available */ f->have_source = fullname ? TRUE : FALSE; @@ -1187,19 +1191,19 @@ static GList* get_stack(void) stack = g_list_prepend(stack, f); } gdb_mi_record_free(record); - + return g_list_reverse(stack); } /* - * updates variables from vars list + * updates variables from vars list */ static void get_variables (GList *vars) { while (vars) { gchar command[1000]; - + variable *var = (variable*)vars->data; gchar *varname = var->internal->str; @@ -1216,7 +1220,7 @@ static void get_variables (GList *vars) expression = gdb_mi_result_var(record->first, "path_expr", GDB_MI_VAL_STRING); g_string_assign(var->expression, expression ? expression : ""); gdb_mi_record_free(record); - + /* children number */ g_snprintf(command, sizeof command, "-var-info-num-children \"%s\"", varname); exec_sync_command(command, TRUE, &record); @@ -1293,7 +1297,7 @@ static void update_files(void) } /* - * updates watches list + * updates watches list */ static void update_watches(void) { @@ -1305,17 +1309,17 @@ static void update_watches(void) for (iter = watches; iter; iter = iter->next) { variable *var = (variable*)iter->data; - + if (var->internal->len) { g_snprintf(command, sizeof command, "-var-delete %s", var->internal->str); exec_sync_command(command, TRUE, NULL); } - + /* reset all variables fields */ variable_reset(var); } - + /* create GDB variables, adding successfully created variables to the list then passed for updatind */ for (iter = watches; iter; iter = iter->next) @@ -1336,22 +1340,22 @@ static void update_watches(void) var->evaluated = FALSE; g_string_assign(var->internal, ""); gdb_mi_record_free(record); - + continue; } - + /* find and assign internal name */ name = gdb_mi_result_var(record->first, "name", GDB_MI_VAL_STRING); g_string_assign(var->internal, name ? name : ""); gdb_mi_record_free(record); - + var->evaluated = name != NULL; /* add to updating list */ updating = g_list_prepend(updating, var); } updating = g_list_reverse(updating); - + /* update watches */ get_variables(updating); @@ -1360,7 +1364,7 @@ static void update_watches(void) } /* - * updates autos list + * updates autos list */ static void update_autos(void) { @@ -1371,17 +1375,17 @@ static void update_autos(void) for (iter = autos; iter; iter = iter->next) { variable *var = (variable*)iter->data; - + g_snprintf(command, sizeof command, "-var-delete %s", var->internal->str); exec_sync_command(command, TRUE, NULL); } g_list_foreach(autos, (GFunc)variable_free, NULL); g_list_free(autos); autos = NULL; - + /* add current autos to the list */ - + struct gdb_mi_record *record = NULL; g_snprintf(command, sizeof command, "-stack-list-arguments 0 %i %i", active_frame, active_frame); @@ -1443,45 +1447,45 @@ static void update_autos(void) gdb_mi_record_free(create_record); } g_list_free(vars); - + /* get values for the autos (without incorrect variables) */ get_variables(autos); - + /* add incorrect variables */ autos = g_list_concat(autos, unevaluated); } /* - * get autos list + * get autos list */ static GList* get_autos (void) { return g_list_copy(autos); } /* - * get watches list + * get watches list */ static GList* get_watches (void) { return g_list_copy(watches); } /* - * get files list + * get files list */ static GList* get_files (void) { return g_list_copy(files); } /* - * get list of children + * get list of children */ static GList* get_children (gchar* path) { GList *children = NULL; - + gchar command[1000]; result_class rc; struct gdb_mi_record *record = NULL; @@ -1501,7 +1505,7 @@ static GList* get_children (gchar* path) gdb_mi_record_free(record); if (!n) return NULL; - + /* recursive get children and put into list */ g_snprintf(command, sizeof command, "-var-list-children \"%s\"", path); rc = exec_sync_command(command, TRUE, &record); @@ -1525,15 +1529,15 @@ static GList* get_children (gchar* path) } } gdb_mi_record_free(record); - + children = g_list_reverse(children); get_variables(children); return children; } /* - * add new watch + * add new watch */ static variable* add_watch(gchar* expression) { @@ -1556,7 +1560,7 @@ static variable* add_watch(gchar* expression) gdb_mi_record_free(record); return var; } - + name = gdb_mi_result_var(record->first, "name", GDB_MI_VAL_STRING); g_string_assign(var->internal, name ? name : ""); var->evaluated = name != NULL; @@ -1567,11 +1571,11 @@ static variable* add_watch(gchar* expression) gdb_mi_record_free(record); g_list_free(vars); - return var; + return var; } /* - * remove watch + * remove watch */ static void remove_watch(gchar* internal) { @@ -1614,7 +1618,7 @@ static gchar *evaluate_expression(gchar *expression) } /* - * request GDB interrupt + * request GDB interrupt */ static gboolean request_interrupt(void) { @@ -1623,23 +1627,23 @@ static gboolean request_interrupt(void) g_snprintf(msg, sizeof msg, "interrupting pid=%i", target_pid); dbg_cbs->send_message(msg, "red"); #endif - + requested_interrupt = TRUE; kill(target_pid, SIGINT); return TRUE; } /* - * get GDB error messages + * get GDB error messages */ static gchar* error_message(void) { return err_message; } /* - * define GDB debug module + * define GDB debug module */ DBG_MODULE_DEFINE(gdb); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 4fa2e5: geanylua: Remove deprecated GeanyFunctions (#439)
by Jiří Techet 18 Dec '16

18 Dec '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sat, 17 Dec 2016 22:27:13 UTC Commit: 4fa2e5f6b69df05dfe2894c8978b8fba63b41079 https://github.com/geany/geany-plugins/commit/4fa2e5f6b69df05dfe2894c8978b8… Log Message: ----------- geanylua: Remove deprecated GeanyFunctions (#439) Modified Paths: -------------- geanylua/geanylua.c geanylua/glspi.h geanylua/glspi_init.c geanylua/gsdlg.c Modified: geanylua/geanylua.c 7 lines changed, 2 insertions(+), 5 deletions(-) =================================================================== @@ -53,14 +53,11 @@ PLUGIN_EXPORT PLUGIN_SET_INFO(PLUGIN_NAME, PLUGIN_DESC, PLUGIN_VER, PLUGIN_AUTHOR) PLUGIN_EXPORT -GeanyFunctions *geany_functions; - -PLUGIN_EXPORT GeanyPlugin *geany_plugin; -typedef void (*InitFunc) (GeanyData *data, GeanyFunctions *functions, GeanyPlugin *plugin); +typedef void (*InitFunc) (GeanyData *data, GeanyPlugin *plugin); typedef void (*ConfigFunc) (GtkWidget *parent); typedef void (*CleanupFunc) (void); @@ -213,7 +210,7 @@ void plugin_init(GeanyData *data) g_free(libname); copy_callbacks(); - glspi_init(data, geany_functions, geany_plugin); + glspi_init(data, geany_plugin); } Modified: geanylua/glspi.h 4 lines changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -75,10 +75,6 @@ extern GeanyData *glspi_geany_data; #define geany_data glspi_geany_data -extern GeanyFunctions *glspi_geany_functions; - -#define geany_functions glspi_geany_functions - #ifdef NEED_FAIL_ARG_TYPE /* Pushes an error message onto Lua stack if script passes a wrong arg type */ Modified: geanylua/glspi_init.c 4 lines changed, 1 insertions(+), 3 deletions(-) =================================================================== @@ -34,7 +34,6 @@ PLUGIN_EXPORT const guint glspi_abi = GEANY_ABI_VERSION; GeanyData *glspi_geany_data=NULL; -GeanyFunctions *glspi_geany_functions=NULL; GeanyPlugin *glspi_geany_plugin=NULL; static struct { @@ -407,10 +406,9 @@ static gchar *get_data_dir(void) /* Called by Geany to initialize the plugin */ PLUGIN_EXPORT -void glspi_init (GeanyData *data, GeanyFunctions *functions, GeanyPlugin *plugin) +void glspi_init (GeanyData *data, GeanyPlugin *plugin) { glspi_geany_data = data; - glspi_geany_functions = functions; glspi_geany_plugin = plugin; local_data.script_dir = Modified: geanylua/gsdlg.c 3 lines changed, 0 insertions(+), 3 deletions(-) =================================================================== @@ -28,9 +28,6 @@ #include <stdlib.h> #include "geanyplugin.h" -/* we need tm_get_real_path(), and we can't include glspi.h for those, so hack */ -extern GeanyFunctions *glspi_geany_functions; -#define geany_functions glspi_geany_functions #define TextKey "gsdlg_TextKey_bc4871f4e3478ab5234e28432460a6b8" -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/plugins.geany.org] db3de2: Update installation instructions for Fedora and RHEL/CentOS
by Dominic Hopf 13 Dec '16

13 Dec '16

Branch: refs/heads/master Author: Dominic Hopf <dmaphy(a)googlemail.com> Committer: Dominic Hopf <dmaphy(a)googlemail.com> Date: Tue, 13 Dec 2016 08:59:26 UTC Commit: db3de289b53b5ef8c2e08ee5798140cda27c9190 https://github.com/geany/plugins.geany.org/commit/db3de289b53b5ef8c2e08ee57… Log Message: ----------- Update installation instructions for Fedora and RHEL/CentOS Modified Paths: -------------- content/install.html Modified: content/install.html 11 lines changed, 10 insertions(+), 1 deletions(-) =================================================================== @@ -5,7 +5,16 @@ <h3>Packages</h3> <h4>Fedora</h4> -<code>yum install geany-plugins</code> +<code>dnf install 'geany-plugins-*'</code> +<p>or do a</p> + +<code>dnf search geany-plugins</code> +<p>to get the available plugins listed and +install the plugin you like to use via</p> +<code>dnf install geany-plugins-{pluginname}</code> + +<h4>RHEL/CentOS</h4> +<code>yum install geany-plugins-*</code> <p>or do a</p> <code>yum search geany-plugins</code> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 65f544: Automark: Fix a segfault in case of nothing is selected for auto-marking
by Frank Lanitz 11 Dec '16

11 Dec '16

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sun, 11 Dec 2016 13:24:52 UTC Commit: 65f54463472a780115fbb1ad1a01bce5a0aa4a23 https://github.com/geany/geany-plugins/commit/65f54463472a780115fbb1ad1a01b… Log Message: ----------- Automark: Fix a segfault in case of nothing is selected for auto-marking Modified Paths: -------------- automark/src/automark.c Modified: automark/src/automark.c 6 lines changed, 3 insertions(+), 3 deletions(-) =================================================================== @@ -86,7 +86,7 @@ get_current_word(ScintillaObject *sci) gint pos = sci_get_current_position(sci); gint start = SSM(sci, SCI_WORDSTARTPOSITION, pos, TRUE); gint end = SSM(sci, SCI_WORDENDPOSITION, pos, TRUE); - + if ((guint)(end - start) >= GEANY_MAX_WORD_LENGTH) end = start + (GEANY_MAX_WORD_LENGTH - 1); return sci_get_contents_range(sci, start, end); @@ -116,7 +116,7 @@ automark(gpointer user_data) text = get_current_word(editor->sci); - if (!*text) + if (EMPTY(text)) { editor_indicator_clear(editor, AUTOMARK_INDICATOR); g_free(text); @@ -129,7 +129,7 @@ automark(gpointer user_data) strcpy(text_cache, text); editor_cache = editor; } - + gint vis_first = SSM(sci, SCI_GETFIRSTVISIBLELINE, 0, 0); gint doc_first = SSM(sci, SCI_DOCLINEFROMVISIBLE, vis_first, 0); gint vis_last = SSM(sci, SCI_LINESONSCREEN, 0, 0) + vis_first; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 28060b: automark: Replace deprecated sci_get_text_range() (#436)
by Jiří Techet 10 Dec '16

10 Dec '16

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sat, 10 Dec 2016 14:25:43 UTC Commit: 28060b7fa90141cc7b2a2761af60a535e29b3d09 https://github.com/geany/geany-plugins/commit/28060b7fa90141cc7b2a2761af60a… Log Message: ----------- automark: Replace deprecated sci_get_text_range() (#436) Modified Paths: -------------- automark/src/automark.c Modified: automark/src/automark.c 22 lines changed, 10 insertions(+), 12 deletions(-) =================================================================== @@ -80,21 +80,16 @@ search_mark_in_range( } /* based on editor_find_current_word_sciwc from editor.c */ -static void -get_current_word(ScintillaObject *sci, gchar *word, gsize wordlen) +static gchar * +get_current_word(ScintillaObject *sci) { gint pos = sci_get_current_position(sci); gint start = SSM(sci, SCI_WORDSTARTPOSITION, pos, TRUE); gint end = SSM(sci, SCI_WORDENDPOSITION, pos, TRUE); - if (start == end) - *word = 0; - else - { - if ((guint)(end - start) >= wordlen) - end = start + (wordlen - 1); - sci_get_text_range(sci, start, end, word); - } + if ((guint)(end - start) >= GEANY_MAX_WORD_LENGTH) + end = start + (GEANY_MAX_WORD_LENGTH - 1); + return sci_get_contents_range(sci, start, end); } static gboolean @@ -104,7 +99,7 @@ automark(gpointer user_data) GeanyEditor *editor = doc->editor; static GeanyEditor *editor_cache = NULL; ScintillaObject *sci = editor->sci; - gchar text[GEANY_MAX_WORD_LENGTH]; + gchar *text; static gchar text_cache[GEANY_MAX_WORD_LENGTH] = {0}; gint match_flag = SCFIND_MATCHCASE | SCFIND_WHOLEWORD; struct Sci_TextToFind ttf; @@ -119,11 +114,12 @@ automark(gpointer user_data) if (sci_has_selection(sci)) return FALSE; - get_current_word(editor->sci, text, sizeof(text)); + text = get_current_word(editor->sci); if (!*text) { editor_indicator_clear(editor, AUTOMARK_INDICATOR); + g_free(text); return FALSE; } @@ -147,6 +143,8 @@ automark(gpointer user_data) search_mark_in_range(editor, match_flag, &ttf); + g_free(text); + return FALSE; } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] ab76d9: Gtk3 compatibility for geanydoc plugin (#467)
by Sagar Chalise 10 Dec '16

10 Dec '16

Branch: refs/heads/master Author: Sagar Chalise <sagarchalise(a)users.noreply.github.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sat, 10 Dec 2016 14:10:30 UTC Commit: ab76d9b6836466dcef5283e268a2943092ad3051 https://github.com/geany/geany-plugins/commit/ab76d9b6836466dcef5283e268a29… Log Message: ----------- Gtk3 compatibility for geanydoc plugin (#467) * Macro gtk3 compatibility [Needs testing] * upstream compatibility * Gtk3 support * Changes according to pr comment Modified Paths: -------------- build/geanydoc.m4 geanydoc/src/geanydoc.c Modified: build/geanydoc.m4 1 lines changed, 0 insertions(+), 1 deletions(-) =================================================================== @@ -1,7 +1,6 @@ AC_DEFUN([GP_CHECK_GEANYDOC], [ GP_ARG_DISABLE([GeanyDoc], [auto]) - GP_CHECK_PLUGIN_GTK2_ONLY([GeanyDoc]) GP_COMMIT_PLUGIN_STATUS([GeanyDoc]) AC_CONFIG_FILES([ geanydoc/Makefile Modified: geanydoc/src/geanydoc.c 18 lines changed, 9 insertions(+), 9 deletions(-) =================================================================== @@ -256,7 +256,7 @@ on_comboboxType_changed(GtkComboBox * combobox, G_GNUC_UNUSED gpointer user_data GKeyFile *config = (GKeyFile *) g_object_get_data(G_OBJECT(combobox), "config"); from = g_object_get_data(G_OBJECT(combobox), "current"); - to = gtk_combo_box_get_active_text(combobox); + to = gtk_combo_box_text_get_active_text(combobox); if (from != NULL) { @@ -284,7 +284,7 @@ on_comboboxType_changed(GtkComboBox * combobox, G_GNUC_UNUSED gpointer user_data #define GLADE_HOOKUP_OBJECT(component,widget,name) \ g_object_set_data_full (G_OBJECT (component), name, \ - gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref) + g_object_ref (widget), (GDestroyNotify) g_object_unref) #define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \ g_object_set_data (G_OBJECT (component), name, widget) @@ -303,7 +303,7 @@ create_Interactive(void) GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL); - dialog_vbox1 = GTK_DIALOG(dialog)->vbox; + dialog_vbox1 = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); entry_word = gtk_entry_new(); gtk_widget_show(entry_word); @@ -336,7 +336,7 @@ create_Configure(void) gtk_window_set_title(GTK_WINDOW(Configure), _("Doc")); gtk_window_set_type_hint(GTK_WINDOW(Configure), GDK_WINDOW_TYPE_HINT_DIALOG); - dialog_vbox1 = GTK_DIALOG(Configure)->vbox; + dialog_vbox1 = gtk_dialog_get_content_area(GTK_DIALOG(Configure)); gtk_widget_show(dialog_vbox1); vbox1 = gtk_vbox_new(FALSE, 0); @@ -347,7 +347,7 @@ create_Configure(void) gtk_widget_show(cbIntern); gtk_box_pack_start(GTK_BOX(vbox1), cbIntern, FALSE, FALSE, 0); - comboboxType = gtk_combo_box_new_text(); + comboboxType = gtk_combo_box_text_new(); gtk_widget_show(comboboxType); gtk_box_pack_start(GTK_BOX(vbox1), comboboxType, FALSE, FALSE, 0); @@ -383,19 +383,19 @@ create_Configure(void) gtk_widget_show(label2); gtk_box_pack_start(GTK_BOX(dialog_vbox1), label2, FALSE, FALSE, 0); - dialog_action_area1 = GTK_DIALOG(Configure)->action_area; + dialog_action_area1 = gtk_dialog_get_action_area(GTK_DIALOG(Configure)); gtk_widget_show(dialog_action_area1); gtk_button_box_set_layout(GTK_BUTTON_BOX(dialog_action_area1), GTK_BUTTONBOX_END); cancelbutton1 = gtk_button_new_from_stock("gtk-cancel"); gtk_widget_show(cancelbutton1); gtk_dialog_add_action_widget(GTK_DIALOG(Configure), cancelbutton1, GTK_RESPONSE_CANCEL); - GTK_WIDGET_SET_FLAGS(cancelbutton1, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(cancelbutton1, TRUE); okbutton1 = gtk_button_new_from_stock("gtk-ok"); gtk_widget_show(okbutton1); gtk_dialog_add_action_widget(GTK_DIALOG(Configure), okbutton1, GTK_RESPONSE_OK); - GTK_WIDGET_SET_FLAGS(okbutton1, GTK_CAN_DEFAULT); + gtk_widget_set_can_default(okbutton1, TRUE); g_signal_connect_after((gpointer) comboboxType, "changed", G_CALLBACK(on_comboboxType_changed), NULL); @@ -452,7 +452,7 @@ init_Configure(GtkWidget * dialog) for (i = 0; i < geany->filetypes_array->len; i++) { - gtk_combo_box_append_text(GTK_COMBO_BOX(cbTypes), + gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cbTypes), ((struct GeanyFiletype *) (filetypes[i]))-> name); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 8002a0: geanylua: Fix build with latest Scintilla (#510)
by Colomban Wendling 10 Dec '16

10 Dec '16

Branch: refs/heads/master Author: Colomban Wendling <lists.ban(a)herbesfolles.org> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sat, 10 Dec 2016 10:25:03 UTC Commit: 8002a006da8ad64d8be2c1079141e1cf62a04afe https://github.com/geany/geany-plugins/commit/8002a006da8ad64d8be2c1079141e… Log Message: ----------- geanylua: Fix build with latest Scintilla (#510) When not defining `INCLUDE_DEPRECATED_FEATURES`, unprefixed structure names are not available anymore. Thus, use prefixed names. Modified Paths: -------------- geanylua/glspi_sci.c Modified: geanylua/glspi_sci.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -739,7 +739,7 @@ static gint glspi_scintilla(lua_State* L) static gint glspi_find(lua_State* L) { - struct TextToFind ttf; + struct Sci_TextToFind ttf; gint flags=0; gint i,n; @@ -820,7 +820,7 @@ struct CharacterRange { */ /* -struct TextToFind { +struct Sci_TextToFind { struct CharacterRange chrg; // range to search char *lpstrText; // the search pattern (zero terminated) struct CharacterRange chrgText; // returned as position of matching text -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] ef88e5: Merge branch 'b4n-commander'
by Frank Lanitz 08 Dec '16

08 Dec '16

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Wed, 07 Dec 2016 19:27:42 UTC Commit: ef88e561450fa543bba52c769376c53ea2a2020e https://github.com/geany/geany-plugins/commit/ef88e561450fa543bba52c769376c… Log Message: ----------- Merge branch 'b4n-commander' Modified Paths: -------------- commander/src/commander-plugin.c Modified: commander/src/commander-plugin.c 10 lines changed, 6 insertions(+), 4 deletions(-) =================================================================== @@ -682,10 +682,6 @@ create_panel (void) gtk_container_add (GTK_CONTAINER (frame), box); plugin_data.entry = gtk_entry_new (); - g_signal_connect (plugin_data.entry, "notify::text", - G_CALLBACK (on_entry_text_notify), NULL); - g_signal_connect (plugin_data.entry, "activate", - G_CALLBACK (on_entry_activate), NULL); gtk_box_pack_start (GTK_BOX (box), plugin_data.entry, FALSE, TRUE, 0); plugin_data.store = gtk_list_store_new (COL_COUNT, @@ -726,6 +722,12 @@ create_panel (void) G_CALLBACK (on_view_row_activated), NULL); gtk_container_add (GTK_CONTAINER (scroll), plugin_data.view); + /* connect entry signals after the view is created as they use it */ + g_signal_connect (plugin_data.entry, "notify::text", + G_CALLBACK (on_entry_text_notify), NULL); + g_signal_connect (plugin_data.entry, "activate", + G_CALLBACK (on_entry_activate), NULL); + gtk_widget_show_all (frame); } -------------- 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 December 2016