Plugins-Commits January 2018

plugins-commits@lists.geany.org

1 participants
44 discussions

[geany/geany-plugins] 0ca215: Merge pull request #686 from elextr/patch-4
by Frank Lanitz 31 Jan '18

31 Jan '18

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Wed, 31 Jan 2018 06:00:55 UTC Commit: 0ca2154dee0b654b5ed6feca6d5143341e606b27 https://github.com/geany/geany-plugins/commit/0ca2154dee0b654b5ed6feca6d514… Log Message: ----------- Merge pull request #686 from elextr/patch-4 Add github names to maintainers file Modified Paths: -------------- MAINTAINERS Modified: MAINTAINERS 43 lines changed, 43 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ # P: Person +# G: Github @name # M: Mail patches to: FullName <address@domain> # W: Web-page with status/info # S: Status, one of the following: @@ -13,193 +14,225 @@ addons P: Enrico Tröger <enrico.troeger(a)uvena.de> +g: @eht16 M: Enrico Tröger <enrico.troeger(a)uvena.de> W: http://plugins.geany.org/addons.html S: Maintained autoclose P: Pavel Roschin <rpg89(at)post(dot)ru> +g: @scriptum M: Pavel Roschin <rpg89(at)post(dot)ru> W: S: Maintained automark P: Pavel Roschin <rpg89(at)post(dot)ru> +g: @scriptum M: Pavel Roschin <rpg89(at)post(dot)ru> W: S: Maintained codenav P: Federico Reghenzani <federico(dot)dev(at)reghe(dot)net> +g: M: Federico Reghenzani <federico(dot)dev(at)reghe(dot)net> W: http://plugins.geany.org/codenav.html S: Maintained commander P: Colomban Wendling <ban(a)herbesfolles.org> +g: @b4n M: Colomban Wendling <ban(a)herbesfolles.org> W: S: Maintained debugger P: Alexander Petukhov <devel(a)apetukhov.ru> +g: M: Alexander Petukhov <devel(a)apetukhov.ru> W: http://plugins.geany.org/debugger.html S: Maintained defineformat P: Pavel Roschin <rpg89(at)post(dot)ru> +g: @scriptum M: Pavel Roschin <rpg89(at)post(dot)ru> W: http://plugins.geany.org/defineformat.html S: Maintained devhelp P: Matthew Brush <matt(a)geany.org> +g: @codebrainz M: Matthew Brush <matt(a)geany.org> W: http://plugins.geany.org/devhelp.html S: Maintained geanyctags P: Jiří Techet <techet(a)gmail.com> +g: @techee M: Jiří Techet <techet(a)gmail.com> W: http://plugins.geany.org/geanyctags.html S: Maintained geanydoc P: Yura Siamashka <yurand2(a)gmail.com> +g: M: Yura Siamashka <yurand2(a)gmail.com> W: http://plugins.geany.org/geanydoc.html S: Odd Fixes geanyextrasel P: +g: M: W: http://plugins.geany.org/geanyextrasel.html S: Orphaned geanygendoc P: Colomban Wendling <ban(a)herbesfolles.org> +g: @b4n M: Colomban Wendling <ban(a)herbesfolles.org> W: http://plugins.geany.org/geanygendoc.html S: Maintained geanyinsertnum P: +g: M: W: http://plugins.geany.org/geanyinsertnum.html S: Orphaned latex P: Frank Lanitz <frank(a)frank.uvena.de> +g: @frlan M: Frank Lanitz <frank(a)frank.uvena.de> W: http://frank.uvena.de/en/Geany/geanylatex/ S: Maintained geanylua P: +g: M: W: S: Orphaned geanymacro P: William Fraser <william.fraser(a)virgin.net> +g: M: William Fraser <william.fraser(a)virgin.net> W: http://plugins.geany.org/geanymacro.html S: Maintained geanyminiscript P: Eugene Arshinov <earshinov(a)gmail.com> +g: M: Eugene Arshinov <earshinov(a)gmail.com> W: S: Maintained geanynumberedbookmarks P: William Fraser <william.fraser(a)virgin.net> +g: M: William Fraser <william.fraser(a)virgin.net> W: http://plugins.geany.org/geanynumberedbookmarks.html S: Maintained geanypg P: Hans Alves <alves.h88(a)gmail.com> +g: M: Hans Alves <alves.h88(a)gmail.com> W: http://plugins.geany.org/geanypg.html S: Odd Fixes geanyprj P: Donjan Rodic <bryonak(a)freenet.de> +g: M: Donjan Rodic <bryonak(a)freenet.de> W: http://plugins.geany.org/geanyprj.html S: Odd Fixes geanypy P: Thomas Martitz <kugel(a)rockbox.org> +g: @kugel- M: Thomas Martitz <kugel(a)rockbox.org> W: http://plugins.geany.org/geanypy.html S: Currently diverged from upstream geanysendmail P: Frank Lanitz <frank(a)frank.uvena.de> +g: @frlan M: Frank Lanitz <frank(a)frank.uvena.de> W: http://plugins.geany.org/geanysendmail.html S: Maintained geanyvc P: Yura Siamashka <yurand2(a)gmail.com> +g: M: Yura Siamashka <yurand2(a)gmail.com> W: http://plugins.geany.org/geanyvc.html S: Odd Fixes geniuspaste P: Enrico Trotta <enrico.trt(a)gmail.com> +g: M: Enrico Trotta <enrico.trt(a)gmail.com> W: S: Maintained git-changebar P: Colomban Wendling <ban(a)herbesfolles.org> +g: @b4n M: Colomban Wendling <ban(a)herbesfolles.org> W: http://plugins.geany.org/git-changebar.html S: Maintained keyrecord P: Artur Riazanov <tunyash(a)gmail.com> +g: M: Artur Riazanov <tunyash(a)gmail.com> W: S: Maintained lineoperations P: Sylvan Mostert <smostert.dev(a)gmail.com> +g: M: Sylvan Mostert <smostert.dev(a)gmail.com> W: S: Maintained lipsum P: Frank Lanitz <frank(a)frank.uvena.de> +g: @frlan M: Frank Lanitz <frank(a)frank.uvena.de> W: http://plugins.geany.org/lipsum.html S: Maintained markdown P: Matthew Brush <matt(a)geany.org> +g: @codebrainz M: Matthew Brush <matt(a)geany.org> W: S: Maintained multiterm P: Matthew Brush <matt(a)geany.org> +g: @codebrainz M: Matthew Brush <matt(a)geany.org> W: http://plugins.geany.org/multiterm.html S: Maintained overview P: Matthew Brush <matt(a)geany.org> +g: @codebrainz M: Matthew Brush <matt(a)geany.org> W: https://github.com/codebrainz/overview-plugin S: Maintained pairtaghighlighter P: Volodymyr Kononenko <vm(a)kononenko.ws> +g: M: Volodymyr Kononenko <vm(a)kononenko.ws> W: S: Maintained @@ -212,60 +245,70 @@ S: Orphaned projectorganizer P: Jiří Techet <techet(a)gmail.com> +g: @techee M: Jiří Techet <techet(a)gmail.com> W: http://plugins.geany.org/projectorganizer.html S: Maintained pohelper P: Colomban Wendling <ban(a)herbesfolles.org> +g: @b4n M: Colomban Wendling <ban(a)herbesfolles.org> W: http://plugins.geany.org/pohelper.html S: Maintained scope P: +g: M: W: http://plugins.geany.org/scope.html S: Orphaned shiftcolumn P: +g: M: W: S: Orphaned spellcheck P: Enrico Tröger <enrico.troeger(a)uvena.de> +g: @eht16 M: Enrico Tröger <enrico.troeger(a)uvena.de> W: http://plugins.geany.org/spellcheck.html S: Maintained tableconvert P: Frank Lanitz <frank(a)frank.uvena.de> +g: @frlan M: Frank Lanitz <frank(a)frank.uvena.de> W: http://plugins.geany.org/tableconvert.html S: Maintained treebrowser P: Adam Dingle <adam(a)medovina.org> +g: M: Adam Dingle <adam(a)medovina.org> W: http://plugins.geany.org/treebrowser.html S: Maintained updatechecker P: Frank Lanitz <frank(a)frank.uvena.de> +g: @frlan M: Frank Lanitz <frank(a)frank.uvena.de> W: http://plugins.geany.org/updatechecker.html S: Maintained webhelper P: Colomban Wendling <ban(a)herbesfolles.org> +g: @b4n M: Colomban Wendling <ban(a)herbesfolles.org> W: http://plugins.geany.org/webhelper.html S: Maintained xmlsnippets P: Eugene Arshinov <earshinov(a)gmail.com> +g: @earshinov M: Eugene Arshinov <earshinov(a)gmail.com> W: http://plugins.geany.org/xmlsnippets.html S: Maintained -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 2d6e4d: Add github names to maintainers file
by elextr 31 Jan '18

31 Jan '18

Branch: refs/heads/master Author: elextr <elextr(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: Wed, 31 Jan 2018 01:04:22 UTC Commit: 2d6e4d780204e0562d8566cbf408414aa0137123 https://github.com/geany/geany-plugins/commit/2d6e4d780204e0562d8566cbf4084… Log Message: ----------- Add github names to maintainers file Have the maintainers github user name recorded somewhere so they can be pinged by users rather than waiting for them to notice an issue for their plugin was posted. I have filled in the ones I know for sure, to everybody else, no offense, I am working from memory. Modified Paths: -------------- MAINTAINERS Modified: MAINTAINERS 43 lines changed, 43 insertions(+), 0 deletions(-) =================================================================== @@ -1,4 +1,5 @@ # P: Person +# G: Github @name # M: Mail patches to: FullName <address@domain> # W: Web-page with status/info # S: Status, one of the following: @@ -13,193 +14,225 @@ addons P: Enrico Tröger <enrico.troeger(a)uvena.de> +g: @eht16 M: Enrico Tröger <enrico.troeger(a)uvena.de> W: http://plugins.geany.org/addons.html S: Maintained autoclose P: Pavel Roschin <rpg89(at)post(dot)ru> +g: @scriptum M: Pavel Roschin <rpg89(at)post(dot)ru> W: S: Maintained automark P: Pavel Roschin <rpg89(at)post(dot)ru> +g: @scriptum M: Pavel Roschin <rpg89(at)post(dot)ru> W: S: Maintained codenav P: Federico Reghenzani <federico(dot)dev(at)reghe(dot)net> +g: M: Federico Reghenzani <federico(dot)dev(at)reghe(dot)net> W: http://plugins.geany.org/codenav.html S: Maintained commander P: Colomban Wendling <ban(a)herbesfolles.org> +g: @b4n M: Colomban Wendling <ban(a)herbesfolles.org> W: S: Maintained debugger P: Alexander Petukhov <devel(a)apetukhov.ru> +g: M: Alexander Petukhov <devel(a)apetukhov.ru> W: http://plugins.geany.org/debugger.html S: Maintained defineformat P: Pavel Roschin <rpg89(at)post(dot)ru> +g: @scriptum M: Pavel Roschin <rpg89(at)post(dot)ru> W: http://plugins.geany.org/defineformat.html S: Maintained devhelp P: Matthew Brush <matt(a)geany.org> +g: @codebrainz M: Matthew Brush <matt(a)geany.org> W: http://plugins.geany.org/devhelp.html S: Maintained geanyctags P: Jiří Techet <techet(a)gmail.com> +g: @techee M: Jiří Techet <techet(a)gmail.com> W: http://plugins.geany.org/geanyctags.html S: Maintained geanydoc P: Yura Siamashka <yurand2(a)gmail.com> +g: M: Yura Siamashka <yurand2(a)gmail.com> W: http://plugins.geany.org/geanydoc.html S: Odd Fixes geanyextrasel P: +g: M: W: http://plugins.geany.org/geanyextrasel.html S: Orphaned geanygendoc P: Colomban Wendling <ban(a)herbesfolles.org> +g: @b4n M: Colomban Wendling <ban(a)herbesfolles.org> W: http://plugins.geany.org/geanygendoc.html S: Maintained geanyinsertnum P: +g: M: W: http://plugins.geany.org/geanyinsertnum.html S: Orphaned latex P: Frank Lanitz <frank(a)frank.uvena.de> +g: @frlan M: Frank Lanitz <frank(a)frank.uvena.de> W: http://frank.uvena.de/en/Geany/geanylatex/ S: Maintained geanylua P: +g: M: W: S: Orphaned geanymacro P: William Fraser <william.fraser(a)virgin.net> +g: M: William Fraser <william.fraser(a)virgin.net> W: http://plugins.geany.org/geanymacro.html S: Maintained geanyminiscript P: Eugene Arshinov <earshinov(a)gmail.com> +g: M: Eugene Arshinov <earshinov(a)gmail.com> W: S: Maintained geanynumberedbookmarks P: William Fraser <william.fraser(a)virgin.net> +g: M: William Fraser <william.fraser(a)virgin.net> W: http://plugins.geany.org/geanynumberedbookmarks.html S: Maintained geanypg P: Hans Alves <alves.h88(a)gmail.com> +g: M: Hans Alves <alves.h88(a)gmail.com> W: http://plugins.geany.org/geanypg.html S: Odd Fixes geanyprj P: Donjan Rodic <bryonak(a)freenet.de> +g: M: Donjan Rodic <bryonak(a)freenet.de> W: http://plugins.geany.org/geanyprj.html S: Odd Fixes geanypy P: Thomas Martitz <kugel(a)rockbox.org> +g: @kugel- M: Thomas Martitz <kugel(a)rockbox.org> W: http://plugins.geany.org/geanypy.html S: Currently diverged from upstream geanysendmail P: Frank Lanitz <frank(a)frank.uvena.de> +g: @frlan M: Frank Lanitz <frank(a)frank.uvena.de> W: http://plugins.geany.org/geanysendmail.html S: Maintained geanyvc P: Yura Siamashka <yurand2(a)gmail.com> +g: M: Yura Siamashka <yurand2(a)gmail.com> W: http://plugins.geany.org/geanyvc.html S: Odd Fixes geniuspaste P: Enrico Trotta <enrico.trt(a)gmail.com> +g: M: Enrico Trotta <enrico.trt(a)gmail.com> W: S: Maintained git-changebar P: Colomban Wendling <ban(a)herbesfolles.org> +g: @b4n M: Colomban Wendling <ban(a)herbesfolles.org> W: http://plugins.geany.org/git-changebar.html S: Maintained keyrecord P: Artur Riazanov <tunyash(a)gmail.com> +g: M: Artur Riazanov <tunyash(a)gmail.com> W: S: Maintained lineoperations P: Sylvan Mostert <smostert.dev(a)gmail.com> +g: M: Sylvan Mostert <smostert.dev(a)gmail.com> W: S: Maintained lipsum P: Frank Lanitz <frank(a)frank.uvena.de> +g: @frlan M: Frank Lanitz <frank(a)frank.uvena.de> W: http://plugins.geany.org/lipsum.html S: Maintained markdown P: Matthew Brush <matt(a)geany.org> +g: @codebrainz M: Matthew Brush <matt(a)geany.org> W: S: Maintained multiterm P: Matthew Brush <matt(a)geany.org> +g: @codebrainz M: Matthew Brush <matt(a)geany.org> W: http://plugins.geany.org/multiterm.html S: Maintained overview P: Matthew Brush <matt(a)geany.org> +g: @codebrainz M: Matthew Brush <matt(a)geany.org> W: https://github.com/codebrainz/overview-plugin S: Maintained pairtaghighlighter P: Volodymyr Kononenko <vm(a)kononenko.ws> +g: M: Volodymyr Kononenko <vm(a)kononenko.ws> W: S: Maintained @@ -212,60 +245,70 @@ S: Orphaned projectorganizer P: Jiří Techet <techet(a)gmail.com> +g: @techee M: Jiří Techet <techet(a)gmail.com> W: http://plugins.geany.org/projectorganizer.html S: Maintained pohelper P: Colomban Wendling <ban(a)herbesfolles.org> +g: @b4n M: Colomban Wendling <ban(a)herbesfolles.org> W: http://plugins.geany.org/pohelper.html S: Maintained scope P: +g: M: W: http://plugins.geany.org/scope.html S: Orphaned shiftcolumn P: +g: M: W: S: Orphaned spellcheck P: Enrico Tröger <enrico.troeger(a)uvena.de> +g: @eht16 M: Enrico Tröger <enrico.troeger(a)uvena.de> W: http://plugins.geany.org/spellcheck.html S: Maintained tableconvert P: Frank Lanitz <frank(a)frank.uvena.de> +g: @frlan M: Frank Lanitz <frank(a)frank.uvena.de> W: http://plugins.geany.org/tableconvert.html S: Maintained treebrowser P: Adam Dingle <adam(a)medovina.org> +g: M: Adam Dingle <adam(a)medovina.org> W: http://plugins.geany.org/treebrowser.html S: Maintained updatechecker P: Frank Lanitz <frank(a)frank.uvena.de> +g: @frlan M: Frank Lanitz <frank(a)frank.uvena.de> W: http://plugins.geany.org/updatechecker.html S: Maintained webhelper P: Colomban Wendling <ban(a)herbesfolles.org> +g: @b4n M: Colomban Wendling <ban(a)herbesfolles.org> W: http://plugins.geany.org/webhelper.html S: Maintained xmlsnippets P: Eugene Arshinov <earshinov(a)gmail.com> +g: @earshinov M: Eugene Arshinov <earshinov(a)gmail.com> W: http://plugins.geany.org/xmlsnippets.html S: Maintained -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 58bdb8: Merge pull request #683 from sagarchalise/prettyprint-usage
by Frank Lanitz 30 Jan '18

30 Jan '18

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Tue, 30 Jan 2018 18:19:44 UTC Commit: 58bdb808d28122d7b124679509bbb2b5f4bd75e5 https://github.com/geany/geany-plugins/commit/58bdb808d28122d7b124679509bbb… Log Message: ----------- Merge pull request #683 from sagarchalise/prettyprint-usage Prettyprint usage Modified Paths: -------------- pretty-printer/src/PluginEntry.c Modified: pretty-printer/src/PluginEntry.c 23 lines changed, 17 insertions(+), 6 deletions(-) =================================================================== @@ -185,6 +185,7 @@ void xml_format(GtkMenuItem* menuitem, gpointer gdata) GeanyEditor* editor; ScintillaObject* sco; int input_length; + gboolean has_selection; const gchar* input_buffer; int output_length; gchar* output_buffer; @@ -197,20 +198,21 @@ void xml_format(GtkMenuItem* menuitem, gpointer gdata) editor = doc->editor; sco = editor->sci; - + /* default printing options */ if (prettyPrintingOptions == NULL) { prettyPrintingOptions = createDefaultPrettyPrintingOptions(); } + has_selection = sci_has_selection(sco); /* retrieves the text */ - input_length = sci_get_length(sco); - input_buffer = (gchar *) scintilla_send_message(sco, SCI_GETCHARACTERPOINTER, 0, 0); + input_buffer = (has_selection)?sci_get_selection_contents(sco):sci_get_contents(sco, -1); /* checks if the data is an XML format */ parsedDocument = xmlParseDoc((const unsigned char*)input_buffer); /* this is not a valid xml => exit with an error message */ if(parsedDocument == NULL) { + g_free(input_buffer); dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to parse the content as XML.")); return; } @@ -219,23 +221,32 @@ void xml_format(GtkMenuItem* menuitem, gpointer gdata) xmlFreeDoc(parsedDocument); /* process pretty-printing */ + input_length = (has_selection)?sci_get_selected_text_length(sco):sci_get_length(sco); result = processXMLPrettyPrinting(input_buffer, input_length, &output_buffer, &output_length, prettyPrintingOptions); if (result != PRETTY_PRINTING_SUCCESS) { + g_free(input_buffer); dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to process PrettyPrinting on the specified XML because some features are not supported.\n\nSee Help > Debug messages for more details...")); return; } /* updates the document */ - sci_set_text(sco, output_buffer); + if(has_selection){ + sci_replace_sel(sco, output_buffer); + } + else{ + sci_set_text(sco, output_buffer); + } /* set the line */ xOffset = scintilla_send_message(sco, SCI_GETXOFFSET, 0, 0); scintilla_send_message(sco, SCI_LINESCROLL, -xOffset, 0); /* TODO update with the right function-call for geany-0.19 */ /* sets the type */ - fileType = filetypes_index(GEANY_FILETYPES_XML); - document_set_filetype(doc, fileType); + if(!has_selection && (doc->file_type->id != GEANY_FILETYPES_HTML)){ + fileType = filetypes_index(GEANY_FILETYPES_XML); + document_set_filetype(doc, fileType); + } g_free(output_buffer); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] f7d15a: Merge pull request #685 from Skif-off/geanylua-scintilla-api
by Frank Lanitz 30 Jan '18

30 Jan '18

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Tue, 30 Jan 2018 18:01:39 UTC Commit: f7d15a3e14f57ca0cd98700873d93b89537fbca8 https://github.com/geany/geany-plugins/commit/f7d15a3e14f57ca0cd98700873d93… Log Message: ----------- Merge pull request #685 from Skif-off/geanylua-scintilla-api GeanyLua: Update to match latest Geany's Scintilla API 2 Modified Paths: -------------- geanylua/glspi_sci.h Modified: geanylua/glspi_sci.h 35 lines changed, 29 insertions(+), 6 deletions(-) =================================================================== @@ -57,6 +57,8 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"GETUNDOCOLLECTION", SLT_BOOL, SCI_GETUNDOCOLLECTION, SLT_VOID, SLT_VOID}, {"GETVIEWWS", SLT_INT, SCI_GETVIEWWS, SLT_VOID, SLT_VOID}, {"SETVIEWWS", SLT_VOID, SCI_SETVIEWWS, SLT_INT, SLT_VOID}, + {"GETTABDRAWMODE", SLT_INT, SCI_GETTABDRAWMODE, SLT_VOID, SLT_VOID}, + {"SETTABDRAWMODE", SLT_VOID, SCI_SETTABDRAWMODE, SLT_INT, SLT_VOID}, {"POSITIONFROMPOINT", SLT_INT, SCI_POSITIONFROMPOINT, SLT_INT, SLT_INT}, {"POSITIONFROMPOINTCLOSE", SLT_INT, SCI_POSITIONFROMPOINTCLOSE, SLT_INT, SLT_INT}, {"GOTOLINE", SLT_VOID, SCI_GOTOLINE, SLT_INT, SLT_VOID}, @@ -103,6 +105,10 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"GETMARGINSENSITIVEN", SLT_BOOL, SCI_GETMARGINSENSITIVEN, SLT_INT, SLT_VOID}, {"SETMARGINCURSORN", SLT_VOID, SCI_SETMARGINCURSORN, SLT_INT, SLT_INT}, {"GETMARGINCURSORN", SLT_INT, SCI_GETMARGINCURSORN, SLT_INT, SLT_VOID}, + {"SETMARGINBACKN", SLT_VOID, SCI_SETMARGINBACKN, SLT_INT, SLT_INT}, + {"GETMARGINBACKN", SLT_INT, SCI_GETMARGINBACKN, SLT_INT, SLT_VOID}, + {"SETMARGINS", SLT_VOID, SCI_SETMARGINS, SLT_INT, SLT_VOID}, + {"GETMARGINS", SLT_INT, SCI_GETMARGINS, SLT_VOID, SLT_VOID}, {"STYLECLEARALL", SLT_VOID, SCI_STYLECLEARALL, SLT_VOID, SLT_VOID}, {"STYLESETFORE", SLT_VOID, SCI_STYLESETFORE, SLT_INT, SLT_INT}, {"STYLESETBACK", SLT_VOID, SCI_STYLESETBACK, SLT_INT, SLT_INT}, @@ -176,6 +182,8 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"SETCARETLINEVISIBLE", SLT_VOID, SCI_SETCARETLINEVISIBLE, SLT_BOOL, SLT_VOID}, {"GETCARETLINEBACK", SLT_INT, SCI_GETCARETLINEBACK, SLT_VOID, SLT_VOID}, {"SETCARETLINEBACK", SLT_VOID, SCI_SETCARETLINEBACK, SLT_INT, SLT_VOID}, + {"GETCARETLINEFRAME", SLT_INT, SCI_GETCARETLINEFRAME, SLT_VOID, SLT_VOID}, + {"SETCARETLINEFRAME", SLT_VOID, SCI_SETCARETLINEFRAME, SLT_INT, SLT_VOID}, {"STYLESETCHANGEABLE", SLT_VOID, SCI_STYLESETCHANGEABLE, SLT_INT, SLT_BOOL}, {"AUTOCSHOW", SLT_VOID, SCI_AUTOCSHOW, SLT_INT, SLT_STRING}, {"AUTOCCANCEL", SLT_VOID, SCI_AUTOCCANCEL, SLT_VOID, SLT_VOID}, @@ -282,6 +290,8 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"GETTARGETEND", SLT_INT, SCI_GETTARGETEND, SLT_VOID, SLT_VOID}, {"SETTARGETRANGE", SLT_VOID, SCI_SETTARGETRANGE, SLT_INT, SLT_INT}, {"GETTARGETTEXT", SLT_INT, SCI_GETTARGETTEXT, SLT_VOID, SLT_STRINGRESULT}, + {"TARGETFROMSELECTION", SLT_VOID, SCI_TARGETFROMSELECTION, SLT_VOID, SLT_VOID}, + {"TARGETWHOLEDOCUMENT", SLT_VOID, SCI_TARGETWHOLEDOCUMENT, SLT_VOID, SLT_VOID}, {"REPLACETARGET", SLT_INT, SCI_REPLACETARGET, SLT_INT, SLT_STRING}, {"REPLACETARGETRE", SLT_INT, SCI_REPLACETARGETRE, SLT_INT, SLT_STRING}, {"SEARCHINTARGET", SLT_INT, SCI_SEARCHINTARGET, SLT_INT, SLT_STRING}, @@ -312,6 +322,8 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"SETFOLDEXPANDED", SLT_VOID, SCI_SETFOLDEXPANDED, SLT_INT, SLT_BOOL}, {"GETFOLDEXPANDED", SLT_BOOL, SCI_GETFOLDEXPANDED, SLT_INT, SLT_VOID}, {"TOGGLEFOLD", SLT_VOID, SCI_TOGGLEFOLD, SLT_INT, SLT_VOID}, + {"TOGGLEFOLDSHOWTEXT", SLT_VOID, SCI_TOGGLEFOLDSHOWTEXT, SLT_INT, SLT_STRING}, + {"FOLDDISPLAYTEXTSETSTYLE", SLT_VOID, SCI_FOLDDISPLAYTEXTSETSTYLE, SLT_INT, SLT_VOID}, {"FOLDLINE", SLT_VOID, SCI_FOLDLINE, SLT_INT, SLT_INT}, {"FOLDCHILDREN", SLT_VOID, SCI_FOLDCHILDREN, SLT_INT, SLT_INT}, {"EXPANDCHILDREN", SLT_VOID, SCI_EXPANDCHILDREN, SLT_INT, SLT_INT}, @@ -329,6 +341,9 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"GETMOUSEDWELLTIME", SLT_INT, SCI_GETMOUSEDWELLTIME, SLT_VOID, SLT_VOID}, {"WORDSTARTPOSITION", SLT_INT, SCI_WORDSTARTPOSITION, SLT_INT, SLT_BOOL}, {"WORDENDPOSITION", SLT_INT, SCI_WORDENDPOSITION, SLT_INT, SLT_BOOL}, + {"ISRANGEWORD", SLT_BOOL, SCI_ISRANGEWORD, SLT_INT, SLT_INT}, + {"SETIDLESTYLING", SLT_VOID, SCI_SETIDLESTYLING, SLT_INT, SLT_VOID}, + {"GETIDLESTYLING", SLT_INT, SCI_GETIDLESTYLING, SLT_VOID, SLT_VOID}, {"SETWRAPMODE", SLT_VOID, SCI_SETWRAPMODE, SLT_INT, SLT_VOID}, {"GETWRAPMODE", SLT_INT, SCI_GETWRAPMODE, SLT_VOID, SLT_VOID}, {"SETWRAPVISUALFLAGS", SLT_VOID, SCI_SETWRAPVISUALFLAGS, SLT_INT, SLT_VOID}, @@ -362,11 +377,12 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"SETMULTIPASTE", SLT_VOID, SCI_SETMULTIPASTE, SLT_INT, SLT_VOID}, {"GETMULTIPASTE", SLT_INT, SCI_GETMULTIPASTE, SLT_VOID, SLT_VOID}, {"GETTAG", SLT_INT, SCI_GETTAG, SLT_INT, SLT_STRINGRESULT}, - {"TARGETFROMSELECTION", SLT_VOID, SCI_TARGETFROMSELECTION, SLT_VOID, SLT_VOID}, {"LINESJOIN", SLT_VOID, SCI_LINESJOIN, SLT_VOID, SLT_VOID}, {"LINESSPLIT", SLT_VOID, SCI_LINESSPLIT, SLT_INT, SLT_VOID}, {"SETFOLDMARGINCOLOUR", SLT_VOID, SCI_SETFOLDMARGINCOLOUR, SLT_BOOL, SLT_INT}, {"SETFOLDMARGINHICOLOUR", SLT_VOID, SCI_SETFOLDMARGINHICOLOUR, SLT_BOOL, SLT_INT}, + {"SETACCESSIBILITY", SLT_VOID, SCI_SETACCESSIBILITY, SLT_INT, SLT_VOID}, + {"GETACCESSIBILITY", SLT_INT, SCI_GETACCESSIBILITY, SLT_VOID, SLT_VOID}, {"LINEDOWN", SLT_VOID, SCI_LINEDOWN, SLT_VOID, SLT_VOID}, {"LINEDOWNEXTEND", SLT_VOID, SCI_LINEDOWNEXTEND, SLT_VOID, SLT_VOID}, {"LINEUP", SLT_VOID, SCI_LINEUP, SLT_VOID, SLT_VOID}, @@ -408,6 +424,7 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"LINECUT", SLT_VOID, SCI_LINECUT, SLT_VOID, SLT_VOID}, {"LINEDELETE", SLT_VOID, SCI_LINEDELETE, SLT_VOID, SLT_VOID}, {"LINETRANSPOSE", SLT_VOID, SCI_LINETRANSPOSE, SLT_VOID, SLT_VOID}, + {"LINEREVERSE", SLT_VOID, SCI_LINEREVERSE, SLT_VOID, SLT_VOID}, {"LINEDUPLICATE", SLT_VOID, SCI_LINEDUPLICATE, SLT_VOID, SLT_VOID}, {"LOWERCASE", SLT_VOID, SCI_LOWERCASE, SLT_VOID, SLT_VOID}, {"UPPERCASE", SLT_VOID, SCI_UPPERCASE, SLT_VOID, SLT_VOID}, @@ -431,7 +448,7 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"BRACEHIGHLIGHTINDICATOR", SLT_VOID, SCI_BRACEHIGHLIGHTINDICATOR, SLT_BOOL, SLT_INT}, {"BRACEBADLIGHT", SLT_VOID, SCI_BRACEBADLIGHT, SLT_INT, SLT_VOID}, {"BRACEBADLIGHTINDICATOR", SLT_VOID, SCI_BRACEBADLIGHTINDICATOR, SLT_BOOL, SLT_INT}, - {"BRACEMATCH", SLT_INT, SCI_BRACEMATCH, SLT_INT, SLT_VOID}, + {"BRACEMATCH", SLT_INT, SCI_BRACEMATCH, SLT_INT, SLT_INT}, {"GETVIEWEOL", SLT_BOOL, SCI_GETVIEWEOL, SLT_VOID, SLT_VOID}, {"SETVIEWEOL", SLT_VOID, SCI_SETVIEWEOL, SLT_BOOL, SLT_VOID}, {"GETDOCPOINTER", SLT_INT, SCI_GETDOCPOINTER, SLT_VOID, SLT_VOID}, @@ -443,11 +460,13 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"SETEDGEMODE", SLT_VOID, SCI_SETEDGEMODE, SLT_INT, SLT_VOID}, {"GETEDGECOLOUR", SLT_INT, SCI_GETEDGECOLOUR, SLT_VOID, SLT_VOID}, {"SETEDGECOLOUR", SLT_VOID, SCI_SETEDGECOLOUR, SLT_INT, SLT_VOID}, + {"MULTIEDGEADDLINE", SLT_VOID, SCI_MULTIEDGEADDLINE, SLT_INT, SLT_INT}, + {"MULTIEDGECLEARALL", SLT_VOID, SCI_MULTIEDGECLEARALL, SLT_VOID, SLT_VOID}, {"SEARCHANCHOR", SLT_VOID, SCI_SEARCHANCHOR, SLT_VOID, SLT_VOID}, {"SEARCHNEXT", SLT_INT, SCI_SEARCHNEXT, SLT_INT, SLT_STRING}, {"SEARCHPREV", SLT_INT, SCI_SEARCHPREV, SLT_INT, SLT_STRING}, {"LINESONSCREEN", SLT_INT, SCI_LINESONSCREEN, SLT_VOID, SLT_VOID}, - {"USEPOPUP", SLT_VOID, SCI_USEPOPUP, SLT_BOOL, SLT_VOID}, + {"USEPOPUP", SLT_VOID, SCI_USEPOPUP, SLT_INT, SLT_VOID}, {"SELECTIONISRECTANGLE", SLT_BOOL, SCI_SELECTIONISRECTANGLE, SLT_VOID, SLT_VOID}, {"SETZOOM", SLT_VOID, SCI_SETZOOM, SLT_INT, SLT_VOID}, {"GETZOOM", SLT_INT, SCI_GETZOOM, SLT_VOID, SLT_VOID}, @@ -461,6 +480,8 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"GETSTATUS", SLT_INT, SCI_GETSTATUS, SLT_VOID, SLT_VOID}, {"SETMOUSEDOWNCAPTURES", SLT_VOID, SCI_SETMOUSEDOWNCAPTURES, SLT_BOOL, SLT_VOID}, {"GETMOUSEDOWNCAPTURES", SLT_BOOL, SCI_GETMOUSEDOWNCAPTURES, SLT_VOID, SLT_VOID}, + {"SETMOUSEWHEELCAPTURES", SLT_VOID, SCI_SETMOUSEWHEELCAPTURES, SLT_BOOL, SLT_VOID}, + {"GETMOUSEWHEELCAPTURES", SLT_BOOL, SCI_GETMOUSEWHEELCAPTURES, SLT_VOID, SLT_VOID}, {"SETCURSOR", SLT_VOID, SCI_SETCURSOR, SLT_INT, SLT_VOID}, {"GETCURSOR", SLT_INT, SCI_GETCURSOR, SLT_VOID, SLT_VOID}, {"SETCONTROLCHARSYMBOL", SLT_VOID, SCI_SETCONTROLCHARSYMBOL, SLT_INT, SLT_VOID}, @@ -612,8 +633,8 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"GETSELECTIONS", SLT_INT, SCI_GETSELECTIONS, SLT_VOID, SLT_VOID}, {"GETSELECTIONEMPTY", SLT_BOOL, SCI_GETSELECTIONEMPTY, SLT_VOID, SLT_VOID}, {"CLEARSELECTIONS", SLT_VOID, SCI_CLEARSELECTIONS, SLT_VOID, SLT_VOID}, - {"SETSELECTION", SLT_INT, SCI_SETSELECTION, SLT_INT, SLT_INT}, - {"ADDSELECTION", SLT_INT, SCI_ADDSELECTION, SLT_INT, SLT_INT}, + {"SETSELECTION", SLT_VOID, SCI_SETSELECTION, SLT_INT, SLT_INT}, + {"ADDSELECTION", SLT_VOID, SCI_ADDSELECTION, SLT_INT, SLT_INT}, {"DROPSELECTIONN", SLT_VOID, SCI_DROPSELECTIONN, SLT_INT, SLT_VOID}, {"SETMAINSELECTION", SLT_VOID, SCI_SETMAINSELECTION, SLT_INT, SLT_VOID}, {"GETMAINSELECTION", SLT_INT, SCI_GETMAINSELECTION, SLT_VOID, SLT_VOID}, @@ -649,6 +670,8 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"GETADDITIONALCARETFORE", SLT_INT, SCI_GETADDITIONALCARETFORE, SLT_VOID, SLT_VOID}, {"ROTATESELECTION", SLT_VOID, SCI_ROTATESELECTION, SLT_VOID, SLT_VOID}, {"SWAPMAINANCHORCARET", SLT_VOID, SCI_SWAPMAINANCHORCARET, SLT_VOID, SLT_VOID}, + {"MULTIPLESELECTADDNEXT", SLT_VOID, SCI_MULTIPLESELECTADDNEXT, SLT_VOID, SLT_VOID}, + {"MULTIPLESELECTADDEACH", SLT_VOID, SCI_MULTIPLESELECTADDEACH, SLT_VOID, SLT_VOID}, {"CHANGELEXERSTATE", SLT_INT, SCI_CHANGELEXERSTATE, SLT_INT, SLT_INT}, {"CONTRACTEDFOLDNEXT", SLT_INT, SCI_CONTRACTEDFOLDNEXT, SLT_INT, SLT_VOID}, {"VERTICALCENTRECARET", SLT_VOID, SCI_VERTICALCENTRECARET, SLT_VOID, SLT_VOID}, @@ -690,7 +713,7 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"LOADLEXERLIBRARY", SLT_VOID, SCI_LOADLEXERLIBRARY, SLT_VOID, SLT_STRING}, {"GETPROPERTY", SLT_INT, SCI_GETPROPERTY, SLT_STRING, SLT_STRINGRESULT}, {"GETPROPERTYEXPANDED", SLT_INT, SCI_GETPROPERTYEXPANDED, SLT_STRING, SLT_STRINGRESULT}, - {"GETPROPERTYINT", SLT_INT, SCI_GETPROPERTYINT, SLT_STRING, SLT_VOID}, + {"GETPROPERTYINT", SLT_INT, SCI_GETPROPERTYINT, SLT_STRING, SLT_INT}, {"GETSTYLEBITSNEEDED", SLT_INT, SCI_GETSTYLEBITSNEEDED, SLT_VOID, SLT_VOID}, {"GETLEXERLANGUAGE", SLT_INT, SCI_GETLEXERLANGUAGE, SLT_VOID, SLT_STRINGRESULT}, {"PRIVATELEXERCALL", SLT_INT, SCI_PRIVATELEXERCALL, SLT_INT, SLT_INT}, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 3fad12: pretty print on selection and donot modify filetype if condition not met
by Sagar Chalise 30 Jan '18

30 Jan '18

Branch: refs/heads/master Author: Sagar Chalise <chalisesagar(a)gmail.com> Committer: Sagar Chalise <chalisesagar(a)gmail.com> Date: Tue, 30 Jan 2018 08:37:01 UTC Commit: 3fad1285599766a7932667688871c04610bd8651 https://github.com/geany/geany-plugins/commit/3fad1285599766a7932667688871c… Log Message: ----------- pretty print on selection and donot modify filetype if condition not met Modified Paths: -------------- pretty-printer/src/PluginEntry.c Modified: pretty-printer/src/PluginEntry.c 23 lines changed, 17 insertions(+), 6 deletions(-) =================================================================== @@ -185,6 +185,7 @@ void xml_format(GtkMenuItem* menuitem, gpointer gdata) GeanyEditor* editor; ScintillaObject* sco; int input_length; + gboolean has_selection; const gchar* input_buffer; int output_length; gchar* output_buffer; @@ -197,20 +198,21 @@ void xml_format(GtkMenuItem* menuitem, gpointer gdata) editor = doc->editor; sco = editor->sci; - + /* default printing options */ if (prettyPrintingOptions == NULL) { prettyPrintingOptions = createDefaultPrettyPrintingOptions(); } + has_selection = sci_has_selection(sco); /* retrieves the text */ - input_length = sci_get_length(sco); - input_buffer = (gchar *) scintilla_send_message(sco, SCI_GETCHARACTERPOINTER, 0, 0); + input_buffer = (has_selection)?sci_get_selection_contents(sco):sci_get_contents(sco, -1); /* checks if the data is an XML format */ parsedDocument = xmlParseDoc((const unsigned char*)input_buffer); /* this is not a valid xml => exit with an error message */ if(parsedDocument == NULL) { + g_free(input_buffer); dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to parse the content as XML.")); return; } @@ -219,23 +221,32 @@ void xml_format(GtkMenuItem* menuitem, gpointer gdata) xmlFreeDoc(parsedDocument); /* process pretty-printing */ + input_length = (has_selection)?sci_get_selected_text_length(sco):sci_get_length(sco); result = processXMLPrettyPrinting(input_buffer, input_length, &output_buffer, &output_length, prettyPrintingOptions); if (result != PRETTY_PRINTING_SUCCESS) { + g_free(input_buffer); dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Unable to process PrettyPrinting on the specified XML because some features are not supported.\n\nSee Help > Debug messages for more details...")); return; } /* updates the document */ - sci_set_text(sco, output_buffer); + if(has_selection){ + sci_replace_sel(sco, output_buffer); + } + else{ + sci_set_text(sco, output_buffer); + } /* set the line */ xOffset = scintilla_send_message(sco, SCI_GETXOFFSET, 0, 0); scintilla_send_message(sco, SCI_LINESCROLL, -xOffset, 0); /* TODO update with the right function-call for geany-0.19 */ /* sets the type */ - fileType = filetypes_index(GEANY_FILETYPES_XML); - document_set_filetype(doc, fileType); + if(!has_selection && (doc->file_type->id != GEANY_FILETYPES_HTML)){ + fileType = filetypes_index(GEANY_FILETYPES_XML); + document_set_filetype(doc, fileType); + } g_free(output_buffer); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 55aee6: GeanyLua: Update to match latest Geany's Scintilla API (again, like a #218)
by Skif-off 30 Jan '18

30 Jan '18

Branch: refs/heads/master Author: Skif-off <Skif-off(a)users.noreply.github.com> Committer: Skif-off <Skif-off(a)users.noreply.github.com> Date: Mon, 29 Jan 2018 23:35:57 UTC Commit: 55aee6c81a59d48b652c74da4209e765eaa1c42e https://github.com/geany/geany-plugins/commit/55aee6c81a59d48b652c74da4209e… Log Message: ----------- GeanyLua: Update to match latest Geany's Scintilla API (again, like a #218) Modified Paths: -------------- geanylua/glspi_sci.h Modified: geanylua/glspi_sci.h 35 lines changed, 29 insertions(+), 6 deletions(-) =================================================================== @@ -57,6 +57,8 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"GETUNDOCOLLECTION", SLT_BOOL, SCI_GETUNDOCOLLECTION, SLT_VOID, SLT_VOID}, {"GETVIEWWS", SLT_INT, SCI_GETVIEWWS, SLT_VOID, SLT_VOID}, {"SETVIEWWS", SLT_VOID, SCI_SETVIEWWS, SLT_INT, SLT_VOID}, + {"GETTABDRAWMODE", SLT_INT, SCI_GETTABDRAWMODE, SLT_VOID, SLT_VOID}, + {"SETTABDRAWMODE", SLT_VOID, SCI_SETTABDRAWMODE, SLT_INT, SLT_VOID}, {"POSITIONFROMPOINT", SLT_INT, SCI_POSITIONFROMPOINT, SLT_INT, SLT_INT}, {"POSITIONFROMPOINTCLOSE", SLT_INT, SCI_POSITIONFROMPOINTCLOSE, SLT_INT, SLT_INT}, {"GOTOLINE", SLT_VOID, SCI_GOTOLINE, SLT_INT, SLT_VOID}, @@ -103,6 +105,10 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"GETMARGINSENSITIVEN", SLT_BOOL, SCI_GETMARGINSENSITIVEN, SLT_INT, SLT_VOID}, {"SETMARGINCURSORN", SLT_VOID, SCI_SETMARGINCURSORN, SLT_INT, SLT_INT}, {"GETMARGINCURSORN", SLT_INT, SCI_GETMARGINCURSORN, SLT_INT, SLT_VOID}, + {"SETMARGINBACKN", SLT_VOID, SCI_SETMARGINBACKN, SLT_INT, SLT_INT}, + {"GETMARGINBACKN", SLT_INT, SCI_GETMARGINBACKN, SLT_INT, SLT_VOID}, + {"SETMARGINS", SLT_VOID, SCI_SETMARGINS, SLT_INT, SLT_VOID}, + {"GETMARGINS", SLT_INT, SCI_GETMARGINS, SLT_VOID, SLT_VOID}, {"STYLECLEARALL", SLT_VOID, SCI_STYLECLEARALL, SLT_VOID, SLT_VOID}, {"STYLESETFORE", SLT_VOID, SCI_STYLESETFORE, SLT_INT, SLT_INT}, {"STYLESETBACK", SLT_VOID, SCI_STYLESETBACK, SLT_INT, SLT_INT}, @@ -176,6 +182,8 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"SETCARETLINEVISIBLE", SLT_VOID, SCI_SETCARETLINEVISIBLE, SLT_BOOL, SLT_VOID}, {"GETCARETLINEBACK", SLT_INT, SCI_GETCARETLINEBACK, SLT_VOID, SLT_VOID}, {"SETCARETLINEBACK", SLT_VOID, SCI_SETCARETLINEBACK, SLT_INT, SLT_VOID}, + {"GETCARETLINEFRAME", SLT_INT, SCI_GETCARETLINEFRAME, SLT_VOID, SLT_VOID}, + {"SETCARETLINEFRAME", SLT_VOID, SCI_SETCARETLINEFRAME, SLT_INT, SLT_VOID}, {"STYLESETCHANGEABLE", SLT_VOID, SCI_STYLESETCHANGEABLE, SLT_INT, SLT_BOOL}, {"AUTOCSHOW", SLT_VOID, SCI_AUTOCSHOW, SLT_INT, SLT_STRING}, {"AUTOCCANCEL", SLT_VOID, SCI_AUTOCCANCEL, SLT_VOID, SLT_VOID}, @@ -282,6 +290,8 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"GETTARGETEND", SLT_INT, SCI_GETTARGETEND, SLT_VOID, SLT_VOID}, {"SETTARGETRANGE", SLT_VOID, SCI_SETTARGETRANGE, SLT_INT, SLT_INT}, {"GETTARGETTEXT", SLT_INT, SCI_GETTARGETTEXT, SLT_VOID, SLT_STRINGRESULT}, + {"TARGETFROMSELECTION", SLT_VOID, SCI_TARGETFROMSELECTION, SLT_VOID, SLT_VOID}, + {"TARGETWHOLEDOCUMENT", SLT_VOID, SCI_TARGETWHOLEDOCUMENT, SLT_VOID, SLT_VOID}, {"REPLACETARGET", SLT_INT, SCI_REPLACETARGET, SLT_INT, SLT_STRING}, {"REPLACETARGETRE", SLT_INT, SCI_REPLACETARGETRE, SLT_INT, SLT_STRING}, {"SEARCHINTARGET", SLT_INT, SCI_SEARCHINTARGET, SLT_INT, SLT_STRING}, @@ -312,6 +322,8 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"SETFOLDEXPANDED", SLT_VOID, SCI_SETFOLDEXPANDED, SLT_INT, SLT_BOOL}, {"GETFOLDEXPANDED", SLT_BOOL, SCI_GETFOLDEXPANDED, SLT_INT, SLT_VOID}, {"TOGGLEFOLD", SLT_VOID, SCI_TOGGLEFOLD, SLT_INT, SLT_VOID}, + {"TOGGLEFOLDSHOWTEXT", SLT_VOID, SCI_TOGGLEFOLDSHOWTEXT, SLT_INT, SLT_STRING}, + {"FOLDDISPLAYTEXTSETSTYLE", SLT_VOID, SCI_FOLDDISPLAYTEXTSETSTYLE, SLT_INT, SLT_VOID}, {"FOLDLINE", SLT_VOID, SCI_FOLDLINE, SLT_INT, SLT_INT}, {"FOLDCHILDREN", SLT_VOID, SCI_FOLDCHILDREN, SLT_INT, SLT_INT}, {"EXPANDCHILDREN", SLT_VOID, SCI_EXPANDCHILDREN, SLT_INT, SLT_INT}, @@ -329,6 +341,9 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"GETMOUSEDWELLTIME", SLT_INT, SCI_GETMOUSEDWELLTIME, SLT_VOID, SLT_VOID}, {"WORDSTARTPOSITION", SLT_INT, SCI_WORDSTARTPOSITION, SLT_INT, SLT_BOOL}, {"WORDENDPOSITION", SLT_INT, SCI_WORDENDPOSITION, SLT_INT, SLT_BOOL}, + {"ISRANGEWORD", SLT_BOOL, SCI_ISRANGEWORD, SLT_INT, SLT_INT}, + {"SETIDLESTYLING", SLT_VOID, SCI_SETIDLESTYLING, SLT_INT, SLT_VOID}, + {"GETIDLESTYLING", SLT_INT, SCI_GETIDLESTYLING, SLT_VOID, SLT_VOID}, {"SETWRAPMODE", SLT_VOID, SCI_SETWRAPMODE, SLT_INT, SLT_VOID}, {"GETWRAPMODE", SLT_INT, SCI_GETWRAPMODE, SLT_VOID, SLT_VOID}, {"SETWRAPVISUALFLAGS", SLT_VOID, SCI_SETWRAPVISUALFLAGS, SLT_INT, SLT_VOID}, @@ -362,11 +377,12 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"SETMULTIPASTE", SLT_VOID, SCI_SETMULTIPASTE, SLT_INT, SLT_VOID}, {"GETMULTIPASTE", SLT_INT, SCI_GETMULTIPASTE, SLT_VOID, SLT_VOID}, {"GETTAG", SLT_INT, SCI_GETTAG, SLT_INT, SLT_STRINGRESULT}, - {"TARGETFROMSELECTION", SLT_VOID, SCI_TARGETFROMSELECTION, SLT_VOID, SLT_VOID}, {"LINESJOIN", SLT_VOID, SCI_LINESJOIN, SLT_VOID, SLT_VOID}, {"LINESSPLIT", SLT_VOID, SCI_LINESSPLIT, SLT_INT, SLT_VOID}, {"SETFOLDMARGINCOLOUR", SLT_VOID, SCI_SETFOLDMARGINCOLOUR, SLT_BOOL, SLT_INT}, {"SETFOLDMARGINHICOLOUR", SLT_VOID, SCI_SETFOLDMARGINHICOLOUR, SLT_BOOL, SLT_INT}, + {"SETACCESSIBILITY", SLT_VOID, SCI_SETACCESSIBILITY, SLT_INT, SLT_VOID}, + {"GETACCESSIBILITY", SLT_INT, SCI_GETACCESSIBILITY, SLT_VOID, SLT_VOID}, {"LINEDOWN", SLT_VOID, SCI_LINEDOWN, SLT_VOID, SLT_VOID}, {"LINEDOWNEXTEND", SLT_VOID, SCI_LINEDOWNEXTEND, SLT_VOID, SLT_VOID}, {"LINEUP", SLT_VOID, SCI_LINEUP, SLT_VOID, SLT_VOID}, @@ -408,6 +424,7 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"LINECUT", SLT_VOID, SCI_LINECUT, SLT_VOID, SLT_VOID}, {"LINEDELETE", SLT_VOID, SCI_LINEDELETE, SLT_VOID, SLT_VOID}, {"LINETRANSPOSE", SLT_VOID, SCI_LINETRANSPOSE, SLT_VOID, SLT_VOID}, + {"LINEREVERSE", SLT_VOID, SCI_LINEREVERSE, SLT_VOID, SLT_VOID}, {"LINEDUPLICATE", SLT_VOID, SCI_LINEDUPLICATE, SLT_VOID, SLT_VOID}, {"LOWERCASE", SLT_VOID, SCI_LOWERCASE, SLT_VOID, SLT_VOID}, {"UPPERCASE", SLT_VOID, SCI_UPPERCASE, SLT_VOID, SLT_VOID}, @@ -431,7 +448,7 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"BRACEHIGHLIGHTINDICATOR", SLT_VOID, SCI_BRACEHIGHLIGHTINDICATOR, SLT_BOOL, SLT_INT}, {"BRACEBADLIGHT", SLT_VOID, SCI_BRACEBADLIGHT, SLT_INT, SLT_VOID}, {"BRACEBADLIGHTINDICATOR", SLT_VOID, SCI_BRACEBADLIGHTINDICATOR, SLT_BOOL, SLT_INT}, - {"BRACEMATCH", SLT_INT, SCI_BRACEMATCH, SLT_INT, SLT_VOID}, + {"BRACEMATCH", SLT_INT, SCI_BRACEMATCH, SLT_INT, SLT_INT}, {"GETVIEWEOL", SLT_BOOL, SCI_GETVIEWEOL, SLT_VOID, SLT_VOID}, {"SETVIEWEOL", SLT_VOID, SCI_SETVIEWEOL, SLT_BOOL, SLT_VOID}, {"GETDOCPOINTER", SLT_INT, SCI_GETDOCPOINTER, SLT_VOID, SLT_VOID}, @@ -443,11 +460,13 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"SETEDGEMODE", SLT_VOID, SCI_SETEDGEMODE, SLT_INT, SLT_VOID}, {"GETEDGECOLOUR", SLT_INT, SCI_GETEDGECOLOUR, SLT_VOID, SLT_VOID}, {"SETEDGECOLOUR", SLT_VOID, SCI_SETEDGECOLOUR, SLT_INT, SLT_VOID}, + {"MULTIEDGEADDLINE", SLT_VOID, SCI_MULTIEDGEADDLINE, SLT_INT, SLT_INT}, + {"MULTIEDGECLEARALL", SLT_VOID, SCI_MULTIEDGECLEARALL, SLT_VOID, SLT_VOID}, {"SEARCHANCHOR", SLT_VOID, SCI_SEARCHANCHOR, SLT_VOID, SLT_VOID}, {"SEARCHNEXT", SLT_INT, SCI_SEARCHNEXT, SLT_INT, SLT_STRING}, {"SEARCHPREV", SLT_INT, SCI_SEARCHPREV, SLT_INT, SLT_STRING}, {"LINESONSCREEN", SLT_INT, SCI_LINESONSCREEN, SLT_VOID, SLT_VOID}, - {"USEPOPUP", SLT_VOID, SCI_USEPOPUP, SLT_BOOL, SLT_VOID}, + {"USEPOPUP", SLT_VOID, SCI_USEPOPUP, SLT_INT, SLT_VOID}, {"SELECTIONISRECTANGLE", SLT_BOOL, SCI_SELECTIONISRECTANGLE, SLT_VOID, SLT_VOID}, {"SETZOOM", SLT_VOID, SCI_SETZOOM, SLT_INT, SLT_VOID}, {"GETZOOM", SLT_INT, SCI_GETZOOM, SLT_VOID, SLT_VOID}, @@ -461,6 +480,8 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"GETSTATUS", SLT_INT, SCI_GETSTATUS, SLT_VOID, SLT_VOID}, {"SETMOUSEDOWNCAPTURES", SLT_VOID, SCI_SETMOUSEDOWNCAPTURES, SLT_BOOL, SLT_VOID}, {"GETMOUSEDOWNCAPTURES", SLT_BOOL, SCI_GETMOUSEDOWNCAPTURES, SLT_VOID, SLT_VOID}, + {"SETMOUSEWHEELCAPTURES", SLT_VOID, SCI_SETMOUSEWHEELCAPTURES, SLT_BOOL, SLT_VOID}, + {"GETMOUSEWHEELCAPTURES", SLT_BOOL, SCI_GETMOUSEWHEELCAPTURES, SLT_VOID, SLT_VOID}, {"SETCURSOR", SLT_VOID, SCI_SETCURSOR, SLT_INT, SLT_VOID}, {"GETCURSOR", SLT_INT, SCI_GETCURSOR, SLT_VOID, SLT_VOID}, {"SETCONTROLCHARSYMBOL", SLT_VOID, SCI_SETCONTROLCHARSYMBOL, SLT_INT, SLT_VOID}, @@ -612,8 +633,8 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"GETSELECTIONS", SLT_INT, SCI_GETSELECTIONS, SLT_VOID, SLT_VOID}, {"GETSELECTIONEMPTY", SLT_BOOL, SCI_GETSELECTIONEMPTY, SLT_VOID, SLT_VOID}, {"CLEARSELECTIONS", SLT_VOID, SCI_CLEARSELECTIONS, SLT_VOID, SLT_VOID}, - {"SETSELECTION", SLT_INT, SCI_SETSELECTION, SLT_INT, SLT_INT}, - {"ADDSELECTION", SLT_INT, SCI_ADDSELECTION, SLT_INT, SLT_INT}, + {"SETSELECTION", SLT_VOID, SCI_SETSELECTION, SLT_INT, SLT_INT}, + {"ADDSELECTION", SLT_VOID, SCI_ADDSELECTION, SLT_INT, SLT_INT}, {"DROPSELECTIONN", SLT_VOID, SCI_DROPSELECTIONN, SLT_INT, SLT_VOID}, {"SETMAINSELECTION", SLT_VOID, SCI_SETMAINSELECTION, SLT_INT, SLT_VOID}, {"GETMAINSELECTION", SLT_INT, SCI_GETMAINSELECTION, SLT_VOID, SLT_VOID}, @@ -649,6 +670,8 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"GETADDITIONALCARETFORE", SLT_INT, SCI_GETADDITIONALCARETFORE, SLT_VOID, SLT_VOID}, {"ROTATESELECTION", SLT_VOID, SCI_ROTATESELECTION, SLT_VOID, SLT_VOID}, {"SWAPMAINANCHORCARET", SLT_VOID, SCI_SWAPMAINANCHORCARET, SLT_VOID, SLT_VOID}, + {"MULTIPLESELECTADDNEXT", SLT_VOID, SCI_MULTIPLESELECTADDNEXT, SLT_VOID, SLT_VOID}, + {"MULTIPLESELECTADDEACH", SLT_VOID, SCI_MULTIPLESELECTADDEACH, SLT_VOID, SLT_VOID}, {"CHANGELEXERSTATE", SLT_INT, SCI_CHANGELEXERSTATE, SLT_INT, SLT_INT}, {"CONTRACTEDFOLDNEXT", SLT_INT, SCI_CONTRACTEDFOLDNEXT, SLT_INT, SLT_VOID}, {"VERTICALCENTRECARET", SLT_VOID, SCI_VERTICALCENTRECARET, SLT_VOID, SLT_VOID}, @@ -690,7 +713,7 @@ static SciCmdHashEntry sci_cmd_hash_entries[] = { {"LOADLEXERLIBRARY", SLT_VOID, SCI_LOADLEXERLIBRARY, SLT_VOID, SLT_STRING}, {"GETPROPERTY", SLT_INT, SCI_GETPROPERTY, SLT_STRING, SLT_STRINGRESULT}, {"GETPROPERTYEXPANDED", SLT_INT, SCI_GETPROPERTYEXPANDED, SLT_STRING, SLT_STRINGRESULT}, - {"GETPROPERTYINT", SLT_INT, SCI_GETPROPERTYINT, SLT_STRING, SLT_VOID}, + {"GETPROPERTYINT", SLT_INT, SCI_GETPROPERTYINT, SLT_STRING, SLT_INT}, {"GETSTYLEBITSNEEDED", SLT_INT, SCI_GETSTYLEBITSNEEDED, SLT_VOID, SLT_VOID}, {"GETLEXERLANGUAGE", SLT_INT, SCI_GETLEXERLANGUAGE, SLT_VOID, SLT_STRINGRESULT}, {"PRIVATELEXERCALL", SLT_INT, SCI_PRIVATELEXERCALL, SLT_INT, SLT_INT}, -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] d32a3a: Merge pull request #684 from LarsGit223/addons-readme
by Frank Lanitz 29 Jan '18

29 Jan '18

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Mon, 29 Jan 2018 21:10:50 UTC Commit: d32a3a440b0b3f3ad22e142aa08b884ebe718744 https://github.com/geany/geany-plugins/commit/d32a3a440b0b3f3ad22e142aa08b8… Log Message: ----------- Merge pull request #684 from LarsGit223/addons-readme addons: updated README. See PR #664. Modified Paths: -------------- addons/README Modified: addons/README 17 lines changed, 17 insertions(+), 0 deletions(-) =================================================================== @@ -27,6 +27,8 @@ Features * Strip trailing blank lines when saving * XMLtagging * Enclose selected text with characters +* Show colorized calltip on hovering over a color value +* Open Color Chooser on double clicking on a color value Usage ----- @@ -98,6 +100,21 @@ to the clipboard for further use. The action can be triggered by a keyboard shortcut as well as by a menu item in the Tools menu. +*Show colorized calltip on hovering over a color value* +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +This extension will show a calltip if the mouse is hovered over a color +value like #fff or #ffffff. The calltip background color represents the +color value over which the mouse is hovered. The preferences option "Show +a calltip when hovering over a color value" is used to enable or disable +the extension. + +*Open Color Chooser on double clicking on a color value* +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +This extension will open the Color Chooser if the user double clicks on +a color value like #fff or #ffffff. The preferences option "Open Color +Chooser when double-clicking a color value" is used to enable or disable +the extension. + Requirements ------------ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 7c4cb9: addons: updated README. See PR #664.
by LarsDW223 29 Jan '18

29 Jan '18

Branch: refs/heads/master Author: LarsDW223 <lars_paulsen(a)web.de> Committer: LarsDW223 <lars_paulsen(a)web.de> Date: Mon, 29 Jan 2018 20:37:44 UTC Commit: 7c4cb937fb1c18a032cdc418a450c49a1bb08202 https://github.com/geany/geany-plugins/commit/7c4cb937fb1c18a032cdc418a450c… Log Message: ----------- addons: updated README. See PR #664. Modified Paths: -------------- addons/README Modified: addons/README 17 lines changed, 17 insertions(+), 0 deletions(-) =================================================================== @@ -27,6 +27,8 @@ Features * Strip trailing blank lines when saving * XMLtagging * Enclose selected text with characters +* Show colorized calltip on hovering over a color value +* Open Color Chooser on double clicking on a color value Usage ----- @@ -98,6 +100,21 @@ to the clipboard for further use. The action can be triggered by a keyboard shortcut as well as by a menu item in the Tools menu. +*Show colorized calltip on hovering over a color value* +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +This extension will show a calltip if the mouse is hovered over a color +value like #fff or #ffffff. The calltip background color represents the +color value over which the mouse is hovered. The preferences option "Show +a calltip when hovering over a color value" is used to enable or disable +the extension. + +*Open Color Chooser on double clicking on a color value* +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +This extension will open the Color Chooser if the user double clicks on +a color value like #fff or #ffffff. The preferences option "Open Color +Chooser when double-clicking a color value" is used to enable or disable +the extension. + Requirements ------------ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] da2917: addons: show color tip and start Color Chooser with double click
by LarsDW223 29 Jan '18

29 Jan '18

Branch: refs/heads/master Author: LarsDW223 <lars_paulsen(a)web.de> Committer: LarsDW223 <lars_paulsen(a)web.de> Date: Thu, 21 Dec 2017 10:17:43 UTC Commit: da2917860f5bb059d117de1ddd36110660bc470a https://github.com/geany/geany-plugins/commit/da2917860f5bb059d117de1ddd361… Log Message: ----------- addons: show color tip and start Color Chooser with double click This new feature shows a color tip if the mouse is hovered over a color value like e.g. '#fff' or '#ffffff'. If a color value is double clicked, then the Color Chooser is started. Both (showing the color tip and starting the Color Chooser) can be enabled and disabled via the plugin preferences. See #663. Modified Paths: -------------- addons/src/Makefile.am addons/src/addons.c addons/src/ao_colortip.c addons/src/ao_colortip.h Modified: addons/src/Makefile.am 3 lines changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -25,7 +25,8 @@ addons_la_SOURCES = \ ao_tasks.c \ ao_xmltagging.c \ ao_wrapwords.c \ - ao_copyfilepath.c + ao_copyfilepath.c \ + ao_colortip.c addons_la_CPPFLAGS = $(AM_CPPFLAGS) \ -DG_LOG_DOMAIN=\"Addons\" Modified: addons/src/addons.c 42 lines changed, 42 insertions(+), 0 deletions(-) =================================================================== @@ -39,6 +39,7 @@ #include "ao_xmltagging.h" #include "ao_wrapwords.h" #include "ao_copyfilepath.h" +#include "ao_colortip.h" GeanyPlugin *geany_plugin; @@ -82,6 +83,8 @@ typedef struct gboolean enable_enclose_words; gboolean enable_enclose_words_auto; gboolean strip_trailing_blank_lines; + gboolean enable_colortip; + gboolean enable_double_click_color_chooser; gchar *tasks_token_list; gboolean tasks_scan_all_documents; @@ -96,6 +99,7 @@ typedef struct AoMarkWord *markword; AoTasks *tasks; AoCopyFilePath *copyfilepath; + AoColorTip *colortip; } AddonsInfo; static AddonsInfo *ao_info = NULL; @@ -181,6 +185,8 @@ gboolean ao_editor_notify_cb(GObject *object, GeanyEditor *editor, ao_mark_editor_notify(ao_info->markword, editor, nt); + ao_color_tip_editor_notify(ao_info->colortip, editor, nt); + return FALSE; } @@ -208,6 +214,7 @@ static void ao_document_new_cb(GObject *obj, GeanyDocument *doc, gpointer data) g_return_if_fail(doc != NULL && doc->is_valid); ao_mark_document_new(ao_info->markword, doc); + ao_color_tip_document_new(ao_info->colortip, doc); } @@ -217,6 +224,7 @@ static void ao_document_open_cb(GObject *obj, GeanyDocument *doc, gpointer data) ao_tasks_update(ao_info->tasks, doc); ao_mark_document_open(ao_info->markword, doc); + ao_color_tip_document_open(ao_info->colortip, doc); } @@ -226,6 +234,7 @@ static void ao_document_close_cb(GObject *obj, GeanyDocument *doc, gpointer data ao_tasks_remove(ao_info->tasks, doc); ao_mark_document_close(ao_info->markword, doc); + ao_color_tip_document_close(ao_info->colortip, doc); } @@ -304,6 +313,10 @@ void plugin_init(GeanyData *data) "enable_enclose_words", FALSE); ao_info->enable_enclose_words_auto = utils_get_setting_boolean(config, "addons", "enable_enclose_words_auto", FALSE); + ao_info->enable_colortip = utils_get_setting_boolean(config, + "addons", "enable_colortip", FALSE); + ao_info->enable_double_click_color_chooser = utils_get_setting_boolean(config, + "addons", "enable_double_click_color_chooser", FALSE); plugin_module_make_resident(geany_plugin); @@ -316,6 +329,8 @@ void plugin_init(GeanyData *data) ao_info->tasks = ao_tasks_new(ao_info->enable_tasks, ao_info->tasks_token_list, ao_info->tasks_scan_all_documents); ao_info->copyfilepath = ao_copy_file_path_new(); + ao_info->colortip = ao_color_tip_new(ao_info->enable_colortip, + ao_info->enable_double_click_color_chooser); ao_blanklines_set_enable(ao_info->strip_trailing_blank_lines); @@ -415,6 +430,10 @@ static void ao_configure_response_cb(GtkDialog *dialog, gint response, gpointer g_object_get_data(G_OBJECT(dialog), "check_enclose_words")))); ao_info->enable_enclose_words_auto = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( g_object_get_data(G_OBJECT(dialog), "check_enclose_words_auto")))); + ao_info->enable_colortip = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + g_object_get_data(G_OBJECT(dialog), "check_colortip")))); + ao_info->enable_double_click_color_chooser = (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( + g_object_get_data(G_OBJECT(dialog), "check_double_click_color_chooser")))); ao_enclose_words_set_enabled (ao_info->enable_enclose_words, ao_info->enable_enclose_words_auto); @@ -441,6 +460,9 @@ static void ao_configure_response_cb(GtkDialog *dialog, gint response, gpointer ao_info->enable_enclose_words); g_key_file_set_boolean(config, "addons", "enable_enclose_words_auto", ao_info->enable_enclose_words_auto); + g_key_file_set_boolean(config, "addons", "enable_colortip", ao_info->enable_colortip); + g_key_file_set_boolean(config, "addons", "enable_double_click_color_chooser", + ao_info->enable_double_click_color_chooser); g_object_set(ao_info->doclist, "enable-doclist", ao_info->enable_doclist, NULL); g_object_set(ao_info->doclist, "sort-mode", ao_info->doclist_sort_mode, NULL); @@ -458,6 +480,10 @@ static void ao_configure_response_cb(GtkDialog *dialog, gint response, gpointer "tokens", ao_info->tasks_token_list, NULL); ao_blanklines_set_enable(ao_info->strip_trailing_blank_lines); + g_object_set(ao_info->colortip, + "enable-colortip", ao_info->enable_colortip, + "enable-double-click-color-chooser", ao_info->enable_double_click_color_chooser, + NULL); if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils_mkdir(config_dir, TRUE) != 0) { @@ -487,6 +513,7 @@ GtkWidget *plugin_configure(GtkDialog *dialog) GtkWidget *check_tasks_scan_mode, *entry_tasks_tokens, *label_tasks_tokens, *tokens_hbox; GtkWidget *check_blanklines, *check_xmltagging; GtkWidget *check_enclose_words, *check_enclose_words_auto, *enclose_words_config_button, *enclose_words_hbox; + GtkWidget *check_colortip, *check_double_click_color_chooser; vbox = gtk_vbox_new(FALSE, 6); @@ -633,6 +660,17 @@ GtkWidget *plugin_configure(GtkDialog *dialog) ao_info->enable_enclose_words_auto); gtk_box_pack_start(GTK_BOX(vbox), check_enclose_words_auto, FALSE, FALSE, 3); + check_colortip = gtk_check_button_new_with_label( + _("Show a calltip when hovering over a color value")); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_colortip), + ao_info->enable_colortip); + gtk_box_pack_start(GTK_BOX(vbox), check_colortip, FALSE, FALSE, 3); + + check_double_click_color_chooser = gtk_check_button_new_with_label( + _("Open Color Chooser when double-clicking a color value")); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_double_click_color_chooser), + ao_info->enable_double_click_color_chooser); + gtk_box_pack_start(GTK_BOX(vbox), check_double_click_color_chooser, FALSE, FALSE, 3); g_object_set_data(G_OBJECT(dialog), "check_doclist", check_doclist); g_object_set_data(G_OBJECT(dialog), "radio_doclist_name", radio_doclist_name); @@ -653,6 +691,9 @@ GtkWidget *plugin_configure(GtkDialog *dialog) g_object_set_data(G_OBJECT(dialog), "check_enclose_words", check_enclose_words); g_object_set_data(G_OBJECT(dialog), "check_enclose_words_auto", check_enclose_words_auto); g_object_set_data(G_OBJECT(dialog), "enclose_words_config_button", enclose_words_config_button); + g_object_set_data(G_OBJECT(dialog), "check_colortip", check_colortip); + g_object_set_data(G_OBJECT(dialog), "check_double_click_color_chooser", + check_double_click_color_chooser); g_signal_connect(dialog, "response", G_CALLBACK(ao_configure_response_cb), NULL); ao_configure_tasks_toggled_cb(GTK_TOGGLE_BUTTON(check_tasks), dialog); @@ -678,6 +719,7 @@ void plugin_cleanup(void) g_object_unref(ao_info->markword); g_object_unref(ao_info->tasks); g_object_unref(ao_info->copyfilepath); + g_object_unref(ao_info->colortip); g_free(ao_info->tasks_token_list); ao_blanklines_set_enable(FALSE); Modified: addons/src/ao_colortip.c 397 lines changed, 397 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,397 @@ +/* + * ao_colortip.c - this file is part of Addons, a Geany plugin + * + * Copyright 2017 LarsGit223 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $Id$ + */ + + +#include <gtk/gtk.h> +#include <glib-object.h> + +#include "geanyplugin.h" + +#include "addons.h" +#include "ao_colortip.h" + +typedef struct _AoColorTipPrivate AoColorTipPrivate; + +#define AO_COLORTIP_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj),\ + AO_COLORTIP_TYPE, AoColorTipPrivate)) + +struct _AoColorTip +{ + GObject parent; +}; + +struct _AoColorTipClass +{ + GObjectClass parent_class; +}; + +struct _AoColorTipPrivate +{ + gboolean enable_colortip; + gboolean enable_double_click_color_chooser; +}; + +enum +{ + PROP_0, + PROP_ENABLE_COLORTIP, + PROP_ENABLE_DOUBLE_CLICK_COLOR_CHOOSER, +}; + +G_DEFINE_TYPE(AoColorTip, ao_color_tip, G_TYPE_OBJECT) + +# define SSM(s, m, w, l) scintilla_send_message (s, m, w, l) + + +/* Find a color value (short or long form, e.g. #fff or #ffffff) in the + given string. position must be inside the found color or at maximum + maxdist bytes in front of it (in front of the start of the color value) + or behind it (behind the end of the color value). */ +static gint contains_color_value(gchar *string, gint position, gint maxdist) +{ + gchar *start; + gint end, value, offset, color = -1; + guint length; + + start = strchr(string, '#'); + if (start == NULL) + { + return color; + } + end = start - string + 1; + while (g_ascii_isxdigit (string[end])) + { + end++; + } + end--; + length = &(string[end]) - start + 1; + + if (maxdist != -1) + { + offset = start - string + 1; + if (position < offset && + (offset - position) > maxdist) + { + return color; + } + + offset = end; + if (position > offset && + (position - offset) > maxdist) + { + return color; + } + } + + + if (length == 4) + { + start++; + color = (g_ascii_xdigit_value (*start) << 4) + | g_ascii_xdigit_value (*start); + + start++; + value = (g_ascii_xdigit_value (*start) << 4) + | g_ascii_xdigit_value (*start); + color += value << 8; + + start++; + value = (g_ascii_xdigit_value (*start) << 4) + | g_ascii_xdigit_value (*start); + color += value << 16; + } + else if (length == 7) + { + start++; + color = (g_ascii_xdigit_value (start[0]) << 4) + | g_ascii_xdigit_value (start[1]); + + start += 2; + value = (g_ascii_xdigit_value (start[0]) << 4) + | g_ascii_xdigit_value (start[1]); + color += value << 8; + + start += 2; + value = (g_ascii_xdigit_value (start[0]) << 4) + | g_ascii_xdigit_value (start[1]); + color += value << 16; + } + + return color; +} + + +static gint get_color_value_at_current_doc_position(void) +{ + gchar *subtext; + gint start, end, pos, max, color = -1; + GeanyDocument *doc = document_get_current(); + + g_return_val_if_fail(doc != NULL, FALSE); + + /* Is position valid? */ + pos = sci_get_current_position(doc->editor->sci); + if (pos < 0) + { + return color; + } + max = SSM(doc->editor->sci, SCI_GETTEXTLENGTH, 0, 0); + + /* Calculate range */ + start = pos; + if (start >= 7) + { + start -= 7; + } + else + { + start = 0; + } + end = pos + 7; + if (end > max) + { + end = max; + } + + /* Get text in range and examine it */ + subtext = sci_get_contents_range(doc->editor->sci, start, end); + if (subtext != NULL) + { + pos = pos - start; + color = contains_color_value(subtext, pos, 1); + g_free(subtext); + } + + return color; +} + +static gboolean on_editor_button_press_event(GtkWidget *widget, GdkEventButton *event, + AoColorTip *colortip) +{ + if (event->button == 1) + { + if (event->type == GDK_2BUTTON_PRESS) + { + AoColorTipPrivate *priv = AO_COLORTIP_GET_PRIVATE(colortip); + + if (!priv->enable_double_click_color_chooser) + return FALSE; + + if (get_color_value_at_current_doc_position() != -1) + { + keybindings_send_command + (GEANY_KEY_GROUP_TOOLS, GEANY_KEYS_TOOLS_OPENCOLORCHOOSER); + } + } + } + return FALSE; +} + + +void ao_color_tip_editor_notify(AoColorTip *colortip, GeanyEditor *editor, SCNotification *nt) +{ + ScintillaObject *sci = editor->sci; + AoColorTipPrivate *priv = AO_COLORTIP_GET_PRIVATE(colortip); + + if (!priv->enable_colortip) + { + /* Ignore all events if color tips are disabled in preferences */ + return; + } + + switch (nt->nmhdr.code) + { + case SCN_DWELLSTART: + { + gchar *subtext; + gint start, end, pos, max; + + /* Is position valid? */ + if (nt->position < 0) + break; + + /* Calculate range */ + start = nt->position; + if (start >= 7) + { + start -= 7; + } + else + { + start = 0; + } + pos = nt->position - start; + end = nt->position + 7; + max = SSM(sci, SCI_GETTEXTLENGTH, 0, 0); + if (end > max) + { + end = max; + } + + /* Get text in range and examine it */ + subtext = sci_get_contents_range(sci, start, end); + if (subtext != NULL) + { + gint color; + + color = contains_color_value (subtext, pos, 2); + if (color != -1) + { + SSM(sci, SCI_CALLTIPSETBACK, color, 0); + SSM(sci, SCI_CALLTIPSHOW, nt->position, (sptr_t)" "); + } + g_free(subtext); + } + } + break; + + case SCN_DWELLEND: + SSM(sci, SCI_CALLTIPCANCEL, 0, 0); + break; + } +} + + +static void connect_document_button_press_signal_handler(AoColorTip *colortip, GeanyDocument *document) +{ + g_return_if_fail(DOC_VALID(document)); + + plugin_signal_connect( + geany_plugin, + G_OBJECT(document->editor->sci), + "button-press-event", + FALSE, + G_CALLBACK(on_editor_button_press_event), + colortip); +} + + +static void connect_documents_button_press_signal_handler(AoColorTip *colortip) +{ + guint i = 0; + /* connect the button-press event for all open documents */ + foreach_document(i) + { + connect_document_button_press_signal_handler(colortip, documents[i]); + } +} + + +static void ao_color_tip_finalize(GObject *object) +{ + g_return_if_fail(object != NULL); + g_return_if_fail(IS_AO_COLORTIP(object)); + + G_OBJECT_CLASS(ao_color_tip_parent_class)->finalize(object); +} + + +static void ao_color_tip_set_property(GObject *object, guint prop_id, + const GValue *value, GParamSpec *pspec) +{ + AoColorTipPrivate *priv = AO_COLORTIP_GET_PRIVATE(object); + + switch (prop_id) + { + case PROP_ENABLE_COLORTIP: + priv->enable_colortip = g_value_get_boolean(value); + break; + case PROP_ENABLE_DOUBLE_CLICK_COLOR_CHOOSER: + priv->enable_double_click_color_chooser = g_value_get_boolean(value); + + /* If the plugin is loaded while Geany is already running, we need to connect the + * button press signal for open documents, if Geany is just booting, + * it happens automatically */ + if (priv->enable_double_click_color_chooser && main_is_realized()) + { + connect_documents_button_press_signal_handler(AO_COLORTIP(object)); + } + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + break; + } +} + + +void ao_color_tip_document_new(AoColorTip *colortip, GeanyDocument *document) +{ + connect_document_button_press_signal_handler(colortip, document); +} + + +void ao_color_tip_document_open(AoColorTip *colortip, GeanyDocument *document) +{ + connect_document_button_press_signal_handler(colortip, document); +} + + +void ao_color_tip_document_close(AoColorTip *colortip, GeanyDocument *document) +{ + g_return_if_fail(DOC_VALID(document)); + + g_signal_handlers_disconnect_by_func(document->editor->sci, on_editor_button_press_event, colortip); +} + + +static void ao_color_tip_class_init(AoColorTipClass *klass) +{ + GObjectClass *g_object_class; + + g_object_class = G_OBJECT_CLASS(klass); + g_object_class->finalize = ao_color_tip_finalize; + g_object_class->set_property = ao_color_tip_set_property; + g_type_class_add_private(klass, sizeof(AoColorTipPrivate)); + + g_object_class_install_property(g_object_class, + PROP_ENABLE_COLORTIP, + g_param_spec_boolean( + "enable-colortip", + "enable-colortip", + "Whether to show a calltip when hovering over a color value", + TRUE, + G_PARAM_WRITABLE)); + + g_object_class_install_property(g_object_class, + PROP_ENABLE_DOUBLE_CLICK_COLOR_CHOOSER, + g_param_spec_boolean( + "enable-double-click-color-chooser", + "enable-double-click-color-chooser", + "Enable starting the Color Chooser when double clicking on a color value", + TRUE, + G_PARAM_WRITABLE)); +} + +static void ao_color_tip_init(AoColorTip *self) +{ + AoColorTipPrivate *priv = AO_COLORTIP_GET_PRIVATE(self); + memset(priv, 0, sizeof(*priv)); +} + +AoColorTip *ao_color_tip_new(gboolean enable_tip, gboolean double_click_color_chooser) +{ + return g_object_new( + AO_COLORTIP_TYPE, + "enable-colortip", enable_tip, + "enable-double-click-color-chooser", double_click_color_chooser, + NULL); +} Modified: addons/src/ao_colortip.h 51 lines changed, 51 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,51 @@ +/* + * ao_markword.h - this file is part of Addons, a Geany plugin + * + * Copyright 2017 LarsGit223 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $Id$ + */ + + +#ifndef __AO_COLORTIP_H__ +#define __AO_COLORTIP_H__ + +G_BEGIN_DECLS + +#define AO_COLORTIP_TYPE (ao_color_tip_get_type()) +#define AO_COLORTIP(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\ + AO_COLORTIP_TYPE, AoColorTip)) +#define AO_COLORTIP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),\ + AO_COLORTIP_TYPE, AoColorTipClass)) +#define IS_AO_COLORTIP(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),\ + AO_COLORTIP_TYPE)) +#define IS_AO_COLORTIP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),\ + AO_COLORTIP_TYPE)) + +typedef struct _AoColorTip AoColorTip; +typedef struct _AoColorTipClass AoColorTipClass; + +GType ao_color_tip_get_type (void); +AoColorTip* ao_color_tip_new (gboolean enable_tip, gboolean double_click_color_chooser); +void ao_color_tip_document_new (AoColorTip *colortip, GeanyDocument *document); +void ao_color_tip_document_open (AoColorTip *colortip, GeanyDocument *document); +void ao_color_tip_document_close (AoColorTip *colortip, GeanyDocument *document); +void ao_color_tip_editor_notify (AoColorTip *colortip, GeanyEditor *editor, SCNotification *nt); + +G_END_DECLS + +#endif /* __AO_COLORTIP_H__ */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 7ac0bc: addons: fixed typo.
by LarsDW223 29 Jan '18

29 Jan '18

Branch: refs/heads/master Author: LarsDW223 <lars_paulsen(a)web.de> Committer: LarsDW223 <lars_paulsen(a)web.de> Date: Thu, 21 Dec 2017 10:32:03 UTC Commit: 7ac0bc62a039dc7da14d0acdcf337e5443c1b30d https://github.com/geany/geany-plugins/commit/7ac0bc62a039dc7da14d0acdcf337… Log Message: ----------- addons: fixed typo. Modified Paths: -------------- addons/src/ao_colortip.h Modified: addons/src/ao_colortip.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,5 +1,5 @@ /* - * ao_markword.h - this file is part of Addons, a Geany plugin + * ao_colortip.h - this file is part of Addons, a Geany plugin * * Copyright 2017 LarsGit223 * -------------- 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 January 2018