Commits May 2009

commits@lists.geany.org

3 participants
72 discussions

SF.net SVN: geany:[3807] trunk
by ntrel＠users.sourceforge.net 20 May '09

20 May '09

Revision: 3807 http://geany.svn.sourceforge.net/geany/?rev=3807&view=rev Author: ntrel Date: 2009-05-20 14:42:55 +0000 (Wed, 20 May 2009) Log Message: ----------- Fix multiline indent when selection covers text on the last line. Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-05-19 21:06:04 UTC (rev 3806) +++ trunk/ChangeLog 2009-05-20 14:42:55 UTC (rev 3807) @@ -1,3 +1,9 @@ +2009-05-20 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/editor.c: + Fix multiline indent when selection covers text on the last line. + + 2009-05-19 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/symbols.c, tagmanager/python.c: Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2009-05-19 21:06:04 UTC (rev 3806) +++ trunk/src/editor.c 2009-05-20 14:42:55 UTC (rev 3807) @@ -3396,8 +3396,8 @@ } -/* extra_line is for selecting the cursor line or anchor line at the bottom of a selection, - * when those lines have no selection. */ +/* extra_line is for selecting the cursor line (or anchor line) at the bottom of a selection, + * when those lines have no selection (cursor at start of line). */ void editor_select_lines(GeanyEditor *editor, gboolean extra_line) { gint start, end, line; @@ -4542,6 +4542,8 @@ end = sci_get_selection_end(sci); lstart = sci_get_line_from_position(sci, start); lend = sci_get_line_from_position(sci, end); + if (end == sci_get_length(sci)) + lend++; /* for last line with text on it */ for (line = lstart; line < lend; line++) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3806] trunk
by eht16＠users.sourceforge.net 19 May '09

19 May '09

Revision: 3806 http://geany.svn.sourceforge.net/geany/?rev=3806&view=rev Author: eht16 Date: 2009-05-19 21:06:04 +0000 (Tue, 19 May 2009) Log Message: ----------- Fix quoting the build command string on Windows (closes #2791769). This broke when we made build commands run synchronously on Windows, now we don't need to special quote the commands anymore. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-05-19 20:17:37 UTC (rev 3805) +++ trunk/ChangeLog 2009-05-19 21:06:04 UTC (rev 3806) @@ -6,6 +6,10 @@ * src/editor.c, src/editor.h: Make some only locally used functions static. Fix wrong sanity check. + * src/build.c: + Fix quoting the build command string on Windows (closes #2791769). + This broke when we made build commands run synchronously on Windows, + now we don't need to special quote the commands anymore. 2009-05-19 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2009-05-19 20:17:37 UTC (rev 3805) +++ trunk/src/build.c 2009-05-19 21:06:04 UTC (rev 3806) @@ -507,13 +507,7 @@ g_free(executable); #ifdef G_OS_WIN32 - /* due to g_shell_parse_argv() we need to enclose the command(first element) of cmd_string with - * "" if the command contains a full path(i.e. backslashes) otherwise the backslashes will be - * eaten by g_shell_parse_argv(). */ - setptr(cmd_string, quote_executable(cmd_string)); - if (! g_shell_parse_argv(cmd_string, NULL, &argv, NULL)) - /* if automatic parsing failed, fall back to simple, unsafe argv creation */ - argv = g_strsplit(cmd_string, " ", 0); + argv = g_strsplit(cmd_string, " ", 0); #else argv = g_new0(gchar *, 4); argv[0] = g_strdup("/bin/sh"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3805] trunk
by eht16＠users.sourceforge.net 19 May '09

19 May '09

Revision: 3805 http://geany.svn.sourceforge.net/geany/?rev=3805&view=rev Author: eht16 Date: 2009-05-19 20:17:37 +0000 (Tue, 19 May 2009) Log Message: ----------- Make some locally only used functions static. Fix wrong sanity check. Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c trunk/src/editor.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-05-19 20:17:21 UTC (rev 3804) +++ trunk/ChangeLog 2009-05-19 20:17:37 UTC (rev 3805) @@ -3,6 +3,9 @@ * src/symbols.c, tagmanager/python.c: Parse Python import statements to get symbol completion for the imported module names. + * src/editor.c, src/editor.h: + Make some only locally used functions static. + Fix wrong sanity check. 2009-05-19 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2009-05-19 20:17:21 UTC (rev 3804) +++ trunk/src/editor.c 2009-05-19 20:17:37 UTC (rev 3805) @@ -100,6 +100,8 @@ static void auto_table(GeanyEditor *editor, gint pos); static void close_block(GeanyEditor *editor, gint pos); static void editor_highlight_braces(GeanyEditor *editor, gint cur_pos); +static void editor_auto_latex(GeanyEditor *editor, gint pos); +static void editor_strip_line_trailing_spaces(GeanyEditor *editor, gint line); void editor_snippets_free(void) @@ -1686,12 +1688,15 @@ } -void editor_auto_latex(GeanyEditor *editor, gint pos) +static void editor_auto_latex(GeanyEditor *editor, gint pos) { ScintillaObject *sci; - g_return_if_fail(editor != NULL && editor->document->file_type != NULL); + g_return_if_fail(editor != NULL); + if (editor->document->file_type == NULL) + return; + sci = editor->sci; if (sci_get_char_at(sci, pos - 2) == '}') @@ -3220,7 +3225,7 @@ #if 0 -gboolean editor_lexer_is_c_like(gint lexer) +static gboolean editor_lexer_is_c_like(gint lexer) { switch (lexer) { @@ -4006,7 +4011,7 @@ } -void editor_strip_line_trailing_spaces(GeanyEditor *editor, gint line) +static void editor_strip_line_trailing_spaces(GeanyEditor *editor, gint line) { gint line_start = sci_get_position_from_line(editor->sci, line); gint line_end = sci_get_line_end_position(editor->sci, line); Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2009-05-19 20:17:21 UTC (rev 3804) +++ trunk/src/editor.h 2009-05-19 20:17:37 UTC (rev 3805) @@ -175,8 +175,6 @@ gboolean editor_complete_snippet(GeanyEditor *editor, gint pos); -void editor_auto_latex(GeanyEditor *editor, gint pos); - void editor_show_macro_list(GeanyEditor *editor); gboolean editor_show_calltip(GeanyEditor *editor, gint pos); @@ -187,8 +185,6 @@ gint editor_do_uncomment(GeanyEditor *editor, gint line, gboolean toggle); -gboolean editor_lexer_is_c_like(gint lexer); - gint editor_lexer_get_type_keyword_idx(gint lexer); void editor_insert_multiline_comment(GeanyEditor *editor); @@ -252,8 +248,6 @@ void editor_replace_spaces(GeanyEditor *editor); -void editor_strip_line_trailing_spaces(GeanyEditor *editor, gint line); - void editor_strip_trailing_spaces(GeanyEditor *editor); void editor_ensure_final_newline(GeanyEditor *editor); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3804] trunk
by eht16＠users.sourceforge.net 19 May '09

19 May '09

Revision: 3804 http://geany.svn.sourceforge.net/geany/?rev=3804&view=rev Author: eht16 Date: 2009-05-19 20:17:21 +0000 (Tue, 19 May 2009) Log Message: ----------- Parse Python import statements to get symbol completion for the imported module names. Modified Paths: -------------- trunk/ChangeLog trunk/src/symbols.c trunk/tagmanager/python.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-05-19 11:21:18 UTC (rev 3803) +++ trunk/ChangeLog 2009-05-19 20:17:21 UTC (rev 3804) @@ -1,3 +1,10 @@ +2009-05-19 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/symbols.c, tagmanager/python.c: + Parse Python import statements to get symbol completion for the + imported module names. + + 2009-05-19 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/editor.c: Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2009-05-19 11:21:18 UTC (rev 3803) +++ trunk/src/symbols.c 2009-05-19 20:17:21 UTC (rev 3804) @@ -731,6 +731,7 @@ &(tv_iters.tag_member), _("Methods"), "classviewer-macro", &(tv_iters.tag_function), _("Functions"), "classviewer-method", &(tv_iters.tag_variable), _("Variables"), "classviewer-var", + &(tv_iters.tag_namespace), _("Imports"), "classviewer-namespace", NULL); /*&(tv_iters.tag_macro), _("Mixin"),*/ /*&(tv_iters.tag_variable), _("Variables"),*/ Modified: trunk/tagmanager/python.c =================================================================== --- trunk/tagmanager/python.c 2009-05-19 11:21:18 UTC (rev 3803) +++ trunk/tagmanager/python.c 2009-05-19 20:17:21 UTC (rev 3804) @@ -27,14 +27,15 @@ * DATA DEFINITIONS */ typedef enum { - K_CLASS, K_FUNCTION, K_MEMBER, K_VARIABLE + K_CLASS, K_FUNCTION, K_MEMBER, K_VARIABLE, K_IMPORT } pythonKind; static kindOption PythonKinds[] = { {TRUE, 'c', "class", "classes"}, {TRUE, 'f', "function", "functions"}, {TRUE, 'm', "member", "class members"}, - {TRUE, 'v', "variable", "variables"} + {TRUE, 'v', "variable", "variables"}, + {TRUE, 'i', "namespace", "imports"} }; static char const * const singletriple = "'''"; @@ -247,6 +248,49 @@ vStringDelete (inheritance); } +static void parseImports (const char *cp) +{ + const char *pos; + vString *name, *name_next; + + cp = skipEverything (cp); + + if ((pos = strstr (cp, "import")) == NULL) + return; + + cp = pos + 6; + + /* continue only if there is some space between the keyword and the identifier */ + if (! isspace (*cp)) + return; + + cp++; + cp = skipSpace (cp); + + name = vStringNew (); + name_next = vStringNew (); + + cp = skipEverything (cp); + while (*cp) + { + cp = parseIdentifier (cp, name); + + cp = skipEverything (cp); + /* we parse the next possible import statement as well to be able to ignore 'foo' in + * 'import foo as bar' */ + parseIdentifier (cp, name_next); + + /* take the current tag only if the next one is not "as" */ + if (strcmp (vStringValue (name_next), "as") != 0 && + strcmp (vStringValue (name), "as") != 0) + { + makeSimpleTag (name, PythonKinds, K_IMPORT); + } + } + vStringDelete (name); + vStringDelete (name_next); +} + static void parseFunction (const char *cp, vString *const def, vString *const parent, int is_class_parent) { @@ -428,18 +472,18 @@ } /* Skip type declaration that optionally follows a cdef/cpdef */ -static const char *skipTypeDecl (const char *cp, boolean *is_class) -{ +static const char *skipTypeDecl (const char *cp, boolean *is_class) +{ const char *lastStart = cp, *ptr = cp; int loopCount = 0; ptr = skipSpace(cp); - if (!strncmp("extern", ptr, 6)) { - ptr += 6; - ptr = skipSpace(ptr); + if (!strncmp("extern", ptr, 6)) { + ptr += 6; + ptr = skipSpace(ptr); if (!strncmp("from", ptr, 4)) { return NULL; } } if (!strncmp("class", ptr, 5)) { - ptr += 5 ; + ptr += 5 ; *is_class = TRUE; ptr = skipSpace(ptr); return ptr; @@ -450,7 +494,7 @@ if (!*ptr || *ptr == '=') return NULL; if (*ptr == '(') { return lastStart; /* if we stopped on a '(' we are done */ - } + } ptr = skipSpace(ptr); lastStart = ptr; while (*lastStart == '*') lastStart++; /* cdef int *identifier */ @@ -539,7 +583,7 @@ is_class = TRUE; } else if (!strncmp (keyword, "cdef ", 5)) - { + { cp = skipSpace(keyword + 4); candidate = skipTypeDecl (cp, &is_class); if (candidate) @@ -550,7 +594,7 @@ } else if (!strncmp (keyword, "cpdef ", 6)) - { + { cp = skipSpace(keyword + 5); candidate = skipTypeDecl (cp, &is_class); if (candidate) @@ -597,6 +641,8 @@ makeVariableTag (name, parent); } + /* Find and parse imports */ + parseImports(line); } /* Clean up all memory we allocated. */ vStringDelete (parent); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3803] trunk
by ntrel＠users.sourceforge.net 19 May '09

19 May '09

Revision: 3803 http://geany.svn.sourceforge.net/geany/?rev=3803&view=rev Author: ntrel Date: 2009-05-19 11:21:18 +0000 (Tue, 19 May 2009) Log Message: ----------- Drop rest of word to the right of cursor when autocompleting (do we need a pref for this?). Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-05-18 15:17:48 UTC (rev 3802) +++ trunk/ChangeLog 2009-05-19 11:21:18 UTC (rev 3803) @@ -1,3 +1,10 @@ +2009-05-19 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/editor.c: + Drop rest of word to the right of cursor when autocompleting (do we + need a pref for this?). + + 2009-05-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/sciwrappers.c, src/sciwrappers.h, src/editor.c: Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2009-05-18 15:17:48 UTC (rev 3802) +++ trunk/src/editor.c 2009-05-19 11:21:18 UTC (rev 3803) @@ -4282,6 +4282,7 @@ sci_set_caret_policy_x(sci, CARET_JUMPS | CARET_EVEN, 0); /*sci_set_caret_policy_y(sci, CARET_JUMPS | CARET_EVEN, 0);*/ SSM(sci, SCI_AUTOCSETSEPARATOR, '\n', 0); + SSM(sci, SCI_AUTOCSETDROPRESTOFWORD, TRUE, 0); SSM(sci, SCI_SETSCROLLWIDTHTRACKING, 1, 0); /* only connect signals if this is for the document notebook, not split window */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3802] trunk
by ntrel＠users.sourceforge.net 18 May '09

18 May '09

Revision: 3802 http://geany.svn.sourceforge.net/geany/?rev=3802&view=rev Author: ntrel Date: 2009-05-18 15:17:48 +0000 (Mon, 18 May 2009) Log Message: ----------- Make indenting with the Tabs indent type preserve spaces on the line, so it works for the 'tab indents, space aligns' formatting style. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/editor.c trunk/src/editor.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-05-18 15:01:21 UTC (rev 3801) +++ trunk/ChangeLog 2009-05-18 15:17:48 UTC (rev 3802) @@ -4,6 +4,9 @@ Add sci_set_selection(). * doc/geany.txt, doc/geany.html: Update manual for MRU switching. + * src/callbacks.c, src/editor.c, src/editor.h: + Make indenting with the Tabs indent type preserve spaces on the line, + so it works for the 'tab indents, space aligns' formatting style. 2009-05-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2009-05-18 15:01:21 UTC (rev 3801) +++ trunk/src/callbacks.c 2009-05-18 15:17:48 UTC (rev 3802) @@ -1713,18 +1713,6 @@ } -static void change_line_indent(GeanyEditor *editor, gboolean increase) -{ - const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); - ScintillaObject *sci = editor->sci; - gint line = sci_get_current_line(sci); - gint width = sci_get_line_indentation(sci, line); - - width += increase ? iprefs->width : -iprefs->width; - sci_set_line_indentation(sci, line, width); -} - - void on_menu_increase_indent1_activate (GtkMenuItem *menuitem, gpointer user_data) @@ -1732,14 +1720,7 @@ GeanyDocument *doc = document_get_current(); g_return_if_fail(doc != NULL); - if (sci_get_lines_selected(doc->editor->sci) > 1) - { - sci_send_command(doc->editor->sci, SCI_TAB); - } - else - { - change_line_indent(doc->editor, TRUE); - } + editor_indent(doc->editor, TRUE); } @@ -1750,14 +1731,7 @@ GeanyDocument *doc = document_get_current(); g_return_if_fail(doc != NULL); - if (sci_get_lines_selected(doc->editor->sci) > 1) - { - sci_send_command(doc->editor->sci, SCI_BACKTAB); - } - else - { - change_line_indent(doc->editor, FALSE); - } + editor_indent(doc->editor, FALSE); } Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2009-05-18 15:01:21 UTC (rev 3801) +++ trunk/src/editor.c 2009-05-18 15:17:48 UTC (rev 3802) @@ -4480,3 +4480,78 @@ editor_prefs.smart_home_key ? SCI_VCHOMEWRAP : SCI_HOMEWRAP); sci_assign_cmdkey(sci, SCK_END, SCI_LINEENDWRAP); } + + +/* This is for tab-indents, space aligns formatted code. Spaces should be preserved. */ +static void change_tab_indentation(ScintillaObject *sci, gint line, gboolean increase) +{ + gint pos = sci_get_position_from_line(sci, line); + + if (increase) + { + sci_insert_text(sci, pos, "\t"); + } + else + { + if (sci_get_char_at(sci, pos) == '\t') + { + sci_set_selection(sci, pos, pos + 1); + sci_replace_sel(sci, ""); + } + } +} + + +static void editor_change_line_indent(GeanyEditor *editor, gint line, gboolean increase) +{ + const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); + ScintillaObject *sci = editor->sci; + + if (iprefs->type == GEANY_INDENT_TYPE_TABS /* && iprefs->ignore_spaces */) + change_tab_indentation(sci, line, increase); + else + { + gint width = sci_get_line_indentation(sci, line); + + width += increase ? iprefs->width : -iprefs->width; + sci_set_line_indentation(sci, line, width); + } +} + + +void editor_indent(GeanyEditor *editor, gboolean increase) +{ + ScintillaObject *sci = editor->sci; + gint start, end; + gint line, lstart, lend; + + if (sci_get_lines_selected(sci) <= 1) + { + line = sci_get_current_line(sci); + editor_change_line_indent(editor, line, increase); + return; + } + editor_select_lines(editor, FALSE); + start = sci_get_selection_start(sci); + end = sci_get_selection_end(sci); + lstart = sci_get_line_from_position(sci, start); + lend = sci_get_line_from_position(sci, end); + + for (line = lstart; line < lend; line++) + { + editor_change_line_indent(editor, line, increase); + } + if (lend > lstart) + { + sci_set_selection_start(sci, start); + end = sci_get_position_from_line(sci, lend); + sci_set_selection_end(sci, end); + editor_select_lines(editor, FALSE); + } + else + { + sci_set_current_line(sci, lstart); + } +} + + Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2009-05-18 15:01:21 UTC (rev 3801) +++ trunk/src/editor.h 2009-05-18 15:17:48 UTC (rev 3802) @@ -195,6 +195,8 @@ void editor_insert_alternative_whitespace(GeanyEditor *editor); +void editor_indent(GeanyEditor *editor, gboolean increase); + void editor_smart_line_indentation(GeanyEditor *editor, gint pos); void editor_indentation_by_one_space(GeanyEditor *editor, gint pos, gboolean decrease); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3801] trunk
by ntrel＠users.sourceforge.net 18 May '09

18 May '09

Revision: 3801 http://geany.svn.sourceforge.net/geany/?rev=3801&view=rev Author: ntrel Date: 2009-05-18 15:01:21 +0000 (Mon, 18 May 2009) Log Message: ----------- Update manual for MRU switching. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-05-18 14:51:37 UTC (rev 3800) +++ trunk/ChangeLog 2009-05-18 15:01:21 UTC (rev 3801) @@ -2,6 +2,8 @@ * src/sciwrappers.c, src/sciwrappers.h, src/editor.c: Add sci_set_selection(). + * doc/geany.txt, doc/geany.html: + Update manual for MRU switching. 2009-05-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2009-05-18 14:51:37 UTC (rev 3800) +++ trunk/doc/geany.html 2009-05-18 15:01:21 UTC (rev 3801) @@ -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="2009-05-02" /> +<meta name="date" content="2009-05-12" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2009-05-02</td></tr> +<td>2009-05-12</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.18</td></tr> </tbody> @@ -882,6 +882,8 @@ combination to move between tabs, the order is determined by the tab order, not alphabetical as shown in the documents list (regardless of whether or not editor tabs are visible).</p> +<p>See the <em>Notebook tabs</em> group in the <a class="reference" href="#keybindings">Keybindings</a> section for useful +shortcuts including for Most-Recently-Used document switching.</p> </div> </div> <div class="section"> @@ -2664,9 +2666,9 @@ <p>The following table lists all customizable keyboard shortcuts.</p> <table border="1" class="docutils"> <colgroup> -<col width="29%" /> +<col width="28%" /> <col width="23%" /> -<col width="48%" /> +<col width="49%" /> </colgroup> <thead valign="bottom"> <tr><th class="head">Action</th> @@ -3134,7 +3136,13 @@ </tr> <tr><td>Switch to last used document</td> <td>Ctrl-Tab</td> -<td>Switches to the previously selected open document.</td> +<td>Switches to the previously shown document (if it's +still open). +Holding Ctrl (or another modifier if the keybinding +has been changed) will show a dialog, then repeated +presses of the keybinding will switch to the 2nd-last +used document, 3rd-last, etc. Also known as +Most-Recently-Used documents switching.</td> </tr> <tr><td>Move document left</td> <td>Alt-PageUp</td> @@ -4859,7 +4867,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2009-05-12 15:38 UTC. +Generated on: 2009-05-18 15:00 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 2009-05-18 14:51:37 UTC (rev 3800) +++ trunk/doc/geany.txt 2009-05-18 15:01:21 UTC (rev 3801) @@ -500,7 +500,10 @@ order, not alphabetical as shown in the documents list (regardless of whether or not editor tabs are visible). +See the *Notebook tabs* group in the `Keybindings`_ section for useful +shortcuts including for Most-Recently-Used document switching. + Character sets and Unicode Byte-Order-Mark (BOM) ------------------------------------------------ @@ -2775,7 +2778,13 @@ Switch to right document Ctrl-PageDown Switches to the next open document. -Switch to last used document Ctrl-Tab Switches to the previously selected open document. +Switch to last used document Ctrl-Tab Switches to the previously shown document (if it's + still open). + Holding Ctrl (or another modifier if the keybinding + has been changed) will show a dialog, then repeated + presses of the keybinding will switch to the 2nd-last + used document, 3rd-last, etc. Also known as + Most-Recently-Used documents switching. Move document left Alt-PageUp Changes the current document with the left hand one. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3800] trunk
by ntrel＠users.sourceforge.net 18 May '09

18 May '09

Revision: 3800 http://geany.svn.sourceforge.net/geany/?rev=3800&view=rev Author: ntrel Date: 2009-05-18 14:51:37 +0000 (Mon, 18 May 2009) Log Message: ----------- Add sci_set_selection(). Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c trunk/src/sciwrappers.c trunk/src/sciwrappers.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-05-17 17:49:18 UTC (rev 3799) +++ trunk/ChangeLog 2009-05-18 14:51:37 UTC (rev 3800) @@ -1,3 +1,9 @@ +2009-05-18 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/sciwrappers.c, src/sciwrappers.h, src/editor.c: + Add sci_set_selection(). + + 2009-05-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * tagmanager/python.c: Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2009-05-17 17:49:18 UTC (rev 3799) +++ trunk/src/editor.c 2009-05-18 14:51:37 UTC (rev 3800) @@ -2163,7 +2163,7 @@ sci_replace_sel(sci, to_insert); if (ch == '>') { - SSM(sci, SCI_SETSEL, pos, pos); + sci_set_selection(sci, pos, pos); if (utils_str_equal(tag_name, "table")) auto_table(editor, pos); } @@ -2495,7 +2495,7 @@ continue; } - SSM(editor->sci, SCI_SETSEL, line_start + x, line_start + x + co_len); + sci_set_selection(editor->sci, line_start + x, line_start + x + co_len); sci_replace_sel(editor->sci, ""); count++; } @@ -3387,7 +3387,7 @@ return; } - SSM(editor->sci, SCI_SETSEL, start, end); + sci_set_selection(editor->sci, start, end); } @@ -3414,7 +3414,7 @@ line = sci_get_line_from_position(editor->sci, end); end = sci_get_position_from_line(editor->sci, line + 1); - SSM(editor->sci, SCI_SETSEL, start, end); + sci_set_selection(editor->sci, start, end); } @@ -3490,7 +3490,7 @@ line_found = find_paragraph_stop(editor, line_start, DOWN); pos_end = SSM(editor->sci, SCI_POSITIONFROMLINE, line_found, 0); - SSM(editor->sci, SCI_SETSEL, pos_start, pos_end); + sci_set_selection(editor->sci, pos_start, pos_end); } @@ -3515,7 +3515,7 @@ sel_end = SSM(editor->sci, SCI_GETLINEINDENTPOSITION, i, 0); if (sel_start < sel_end) { - SSM(editor->sci, SCI_SETSEL, sel_start, sel_end); + sci_set_selection(editor->sci, sel_start, sel_end); sci_replace_sel(editor->sci, ""); } sci_insert_text(editor->sci, sel_start, indent); @@ -3601,7 +3601,7 @@ if (sci_get_char_at(editor->sci, indentation_end) == ' ') { - SSM(editor->sci, SCI_SETSEL, indentation_end, indentation_end + 1); + sci_set_selection(editor->sci, indentation_end, indentation_end + 1); sci_replace_sel(editor->sci, ""); count--; if (i == first_line) Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2009-05-17 17:49:18 UTC (rev 3799) +++ trunk/src/sciwrappers.c 2009-05-18 14:51:37 UTC (rev 3800) @@ -400,6 +400,12 @@ } +void sci_set_selection(ScintillaObject *sci, gint anchorPos, gint currentPos) +{ + SSM(sci, SCI_SETSEL, anchorPos, currentPos); +} + + gint sci_get_line_end_position(ScintillaObject* sci, gint line) { return SSM(sci, SCI_GETLINEENDPOSITION, line, 0); Modified: trunk/src/sciwrappers.h =================================================================== --- trunk/src/sciwrappers.h 2009-05-17 17:49:18 UTC (rev 3799) +++ trunk/src/sciwrappers.h 2009-05-18 14:51:37 UTC (rev 3800) @@ -78,6 +78,7 @@ gint sci_get_pos_at_line_sel_end (ScintillaObject* sci, gint line); void sci_set_selection_start (ScintillaObject* sci, gint position); void sci_set_selection_end (ScintillaObject* sci, gint position); +void sci_set_selection (ScintillaObject *sci, gint anchorPos, gint currentPos); gint sci_get_length (ScintillaObject* sci); void sci_get_text (ScintillaObject* sci,gint len,gchar* text); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3799] trunk/src/search.c
by eht16＠users.sourceforge.net 17 May '09

17 May '09

Revision: 3799 http://geany.svn.sourceforge.net/geany/?rev=3799&view=rev Author: eht16 Date: 2009-05-17 17:49:18 +0000 (Sun, 17 May 2009) Log Message: ----------- Remember also whether to use the extra grep options (got lost in the last commit, oops). Modified Paths: -------------- trunk/src/search.c Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2009-05-17 17:16:39 UTC (rev 3798) +++ trunk/src/search.c 2009-05-17 17:49:18 UTC (rev 3799) @@ -87,8 +87,9 @@ gboolean fif_match_whole_word; gboolean fif_invert_results; gboolean fif_recursive; + gboolean fif_use_extra_options; } -settings = {0, NULL, FALSE, FALSE, FALSE, FALSE}; +settings = {0, NULL, FALSE, FALSE, FALSE, FALSE, FALSE}; static GeanyPrefGroup *fif_prefs = NULL; @@ -183,6 +184,8 @@ "fif_invert_results", FALSE, "check_invert"); stash_group_add_toggle_button(group, &settings.fif_recursive, "fif_recursive", FALSE, "check_recursive"); + stash_group_add_toggle_button(group, &settings.fif_use_extra_options, + "fif_use_extra_options", FALSE, "check_extra"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3798] trunk
by eht16＠users.sourceforge.net 17 May '09

17 May '09

Revision: 3798 http://geany.svn.sourceforge.net/geany/?rev=3798&view=rev Author: eht16 Date: 2009-05-17 17:16:39 +0000 (Sun, 17 May 2009) Log Message: ----------- Backport change from CTags SVN to keep the parser more in sync: Add support for Cython constructs to the Python parser. Modified Paths: -------------- trunk/ChangeLog trunk/tagmanager/python.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-05-17 17:16:24 UTC (rev 3797) +++ trunk/ChangeLog 2009-05-17 17:16:39 UTC (rev 3798) @@ -3,6 +3,8 @@ * tagmanager/python.c: Fix missing symbols for variables when an equal sign is used in a comment on the same line as the variable declaration. + Backport change from CTags SVN to keep the parser more in sync: + Add support for Cython constructs to the Python parser. * src/search.c: Remember the additional Find in Files search flags at startup. * src/dialogs.c: Modified: trunk/tagmanager/python.c =================================================================== --- trunk/tagmanager/python.c 2009-05-17 17:16:24 UTC (rev 3797) +++ trunk/tagmanager/python.c 2009-05-17 17:16:39 UTC (rev 3798) @@ -188,7 +188,8 @@ while (*cp) { cp = skipEverything (cp); - if (!strncmp(cp, "def", 3) || !strncmp(cp, "class", 5)) + if (!strncmp(cp, "def", 3) || !strncmp(cp, "class", 5) || + !strncmp(cp, "cdef", 4) || !strncmp(cp, "cpdef", 5)) { return cp; } @@ -426,6 +427,37 @@ return start; } +/* Skip type declaration that optionally follows a cdef/cpdef */ +static const char *skipTypeDecl (const char *cp, boolean *is_class) +{ + const char *lastStart = cp, *ptr = cp; + int loopCount = 0; + ptr = skipSpace(cp); + if (!strncmp("extern", ptr, 6)) { + ptr += 6; + ptr = skipSpace(ptr); + if (!strncmp("from", ptr, 4)) { return NULL; } + } + if (!strncmp("class", ptr, 5)) { + ptr += 5 ; + *is_class = TRUE; + ptr = skipSpace(ptr); + return ptr; + } + /* limit so that we don't pick off "int item=obj()" */ + while (*ptr && loopCount++ < 2) { + while (*ptr && *ptr != '=' && *ptr != '(' && !isspace(*ptr)) ptr++; + if (!*ptr || *ptr == '=') return NULL; + if (*ptr == '(') { + return lastStart; /* if we stopped on a '(' we are done */ + } + ptr = skipSpace(ptr); + lastStart = ptr; + while (*lastStart == '*') lastStart++; /* cdef int *identifier */ + } + return NULL; +} + static void findPythonTags (void) { vString *const continuation = vStringNew (); @@ -440,7 +472,7 @@ while ((line = (const char *) fileReadLine ()) != NULL) { - const char *cp = line; + const char *cp = line, *candidate; char const *longstring; char const *keyword, *variable; int indent; @@ -506,7 +538,28 @@ found = TRUE; is_class = TRUE; } + else if (!strncmp (keyword, "cdef ", 5)) + { + cp = skipSpace(keyword + 4); + candidate = skipTypeDecl (cp, &is_class); + if (candidate) + { + found = TRUE; + cp = candidate; + } + } + else if (!strncmp (keyword, "cpdef ", 6)) + { + cp = skipSpace(keyword + 5); + candidate = skipTypeDecl (cp, &is_class); + if (candidate) + { + found = TRUE; + cp = candidate; + } + } + if (found) { boolean is_parent_class; @@ -554,7 +607,7 @@ extern parserDefinition *PythonParser (void) { - static const char *const extensions[] = { "py", "pyx", "pxd", "scons", "python", NULL }; + static const char *const extensions[] = { "py", "pyx", "pxd", "pxi" ,"scons", NULL }; parserDefinition *def = parserNew ("Python"); def->kinds = PythonKinds; def->kindCount = KIND_COUNT (PythonKinds); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2009