Commits September 2008

commits@lists.geany.org

3 participants
92 discussions

SF.net SVN: geany:[2962] trunk
by eht16＠users.sourceforge.net 17 Sep '08

17 Sep '08

Revision: 2962 http://geany.svn.sourceforge.net/geany/?rev=2962&view=rev Author: eht16 Date: 2008-09-17 18:00:37 +0000 (Wed, 17 Sep 2008) Log Message: ----------- Add missing 'directive' style to filetype CSS (patch from Jason Oster, #2114697, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.css trunk/src/highlighting.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-17 17:01:38 UTC (rev 2961) +++ trunk/ChangeLog 2008-09-17 18:00:37 UTC (rev 2962) @@ -1,3 +1,10 @@ +2008-09-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * data/filetypes.css, src/highlighting.c: + Add missing 'directive' style to filetype CSS + (patch from Jason Oster, #2114697, thanks). + + 2008-09-17 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/callbacks.c, THANKS: Modified: trunk/data/filetypes.css =================================================================== --- trunk/data/filetypes.css 2008-09-17 17:01:38 UTC (rev 2961) +++ trunk/data/filetypes.css 2008-09-17 18:00:37 UTC (rev 2962) @@ -17,6 +17,7 @@ id=0x7f0000;0xffffff;false;false identifier2=0x6b6bff;0xffffff;false;false important=0xff0000;0xffffff;false;false +directive=0x006bff;0xffffff;false;true [keywords] # CSS 1 keywords Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2008-09-17 17:01:38 UTC (rev 2961) +++ trunk/src/highlighting.c 2008-09-17 18:00:37 UTC (rev 2962) @@ -1888,7 +1888,7 @@ static void styleset_css_init(gint ft_id, GKeyFile *config, GKeyFile *config_home) { - new_style_array(GEANY_FILETYPES_CSS, 16); + new_style_array(GEANY_FILETYPES_CSS, 17); get_keyfile_hex(config, config_home, "styling", "default", "0x003399", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[0]); get_keyfile_hex(config, config_home, "styling", "comment", "0x808080", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[1]); get_keyfile_hex(config, config_home, "styling", "tag", "0x2166a4", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[2]); @@ -1905,6 +1905,7 @@ get_keyfile_hex(config, config_home, "styling", "id", "0x7f0000", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[13]); get_keyfile_hex(config, config_home, "styling", "identifier2", "0x6b6bff", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[14]); get_keyfile_hex(config, config_home, "styling", "important", "0xff0000", "0xffffff", "true", &style_sets[GEANY_FILETYPES_CSS].styling[15]); + get_keyfile_hex(config, config_home, "styling", "directive", "0x006bff", "0xffffff", "false", &style_sets[GEANY_FILETYPES_CSS].styling[16]); style_sets[GEANY_FILETYPES_CSS].keywords = g_new(gchar*, 4); get_keyfile_keywords(config, config_home, "keywords", "primary", GEANY_FILETYPES_CSS, 0, @@ -1969,6 +1970,7 @@ set_sci_style(sci, SCE_CSS_ID, GEANY_FILETYPES_CSS, 13); set_sci_style(sci, SCE_CSS_IDENTIFIER2, GEANY_FILETYPES_CSS, 14); set_sci_style(sci, SCE_CSS_IMPORTANT, GEANY_FILETYPES_CSS, 15); + set_sci_style(sci, SCE_CSS_DIRECTIVE, GEANY_FILETYPES_CSS, 16); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2960] trunk
by ntrel＠users.sourceforge.net 17 Sep '08

17 Sep '08

Revision: 2960 http://geany.svn.sourceforge.net/geany/?rev=2960&view=rev Author: ntrel Date: 2008-09-17 16:14:51 +0000 (Wed, 17 Sep 2008) Log Message: ----------- Update feature list in About Geany section. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-17 15:54:37 UTC (rev 2959) +++ trunk/ChangeLog 2008-09-17 16:14:51 UTC (rev 2960) @@ -7,6 +7,8 @@ Apply patch (with minor changes) from Jason Oster to improve showing brace indent guides on empty lines when appropriate (thanks, #2105982). + * doc/geany.txt, doc/geany.html: + Update feature list in About Geany section. 2008-09-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-09-17 15:54:37 UTC (rev 2959) +++ trunk/doc/geany.html 2008-09-17 16:14:51 UTC (rev 2960) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2008-09-08" /> +<meta name="date" content="2008-09-15" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2008-09-08</td></tr> +<td>2008-09-15</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.15</td></tr> </tbody> @@ -400,17 +400,18 @@ <p>Some basic features of Geany are:</p> <ul class="simple"> <li>Syntax highlighting</li> -<li>Code completion</li> -<li>Auto completion of often-used constructs like "if", "for" and "while"</li> -<li>Auto completion of XML and HTML tags</li> +<li>Code folding</li> +<li>Symbol name auto-completion</li> +<li>Construct completion/snippets</li> +<li>Auto-closing of XML and HTML tags</li> <li>Call tips</li> <li>Many supported filetypes including C, Java, PHP, HTML, Python, Perl, Pascal, and others</li> -<li>Tag/Symbol lists</li> -<li>Plugin interface</li> +<li>Symbol lists</li> <li>Code navigation</li> <li>Build system to compile and execute your code</li> <li>Simple project management</li> +<li>Plugin interface</li> </ul> </div> <div class="section"> @@ -4240,7 +4241,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2008-09-15 13:05 UTC. +Generated on: 2008-09-17 16:01 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2008-09-17 15:54:37 UTC (rev 2959) +++ trunk/doc/geany.txt 2008-09-17 16:14:51 UTC (rev 2960) @@ -44,17 +44,18 @@ Some basic features of Geany are: * Syntax highlighting -* Code completion -* Auto completion of often-used constructs like "if", "for" and "while" -* Auto completion of XML and HTML tags +* Code folding +* Symbol name auto-completion +* Construct completion/snippets +* Auto-closing of XML and HTML tags * Call tips * Many supported filetypes including C, Java, PHP, HTML, Python, Perl, Pascal, and others -* Tag/Symbol lists -* Plugin interface +* Symbol lists * Code navigation * Build system to compile and execute your code * Simple project management +* Plugin interface This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2959] trunk/TODO
by ntrel＠users.sourceforge.net 17 Sep '08

17 Sep '08

Revision: 2959 http://geany.svn.sourceforge.net/geany/?rev=2959&view=rev Author: ntrel Date: 2008-09-17 15:54:37 +0000 (Wed, 17 Sep 2008) Log Message: ----------- Add item: custom pipe-separated tags files support. Edit/update wishlist. Modified Paths: -------------- trunk/TODO Modified: trunk/TODO =================================================================== --- trunk/TODO 2008-09-17 12:36:04 UTC (rev 2958) +++ trunk/TODO 2008-09-17 15:54:37 UTC (rev 2959) @@ -28,6 +28,7 @@ o (parsing tags from a memory buffer instead of a file on disk) o (calltip support for non-C-like languages that use function_name(arguments) syntax) + o (custom pipe-separated tags files support) o (better tags support for popular languages? - this is a moving target...) o (tango-like icons for the symbol list) @@ -50,8 +51,8 @@ -------- Note: these items might not get worked on. - o Some kind of support for ctags files + o Some kind of support for CTags tags files o Scope resolution for object members - o Multiline regex support (requires work on Scintilla) - o Split window editing - o Python plugin interface + o Multiline regex support (may require work on Scintilla, or + alternatively could perhaps use SCI_GETCHARACTERPOINTER) + o Python plugin interface (different concept from Lua scripting). This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2957] trunk
by ntrel＠users.sourceforge.net 17 Sep '08

17 Sep '08

Revision: 2957 http://geany.svn.sourceforge.net/geany/?rev=2957&view=rev Author: ntrel Date: 2008-09-17 12:12:49 +0000 (Wed, 17 Sep 2008) Log Message: ----------- Cancel autocompletion on Undo/Redo (based on a patch by Jason Oster, thanks; #2102715). Modified Paths: -------------- trunk/ChangeLog trunk/THANKS trunk/src/callbacks.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-17 10:09:16 UTC (rev 2956) +++ trunk/ChangeLog 2008-09-17 12:12:49 UTC (rev 2957) @@ -1,3 +1,10 @@ +2008-09-17 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/callbacks.c, THANKS: + Cancel autocompletion on Undo/Redo (based on a patch by Jason Oster, + thanks; #2102715). + + 2008-09-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/keybindings.c, src/sciwrappers.c, src/sciwrappers.h, Modified: trunk/THANKS =================================================================== --- trunk/THANKS 2008-09-17 10:09:16 UTC (rev 2956) +++ trunk/THANKS 2008-09-17 12:12:49 UTC (rev 2957) @@ -47,6 +47,7 @@ Felipe Pena <felipensp(at)gmail(dot)com> - Missing PHP keywords Colomban Wendling <colombanw(at)users(dot)sourceforge(dot)net> - GLSL filetype patch Timothy Boronczyk <tboronczyk(at)gmail(dot)com> - scroll_stop_at_last_line GUI pref patch +Jason Oster <parasytic(at)users(dot)sourceforge(dot)net> - various patches Translators: ------------ Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2008-09-17 10:09:16 UTC (rev 2956) +++ trunk/src/callbacks.c 2008-09-17 12:12:49 UTC (rev 2957) @@ -280,8 +280,12 @@ gpointer user_data) { GeanyDocument *doc = document_get_current(); + if (doc != NULL && document_can_undo(doc)) + { + SSM(doc->editor->sci, SCI_CANCEL, 0, 0); document_undo(doc); + } } @@ -290,8 +294,12 @@ gpointer user_data) { GeanyDocument *doc = document_get_current(); + if (doc != NULL && document_can_redo(doc)) + { + SSM(doc->editor->sci, SCI_CANCEL, 0, 0); document_redo(doc); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2956] trunk/wscript
by eht16＠users.sourceforge.net 17 Sep '08

17 Sep '08

Revision: 2956 http://geany.svn.sourceforge.net/geany/?rev=2956&view=rev Author: eht16 Date: 2008-09-17 10:09:16 +0000 (Wed, 17 Sep 2008) Log Message: ----------- Add 'splitwindow' plugin to the build list of the Waf build system. Modified Paths: -------------- trunk/wscript Modified: trunk/wscript =================================================================== --- trunk/wscript 2008-09-16 16:08:07 UTC (rev 2955) +++ trunk/wscript 2008-09-17 10:09:16 UTC (rev 2956) @@ -324,6 +324,7 @@ build_plugin('export') build_plugin('filebrowser') build_plugin('htmlchars') + build_plugin('splitwindow') build_plugin('vcdiff') # Translations This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2955] branches/split-window-plugin/
by ntrel＠users.sourceforge.net 16 Sep '08

16 Sep '08

Revision: 2955 http://geany.svn.sourceforge.net/geany/?rev=2955&view=rev Author: ntrel Date: 2008-09-16 16:08:07 +0000 (Tue, 16 Sep 2008) Log Message: ----------- Removing completed branch. Removed Paths: ------------- branches/split-window-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:[2954] trunk
by ntrel＠users.sourceforge.net 16 Sep '08

16 Sep '08

Revision: 2954 http://geany.svn.sourceforge.net/geany/?rev=2954&view=rev Author: ntrel Date: 2008-09-16 16:06:47 +0000 (Tue, 16 Sep 2008) Log Message: ----------- Merge split-window-plugin branch. Add Split Window plugin (should work OK for viewing and basic text editing; most other features are not implemented yet). Add editor_create_widget() to the API. Modified Paths: -------------- trunk/ChangeLog trunk/plugins/Makefile.am trunk/plugins/makefile.win32 trunk/po/POTFILES.in trunk/src/editor.c trunk/src/editor.h trunk/src/plugindata.h trunk/src/plugins.c Added Paths: ----------- trunk/plugins/splitwindow.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-16 15:47:26 UTC (rev 2953) +++ trunk/ChangeLog 2008-09-16 16:06:47 UTC (rev 2954) @@ -14,6 +14,13 @@ Add plugin signal "document-close", sent just before a document is closed. (Merged from split-window-plugin branch). + * src/plugindata.h, src/plugins.c, src/editor.c, src/editor.h, + po/POTFILES.in, plugins/splitwindow.c, plugins/Makefile.am, + plugins/makefile.win32: + Merge split-window-plugin branch. + Add Split Window plugin (should work OK for viewing and basic text + editing; most other features are not implemented yet). + Add editor_create_widget() to the API. 2008-09-15 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/plugins/Makefile.am =================================================================== --- trunk/plugins/Makefile.am 2008-09-16 15:47:26 UTC (rev 2953) +++ trunk/plugins/Makefile.am 2008-09-16 16:06:47 UTC (rev 2954) @@ -16,6 +16,7 @@ vcdiff_la_LDFLAGS = -module -avoid-version autosave_la_LDFLAGS = -module -avoid-version filebrowser_la_LDFLAGS = -module -avoid-version +splitwindow_la_LDFLAGS = -module -avoid-version if PLUGINS @@ -26,7 +27,8 @@ export.la \ vcdiff.la \ autosave.la \ - filebrowser.la + filebrowser.la \ + splitwindow.la # Plugins not to be installed noinst_LTLIBRARIES = \ @@ -39,6 +41,7 @@ vcdiff_la_SOURCES = vcdiff.c autosave_la_SOURCES = autosave.c filebrowser_la_SOURCES = filebrowser.c +splitwindow_la_SOURCES = splitwindow.c # instead of linking against all in $(GTK_LIBS), we link only against needed libs demoplugin_la_LIBADD = $(GTK_LIBS) @@ -48,6 +51,7 @@ vcdiff_la_LIBADD = $(GTK_LIBS) autosave_la_LIBADD = $(GTK_LIBS) filebrowser_la_LIBADD = $(GTK_LIBS) +splitwindow_la_LIBADD = $(GTK_LIBS) endif # PLUGINS Modified: trunk/plugins/makefile.win32 =================================================================== --- trunk/plugins/makefile.win32 2008-09-16 15:47:26 UTC (rev 2953) +++ trunk/plugins/makefile.win32 2008-09-16 16:06:47 UTC (rev 2954) @@ -54,6 +54,7 @@ demoplugin.dll \ classbuilder.dll \ export.dll \ + splitwindow.dll \ vcdiff.dll \ autosave.dll \ filebrowser.dll Copied: trunk/plugins/splitwindow.c (from rev 2950, branches/split-window-plugin/plugins/splitwindow.c) =================================================================== --- trunk/plugins/splitwindow.c (rev 0) +++ trunk/plugins/splitwindow.c 2008-09-16 16:06:47 UTC (rev 2954) @@ -0,0 +1,274 @@ +/* + * splitview.c + * + * Copyright 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * + * 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. + */ + +#include "geany.h" +#include <glib/gi18n.h> +#include "Scintilla.h" +#include "ScintillaWidget.h" +#include "SciLexer.h" + +#include "ui_utils.h" +#include "document.h" +#include "editor.h" +#include "plugindata.h" +#include "pluginmacros.h" + + +PLUGIN_VERSION_CHECK(76) +PLUGIN_SET_INFO(_("Split Window"), _("Splits the editor view into two windows."), + "0.1", _("The Geany developer team")) + + +GeanyData *geany_data; +GeanyFunctions *geany_functions; +PluginFields *plugin_fields; + +enum State +{ + STATE_SPLIT_HORIZONTAL, + /* STATE_SPLIT_VERTICAL, */ + STATE_UNSPLIT, + STATE_COUNT +}; + +static struct +{ + GtkWidget *main; + GtkWidget *horizontal; + GtkWidget *unsplit; +} +menu_items; + +static enum State plugin_state; +static GeanyEditor *our_editor = NULL; /* original editor for split view */ + + +static gint sci_get_value(ScintillaObject *sci, gint message_id, gint param) +{ + return p_sci->send_message(sci, message_id, param, 0); +} + + +static void set_styles(ScintillaObject *oldsci, ScintillaObject *newsci) +{ + gint style_id; + + for (style_id = 0; style_id <= 127; style_id++) + { + gint val; + + val = sci_get_value(oldsci, SCI_STYLEGETFORE, style_id); + p_sci->send_message(newsci, SCI_STYLESETFORE, style_id, val); + val = sci_get_value(oldsci, SCI_STYLEGETBACK, style_id); + p_sci->send_message(newsci, SCI_STYLESETBACK, style_id, val); + val = sci_get_value(oldsci, SCI_STYLEGETBOLD, style_id); + p_sci->send_message(newsci, SCI_STYLESETBOLD, style_id, val); + val = sci_get_value(oldsci, SCI_STYLEGETITALIC, style_id); + p_sci->send_message(newsci, SCI_STYLESETITALIC, style_id, val); + } +} + + +static void sci_set_font(ScintillaObject *sci, gint style, const gchar *font, + gint size) +{ + p_sci->send_message(sci, SCI_STYLESETFONT, style, (sptr_t) font); + p_sci->send_message(sci, SCI_STYLESETSIZE, style, size); +} + + +static void update_font(ScintillaObject *current, ScintillaObject *sci) +{ + gint style_id; + gint size; + gchar font_name[1024]; /* should be big enough */ + + p_sci->send_message(current, SCI_STYLEGETFONT, 0, (sptr_t)font_name); + size = sci_get_value(current, SCI_STYLEGETSIZE, 0); + + for (style_id = 0; style_id <= 127; style_id++) + { + sci_set_font(sci, style_id, font_name, size); + } + + /* line number and braces */ + sci_set_font(sci, STYLE_LINENUMBER, font_name, size); + sci_set_font(sci, STYLE_BRACELIGHT, font_name, size); + sci_set_font(sci, STYLE_BRACEBAD, font_name, size); +} + + +/* line numbers visibility */ +static void set_line_numbers(ScintillaObject * sci, gboolean set, gint extra_width) +{ + if (set) + { + gchar tmp_str[15]; + gint len = p_sci->send_message(sci, SCI_GETLINECOUNT, 0, 0); + gint width; + g_snprintf(tmp_str, 15, "_%d%d", len, extra_width); + width = p_sci->send_message(sci, SCI_TEXTWIDTH, STYLE_LINENUMBER, (sptr_t) tmp_str); + p_sci->send_message(sci, SCI_SETMARGINWIDTHN, 0, width); + p_sci->send_message(sci, SCI_SETMARGINSENSITIVEN, 0, FALSE); /* use default behaviour */ + } + else + { + p_sci->send_message(sci, SCI_SETMARGINWIDTHN, 0, 0 ); + } +} + + +static void sync_to_current(ScintillaObject *current, ScintillaObject *sci) +{ + gpointer sdoc; + gint lexer; + gint pos; + + /* set the new sci widget to view the existing Scintilla document */ + sdoc = (gpointer) p_sci->send_message(current, SCI_GETDOCPOINTER, 0, 0); + p_sci->send_message(sci, SCI_SETDOCPOINTER, 0, GPOINTER_TO_INT(sdoc)); + + update_font(current, sci); + lexer = p_sci->send_message(current, SCI_GETLEXER, 0, 0); + p_sci->send_message(sci, SCI_SETLEXER, lexer, 0); + set_styles(current, sci); + + pos = p_sci->get_current_position(current); + p_sci->set_current_position(sci, pos, TRUE); + + /* override some defaults */ + set_line_numbers(sci, TRUE, 0); + p_sci->send_message(sci, SCI_SETMARGINWIDTHN, 1, 0 ); /* hide marker margin */ +} + + +static void set_state(enum State id) +{ + gtk_widget_set_sensitive(menu_items.horizontal, + id != STATE_SPLIT_HORIZONTAL); + gtk_widget_set_sensitive(menu_items.unsplit, + id != STATE_UNSPLIT); + + plugin_state = id; +} + + +static void on_split_view(GtkMenuItem *menuitem, gpointer user_data) +{ + GtkWidget *notebook = geany_data->main_widgets->notebook; + GtkWidget *parent = gtk_widget_get_parent(notebook); + GtkWidget *pane; + GeanyDocument *doc = p_document->get_current(); + ScintillaObject *sci; + gint width = notebook->allocation.width / 2; + + set_state(STATE_SPLIT_HORIZONTAL); + + g_return_if_fail(doc); + g_return_if_fail(our_editor == NULL); + + /* reparent document notebook */ + g_object_ref(notebook); + gtk_container_remove(GTK_CONTAINER(parent), notebook); + pane = gtk_hpaned_new(); + gtk_container_add(GTK_CONTAINER(parent), pane); + gtk_paned_add1(GTK_PANED(pane), notebook); + g_object_unref(notebook); + + our_editor = doc->editor; + sci = p_editor->create_widget(our_editor); + sync_to_current(our_editor->sci, sci); + gtk_paned_add2(GTK_PANED(pane), GTK_WIDGET(sci)); + + gtk_paned_set_position(GTK_PANED(pane), width); + gtk_widget_show_all(pane); +} + + +static void on_unsplit(GtkMenuItem *menuitem, gpointer user_data) +{ + GtkWidget *notebook = geany_data->main_widgets->notebook; + GtkWidget *pane = gtk_widget_get_parent(notebook); + GtkWidget *parent = gtk_widget_get_parent(pane); + + set_state(STATE_UNSPLIT); + + g_return_if_fail(our_editor); + + /* reparent document notebook */ + g_object_ref(notebook); + gtk_container_remove(GTK_CONTAINER(pane), notebook); + gtk_widget_destroy(pane); + our_editor = NULL; + gtk_container_add(GTK_CONTAINER(parent), notebook); + g_object_unref(notebook); +} + + +void plugin_init(GeanyData *data) +{ + GtkWidget *item, *menu; + + menu_items.main = item = gtk_menu_item_new_with_mnemonic(_("_Split Window")); + gtk_menu_append(geany_data->main_widgets->tools_menu, menu_items.main); + plugin_fields->menu_item = item; + plugin_fields->flags = PLUGIN_IS_DOCUMENT_SENSITIVE; + + menu = gtk_menu_new(); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_items.main), menu); + + menu_items.horizontal = item = + gtk_menu_item_new_with_mnemonic(_("_Horizontally")); + g_signal_connect(item, "activate", G_CALLBACK(on_split_view), NULL); + gtk_menu_append(menu, item); + + menu_items.unsplit = item = + gtk_menu_item_new_with_mnemonic(_("_Unsplit")); + g_signal_connect(item, "activate", G_CALLBACK(on_unsplit), NULL); + gtk_menu_append(menu, item); + + gtk_widget_show_all(menu_items.main); + + set_state(STATE_UNSPLIT); +} + + +static void on_document_close(GObject *obj, GeanyDocument *doc, gpointer user_data) +{ + /* remove the split window because the document won't exist anymore */ + if (our_editor && doc == our_editor->document) + on_unsplit(NULL, NULL); +} + +PluginCallback plugin_callbacks[] = +{ + { "document-close", (GCallback) &on_document_close, FALSE, NULL }, + { NULL, NULL, FALSE, NULL } +}; + + +void plugin_cleanup() +{ + if (plugin_state != STATE_UNSPLIT) + on_unsplit(NULL, NULL); + + gtk_widget_destroy(menu_items.main); +} Modified: trunk/po/POTFILES.in =================================================================== --- trunk/po/POTFILES.in 2008-09-16 15:47:26 UTC (rev 2953) +++ trunk/po/POTFILES.in 2008-09-16 16:06:47 UTC (rev 2954) @@ -42,3 +42,4 @@ plugins/vcdiff.c plugins/filebrowser.c plugins/autosave.c +plugins/splitwindow.c Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-09-16 15:47:26 UTC (rev 2953) +++ trunk/src/editor.c 2008-09-16 16:06:47 UTC (rev 2954) @@ -3766,6 +3766,7 @@ /* Create new editor widget (scintilla). * @note The @c "sci-notify" signal is connected separately. */ +/* TODO: change to use GeanyEditor */ static ScintillaObject *create_new_sci(GeanyDocument *doc) { ScintillaObject *sci; @@ -3804,6 +3805,29 @@ } +/** Create a new Scintilla @c GtkWidget based on the settings for @a editor. + * @param editor Editor settings. + * @return The new widget. */ +ScintillaObject *editor_create_widget(GeanyEditor *editor) +{ + const GeanyIndentPrefs *iprefs = get_default_indent_prefs(); + ScintillaObject *old, *sci; + + /* temporarily change editor to use the new sci widget */ + old = editor->sci; + sci = create_new_sci(editor->document); + editor->sci = sci; + + editor_set_indent_type(editor, iprefs->type); + editor_set_font(editor, interface_prefs.editor_font); + + /* if editor already had a widget, restore it */ + if (old) + editor->sci = old; + return sci; +} + + GeanyEditor *editor_create(GeanyDocument *doc) { const GeanyIndentPrefs *iprefs = get_default_indent_prefs(); @@ -3811,14 +3835,12 @@ editor->document = doc; - editor->sci = create_new_sci(doc); - editor_set_indent_type(editor, iprefs->type); - editor_set_font(editor, interface_prefs.editor_font); - editor->auto_indent = (iprefs->auto_indent_mode != GEANY_AUTOINDENT_NONE); editor->line_wrapping = editor_prefs.line_wrapping; editor->scroll_percent = -1.0F; editor->line_breaking = FALSE; + + editor->sci = editor_create_widget(editor); return editor; } Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2008-09-16 15:47:26 UTC (rev 2953) +++ trunk/src/editor.h 2008-09-16 16:06:47 UTC (rev 2954) @@ -142,6 +142,8 @@ void editor_destroy(GeanyEditor *editor); +ScintillaObject *editor_create_widget(GeanyEditor *editor); + void on_editor_notification(GtkWidget* editor, gint scn, gpointer lscn, gpointer user_data); gboolean editor_start_auto_complete(GeanyDocument *doc, gint pos, gboolean force); Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2008-09-16 15:47:26 UTC (rev 2953) +++ trunk/src/plugindata.h 2008-09-16 16:06:47 UTC (rev 2954) @@ -41,7 +41,7 @@ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 91, + GEANY_API_VERSION = 92, /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ @@ -456,6 +456,7 @@ void (*clear_indicators) (struct GeanyEditor *editor); const struct GeanyIndentPrefs* (*get_indent_prefs)(struct GeanyEditor *editor); + struct _ScintillaObject* (*create_widget)(struct GeanyEditor *editor); /* Remember to convert any GeanyDocument or ScintillaObject pointers in any * appended functions to GeanyEditor pointers. */ } Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2008-09-16 15:47:26 UTC (rev 2953) +++ trunk/src/plugins.c 2008-09-16 16:06:47 UTC (rev 2954) @@ -115,7 +115,8 @@ &editor_set_indicator, &editor_set_indicator_on_line, &editor_clear_indicators, - &editor_get_indent_prefs + &editor_get_indent_prefs, + &editor_create_widget }; static ScintillaFuncs sci_funcs = { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2953] trunk
by ntrel＠users.sourceforge.net 16 Sep '08

16 Sep '08

Revision: 2953 http://geany.svn.sourceforge.net/geany/?rev=2953&view=rev Author: ntrel Date: 2008-09-16 15:47:26 +0000 (Tue, 16 Sep 2008) Log Message: ----------- Add plugin signal "document-close", sent just before a document is closed. (Merged from split-window-plugin branch). Modified Paths: -------------- trunk/ChangeLog trunk/doc/plugins.dox trunk/src/document.c trunk/src/geanyobject.c trunk/src/geanyobject.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-16 15:42:27 UTC (rev 2952) +++ trunk/ChangeLog 2008-09-16 15:47:26 UTC (rev 2953) @@ -9,6 +9,11 @@ * doc/plugins.dox: Fix wrong parameter for "project-close" signal. (Merged from split-window-plugin branch). + * src/geanyobject.c, src/geanyobject.h, src/document.c, + doc/plugins.dox: + Add plugin signal "document-close", sent just before a document is + closed. + (Merged from split-window-plugin branch). 2008-09-15 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/doc/plugins.dox =================================================================== --- trunk/doc/plugins.dox 2008-09-16 15:42:27 UTC (rev 2952) +++ trunk/doc/plugins.dox 2008-09-16 15:47:26 UTC (rev 2953) @@ -121,6 +121,17 @@ * @param user_data user data. * @endsignaldef * + * @signaldef document-close + * @signalproto + * void user_function(GObject *obj, GeanyDocument *doc, gpointer user_data); + * @endsignalproto + * @signaldesc + * Sent before closing a document. + * @param obj a GeanyObject instance, should be ignored. + * @param doc the document about to be closed. + * @param user_data user data. + * @endsignaldef + * * @signaldef project-open * @signalproto * void user_function(GObject *obj, GKeyFile *config, gpointer user_data); Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-09-16 15:42:27 UTC (rev 2952) +++ trunk/src/document.c 2008-09-16 15:47:26 UTC (rev 2953) @@ -475,53 +475,60 @@ gboolean document_remove_page(guint page_num) { GeanyDocument *doc = document_get_from_page(page_num); + Document *fdoc = DOCUMENT(doc); - if (doc != NULL) + if (doc == NULL) { - Document *fdoc = DOCUMENT(doc); + geany_debug("Error: page_num: %d", page_num); + return FALSE; + } + + if (doc->changed && ! dialogs_show_unsaved_file(doc)) + { + return FALSE; + } + + /* tell any plugins that the document is about to be closed */ + if (geany_object) + { + g_signal_emit_by_name(geany_object, "document-close", doc); + } - if (doc->changed && ! dialogs_show_unsaved_file(doc)) - { - return FALSE; - } - /* Checking real_path makes it likely the file exists on disk */ - if (! main_status.closing_all && doc->real_path != NULL) - ui_add_recent_file(doc->file_name); + /* Checking real_path makes it likely the file exists on disk */ + if (! main_status.closing_all && doc->real_path != NULL) + ui_add_recent_file(doc->file_name); - notebook_remove_page(page_num); - treeviews_remove_document(doc); - navqueue_remove_file(doc->file_name); - msgwin_status_add(_("File %s closed."), DOC_FILENAME(doc)); - g_free(doc->encoding); - g_free(fdoc->saved_encoding.encoding); - g_free(doc->file_name); - g_free(doc->real_path); - tm_workspace_remove_object(doc->tm_file, TRUE, TRUE); + notebook_remove_page(page_num); + treeviews_remove_document(doc); + navqueue_remove_file(doc->file_name); + msgwin_status_add(_("File %s closed."), DOC_FILENAME(doc)); + g_free(doc->encoding); + g_free(fdoc->saved_encoding.encoding); + g_free(doc->file_name); + g_free(doc->real_path); + tm_workspace_remove_object(doc->tm_file, TRUE, TRUE); - editor_destroy(doc->editor); - doc->editor = NULL; + editor_destroy(doc->editor); + doc->editor = NULL; - doc->is_valid = FALSE; - doc->file_name = NULL; - doc->real_path = NULL; - doc->file_type = NULL; - doc->encoding = NULL; - doc->has_bom = FALSE; - doc->tm_file = NULL; - document_undo_clear(doc); - if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) == 0) - { - treeviews_update_tag_list(NULL, FALSE); - /*on_notebook1_switch_page(GTK_NOTEBOOK(main_widgets.notebook), NULL, 0, NULL);*/ - ui_set_window_title(NULL); - ui_save_buttons_toggle(FALSE); - ui_document_buttons_update(); - build_menu_update(NULL); - } - return TRUE; + doc->is_valid = FALSE; + doc->file_name = NULL; + doc->real_path = NULL; + doc->file_type = NULL; + doc->encoding = NULL; + doc->has_bom = FALSE; + doc->tm_file = NULL; + document_undo_clear(doc); + if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) == 0) + { + treeviews_update_tag_list(NULL, FALSE); + /*on_notebook1_switch_page(GTK_NOTEBOOK(main_widgets.notebook), NULL, 0, NULL);*/ + ui_set_window_title(NULL); + ui_save_buttons_toggle(FALSE); + ui_document_buttons_update(); + build_menu_update(NULL); } - geany_debug("Error: page_num: %d", page_num); - return FALSE; + return TRUE; } Modified: trunk/src/geanyobject.c =================================================================== --- trunk/src/geanyobject.c 2008-09-16 15:42:27 UTC (rev 2952) +++ trunk/src/geanyobject.c 2008-09-16 15:47:26 UTC (rev 2953) @@ -116,6 +116,15 @@ gtk_marshal_NONE__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); + geany_object_signals[GCB_DOCUMENT_CLOSE] = g_signal_new ( + "document-close", + G_OBJECT_CLASS_TYPE (g_object_class), + G_SIGNAL_RUN_FIRST, + G_STRUCT_OFFSET (GeanyObjectClass, document_close), + NULL, NULL, + gtk_marshal_NONE__POINTER, + G_TYPE_NONE, 1, + G_TYPE_POINTER); geany_object_signals[GCB_PROJECT_OPEN] = g_signal_new ( "project-open", @@ -143,6 +152,7 @@ NULL, NULL, gtk_marshal_NONE__NONE, G_TYPE_NONE, 0); + geany_object_signals[GCB_UPDATE_EDITOR_MENU] = g_signal_new ( "update-editor-menu", G_OBJECT_CLASS_TYPE (g_object_class), Modified: trunk/src/geanyobject.h =================================================================== --- trunk/src/geanyobject.h 2008-09-16 15:42:27 UTC (rev 2952) +++ trunk/src/geanyobject.h 2008-09-16 15:47:26 UTC (rev 2953) @@ -38,6 +38,7 @@ GCB_DOCUMENT_OPEN, GCB_DOCUMENT_SAVE, GCB_DOCUMENT_ACTIVATE, + GCB_DOCUMENT_CLOSE, GCB_PROJECT_OPEN, GCB_PROJECT_SAVE, GCB_PROJECT_CLOSE, @@ -75,6 +76,7 @@ void (*document_open)(GeanyDocument *doc); void (*document_save)(GeanyDocument *doc); void (*document_activate)(GeanyDocument *doc); + void (*document_close)(GeanyDocument *doc); void (*project_open)(GKeyFile *keyfile); void (*project_save)(GKeyFile *keyfile); void (*project_close)(void); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2952] trunk
by ntrel＠users.sourceforge.net 16 Sep '08

16 Sep '08

Revision: 2952 http://geany.svn.sourceforge.net/geany/?rev=2952&view=rev Author: ntrel Date: 2008-09-16 15:42:27 +0000 (Tue, 16 Sep 2008) Log Message: ----------- Fix wrong parameter for "project-close" signal. (Merged from split-window-plugin branch). Modified Paths: -------------- trunk/ChangeLog trunk/doc/plugins.dox Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-16 15:37:50 UTC (rev 2951) +++ trunk/ChangeLog 2008-09-16 15:42:27 UTC (rev 2952) @@ -6,6 +6,9 @@ Improve dox for sciwrappers.c. Correct sci_grap_focus() misspelling. (Merged from split-window-plugin branch). + * doc/plugins.dox: + Fix wrong parameter for "project-close" signal. + (Merged from split-window-plugin branch). 2008-09-15 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/doc/plugins.dox =================================================================== --- trunk/doc/plugins.dox 2008-09-16 15:37:50 UTC (rev 2951) +++ trunk/doc/plugins.dox 2008-09-16 15:42:27 UTC (rev 2952) @@ -149,13 +149,11 @@ * * @signaldef project-close * @signalproto - * void user_function(GObject *obj, GKeyFile *config, gpointer user_data); + * void user_function(GObject *obj, gpointer user_data); * @endsignalproto * @signaldesc * Sent after a project is closed. * @param obj a GeanyObject instance, should be ignored. - * @param config an exising GKeyFile object which can be used to read and write data. - * It must not be closed or freed. * @param user_data user data. * @endsignaldef * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2951] trunk
by ntrel＠users.sourceforge.net 16 Sep '08

16 Sep '08

Revision: 2951 http://geany.svn.sourceforge.net/geany/?rev=2951&view=rev Author: ntrel Date: 2008-09-16 15:37:50 +0000 (Tue, 16 Sep 2008) Log Message: ----------- Fix Doxygen 1.5.4 undocumented parameter warnings. Improve dox for sciwrappers.c. Correct sci_grap_focus() misspelling. (Merged from split-window-plugin branch). Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c trunk/src/keybindings.c trunk/src/sciwrappers.c trunk/src/sciwrappers.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-16 15:21:46 UTC (rev 2950) +++ trunk/ChangeLog 2008-09-16 15:37:50 UTC (rev 2951) @@ -1,3 +1,13 @@ +2008-09-16 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/keybindings.c, src/sciwrappers.c, src/sciwrappers.h, + src/filetypes.c: + Fix Doxygen 1.5.4 undocumented parameter warnings. + Improve dox for sciwrappers.c. + Correct sci_grap_focus() misspelling. + (Merged from split-window-plugin branch). + + 2008-09-15 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/editor.c: Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2008-09-16 15:21:46 UTC (rev 2950) +++ trunk/src/filetypes.c 2008-09-16 15:37:50 UTC (rev 2951) @@ -1133,7 +1133,9 @@ } -/** Find a filetype pointer from its @c name field. */ +/** Find a filetype pointer from its @c name field. + * @param name Filetype name. + * @return The filetype found, or @c NULL. */ GeanyFiletype *filetypes_lookup_by_name(const gchar *name) { GeanyFiletype *ft; Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2008-09-16 15:21:46 UTC (rev 2950) +++ trunk/src/keybindings.c 2008-09-16 15:37:50 UTC (rev 2951) @@ -97,7 +97,15 @@ /* This is used to set default keybindings on startup but at this point we don't want to * assign the keybinding to the menu_item (apply_kb_accel) otherwise it can't be overridden * by user keybindings anymore */ -/** Simple convenience function to fill a GeanyKeyBinding struct item. */ +/** Simple convenience function to fill a GeanyKeyBinding struct item. + * @param group + * @param key_id + * @param callback + * @param key + * @param mod + * @param name + * @param label + * @param menu_item */ void keybindings_set_item(GeanyKeyGroup *group, gsize key_id, GeanyKeyCallback callback, guint key, GdkModifierType mod, gchar *name, gchar *label, GtkWidget *menu_item) Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2008-09-16 15:21:46 UTC (rev 2950) +++ trunk/src/sciwrappers.c 2008-09-16 15:37:50 UTC (rev 2951) @@ -196,7 +196,9 @@ } } -/** Set all text. */ +/** Set all text. + * @param sci Scintilla widget. + * @param text Text. */ void sci_set_text(ScintillaObject* sci, const gchar* text) { if( text != NULL ){ /* if null text is passed to scintilla will segfault */ @@ -369,35 +371,47 @@ } -/** Get line number from character index. */ +/** Get line number from position. + * @param sci Scintilla widget. + * @param position Position. */ gint sci_get_line_from_position(ScintillaObject* sci, gint position ) { return SSM(sci, SCI_LINEFROMPOSITION, position, 0); } -/** Get column number relative to the start of the line that @a position is on. */ +/** Get column number relative to the start of the line that @a position is on. + * @param sci Scintilla widget. + * @param position Position. */ gint sci_get_col_from_position(ScintillaObject* sci, gint position ) { return SSM(sci, SCI_GETCOLUMN, position, 0); } -/** Get character index for the start of @a line. */ +/** Get position for the start of @a line. + * @param sci Scintilla widget. + * @param line Line. + * @return Position. */ gint sci_get_position_from_line(ScintillaObject* sci, gint line ) { return SSM(sci, SCI_POSITIONFROMLINE, line, 0); } -/** Get cursor position. */ +/** Get cursor position. + * @param sci Scintilla widget. + * @return Position. */ gint sci_get_current_position(ScintillaObject* sci ) { return SSM(sci, SCI_GETCURRENTPOS, 0, 0); } -/** Set the cursor position. */ +/** Set the cursor position. + * @param sci Scintilla widget. + * @param position Position. + * @param scroll_to_caret Whether to scroll the cursor in view. */ void sci_set_current_position(ScintillaObject* sci, gint position, gboolean scroll_to_caret) { if (scroll_to_caret) @@ -420,21 +434,26 @@ } -/** Get total number of lines. */ +/** Get total number of lines. + * @param sci Scintilla widget. */ gint sci_get_line_count( ScintillaObject* sci ) { return SSM(sci, SCI_GETLINECOUNT, 0, 0); } -/** Set selection start position. */ +/** Set selection start position. + * @param sci Scintilla widget. + * @param position Position. */ void sci_set_selection_start(ScintillaObject* sci, gint position) { SSM(sci, SCI_SETSELECTIONSTART, position, 0); } -/** Set selection end position. */ +/** Set selection end position. + * @param sci Scintilla widget. + * @param position Position. */ void sci_set_selection_end(ScintillaObject* sci, gint position) { SSM(sci, SCI_SETSELECTIONEND, position, 0); @@ -471,28 +490,36 @@ } -/** Get position of selection start. */ +/** Get position of selection start. + * @param sci Scintilla widget. + * @return Position. */ gint sci_get_selection_start(ScintillaObject* sci) { return SSM(sci, SCI_GETSELECTIONSTART,0,0); } -/** Get position of selection end. */ +/** Get position of selection end. + * @param sci Scintilla widget. + * @return Position. */ gint sci_get_selection_end(ScintillaObject* sci) { return SSM(sci, SCI_GETSELECTIONEND,0,0); } -/** Replace selection. */ +/** Replace selection. + * @param sci Scintilla widget. + * @param text Text. */ void sci_replace_sel(ScintillaObject* sci, const gchar* text) { SSM(sci, SCI_REPLACESEL,0, (sptr_t) text); } -/** Get length of all text. */ +/** Get length of all text. + * @param sci Scintilla widget. + * @return Length. */ gint sci_get_length(ScintillaObject* sci) { return SSM(sci,SCI_GETLENGTH,0,0); @@ -505,14 +532,21 @@ } -/** Get line length. */ +/** Get line length. + * @param sci Scintilla widget. + * @param line Line number. + * @return Length. */ gint sci_get_line_length(ScintillaObject* sci,gint line) { return SSM(sci,SCI_LINELENGTH, line,0); } -/** Returns: a NULL-terminated copy of the line text. */ +/* TODO: rename/change to use buffer? Otherwise inconsistent with sci_get_text*(). */ +/** Get line contents. + * @param sci Scintilla widget. + * @param line_num Line number. + * @return A @c NULL-terminated copy of the line text. */ gchar *sci_get_line(ScintillaObject* sci, gint line_num) { gint len = sci_get_line_length(sci, line_num); @@ -524,23 +558,29 @@ } -/** The last char will be null terminated, so ensure @a text has been allocated @a len + 1 - * bytes. */ +/** Get all text. + * @param sci Scintilla widget. + * @param len Length of @a text buffer, usually sci_get_length() + 1. + * @param text Text buffer; must be allocated @a len + 1 bytes for null-termination. */ void sci_get_text(ScintillaObject* sci, gint len, gchar* text) { SSM( sci, SCI_GETTEXT, len, (sptr_t) text ); } -/** Text must be allocated sci_get_selected_text_length() + 1, because - * the selection will be NULL-terminated. */ +/** Get selected text. + * @param sci Scintilla widget. + * @param text Text buffer; must be allocated sci_get_selected_text_length() + 1 bytes + * for null-termination. */ void sci_get_selected_text(ScintillaObject* sci, gchar* text) { SSM( sci, SCI_GETSELTEXT, 0, (sptr_t) text); } -/** Get selected text length. */ +/** Get selected text length. + * @param sci Scintilla widget. + * @return Length. */ gint sci_get_selected_text_length(ScintillaObject* sci) { return SSM( sci, SCI_GETSELTEXT, 0, 0); @@ -561,14 +601,19 @@ } -/** Returns: whether @a line should be drawn on the screen (folding may have hidden it). */ +/** Check if a line is visible (folding may have hidden it). + * @param sci Scintilla widget. + * @param line Line number. + * @return Whether @a line will be drawn on the screen. */ gboolean sci_get_line_is_visible(ScintillaObject* sci, gint line) { return SSM(sci,SCI_GETLINEVISIBLE, line,0); } -/** Make the @a line visible (folding may have hidden it). */ +/** Make the @a line visible (folding may have hidden it). + * @param sci Scintilla widget. + * @param line Line number. */ void sci_ensure_line_is_visible(ScintillaObject* sci, gint line) { SSM(sci,SCI_ENSUREVISIBLE,line,0); @@ -637,14 +682,19 @@ } -/** Get display tab width. */ +/** Get display tab width (this is not indent width, see GeanyIndentPrefs). + * @param sci Scintilla widget. + * @return Width. */ gint sci_get_tab_width(ScintillaObject * sci) { return SSM(sci, SCI_GETTABWIDTH, 0, 0); } -/** Get character. */ +/** Get character. + * @param sci Scintilla widget. + * @param pos Position. + * @return Char. */ gchar sci_get_char_at(ScintillaObject *sci, gint pos) { return (gchar) SSM(sci, SCI_GETCHARAT, pos, 0); @@ -669,7 +719,10 @@ } -/** You can also call this has_selection. */ +/* TODO: rename to has_selection. */ +/** Check if there's a selection. + * @param sci Scintilla widget. + * @return Whether a selection is present. */ gboolean sci_can_copy(ScintillaObject *sci) { if (SSM(sci, SCI_GETSELECTIONEND,0,0) - SSM(sci, SCI_GETSELECTIONSTART,0,0)) @@ -698,7 +751,8 @@ } -/** Scroll the cursor in view. */ +/** Scroll the cursor in view. + * @param sci Scintilla widget. */ void sci_scroll_caret(ScintillaObject *sci) { SSM(sci, SCI_SCROLLCARET, 0, 0); @@ -749,7 +803,10 @@ } -/** Get style number for @a position. */ +/** Get style ID for @a position. + * @param sci Scintilla widget. + * @param position Position. + * @return Style ID. */ gint sci_get_style_at(ScintillaObject *sci, gint position) { return SSM(sci, SCI_GETSTYLEAT, position, 0); @@ -774,7 +831,11 @@ } -/** Text will be zero terminated and must be allocated (end - start + 1) bytes. */ +/** Get text between @a start and @a end. + * @param sci Scintilla widget. + * @param start Start. + * @param end End. + * @param text Text will be zero terminated and must be allocated (end - start + 1) bytes. */ void sci_get_text_range(ScintillaObject *sci, gint start, gint end, gchar *text) { struct TextRange tr; @@ -797,14 +858,17 @@ } -/** Insert text. */ +/** Insert text. + * @param sci Scintilla widget. + * @param pos Position. + * @param text Text. */ void sci_insert_text(ScintillaObject *sci, gint pos, const gchar *text) { SSM(sci, SCI_INSERTTEXT, pos, (sptr_t) text); } -void sci_grap_focus(ScintillaObject *sci) +void sci_grab_focus(ScintillaObject *sci) { SSM(sci, SCI_GRABFOCUS, 0, 0); } @@ -865,7 +929,9 @@ } -/** Get current line number. */ +/** Get current line number. + * @param sci Scintilla widget. + * @return Line number. */ gint sci_get_current_line(ScintillaObject *sci) { return SSM(sci, SCI_LINEFROMPOSITION, SSM(sci, SCI_GETCURRENTPOS, 0, 0), 0); @@ -918,7 +984,11 @@ SSM(sci, SCI_AUTOCSETMAXHEIGHT, val, 0); } -/** Find a matching brace at @a pos. */ +/** Find a matching brace at @a pos. + * @param sci Scintilla widget. + * @param pos Position. + * @return Matching brace position. */ +/* TODO: rename _matching_brace */ gint sci_find_bracematch(ScintillaObject *sci, gint pos) { return SSM(sci, SCI_BRACEMATCH, pos, 0); @@ -949,13 +1019,17 @@ return SSM(sci, SCI_GETLINESELENDPOSITION, line, 0); } -/** Get selection mode. */ +/** Get selection mode. + * @param sci Scintilla widget. + * @return Selection mode. */ gint sci_get_selection_mode(ScintillaObject *sci) { return SSM(sci, SCI_GETSELECTIONMODE, 0, 0); } -/** Set selection mode. */ +/** Set selection mode. + * @param sci Scintilla widget. + * @param mode Mode. */ void sci_set_selection_mode(ScintillaObject *sci, gint mode) { SSM(sci, SCI_SETSELECTIONMODE, mode, 0); Modified: trunk/src/sciwrappers.h =================================================================== --- trunk/src/sciwrappers.h 2008-09-16 15:21:46 UTC (rev 2950) +++ trunk/src/sciwrappers.h 2008-09-16 15:37:50 UTC (rev 2951) @@ -141,7 +141,7 @@ void sci_selection_duplicate (ScintillaObject * sci); void sci_line_duplicate (ScintillaObject * sci); void sci_insert_text (ScintillaObject * sci, gint pos, const gchar *text); -void sci_grap_focus (ScintillaObject * sci); +void sci_grab_focus (ScintillaObject * sci); void sci_set_cursor (ScintillaObject * sci, gint cursor); void sci_target_from_selection (ScintillaObject * sci); void sci_target_start (ScintillaObject * sci, gint start); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2008