Plugins-Commits August 2011

plugins-commits@lists.geany.org

8 participants
73 discussions

SF.net SVN: geany-plugins:[2137] trunk/geany-plugins
by frlan＠users.sourceforge.net 14 Aug '11

14 Aug '11

Revision: 2137 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2137&view=rev Author: frlan Date: 2011-08-13 22:15:21 +0000 (Sat, 13 Aug 2011) Log Message: ----------- Fix build of updatechecker and tableconvert due to not properly included config.h Modified Paths: -------------- trunk/geany-plugins/tableconvert/src/tableconvert.c trunk/geany-plugins/updatechecker/src/updatechecker.c Modified: trunk/geany-plugins/tableconvert/src/tableconvert.c =================================================================== --- trunk/geany-plugins/tableconvert/src/tableconvert.c 2011-08-13 22:10:30 UTC (rev 2136) +++ trunk/geany-plugins/tableconvert/src/tableconvert.c 2011-08-13 22:15:21 UTC (rev 2137) @@ -18,6 +18,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifdef HAVE_CONFIG_H + #include "config.h" /* for the gettext domain */ +#endif + + #include "geanyplugin.h" GeanyPlugin *geany_plugin; Modified: trunk/geany-plugins/updatechecker/src/updatechecker.c =================================================================== --- trunk/geany-plugins/updatechecker/src/updatechecker.c 2011-08-13 22:10:30 UTC (rev 2136) +++ trunk/geany-plugins/updatechecker/src/updatechecker.c 2011-08-13 22:15:21 UTC (rev 2137) @@ -24,6 +24,11 @@ #include "libsoup/soup.h" #include "stdlib.h" +#ifdef HAVE_CONFIG_H + #include "config.h" /* for the gettext domain */ +#endif + + GeanyPlugin *geany_plugin; GeanyData *geany_data; GeanyFunctions *geany_functions; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2136] trunk/geany-plugins/geanysendmail/src/ geanysendmail.c
by frlan＠users.sourceforge.net 14 Aug '11

14 Aug '11

Revision: 2136 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2136&view=rev Author: frlan Date: 2011-08-13 22:10:30 +0000 (Sat, 13 Aug 2011) Log Message: ----------- Fix build of geanysendmail plugin due to not properly included config.h Modified Paths: -------------- trunk/geany-plugins/geanysendmail/src/geanysendmail.c Modified: trunk/geany-plugins/geanysendmail/src/geanysendmail.c =================================================================== --- trunk/geany-plugins/geanysendmail/src/geanysendmail.c 2011-08-13 22:10:02 UTC (rev 2135) +++ trunk/geany-plugins/geanysendmail/src/geanysendmail.c 2011-08-13 22:10:30 UTC (rev 2136) @@ -26,6 +26,9 @@ #include "geanyplugin.h" #include "icon.h" +#ifdef HAVE_CONFIG_H + #include "config.h" /* for the gettext domain */ +#endif #ifdef HAVE_LOCALE_H # include <locale.h> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2135] trunk/geany-plugins/geanylipsum/src/ geanylipsum.c
by frlan＠users.sourceforge.net 14 Aug '11

14 Aug '11

Revision: 2135 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2135&view=rev Author: frlan Date: 2011-08-13 22:10:02 +0000 (Sat, 13 Aug 2011) Log Message: ----------- Fix build of geanylipsum plugin due to not properly included config.h Modified Paths: -------------- trunk/geany-plugins/geanylipsum/src/geanylipsum.c Modified: trunk/geany-plugins/geanylipsum/src/geanylipsum.c =================================================================== --- trunk/geany-plugins/geanylipsum/src/geanylipsum.c 2011-08-13 22:09:39 UTC (rev 2134) +++ trunk/geany-plugins/geanylipsum/src/geanylipsum.c 2011-08-13 22:10:02 UTC (rev 2135) @@ -20,6 +20,10 @@ #include "geanyplugin.h" +#ifdef HAVE_CONFIG_H + #include "config.h" /* for the gettext domain */ +#endif + #include <string.h> #ifdef HAVE_LOCALE_H # include <locale.h> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2134] trunk/geanylatex/src/geanylatex.c
by frlan＠users.sourceforge.net 14 Aug '11

14 Aug '11

Revision: 2134 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2134&view=rev Author: frlan Date: 2011-08-13 22:09:39 +0000 (Sat, 13 Aug 2011) Log Message: ----------- GeanyLaTeX: Fix build of plugin due to not properly included config.h Modified Paths: -------------- trunk/geanylatex/src/geanylatex.c Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2011-08-13 22:09:16 UTC (rev 2133) +++ trunk/geanylatex/src/geanylatex.c 2011-08-13 22:09:39 UTC (rev 2134) @@ -25,6 +25,11 @@ /* LaTeX plugin */ /* This plugin improves the work with LaTeX and Geany.*/ + +#ifdef HAVE_CONFIG_H + #include "config.h" /* for the gettext domain */ +#endif + #include "geanylatex.h" #include "ctype.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2133] trunk/geany-plugins/geanylatex/src/ geanylatex.c
by frlan＠users.sourceforge.net 14 Aug '11

14 Aug '11

Revision: 2133 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2133&view=rev Author: frlan Date: 2011-08-13 22:09:16 +0000 (Sat, 13 Aug 2011) Log Message: ----------- GeanyLaTeX: Fix build of plugin due to not properly included config.h Modified Paths: -------------- trunk/geany-plugins/geanylatex/src/geanylatex.c Modified: trunk/geany-plugins/geanylatex/src/geanylatex.c =================================================================== --- trunk/geany-plugins/geanylatex/src/geanylatex.c 2011-08-13 21:43:28 UTC (rev 2132) +++ trunk/geany-plugins/geanylatex/src/geanylatex.c 2011-08-13 22:09:16 UTC (rev 2133) @@ -25,6 +25,11 @@ /* LaTeX plugin */ /* This plugin improves the work with LaTeX and Geany.*/ + +#ifdef HAVE_CONFIG_H +# include "config.h" /* for the gettext domain */ +#endif + #include "geanylatex.h" #include "ctype.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2132] trunk/geany-plugins/geanypg/src
by alvesh88＠users.sourceforge.net 13 Aug '11

13 Aug '11

Revision: 2132 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2132&view=rev Author: alvesh88 Date: 2011-08-13 21:43:28 +0000 (Sat, 13 Aug 2011) Log Message: ----------- Fixed a bunch of compiler warnings about shadowing the global index variable and discarding const qualifiers (string literals are const) and fixed a function definition (geanypg_validity) which had a wrong parameter type (gpgme_summary_t instead of gpgme_validity_t). Modified Paths: -------------- trunk/geany-plugins/geanypg/src/aux.c trunk/geany-plugins/geanypg/src/key_selection_dialog.c trunk/geany-plugins/geanypg/src/pinentry.c trunk/geany-plugins/geanypg/src/verify_aux.c Modified: trunk/geany-plugins/geanypg/src/aux.c =================================================================== --- trunk/geany-plugins/geanypg/src/aux.c 2011-08-13 18:18:32 UTC (rev 2131) +++ trunk/geany-plugins/geanypg/src/aux.c 2011-08-13 21:43:28 UTC (rev 2132) @@ -32,24 +32,24 @@ { gpgme_error_t err; unsigned long size = SIZE; - //initialize index to 0 - unsigned long index = 0; + //initialize idx to 0 + unsigned long idx = 0; //allocate array of size 1N ed->key_array = (gpgme_key_t*) malloc(SIZE * sizeof(gpgme_key_t)); err = gpgme_op_keylist_start(ed->ctx, NULL, 0); while (!err) { - err = gpgme_op_keylist_next(ed->ctx, ed->key_array + index); + err = gpgme_op_keylist_next(ed->ctx, ed->key_array + idx); if (err) break; - ++index; - if (index >= size) + ++idx; + if (idx >= size) { size += SIZE; ed->key_array = (gpgme_key_t*) realloc(ed->key_array, size * sizeof(gpgme_key_t)); } } - ed->nkeys = index; + ed->nkeys = idx; if (gpg_err_code(err) != GPG_ERR_EOF) { geanypg_show_err_msg(err); @@ -62,24 +62,24 @@ { gpgme_error_t err; unsigned long size = SIZE; - //initialize index to 0 - unsigned long index = 0; + //initialize idx to 0 + unsigned long idx = 0; //allocate array of size 1N ed->skey_array = (gpgme_key_t*) malloc(SIZE * sizeof(gpgme_key_t)); err = gpgme_op_keylist_start(ed->ctx, NULL, 1); while (!err) { - err = gpgme_op_keylist_next(ed->ctx, ed->skey_array + index); + err = gpgme_op_keylist_next(ed->ctx, ed->skey_array + idx); if (err) break; - ++index; - if (index >= size) + ++idx; + if (idx >= size) { size += SIZE; ed->skey_array = (gpgme_key_t*) realloc(ed->skey_array, size * sizeof(gpgme_key_t)); } } - ed->nskeys = index; + ed->nskeys = idx; if (gpg_err_code(err) != GPG_ERR_EOF) { geanypg_show_err_msg(err); Modified: trunk/geany-plugins/geanypg/src/key_selection_dialog.c =================================================================== --- trunk/geany-plugins/geanypg/src/key_selection_dialog.c 2011-08-13 18:18:32 UTC (rev 2131) +++ trunk/geany-plugins/geanypg/src/key_selection_dialog.c 2011-08-13 21:43:28 UTC (rev 2132) @@ -53,7 +53,8 @@ static GtkListStore * geanypg_makelist(gpgme_key_t * key_array, unsigned long nkeys, int addnone) { GtkTreeIter iter; - unsigned long index; + unsigned long idx; + char empty_string = '\0'; GtkListStore * list = gtk_list_store_new(N_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING); if (addnone) { @@ -64,17 +65,17 @@ KEYID_COLUMN, "", -1); } - for (index = 0; index < nkeys; ++index) + for (idx = 0; idx < nkeys; ++idx) { - char * name = (key_array[index]->uids && key_array[index]->uids->name) ? key_array[index]->uids->name : ""; - char * email = (key_array[index]->uids && key_array[index]->uids->email) ? key_array[index]->uids->email : ""; + char * name = (key_array[idx]->uids && key_array[idx]->uids->name) ? key_array[idx]->uids->name : &empty_string; + char * email = (key_array[idx]->uids && key_array[idx]->uids->email) ? key_array[idx]->uids->email : &empty_string; char buffer[strlen(name) + strlen(email) + 7]; sprintf(buffer, "%s <%s>", name, email); gtk_list_store_append(list, &iter); gtk_list_store_set(list, &iter, TOGGLE_COLUMN, FALSE, RECIPIENT_COLUMN, buffer, - KEYID_COLUMN, key_array[index]->subkeys->keyid, + KEYID_COLUMN, key_array[idx]->subkeys->keyid, -1); } return list; @@ -127,7 +128,7 @@ int geanypg_encrypt_selection_dialog(encrypt_data * ed, gpgme_key_t ** selected, int * sign) { GtkWidget * dialog = gtk_dialog_new(); - unsigned long index, sindex, capacity; + unsigned long idx, sidx, capacity; int response; GtkWidget * contentarea, * listview, * scrollwin, * combobox; GtkTreeIter iter; @@ -165,11 +166,11 @@ gtk_widget_destroy(dialog); return 0; } - index = gtk_combo_box_get_active(GTK_COMBO_BOX(combobox)); - if (index && index <= ed->nskeys) + idx = gtk_combo_box_get_active(GTK_COMBO_BOX(combobox)); + if (idx && idx <= ed->nskeys) { *sign = 1; - gpgme_signers_add(ed->ctx, ed->skey_array[index - 1]); // -1 because the first option is `None' + gpgme_signers_add(ed->ctx, ed->skey_array[idx - 1]); // -1 because the first option is `None' } // try to loop all the keys in the list // if they are active (the user checked the checkbox in front of the key) @@ -179,25 +180,25 @@ { capacity = SIZE; *selected = (gpgme_key_t*) malloc(SIZE * sizeof(gpgme_key_t)); - index = 0; - sindex = 0; + idx = 0; + sidx = 0; gtk_tree_model_get(GTK_TREE_MODEL(list), &iter, TOGGLE_COLUMN, &active, -1); if (active) - (*selected)[sindex++] = ed->key_array[index]; + (*selected)[sidx++] = ed->key_array[idx]; while (gtk_tree_model_iter_next(GTK_TREE_MODEL(list), &iter)) { - ++index; + ++idx; gtk_tree_model_get(GTK_TREE_MODEL(list), &iter, TOGGLE_COLUMN, &active, -1); if (active) - (*selected)[sindex++] = ed->key_array[index]; - if (sindex >= capacity - 1) + (*selected)[sidx++] = ed->key_array[idx]; + if (sidx >= capacity - 1) { capacity += SIZE; *selected = (gpgme_key_t*) realloc(*selected, capacity * sizeof(gpgme_key_t)); } } - (*selected)[sindex] = NULL; + (*selected)[sidx] = NULL; } else { @@ -212,7 +213,7 @@ int geanypg_sign_selection_dialog(encrypt_data * ed) { GtkWidget * dialog = gtk_dialog_new(); - unsigned long index; + unsigned long idx; int response; GtkWidget * contentarea = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); GtkWidget * combobox = geanypg_combobox( @@ -234,10 +235,10 @@ gtk_widget_destroy(dialog); return 0; } - index = gtk_combo_box_get_active(GTK_COMBO_BOX(combobox)); + idx = gtk_combo_box_get_active(GTK_COMBO_BOX(combobox)); gpgme_signers_clear(ed->ctx); - if (index < ed->nskeys) - gpgme_signers_add(ed->ctx, ed->skey_array[index]); + if (idx < ed->nskeys) + gpgme_signers_add(ed->ctx, ed->skey_array[idx]); gtk_widget_destroy(dialog); return 1; Modified: trunk/geany-plugins/geanypg/src/pinentry.c =================================================================== --- trunk/geany-plugins/geanypg/src/pinentry.c 2011-08-13 18:18:32 UTC (rev 2131) +++ trunk/geany-plugins/geanypg/src/pinentry.c 2011-08-13 21:43:28 UTC (rev 2132) @@ -52,15 +52,15 @@ static int geanypg_read(int fd, char delim, int max, char * buffer) { - int index, rv = 1; + int idx, rv = 1; char ch = 0; - for (index = 0; (index < max - 1) && rv && ch != delim; ++index) + for (idx = 0; (idx < max - 1) && rv && ch != delim; ++idx) { rv = read(fd, &ch, 1); - buffer[index] = ch; + buffer[idx] = ch; } - buffer[index ? index - 1 : 0] = 0; - return index ? index - 1 : 0; + buffer[idx ? idx - 1 : 0] = 0; + return idx ? idx - 1 : 0; } gpgme_error_t geanypg_passphrase_cb(void * hook, const char * uid_hint, @@ -89,7 +89,8 @@ childpid = fork(); if (!childpid) { // pinentry - char * argv[] = {"pinentry", NULL}; + char arg1[] = "pinentry"; + char * argv[] = {arg1, NULL}; close(outpipe[READ]); dup2(outpipe[WRITE], STDOUT_FILENO); Modified: trunk/geany-plugins/geanypg/src/verify_aux.c =================================================================== --- trunk/geany-plugins/geanypg/src/verify_aux.c 2011-08-13 18:18:32 UTC (rev 2131) +++ trunk/geany-plugins/geanypg/src/verify_aux.c 2011-08-13 21:43:28 UTC (rev 2132) @@ -23,17 +23,26 @@ void geanypg_get_keys_with_fp(encrypt_data * ed, char * buffer) { - unsigned long index, found = 0; - for (index = 0; index < ed->nkeys && ! found; ++index) + unsigned long idx, found = 0; + char empty_string = '\0'; + for (idx = 0; idx < ed->nkeys && ! found; ++idx) { - gpgme_subkey_t sub = ed->key_array[index]->subkeys; + gpgme_subkey_t sub = ed->key_array[idx]->subkeys; while (sub && !found) { if (sub->fpr && !strncmp(sub->fpr, buffer, 40)) { - char * name = (ed->key_array[index]->uids && ed->key_array[index]->uids->name) ? ed->key_array[index]->uids->name : ""; - char * email = (ed->key_array[index]->uids && ed->key_array[index]->uids->email) ? ed->key_array[index]->uids->email : ""; + char * name = (ed->key_array[idx]->uids && ed->key_array[idx]->uids->name) + ? + ed->key_array[idx]->uids->name + : + &empty_string; + char * email = (ed->key_array[idx]->uids && ed->key_array[idx]->uids->email) + ? + ed->key_array[idx]->uids->email + : + &empty_string; if (strlen(name) + strlen(email) < 500) sprintf(buffer, "%s <%s>", name, email); else @@ -49,9 +58,9 @@ } } -static const char * geanypg_validity(gpgme_sigsum_t summary) +static const char * geanypg_validity(gpgme_validity_t validity) { - switch (summary) + switch (validity) { case GPGME_VALIDITY_UNKNOWN: return "unknown"; case GPGME_VALIDITY_UNDEFINED:return "undefined"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2131] trunk/geany-plugins/devhelp/src
by codebrainz＠users.sourceforge.net 13 Aug '11

13 Aug '11

Revision: 2131 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2131&view=rev Author: codebrainz Date: 2011-08-13 18:18:32 +0000 (Sat, 13 Aug 2011) Log Message: ----------- Add missing string.h includes. Modified Paths: -------------- trunk/geany-plugins/devhelp/src/dhp-object.c trunk/geany-plugins/devhelp/src/dhp-plugin.c Modified: trunk/geany-plugins/devhelp/src/dhp-object.c =================================================================== --- trunk/geany-plugins/devhelp/src/dhp-object.c 2011-08-13 17:58:52 UTC (rev 2130) +++ trunk/geany-plugins/devhelp/src/dhp-object.c 2011-08-13 18:18:32 UTC (rev 2131) @@ -20,6 +20,7 @@ */ #include <stdlib.h> +#include <string.h> #include <gtk/gtk.h> #include <geanyplugin.h> Modified: trunk/geany-plugins/devhelp/src/dhp-plugin.c =================================================================== --- trunk/geany-plugins/devhelp/src/dhp-plugin.c 2011-08-13 17:58:52 UTC (rev 2130) +++ trunk/geany-plugins/devhelp/src/dhp-plugin.c 2011-08-13 18:18:32 UTC (rev 2131) @@ -19,6 +19,7 @@ * MA 02110-1301, USA. */ +#include <string.h> #include <sys/stat.h> /* for g_mkdir_with_parents, is it portable? */ #include <gtk/gtk.h> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2130] trunk/geany-plugins/addons/src/addons.c
by frlan＠users.sourceforge.net 13 Aug '11

13 Aug '11

Revision: 2130 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2130&view=rev Author: frlan Date: 2011-08-13 17:58:52 +0000 (Sat, 13 Aug 2011) Log Message: ----------- Fix build of addons plugin due to not properly included config.h Modified Paths: -------------- trunk/geany-plugins/addons/src/addons.c Modified: trunk/geany-plugins/addons/src/addons.c =================================================================== --- trunk/geany-plugins/addons/src/addons.c 2011-08-13 15:05:45 UTC (rev 2129) +++ trunk/geany-plugins/addons/src/addons.c 2011-08-13 17:58:52 UTC (rev 2130) @@ -34,6 +34,9 @@ #include "ao_tasks.h" #include "ao_xmltagging.h" +#ifdef HAVE_CONFIG_H +# include "config.h" /* for the gettext domain */ +#endif GeanyPlugin *geany_plugin; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2129] trunk/geany-plugins/geanygendoc/src
by colombanw＠users.sourceforge.net 13 Aug '11

13 Aug '11

Revision: 2129 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2129&view=rev Author: colombanw Date: 2011-08-13 15:05:45 +0000 (Sat, 13 Aug 2011) Log Message: ----------- Properly include config.h as needed Geany used to have a bug with the side effect of including config.h implicitly. Now this bug is fixed, but it breaks code relying on this side effect. Modified Paths: -------------- trunk/geany-plugins/geanygendoc/src/ggd-file-type-loader.c trunk/geany-plugins/geanygendoc/src/ggd-file-type-manager.c trunk/geany-plugins/geanygendoc/src/ggd-plugin.c trunk/geany-plugins/geanygendoc/src/ggd-tag-utils.c trunk/geany-plugins/geanygendoc/src/ggd-utils.c trunk/geany-plugins/geanygendoc/src/ggd-widget-doctype-selector.c trunk/geany-plugins/geanygendoc/src/ggd.c Modified: trunk/geany-plugins/geanygendoc/src/ggd-file-type-loader.c =================================================================== --- trunk/geany-plugins/geanygendoc/src/ggd-file-type-loader.c 2011-08-07 15:11:37 UTC (rev 2128) +++ trunk/geany-plugins/geanygendoc/src/ggd-file-type-loader.c 2011-08-13 15:05:45 UTC (rev 2129) @@ -24,6 +24,10 @@ */ +#ifdef HAVE_CONFIG_H +# include "config.h" /* for the gettext domain */ +#endif + #include "ggd-file-type-loader.h" #include <string.h> Modified: trunk/geany-plugins/geanygendoc/src/ggd-file-type-manager.c =================================================================== --- trunk/geany-plugins/geanygendoc/src/ggd-file-type-manager.c 2011-08-07 15:11:37 UTC (rev 2128) +++ trunk/geany-plugins/geanygendoc/src/ggd-file-type-manager.c 2011-08-13 15:05:45 UTC (rev 2129) @@ -19,6 +19,10 @@ */ +#ifdef HAVE_CONFIG_H +# include "config.h" /* for the gettext domain */ +#endif + #include "ggd-file-type-manager.h" #include <glib.h> Modified: trunk/geany-plugins/geanygendoc/src/ggd-plugin.c =================================================================== --- trunk/geany-plugins/geanygendoc/src/ggd-plugin.c 2011-08-07 15:11:37 UTC (rev 2128) +++ trunk/geany-plugins/geanygendoc/src/ggd-plugin.c 2011-08-13 15:05:45 UTC (rev 2129) @@ -18,6 +18,10 @@ * */ +#ifdef HAVE_CONFIG_H +# include "config.h" /* for the gettext domain */ +#endif + #include "ggd-plugin.h" #include <glib.h> Modified: trunk/geany-plugins/geanygendoc/src/ggd-tag-utils.c =================================================================== --- trunk/geany-plugins/geanygendoc/src/ggd-tag-utils.c 2011-08-07 15:11:37 UTC (rev 2128) +++ trunk/geany-plugins/geanygendoc/src/ggd-tag-utils.c 2011-08-13 15:05:45 UTC (rev 2129) @@ -19,6 +19,10 @@ */ +#ifdef HAVE_CONFIG_H +# include "config.h" /* for the gettext domain */ +#endif + #include "ggd-tag-utils.h" #include <geanyplugin.h> Modified: trunk/geany-plugins/geanygendoc/src/ggd-utils.c =================================================================== --- trunk/geany-plugins/geanygendoc/src/ggd-utils.c 2011-08-07 15:11:37 UTC (rev 2128) +++ trunk/geany-plugins/geanygendoc/src/ggd-utils.c 2011-08-13 15:05:45 UTC (rev 2129) @@ -19,6 +19,10 @@ */ +#ifdef HAVE_CONFIG_H +# include "config.h" /* for the gettext domain */ +#endif + #include "ggd-utils.h" #include <sys/types.h> Modified: trunk/geany-plugins/geanygendoc/src/ggd-widget-doctype-selector.c =================================================================== --- trunk/geany-plugins/geanygendoc/src/ggd-widget-doctype-selector.c 2011-08-07 15:11:37 UTC (rev 2128) +++ trunk/geany-plugins/geanygendoc/src/ggd-widget-doctype-selector.c 2011-08-13 15:05:45 UTC (rev 2129) @@ -18,6 +18,10 @@ * */ +#ifdef HAVE_CONFIG_H +# include "config.h" /* for the gettext domain */ +#endif + #include "ggd-widget-doctype-selector.h" #include <gtk/gtk.h> Modified: trunk/geany-plugins/geanygendoc/src/ggd.c =================================================================== --- trunk/geany-plugins/geanygendoc/src/ggd.c 2011-08-07 15:11:37 UTC (rev 2128) +++ trunk/geany-plugins/geanygendoc/src/ggd.c 2011-08-13 15:05:45 UTC (rev 2129) @@ -18,6 +18,10 @@ * */ +#ifdef HAVE_CONFIG_H +# include "config.h" /* for the gettext domain */ +#endif + #include "ggd.h" #include <string.h> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[2128] trunk/geany-plugins/debugger/src
by cesspit＠users.sourceforge.net 07 Aug '11

07 Aug '11

Revision: 2128 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2128&view=rev Author: cesspit Date: 2011-08-07 15:11:37 +0000 (Sun, 07 Aug 2011) Log Message: ----------- debugger plugin: - xpm-s for margin markers Modified Paths: -------------- trunk/geany-plugins/debugger/src/markers.c Added Paths: ----------- trunk/geany-plugins/debugger/src/xpm/ trunk/geany-plugins/debugger/src/xpm/arrow_1_disable.xpm trunk/geany-plugins/debugger/src/xpm/arrow_1_yellow.xpm trunk/geany-plugins/debugger/src/xpm/breakpoint.xpm trunk/geany-plugins/debugger/src/xpm/breakpoint_condition.xpm trunk/geany-plugins/debugger/src/xpm/breakpoint_disabled.xpm Modified: trunk/geany-plugins/debugger/src/markers.c =================================================================== --- trunk/geany-plugins/debugger/src/markers.c 2011-08-06 21:58:41 UTC (rev 2127) +++ trunk/geany-plugins/debugger/src/markers.c 2011-08-07 15:11:37 UTC (rev 2128) @@ -30,19 +30,21 @@ #include "breakpoint.h" #include "breakpoints.h" +#include "xpm/breakpoint.xpm" +#include "xpm/breakpoint_disabled.xpm" +#include "xpm/breakpoint_condition.xpm" + +#include "xpm/arrow_1_disable.xpm" +#include "xpm/arrow_1_yellow.xpm" + /* markers identifiers */ #define M_FIRST 12 #define M_BP_ENABLED M_FIRST #define M_BP_DISABLED (M_FIRST + 1) -#define M_CI_BACKGROUND (M_FIRST + 2) -#define M_BP_ENABLED_CONDITIONAL (M_FIRST + 3) -#define M_BP_ENABLED_HITS (M_FIRST + 4) -#define M_BP_ENABLED_HITS_CONDITIONAL (M_FIRST + 5) -#define M_BP_DISABLED_CONDITIONAL (M_FIRST + 6) -#define M_BP_DISABLED_HITS (M_FIRST + 7) -#define M_BP_DISABLED_HITS_CONDITIONAL (M_FIRST + 8) -#define M_CI_ARROW (M_FIRST + 9) -#define M_FRAME (M_FIRST + 10) +#define M_BP_CONDITIONAL (M_FIRST + 2) +#define M_CI_BACKGROUND (M_FIRST + 3) +#define M_CI_ARROW (M_FIRST + 4) +#define M_FRAME (M_FIRST + 5) #define MARKER_PRESENT(mask, marker) (mask && (0x01 << marker)) @@ -56,6 +58,9 @@ #define WHITE RGB(255,255,255) #define PINK RGB(255,192,203) +#define BP_BACKGROUND RGB(255,246,33) + + #define LIGHT_YELLOW RGB(200,200,0) /* @@ -64,41 +69,14 @@ void markers_set_for_document(ScintillaObject *sci) { /* enabled breakpoint */ - scintilla_send_message(sci, SCI_MARKERDEFINE, M_BP_ENABLED, SC_MARK_ROUNDRECT); - scintilla_send_message(sci, SCI_MARKERSETBACK, M_BP_ENABLED, RED); - scintilla_send_message(sci, SCI_MARKERSETFORE, M_BP_ENABLED, RED); + scintilla_send_message(sci, SCI_MARKERDEFINEPIXMAP, M_BP_ENABLED, (long)breakpoint_xpm); - /* enabled breakpoint - condition */ - scintilla_send_message(sci, SCI_MARKERDEFINE, M_BP_ENABLED_CONDITIONAL, SC_MARK_ROUNDRECT); - scintilla_send_message(sci, SCI_MARKERSETBACK, M_BP_ENABLED_CONDITIONAL, BLUE); - scintilla_send_message(sci, SCI_MARKERSETFORE, M_BP_ENABLED_CONDITIONAL, BLUE); - - /* enabled breakpoint - hits */ - scintilla_send_message(sci, SCI_MARKERDEFINE, M_BP_ENABLED_HITS, SC_MARK_ROUNDRECT); - scintilla_send_message(sci, SCI_MARKERSETBACK, M_BP_ENABLED_HITS, YELLOW); - scintilla_send_message(sci, SCI_MARKERSETFORE, M_BP_ENABLED_HITS, YELLOW); - - /* enabled breakpoint - hits, condition */ - scintilla_send_message(sci, SCI_MARKERDEFINE, M_BP_ENABLED_HITS_CONDITIONAL, SC_MARK_ROUNDRECT); - scintilla_send_message(sci, SCI_MARKERSETBACK, M_BP_ENABLED_HITS_CONDITIONAL, GREEN); - scintilla_send_message(sci, SCI_MARKERSETFORE, M_BP_ENABLED_HITS_CONDITIONAL, GREEN); - /* disabled breakpoint */ - scintilla_send_message(sci, SCI_MARKERDEFINE, M_BP_DISABLED, SC_MARK_ROUNDRECT); - scintilla_send_message(sci, SCI_MARKERSETFORE, M_BP_DISABLED, RED); + scintilla_send_message(sci, SCI_MARKERDEFINEPIXMAP, M_BP_DISABLED, (long)breakpoint_disabled_xpm); - /* disabled breakpoint - condition */ - scintilla_send_message(sci, SCI_MARKERDEFINE, M_BP_DISABLED_CONDITIONAL, SC_MARK_ROUNDRECT); - scintilla_send_message(sci, SCI_MARKERSETFORE, M_BP_DISABLED_CONDITIONAL, BLUE); + /* conditional breakpoint */ + scintilla_send_message(sci, SCI_MARKERDEFINEPIXMAP, M_BP_CONDITIONAL, (long)breakpoint_condition_xpm); - /* disabled breakpoint - hits */ - scintilla_send_message(sci, SCI_MARKERDEFINE, M_BP_DISABLED_HITS, SC_MARK_ROUNDRECT); - scintilla_send_message(sci, SCI_MARKERSETFORE, M_BP_DISABLED_HITS, YELLOW); - - /* disabled breakpoint - hits, condition */ - scintilla_send_message(sci, SCI_MARKERDEFINE, M_BP_DISABLED_HITS_CONDITIONAL, SC_MARK_ROUNDRECT); - scintilla_send_message(sci, SCI_MARKERSETFORE, M_BP_DISABLED_HITS_CONDITIONAL, GREEN); - /* currect instruction background */ scintilla_send_message(sci, SCI_MARKERDEFINE, M_CI_BACKGROUND, SC_MARK_BACKGROUND); scintilla_send_message(sci, SCI_MARKERSETBACK, M_CI_BACKGROUND, YELLOW); @@ -106,15 +84,10 @@ scintilla_send_message(sci, SCI_MARKERSETALPHA, M_CI_BACKGROUND, 75); /* currect instruction arrow */ - scintilla_send_message(sci, SCI_MARKERDEFINE, M_CI_ARROW, SC_MARK_SHORTARROW); - scintilla_send_message(sci, SCI_MARKERSETBACK, M_CI_ARROW, YELLOW); - scintilla_send_message(sci, SCI_MARKERSETFORE, M_CI_ARROW, BLACK); - scintilla_send_message(sci, SCI_MARKERSETALPHA, M_CI_ARROW, 75); + scintilla_send_message(sci, SCI_MARKERDEFINEPIXMAP, M_CI_ARROW, (long)arrow_1_yellow_xpm); /* frame marker current */ - scintilla_send_message(sci, SCI_MARKERDEFINE, M_FRAME, SC_MARK_SHORTARROW); - scintilla_send_message(sci, SCI_MARKERSETBACK, M_FRAME, WHITE); - scintilla_send_message(sci, SCI_MARKERSETFORE, M_FRAME, BLACK); + scintilla_send_message(sci, SCI_MARKERDEFINEPIXMAP, M_FRAME, (long)arrow_1_disable_xpm); } /* @@ -139,38 +112,18 @@ GeanyDocument *doc = document_find_by_filename(bp->file); if (doc) { - int marker; - if (bp->enabled) + if (!bp->enabled) { - if (strlen(bp->condition)) - { - marker = bp->hitscount ? M_BP_ENABLED_HITS_CONDITIONAL : M_BP_ENABLED_CONDITIONAL; - } - else if (bp->hitscount) - { - marker = M_BP_ENABLED_HITS; - } - else - { - marker = M_BP_ENABLED; - } + sci_set_marker_at_line(doc->editor->sci, bp->line - 1, M_BP_DISABLED); } + else if (strlen(bp->condition) || bp->hitscount) + { + sci_set_marker_at_line(doc->editor->sci, bp->line - 1, M_BP_CONDITIONAL); + } else { - if (strlen(bp->condition)) - { - marker = bp->hitscount ? M_BP_DISABLED_HITS_CONDITIONAL : M_BP_DISABLED_CONDITIONAL; - } - else if (bp->hitscount) - { - marker = M_BP_DISABLED_HITS; - } - else - { - marker = M_BP_DISABLED; - } + sci_set_marker_at_line(doc->editor->sci, bp->line - 1, M_BP_ENABLED); } - sci_set_marker_at_line(doc->editor->sci, bp->line - 1, marker); } } @@ -181,13 +134,8 @@ { static int breakpoint_markers[] = { M_BP_ENABLED, - M_BP_ENABLED_CONDITIONAL, - M_BP_ENABLED_HITS, - M_BP_ENABLED_HITS_CONDITIONAL, M_BP_DISABLED, - M_BP_DISABLED_CONDITIONAL, - M_BP_DISABLED_HITS, - M_BP_DISABLED_HITS_CONDITIONAL + M_BP_CONDITIONAL }; GeanyDocument *doc = document_find_by_filename(bp->file); Added: trunk/geany-plugins/debugger/src/xpm/arrow_1_disable.xpm =================================================================== --- trunk/geany-plugins/debugger/src/xpm/arrow_1_disable.xpm (rev 0) +++ trunk/geany-plugins/debugger/src/xpm/arrow_1_disable.xpm 2011-08-07 15:11:37 UTC (rev 2128) @@ -0,0 +1,29 @@ +/* XPM */ +static char * arrow_1_disable_xpm[] = { +"16 16 10 1", +" c None", +". c #938E12", +"+ c #959011", +"@ c #928E12", +"# c #949011", +"$ c #938F11", +"% c #948F11", +"& c #938E11", +"* c #928E11", +"= c #938F12", +" ", +" . ", +" .. ", +" ++@ ", +" #$#. ", +" #$#.. ", +" %%%%%%%%& %.% ", +" %******** %%% ", +" =@ ===", +" ========= ==. ", +" ......... ... ", +" ..... ", +" @@.@ ", +" @.@ ", +" .@ ", +" @ "}; Added: trunk/geany-plugins/debugger/src/xpm/arrow_1_yellow.xpm =================================================================== --- trunk/geany-plugins/debugger/src/xpm/arrow_1_yellow.xpm (rev 0) +++ trunk/geany-plugins/debugger/src/xpm/arrow_1_yellow.xpm 2011-08-07 15:11:37 UTC (rev 2128) @@ -0,0 +1,64 @@ +/* XPM */ +static char * arrow_1_yellow_xpm[] = { +"16 16 45 1", +" c None", +". c #948F11", +"+ c #959011", +"@ c #949011", +"# c #E8DF29", +"$ c #E1D829", +"% c #E3D927", +"& c #E1D529", +"* c #DDDA21", +"= c #DCD821", +"- c #DCD621", +"; c #DBD521", +"> c #DAD323", +", c #DAD227", +"' c #D9CF27", +") c #D8CF27", +"! c #D7CD27", +"~ c #D6CB29", +"{ c #D6C92B", +"] c #938F12", +"^ c #BEBA1D", +"/ c #BDB91D", +"( c #BDB71D", +"_ c #BDB621", +": c #BDB321", +"< c #BBB321", +"[ c #BAB121", +"} c #BAB023", +"| c #B9AE25", +"1 c #B9AD25", +"2 c #B7AC27", +"3 c #B7AA27", +"4 c #A8A418", +"5 c #A7A21A", +"6 c #A7A01D", +"7 c #A79F1D", +"8 c #A59F1D", +"9 c #A59D1D", +"0 c #A49B1F", +"a c #A49A21", +"b c #A49921", +"c c #A29821", +"d c #A29621", +"e c #938E12", +"f c #928E12", +" ", +" ", +" . ", +" +. ", +" @#. ", +" @#$@ ", +" ........%$&. ", +" .*=-;>,')!~{. ", +" ]^/(_:<[}|123] ", +" ]4567890abcd] ", +" eeeeeeeeddde ", +" edde ", +" fde ", +" .e ", +" e ", +" "}; Added: trunk/geany-plugins/debugger/src/xpm/breakpoint.xpm =================================================================== --- trunk/geany-plugins/debugger/src/xpm/breakpoint.xpm (rev 0) +++ trunk/geany-plugins/debugger/src/xpm/breakpoint.xpm 2011-08-07 15:11:37 UTC (rev 2128) @@ -0,0 +1,91 @@ +/* XPM */ +static char * breakpoint_xpm[] = { +"16 16 72 1", +" c None", +". c #772B1A", +"+ c #903B2D", +"@ c #F17A78", +"# c #C65C55", +"$ c #F17876", +"% c #FF7E7E", +"& c #FF7B7B", +"* c #C65750", +"= c #8F3A2C", +"- c #EF7573", +"; c #FD7B7B", +"> c #FD7878", +", c #FD7575", +"' c #FD7272", +") c #C5524B", +"! c #8E392C", +"~ c #E7716F", +"{ c #F47676", +"] c #F47373", +"^ c #F47070", +"/ c #F46D6D", +"( c #F46A6A", +"_ c #F46767", +": c #C04C45", +"< c #8B382A", +"[ c #DB6B69", +"} c #E77070", +"| c #E76D6D", +"1 c #E76A6A", +"2 c #E76868", +"3 c #E76565", +"4 c #E76161", +"5 c #E75F5F", +"6 c #E75D5D", +"7 c #B8453E", +"8 c #8D392B", +"9 c #DB6867", +"0 c #E56C6C", +"a c #E56A6A", +"b c #E56767", +"c c #E56363", +"d c #E56161", +"e c #E55E5E", +"f c #E55C5C", +"g c #E55959", +"h c #B8443D", +"i c #8A3729", +"j c #CD5D5B", +"k c #D66060", +"l c #D65E5E", +"m c #D65A5A", +"n c #D65858", +"o c #D65656", +"p c #D65353", +"q c #AF413A", +"r c #863326", +"s c #BB514F", +"t c #C25252", +"u c #C25050", +"v c #C24E4E", +"w c #C24C4C", +"x c #A33C36", +"y c #813023", +"z c #A54241", +"A c #AA4444", +"B c #AA4242", +"C c #953730", +"D c #7B2D1F", +"E c #893432", +"F c #822F28", +"G c #772B1D", +" . ", +" ... ", +" ..+.. ", +" ..+@#.. ", +" ..+$%&*.. ", +" ..=-;>,').. ", +" ..!~{]^/(_:.. ", +"..<[}|1234567.. ", +"..890abcdefgh.. ", +" ..ijklmnopq.. ", +" ..rstuvwx.. ", +" ..yzABC.. ", +" ..DEF.. ", +" ..G.. ", +" ... ", +" . "}; Added: trunk/geany-plugins/debugger/src/xpm/breakpoint_condition.xpm =================================================================== --- trunk/geany-plugins/debugger/src/xpm/breakpoint_condition.xpm (rev 0) +++ trunk/geany-plugins/debugger/src/xpm/breakpoint_condition.xpm 2011-08-07 15:11:37 UTC (rev 2128) @@ -0,0 +1,42 @@ +/* XPM */ +static char * breakpoint_condition_xpm[] = { +"16 16 23 1", +" c None", +". c #772B1A", +"+ c #903B2D", +"@ c #FFAA00", +"# c #C65C55", +"$ c #C65750", +"% c #8F3A2C", +"& c #C5524B", +"* c #8E392C", +"= c #C04C45", +"- c #8B382A", +"; c #B8453E", +"> c #8D392B", +", c #B8443D", +"' c #8A3729", +") c #B34B38", +"! c #863326", +"~ c #A33C36", +"{ c #813023", +"] c #A7592E", +"^ c #7B2D1F", +"/ c #822F28", +"( c #772B1D", +" . ", +" ... ", +" ..+.. ", +" ..+@#.. ", +" ..+@@@$.. ", +" ..%@@@@@&.. ", +" ..*@@@@@@@=.. ", +"..-@@@@@@@@@;.. ", +"..>@@@@@@@@@,.. ", +" ..'@@@@@@@).. ", +" ..!@@@@@~.. ", +" ..{@@@].. ", +" ..^@/.. ", +" ..(.. ", +" ... ", +" . "}; Added: trunk/geany-plugins/debugger/src/xpm/breakpoint_disabled.xpm =================================================================== --- trunk/geany-plugins/debugger/src/xpm/breakpoint_disabled.xpm (rev 0) +++ trunk/geany-plugins/debugger/src/xpm/breakpoint_disabled.xpm 2011-08-07 15:11:37 UTC (rev 2128) @@ -0,0 +1,21 @@ +/* XPM */ +static char * breakpoint_disabled_xpm[] = { +"16 16 2 1", +" c None", +". c #772B1A", +" .. ", +" .... ", +" ...... ", +" ... ... ", +" ... ... ", +" ... ... ", +" ... ... ", +"... ...", +"... ...", +" ... ... ", +" ... ... ", +" ... ... ", +" ... ... ", +" ...... ", +" .... ", +" .. "}; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits August 2011