Commits September 2008

commits@lists.geany.org

3 participants
92 discussions

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

16 Sep '08

Revision: 2950 http://geany.svn.sourceforge.net/geany/?rev=2950&view=rev Author: ntrel Date: 2008-09-16 15:21:46 +0000 (Tue, 16 Sep 2008) Log Message: ----------- Add editor_create_widget() to the API; remove editor_create(), editor_destroy(). Modified Paths: -------------- branches/split-window-plugin/ChangeLog branches/split-window-plugin/plugins/splitwindow.c branches/split-window-plugin/src/editor.c branches/split-window-plugin/src/editor.h branches/split-window-plugin/src/plugindata.h branches/split-window-plugin/src/plugins.c Modified: branches/split-window-plugin/ChangeLog =================================================================== --- branches/split-window-plugin/ChangeLog 2008-09-16 12:21:14 UTC (rev 2949) +++ branches/split-window-plugin/ChangeLog 2008-09-16 15:21:46 UTC (rev 2950) @@ -5,6 +5,10 @@ Fix Doxygen 1.5.4 undocumented parameter warnings. Improve dox for sciwrappers.c. Correct sci_grap_focus() misspelling. + * src/plugindata.h, src/plugins.c, src/editor.c, src/editor.h, + plugins/splitwindow.c: + Add editor_create_widget() to the API; remove editor_create(), + editor_destroy(). 2008-09-15 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: branches/split-window-plugin/plugins/splitwindow.c =================================================================== --- branches/split-window-plugin/plugins/splitwindow.c 2008-09-16 12:21:14 UTC (rev 2949) +++ branches/split-window-plugin/plugins/splitwindow.c 2008-09-16 15:21:46 UTC (rev 2950) @@ -58,7 +58,7 @@ menu_items; static enum State plugin_state; -static GeanyEditor *our_editor = NULL; +static GeanyEditor *our_editor = NULL; /* original editor for split view */ static gint sci_get_value(ScintillaObject *sci, gint message_id, gint param) @@ -193,9 +193,9 @@ gtk_paned_add1(GTK_PANED(pane), notebook); g_object_unref(notebook); - our_editor = p_editor->create(doc); - sci = our_editor->sci; - sync_to_current(doc->editor->sci, sci); + 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); @@ -217,7 +217,6 @@ g_object_ref(notebook); gtk_container_remove(GTK_CONTAINER(pane), notebook); gtk_widget_destroy(pane); - p_editor->destroy(our_editor); our_editor = NULL; gtk_container_add(GTK_CONTAINER(parent), notebook); g_object_unref(notebook); Modified: branches/split-window-plugin/src/editor.c =================================================================== --- branches/split-window-plugin/src/editor.c 2008-09-16 12:21:14 UTC (rev 2949) +++ branches/split-window-plugin/src/editor.c 2008-09-16 15:21:46 UTC (rev 2950) @@ -3753,6 +3753,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; @@ -3793,6 +3794,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(); @@ -3800,14 +3824,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: branches/split-window-plugin/src/editor.h =================================================================== --- branches/split-window-plugin/src/editor.h 2008-09-16 12:21:14 UTC (rev 2949) +++ branches/split-window-plugin/src/editor.h 2008-09-16 15:21:46 UTC (rev 2950) @@ -143,6 +143,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: branches/split-window-plugin/src/plugindata.h =================================================================== --- branches/split-window-plugin/src/plugindata.h 2008-09-16 12:21:14 UTC (rev 2949) +++ branches/split-window-plugin/src/plugindata.h 2008-09-16 15:21:46 UTC (rev 2950) @@ -41,13 +41,13 @@ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 90, + GEANY_API_VERSION = 91, /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ /* This should usually stay the same if fields are only appended, assuming only pointers to * structs and not structs themselves are declared by plugins. */ - GEANY_ABI_VERSION = 44 + GEANY_ABI_VERSION = 45 }; /** Check the plugin can be loaded by Geany. @@ -455,8 +455,7 @@ void (*clear_indicators) (struct GeanyEditor *editor); const struct GeanyIndentPrefs* (*get_indent_prefs)(struct GeanyEditor *editor); - struct GeanyEditor* (*create)(struct GeanyDocument *doc); - void (*destroy)(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: branches/split-window-plugin/src/plugins.c =================================================================== --- branches/split-window-plugin/src/plugins.c 2008-09-16 12:21:14 UTC (rev 2949) +++ branches/split-window-plugin/src/plugins.c 2008-09-16 15:21:46 UTC (rev 2950) @@ -116,8 +116,7 @@ &editor_set_indicator_on_line, &editor_clear_indicators, &editor_get_indent_prefs, - &editor_create, - &editor_destroy + &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:[2949] branches/split-window-plugin
by ntrel＠users.sourceforge.net 16 Sep '08

16 Sep '08

Revision: 2949 http://geany.svn.sourceforge.net/geany/?rev=2949&view=rev Author: ntrel Date: 2008-09-16 12:21:14 +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. Modified Paths: -------------- branches/split-window-plugin/ChangeLog branches/split-window-plugin/src/filetypes.c branches/split-window-plugin/src/keybindings.c branches/split-window-plugin/src/sciwrappers.c branches/split-window-plugin/src/sciwrappers.h Modified: branches/split-window-plugin/ChangeLog =================================================================== --- branches/split-window-plugin/ChangeLog 2008-09-15 21:51:27 UTC (rev 2948) +++ branches/split-window-plugin/ChangeLog 2008-09-16 12:21:14 UTC (rev 2949) @@ -1,3 +1,12 @@ +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. + + 2008-09-15 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * plugins/splitwindow.c: Modified: branches/split-window-plugin/src/filetypes.c =================================================================== --- branches/split-window-plugin/src/filetypes.c 2008-09-15 21:51:27 UTC (rev 2948) +++ branches/split-window-plugin/src/filetypes.c 2008-09-16 12:21:14 UTC (rev 2949) @@ -1055,7 +1055,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: branches/split-window-plugin/src/keybindings.c =================================================================== --- branches/split-window-plugin/src/keybindings.c 2008-09-15 21:51:27 UTC (rev 2948) +++ branches/split-window-plugin/src/keybindings.c 2008-09-16 12:21:14 UTC (rev 2949) @@ -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: branches/split-window-plugin/src/sciwrappers.c =================================================================== --- branches/split-window-plugin/src/sciwrappers.c 2008-09-15 21:51:27 UTC (rev 2948) +++ branches/split-window-plugin/src/sciwrappers.c 2008-09-16 12:21:14 UTC (rev 2949) @@ -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: branches/split-window-plugin/src/sciwrappers.h =================================================================== --- branches/split-window-plugin/src/sciwrappers.h 2008-09-15 21:51:27 UTC (rev 2948) +++ branches/split-window-plugin/src/sciwrappers.h 2008-09-16 12:21:14 UTC (rev 2949) @@ -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

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

15 Sep '08

Revision: 2946 http://geany.svn.sourceforge.net/geany/?rev=2946&view=rev Author: ntrel Date: 2008-09-15 13:03:05 +0000 (Mon, 15 Sep 2008) Log Message: ----------- s/auto detect/auto-detect. Minor formatting fixes. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-15 12:49:51 UTC (rev 2945) +++ trunk/ChangeLog 2008-09-15 13:03:05 UTC (rev 2946) @@ -6,6 +6,9 @@ * src/editor.c: Apply patch from Jason Oster to highlight matching brace indent guides (thanks, #2104099). + * doc/geany.txt, doc/geany.html: + s/auto detect/auto-detect. + Minor formatting fixes. 2008-09-14 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-09-15 12:49:51 UTC (rev 2945) +++ trunk/doc/geany.html 2008-09-15 13:03:05 UTC (rev 2946) @@ -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="$Date$" /> +<meta name="date" content="2008-09-08" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>$Date$</td></tr> +<td>2008-09-08</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.15</td></tr> </tbody> @@ -785,18 +785,18 @@ you have to set manually the encoding of the file in order to display it correctly. You can this in the file open dialog by selecting an encoding in the drop down box or by reloading the file with the -file menu item "Reload as". The auto detection works well for most -encodings but there are also some encodings known where auto detection +file menu item "Reload as". The auto-detection works well for most +encodings but there are also some encodings known where auto-detection has its problems. Auto detecting the encoding of a file is not easy and sometimes an encoding might be detected not correctly.</p> <p>There are different ways to use different encodings in Geany:</p> <ul> <li><p class="first">Using the file open dialog</p> <p>This opens the file with the encoding specified in the encoding drop -down box. If the encoding is set to "Detect from file" auto detection +down box. If the encoding is set to "Detect from file" auto-detection will be used. If the encoding is set to "Without encoding (None)" the file will be opened without any character conversion and Geany will -not try to auto detect the encoding(see below for more information).</p> +not try to auto-detect the encoding (see below for more information).</p> </li> <li><p class="first">Using the "Reload as" menu item</p> <p>This item reloads the current file with the specified encoding. It can @@ -807,8 +807,8 @@ the current file unless you save it. It is useful when you want to change the encoding of the file.</p> </li> -<li><p class="first">Specifying the encoding in the file itself -As mentioned above, auto detecting the encoding of a file may fail on +<li><p class="first">Specifying the encoding in the file itself</p> +<p>As mentioned above, auto-detecting the encoding of a file may fail on some encodings. If you know that Geany doesn't open a certain file, you can add a special line to the beginning of the file to force an encoding when opening the file (for details see below).</p> @@ -860,7 +860,7 @@ <div class="section"> <h3><a class="toc-backref" href="#id34" id="special-encoding-none" name="special-encoding-none">Special encoding "None"</a></h3> <p>There is a special encoding "None" which is actually no real -encoding. It is useful when you know that Geany cannot auto detect +encoding. It is useful when you know that Geany cannot auto-detect the encoding of a file and it is not displayed correctly. Especially when the file contains NUL-bytes this can be useful to skip auto detection and open the file properly at least until the occurrence @@ -4240,7 +4240,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2008-09-07 20:26 UTC. +Generated on: 2008-09-15 13:05 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-15 12:49:51 UTC (rev 2945) +++ trunk/doc/geany.txt 2008-09-15 13:03:05 UTC (rev 2946) @@ -429,8 +429,8 @@ you have to set manually the encoding of the file in order to display it correctly. You can this in the file open dialog by selecting an encoding in the drop down box or by reloading the file with the -file menu item "Reload as". The auto detection works well for most -encodings but there are also some encodings known where auto detection +file menu item "Reload as". The auto-detection works well for most +encodings but there are also some encodings known where auto-detection has its problems. Auto detecting the encoding of a file is not easy and sometimes an encoding might be detected not correctly. @@ -439,10 +439,10 @@ * Using the file open dialog This opens the file with the encoding specified in the encoding drop - down box. If the encoding is set to "Detect from file" auto detection + down box. If the encoding is set to "Detect from file" auto-detection will be used. If the encoding is set to "Without encoding (None)" the file will be opened without any character conversion and Geany will - not try to auto detect the encoding(see below for more information). + not try to auto-detect the encoding (see below for more information). * Using the "Reload as" menu item @@ -456,7 +456,8 @@ change the encoding of the file. * Specifying the encoding in the file itself - As mentioned above, auto detecting the encoding of a file may fail on + + As mentioned above, auto-detecting the encoding of a file may fail on some encodings. If you know that Geany doesn't open a certain file, you can add a special line to the beginning of the file to force an encoding when opening the file (for details see below). @@ -510,7 +511,7 @@ ^^^^^^^^^^^^^^^^^^^^^^^ There is a special encoding "None" which is actually no real -encoding. It is useful when you know that Geany cannot auto detect +encoding. It is useful when you know that Geany cannot auto-detect the encoding of a file and it is not displayed correctly. Especially when the file contains NUL-bytes this can be useful to skip auto detection and open the file properly at least until the occurrence This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

15 Sep '08

Revision: 2945 http://geany.svn.sourceforge.net/geany/?rev=2945&view=rev Author: ntrel Date: 2008-09-15 12:49:51 +0000 (Mon, 15 Sep 2008) Log Message: ----------- Apply patch from Jason Oster to highlight matching brace indent guides (thanks, #2104099). Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-15 12:37:24 UTC (rev 2944) +++ trunk/ChangeLog 2008-09-15 12:49:51 UTC (rev 2945) @@ -3,6 +3,9 @@ * src/editor.c: Show ellipsis (...) item when there are too many symbol names for autocompletion. + * src/editor.c: + Apply patch from Jason Oster to highlight matching brace indent + guides (thanks, #2104099). 2008-09-14 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-09-15 12:37:24 UTC (rev 2944) +++ trunk/src/editor.c 2008-09-15 12:49:51 UTC (rev 2945) @@ -2482,6 +2482,7 @@ brace_pos++; if (! utils_isbrace(sci_get_char_at(sci, brace_pos), editor_prefs.brace_match_ltgt)) { + SSM(sci, SCI_SETHIGHLIGHTGUIDE, 0, 0); SSM(sci, SCI_BRACEBADLIGHT, (uptr_t)-1, 0); return; } @@ -2489,9 +2490,16 @@ end_pos = SSM(sci, SCI_BRACEMATCH, brace_pos, 0); if (end_pos >= 0) + { + gint col = MIN(sci_get_col_from_position(sci, brace_pos), sci_get_col_from_position(sci, end_pos)); + SSM(sci, SCI_SETHIGHLIGHTGUIDE, col, 0); SSM(sci, SCI_BRACEHIGHLIGHT, brace_pos, end_pos); + } else + { + SSM(sci, SCI_SETHIGHLIGHTGUIDE, 0, 0); SSM(sci, SCI_BRACEBADLIGHT, brace_pos, 0); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

15 Sep '08

Revision: 2944 http://geany.svn.sourceforge.net/geany/?rev=2944&view=rev Author: ntrel Date: 2008-09-15 12:37:24 +0000 (Mon, 15 Sep 2008) Log Message: ----------- Show ellipsis (...) item when there are too many symbol names for autocompletion. Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-09-14 19:36:11 UTC (rev 2943) +++ trunk/ChangeLog 2008-09-15 12:37:24 UTC (rev 2944) @@ -1,7 +1,14 @@ +2008-09-15 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/editor.c: + Show ellipsis (...) item when there are too many symbol names for + autocompletion. + + 2008-09-14 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * COPYING: Fixing a little encoding issue in GPL text. - * po/tr.po, po/LINGUAS, src/about.c, THANKS: Adding Turkish translation + * po/tr.po, po/LINGUAS, src/about.c, THANKS: Adding Turkish translation provided by Gürkan Gür. Thanks for it. Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-09-14 19:36:11 UTC (rev 2943) +++ trunk/src/editor.c 2008-09-15 12:37:24 UTC (rev 2944) @@ -1397,9 +1397,16 @@ GString *words = g_string_sized_new(150); guint j; - for (j = 0; ((j < tags->len) && (j < editor_prefs.autocompletion_max_entries)); ++j) + for (j = 0; j < tags->len; ++j) { - if (j > 0) g_string_append_c(words, '\n'); + if (j > 0) + g_string_append_c(words, '\n'); + + if (j == editor_prefs.autocompletion_max_entries) + { + g_string_append(words, "..."); + break; + } g_string_append(words, ((TMTag *) tags->pdata[j])->name); } show_autocomplete(sci, rootlen, words->str); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

12 Sep '08

Revision: 2941 http://geany.svn.sourceforge.net/geany/?rev=2941&view=rev Author: ntrel Date: 2008-09-12 14:12:15 +0000 (Fri, 12 Sep 2008) Log Message: ----------- Make menu document-sensitive. Modified Paths: -------------- branches/split-window-plugin/ChangeLog branches/split-window-plugin/plugins/splitwindow.c Modified: branches/split-window-plugin/ChangeLog =================================================================== --- branches/split-window-plugin/ChangeLog 2008-09-12 11:37:02 UTC (rev 2940) +++ branches/split-window-plugin/ChangeLog 2008-09-12 14:12:15 UTC (rev 2941) @@ -1,3 +1,9 @@ +2008-09-12 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * plugins/splitwindow.c: + Make menu document-sensitive. + + 2008-09-11 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/geanyobject.c, src/geanyobject.h, src/document.c, Modified: branches/split-window-plugin/plugins/splitwindow.c =================================================================== --- branches/split-window-plugin/plugins/splitwindow.c 2008-09-12 11:37:02 UTC (rev 2940) +++ branches/split-window-plugin/plugins/splitwindow.c 2008-09-12 14:12:15 UTC (rev 2941) @@ -39,6 +39,7 @@ GeanyData *geany_data; GeanyFunctions *geany_functions; +PluginFields *plugin_fields; enum State { @@ -239,8 +240,10 @@ { GtkWidget *item, *menu; - menu_items.main = gtk_menu_item_new_with_mnemonic(_("_Split Window")); + 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); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[2940] trunk/src/sciwrappers.c
by ntrel＠users.sourceforge.net 12 Sep '08

12 Sep '08

Revision: 2940 http://geany.svn.sourceforge.net/geany/?rev=2940&view=rev Author: ntrel Date: 2008-09-12 11:37:02 +0000 (Fri, 12 Sep 2008) Log Message: ----------- Add newline at end of file. Modified Paths: -------------- trunk/src/sciwrappers.c Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2008-09-11 16:26:34 UTC (rev 2939) +++ trunk/src/sciwrappers.c 2008-09-12 11:37:02 UTC (rev 2940) @@ -990,4 +990,4 @@ void sci_set_scroll_stop_at_last_line(ScintillaObject* sci, gboolean set) { SSM(sci, SCI_SETENDATLASTLINE, set, 0); -} \ No newline at end of file +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

11 Sep '08

Revision: 2939 http://geany.svn.sourceforge.net/geany/?rev=2939&view=rev Author: ntrel Date: 2008-09-11 16:26:34 +0000 (Thu, 11 Sep 2008) Log Message: ----------- Set pane splitter halfway. Copy cursor position from original editor. Modified Paths: -------------- branches/split-window-plugin/ChangeLog branches/split-window-plugin/plugins/splitwindow.c Modified: branches/split-window-plugin/ChangeLog =================================================================== --- branches/split-window-plugin/ChangeLog 2008-09-11 15:30:36 UTC (rev 2938) +++ branches/split-window-plugin/ChangeLog 2008-09-11 16:26:34 UTC (rev 2939) @@ -8,6 +8,9 @@ Unsplit when the source document is closed. * doc/plugins.dox: Fix wrong parameter for "project-close" signal. + * plugins/splitwindow.c: + Set pane splitter halfway. + Copy cursor position from original editor. 2008-09-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: branches/split-window-plugin/plugins/splitwindow.c =================================================================== --- branches/split-window-plugin/plugins/splitwindow.c 2008-09-11 15:30:36 UTC (rev 2938) +++ branches/split-window-plugin/plugins/splitwindow.c 2008-09-11 16:26:34 UTC (rev 2939) @@ -147,10 +147,15 @@ } -static void update_view(ScintillaObject *sci) +static void sync_to_current(ScintillaObject *current, ScintillaObject *sci) { - ScintillaObject *current = p_document->get_current()->editor->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(sci, geany->interface_prefs->editor_font, 0); @@ -158,6 +163,9 @@ 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); + set_line_numbers(sci, TRUE, 0); p_sci->send_message(sci, SCI_SETMARGINWIDTHN, 1, 0 ); /* hide marker margin */ } @@ -181,7 +189,7 @@ GtkWidget *pane; GeanyDocument *doc = p_document->get_current(); ScintillaObject *sci; - gpointer sdoc; + gint width = notebook->allocation.width / 2; set_state(STATE_SPLIT_HORIZONTAL); @@ -196,13 +204,12 @@ gtk_paned_add1(GTK_PANED(pane), notebook); g_object_unref(notebook); - sci = doc->editor->sci; - sdoc = (gpointer) p_sci->send_message(sci, SCI_GETDOCPOINTER, 0, 0); our_editor = p_editor->create(doc); sci = our_editor->sci; - p_sci->send_message(sci, SCI_SETDOCPOINTER, 0, GPOINTER_TO_INT(sdoc)); - update_view(sci); + sync_to_current(doc->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); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

11 Sep '08

Revision: 2938 http://geany.svn.sourceforge.net/geany/?rev=2938&view=rev Author: ntrel Date: 2008-09-11 15:30:36 +0000 (Thu, 11 Sep 2008) Log Message: ----------- Fix wrong parameter for "project-close" signal. Modified Paths: -------------- branches/split-window-plugin/ChangeLog branches/split-window-plugin/doc/plugins.dox Modified: branches/split-window-plugin/ChangeLog =================================================================== --- branches/split-window-plugin/ChangeLog 2008-09-11 15:06:14 UTC (rev 2937) +++ branches/split-window-plugin/ChangeLog 2008-09-11 15:30:36 UTC (rev 2938) @@ -6,6 +6,8 @@ closed. * plugins/splitwindow.c: Unsplit when the source document is closed. + * doc/plugins.dox: + Fix wrong parameter for "project-close" signal. 2008-09-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: branches/split-window-plugin/doc/plugins.dox =================================================================== --- branches/split-window-plugin/doc/plugins.dox 2008-09-11 15:06:14 UTC (rev 2937) +++ branches/split-window-plugin/doc/plugins.dox 2008-09-11 15:30:36 UTC (rev 2938) @@ -160,13 +160,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:[2937] branches/split-window-plugin
by ntrel＠users.sourceforge.net 11 Sep '08

11 Sep '08

Revision: 2937 http://geany.svn.sourceforge.net/geany/?rev=2937&view=rev Author: ntrel Date: 2008-09-11 15:06:14 +0000 (Thu, 11 Sep 2008) Log Message: ----------- Unsplit when the source document is closed. Modified Paths: -------------- branches/split-window-plugin/ChangeLog branches/split-window-plugin/plugins/splitwindow.c Modified: branches/split-window-plugin/ChangeLog =================================================================== --- branches/split-window-plugin/ChangeLog 2008-09-11 15:03:58 UTC (rev 2936) +++ branches/split-window-plugin/ChangeLog 2008-09-11 15:06:14 UTC (rev 2937) @@ -4,6 +4,8 @@ doc/plugins.dox: Add plugin signal "document-close", sent just before a document is closed. + * plugins/splitwindow.c: + Unsplit when the source document is closed. 2008-09-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: branches/split-window-plugin/plugins/splitwindow.c =================================================================== --- branches/split-window-plugin/plugins/splitwindow.c 2008-09-11 15:03:58 UTC (rev 2936) +++ branches/split-window-plugin/plugins/splitwindow.c 2008-09-11 15:06:14 UTC (rev 2937) @@ -254,6 +254,20 @@ } +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) 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