Commits January 2009

commits@lists.geany.org

3 participants
98 discussions

SF.net SVN: geany:[3461] trunk
by eht16＠users.sourceforge.net 12 Jan '09

12 Jan '09

Revision: 3461 http://geany.svn.sourceforge.net/geany/?rev=3461&view=rev Author: eht16 Date: 2009-01-11 21:05:03 +0000 (Sun, 11 Jan 2009) Log Message: ----------- Support multiple %cursor% wildcards in Snippets. To switch between %cursor% wildcards, use the new keybinding 'Move cursor in snippet' (patch by Thomas Martitz, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/THANKS trunk/data/snippets.conf trunk/doc/geany.html trunk/doc/geany.txt trunk/po/POTFILES.in trunk/src/Makefile.am trunk/src/about.c trunk/src/editor.c trunk/src/editor.h trunk/src/keybindings.c trunk/src/keybindings.h trunk/src/makefile.win32 trunk/src/plugindata.h trunk/src/utils.c trunk/src/utils.h trunk/wscript Added Paths: ----------- trunk/src/queue.c trunk/src/queue.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-11 18:29:39 UTC (rev 3460) +++ trunk/ChangeLog 2009-01-11 21:05:03 UTC (rev 3461) @@ -9,6 +9,13 @@ src/symbols.c, tagmanager/read.h: Fix several compiler warnings and build errors (patch by Daniel Richard G., thanks). + * data/snippets.conf, doc/geany.html, doc/geany.txt, src/editor.c, + src/editor.h, src/keybindings.c, src/keybindings.h, src/Makefile.am, + src/makefile.win32, src/plugindata.h, src/utils.c, src/utils.h, + src/about.c, src/queue.c, src/queue.h, THANKS, wscript: + Support multiple %cursor% wildcards in Snippets. To switch between + %cursor% wildcards, use the new keybinding 'Move cursor in snippet' + (patch by Thomas Martitz, thanks). 2009-01-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/THANKS =================================================================== --- trunk/THANKS 2009-01-11 18:29:39 UTC (rev 3460) +++ trunk/THANKS 2009-01-11 21:05:03 UTC (rev 3461) @@ -59,6 +59,7 @@ Guillaume de Rorthais <ioguix(at)free(dot)fr> - Auto-close brackets/braces/quotes patch Tyler Mulligan <tyler(at)doknowevil(dot)net> - Close All toolbar icon Philipp Gildein <philipp(at)gildein(dot)com> - Ada filetype patch +Thomas Martitz <thomas47(at)arcor(dot)de> - Multiple %cursor% wildcards in Snippets patch Translators: ------------ Modified: trunk/data/snippets.conf =================================================================== --- trunk/data/snippets.conf 2009-01-11 18:29:39 UTC (rev 3460) +++ trunk/data/snippets.conf 2009-01-11 21:05:03 UTC (rev 3461) @@ -3,9 +3,11 @@ # use \n or %newline% for a new line (it will be replaced by the used EOL char(s) - LF, CR/LF, CR). # use \t or %ws% for an indentation step, it will be replaced according to the current document's indent mode. # use \s to force whitespace at beginning or end of a value ('key= value' won't work, use 'key=\svalue'). -# use %cursor% to define where the cursor should be placed after completion. # use %key% for all keys defined in the [Special] section. -# you can define a section for each supported filetype to overwrite default settings, the section +# use %cursor% to define where the cursor should be placed after completion. You can define multiple +# %cursor% wildcards and use the "Move cursor in snippet" to jump to the next defined cursor +# position in the completed snippet. +# You can define a section for each supported filetype to overwrite default settings, the section # name must match exactly the internal filetype name, run 'geany --ft-names' for a full list. # # Additionally, you can use most of the template wildcards like {developer} or {date} in the snippets. @@ -18,13 +20,13 @@ # Default is used for all filetypes and keys can be overwritten by [filetype] sections [Default] -if=if (%cursor%)%brace_open%\n%brace_close% -else=else%brace_open%%cursor%\n%brace_close% -for=for (i = 0; i < %cursor%; i++)%brace_open%\n%brace_close% -while=while (%cursor%)%brace_open%\n%brace_close% -do=do%brace_open%%cursor%\n%brace_close% while () -switch=switch (%cursor%)%brace_open%case : break;\n%ws%default: \n%brace_close% -try=try%block_cursor%catch ()%block% +if=if (%cursor%)%block_cursor% +else=else%block_cursor% +for=for (i = 0; i < %cursor%; i++)%block_cursor% +while=while (%cursor%)%block_cursor% +do=do\n{%n%%cursor%\n} while(%cursor%)\n%cursor% +switch=switch (%cursor%)%brace_open%case %cursor%:%n%\t%cursor%%n%break;\n%ws%default:%n%\t%cursor%\n%brace_close%%cursor% +try=try%block%\ncatch (%cursor%)%block_cursor% # special keys to be used in other snippets, cannot be used "standalone" # can be used by %key%, e.g. %brace_open% @@ -34,8 +36,8 @@ [Special] brace_open=\n{\n\t brace_close=}\n -block=\n{\n\t\n}\n -block_cursor=\n{\n\t%cursor%\n}\n +block=\n{\n\t%cursor%\n} +block_cursor=\n{\n\t%cursor%\n}\n%cursor% #wordchars=_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 [C++] Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2009-01-11 18:29:39 UTC (rev 3460) +++ trunk/doc/geany.html 2009-01-11 21:05:03 UTC (rev 3461) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.5: 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="2009-01-04" /> <style type="text/css"> /* @@ -139,7 +139,7 @@ Nick Treleaven Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>$Date$</td></tr> +<td>2009-01-04</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.16</td></tr> </tbody> @@ -1131,7 +1131,10 @@ </tr> <tr><td>%cursor%</td> <td>Place the cursor at this position after completion has -been done.</td> +been done. You can define multiple %cursor% wildcards +and use the keybinding <tt class="docutils literal">Move cursor in snippet</tt> to jump +to the next defined cursor position in the completed +snippet.</td> </tr> <tr><td>%...%</td> <td>"..." means the name of a key in the "Special" section. @@ -1152,7 +1155,8 @@ </pre> Every time you write <tt class="docutils literal">myname</tt> <TAB> in Geany, it will replace "myname" with "Enrico Tröger". The key to start auto completion can be changed -in the preferences dialog, by default it is TAB. +in the preferences dialog, by default it is TAB. The corresponding keybinding +is called <tt class="docutils literal">Complete snippet</tt>. Since Geany 0.15 you can also use most of the available templates wildcards listed in <a class="reference internal" href="#template-wildcards">Template wildcards</a>. All wildcards which are listed as <cite>available in snippets</cite> can be used. For instance to improve the above example: @@ -2588,6 +2592,12 @@ argument. See the section called <a class="reference internal" href="#context-actions">Context actions</a>.</td> </tr> +<tr><td>Move cursor in snippet</td> +<td> </td> +<td>Jumps to the next defined cursor positions in a +completed snippets if multiple cursor positions +where defined.</td> +</tr> <tr><td>Clipboard</td> <td> </td> <td> </td> @@ -4559,7 +4569,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference external" href="geany.txt">View document source</a>. -Generated on: 2009-01-04 18:12 UTC. +Generated on: 2009-01-11 20:50 UTC. Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2009-01-11 18:29:39 UTC (rev 3460) +++ trunk/doc/geany.txt 2009-01-11 21:05:03 UTC (rev 3461) @@ -806,7 +806,10 @@ ('key= value' won't work, use 'key=\\svalue') %cursor% Place the cursor at this position after completion has - been done. + been done. You can define multiple %cursor% wildcards + and use the keybinding ``Move cursor in snippet`` to jump + to the next defined cursor position in the completed + snippet. %...% "..." means the name of a key in the "Special" section. If you have defined a key "brace_open" in the "Special" @@ -826,7 +829,8 @@ Every time you write ``myname`` <TAB> in Geany, it will replace "myname" with "Enrico Tröger". The key to start auto completion can be changed -in the preferences dialog, by default it is TAB. +in the preferences dialog, by default it is TAB. The corresponding keybinding +is called ``Complete snippet``. Since Geany 0.15 you can also use most of the available templates wildcards listed in `Template wildcards`_. All wildcards which are listed as @@ -2377,6 +2381,10 @@ argument. See the section called `Context actions`_. +Move cursor in snippet Jumps to the next defined cursor positions in a + completed snippets if multiple cursor positions + where defined. + **Clipboard** Cut Ctrl-X Cut the current selection to the clipboard. Modified: trunk/po/POTFILES.in =================================================================== --- trunk/po/POTFILES.in 2009-01-11 18:29:39 UTC (rev 3460) +++ trunk/po/POTFILES.in 2009-01-11 21:05:03 UTC (rev 3461) @@ -26,6 +26,7 @@ src/prefs.c src/printing.c src/project.c +src/queue.c src/sciwrappers.c src/search.c src/socket.c Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2009-01-11 18:29:39 UTC (rev 3460) +++ trunk/src/Makefile.am 2009-01-11 21:05:03 UTC (rev 3461) @@ -34,6 +34,7 @@ prefs.c prefs.h \ printing.c printing.h \ project.c project.h \ + queue.c queue.h \ sciwrappers.c sciwrappers.h \ search.c search.h \ socket.c socket.h \ Modified: trunk/src/about.c =================================================================== --- trunk/src/about.c 2009-01-11 18:29:39 UTC (rev 3460) +++ trunk/src/about.c 2009-01-11 21:05:03 UTC (rev 3461) @@ -83,8 +83,8 @@ "Giuseppe Torelli, Guillaume de Rorthais, Guillaume Hoffmann, Herbert Voss, Jason Oster, Jean-François Wauthy, Jeff Pohlmeyer, " "John Gabriele, Josef Whiter, Kevin Ellwood, Kristoffer A. Tjernås, Marko Peric, Matti Mårds, Moritz Barsnick, " "Peter Strand, Philipp Gildein, Pierre Joye, Rob van der Linde, Robert McGinley, Roland Baudin, S Jagannathan, Saleem Abdulrasool, " -"Sebastian Kraft, Shiv, Slava Semushin, Stefan Oltmanns, Tamim, Tomás Vírseda, Tyler Mulligan, Walery Studennikov, " -"Yura Siamashka"; +"Sebastian Kraft, Shiv, Slava Semushin, Stefan Oltmanns, Tamim, Thomas Martitz, Tomás Vírseda, " +"Tyler Mulligan, Walery Studennikov, Yura Siamashka"; static void header_eventbox_style_set(GtkWidget *widget); Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2009-01-11 18:29:39 UTC (rev 3460) +++ trunk/src/editor.c 2009-01-11 21:05:03 UTC (rev 3461) @@ -58,12 +58,16 @@ #include "keybindings.h" #include "project.h" #include "projectprivate.h" +#include "queue.h" /* Note: Avoid using SSM in files not related to scintilla, use sciwrappers.h instead. */ #define SSM(s, m, w, l) scintilla_send_message(s, m, w, l) +static GeanyQueue *snippet_queue = NULL; +static gint snippet_cursor_insert_pos; + /* holds word under the mouse or keyboard cursor */ static gchar current_word[GEANY_MAX_WORD_LENGTH]; @@ -96,9 +100,10 @@ static void close_block(GeanyEditor *editor, gint pos); -void editor_snippets_free() +void editor_snippets_free(void) { g_hash_table_destroy(editor_prefs.snippets); + queue_destroy(snippet_queue); } @@ -113,6 +118,8 @@ GKeyFile *userconfig = g_key_file_new(); GHashTable *tmp; + snippet_queue = queue_init(); + sysconfigfile = g_strconcat(app->datadir, G_DIR_SEPARATOR_S, "snippets.conf", NULL); userconfigfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "snippets.conf", NULL); @@ -1800,12 +1807,15 @@ * @param cursor_index If >= 0, the index into @a text to place the cursor. * @param newline_indent_size Indentation size (in spaces) to insert for each newline; use * -1 to read the indent size from the line with @a insert_pos on it. + * @param replace_newlines Whether to replace newlines in text or not. If + * newlines have been replaced before, this should be false, to avoid multiple + * replacements of newlines, which is error prone on Windows. * @warning Make sure all \t tab chars in @a text are intended as indent widths, * NOT any hard tabs (you get those when copying document text with the Tabs * & Spaces indent mode set). * @note This doesn't scroll the cursor in view afterwards. */ static void editor_insert_text_block(GeanyEditor *editor, const gchar *text, gint insert_pos, - gint cursor_index, gint newline_indent_size) + gint cursor_index, gint newline_indent_size, gboolean replace_newlines) { ScintillaObject *sci = editor->sci; gint line_start = sci_get_line_from_position(sci, insert_pos); @@ -1835,7 +1845,8 @@ } /* transform line endings */ - utils_string_replace_all(buf, "\n", editor_get_eol_char(editor)); + if (replace_newlines) + utils_string_replace_all(buf, "\n", editor_get_eol_char(editor)); /* transform tabs into indent widths (in spaces) */ whitespace = g_strnfill(editor_get_indent_prefs(editor)->width, ' '); @@ -1857,24 +1868,47 @@ /* fixup indentation (very useful for Tabs & Spaces indent type) */ line_end = sci_get_line_from_position(sci, insert_pos + buf->len); fix_line_indents(editor, line_start, line_end); + snippet_cursor_insert_pos = sci_get_current_position(sci); g_string_free(buf, TRUE); } +/* Move the cursor to the next specified cursor position in an inserted snippet. + * Can, and should, be optimized to give better results */ +void snippet_goto_next_cursor(ScintillaObject *sci, gint current_pos) +{ + if (snippet_queue) + { + gpointer offset; + + snippet_queue = queue_delete(snippet_queue, &offset, FALSE); + if (current_pos > snippet_cursor_insert_pos) + snippet_cursor_insert_pos = GPOINTER_TO_INT(offset) + current_pos; + else + snippet_cursor_insert_pos += GPOINTER_TO_INT(offset); + + sci_set_current_position(sci, snippet_cursor_insert_pos, FALSE); + } +} + + static gboolean snippets_complete_constructs(GeanyEditor *editor, gint pos, const gchar *word) { + ScintillaObject *sci = editor->sci; gchar *str, *whitespace; GString *pattern; - gint step, str_len; - gsize cur_index; + gint i, str_len, tmp_pos, whitespace_len, nl_count = 0; + gssize cur_index = -1; gint ft_id = FILETYPE_ID(editor->document->file_type); GHashTable *specials; - ScintillaObject *sci = editor->sci; + GeanyQueue *temp_list; + const GeanyIndentPrefs *iprefs; + gsize indent_size; + gint cursor_steps, old_cursor = 0; str = g_strdup(word); g_strstrip(str); - pattern = g_string_new(snippets_find_completion_by_name(filetypes[ft_id]->name, str)); if (pattern == NULL || pattern->len == 0) { @@ -1883,6 +1917,11 @@ return FALSE; } + temp_list = queue_init(); + iprefs = editor_get_indent_prefs(editor); + read_indent(editor, pos); + indent_size = strlen(indent); + /* remove the typed word, it will be added again by the used auto completion * (not really necessary but this makes the auto completion more flexible, * e.g. with a completion like hi=hello, so typing "hi<TAB>" will result in "hello") */ @@ -1905,25 +1944,71 @@ snippets_replace_wildcards(editor, pattern); /* transform other wildcards */ - utils_string_replace_all(pattern, "%newline%", editor_get_eol_char(editor)); + /* convert to %newlines%, else we get endless loops */ + utils_string_replace_all(pattern, "\n", "%newline%"); - /* use spaces for indentation, will be fixed up */ - whitespace = g_strnfill(editor_get_indent_prefs(editor)->width, ' '); - utils_string_replace_all(pattern, "%ws%", whitespace); - g_free(whitespace); + /* if spaces are used, replaces all tabs with %ws%, which is later replaced + * by real whitespace characters + * otherwise replace all %ws% by \t, which will be replaced later by tab + * characters, + * this makes seperating between tab and spaces intentation pretty easy */ + if (iprefs->type == GEANY_INDENT_TYPE_SPACES) + utils_string_replace_all(pattern, "\t", "%ws%"); + else + utils_string_replace_all(pattern, "%ws%", "\t"); - /* find the %cursor% pos (has to be done after all other operations) */ - step = utils_strpos(pattern->str, "%cursor%"); - if (step != -1) - utils_string_replace_all(pattern, "%cursor%", ""); + whitespace = g_strnfill(iprefs->width, ' '); /* use spaces for indentation, will be fixed up */ + whitespace_len = strlen(whitespace); + i = 0; + while ((cursor_steps = utils_strpos(pattern->str, "%cursor%")) >= 0) + { + /* replace every %newline% (up to next %cursor%) with EOL, + * and update cursor_steps after */ + while ((tmp_pos = utils_strpos(pattern->str, "%newline%")) < cursor_steps && tmp_pos != -1) + { + nl_count++; + utils_string_replace_first(pattern, "%newline%", editor_get_eol_char(editor)); + cursor_steps = utils_strpos(pattern->str, "%cursor%"); + } + /* replace every %ws% (up to next %cursor%) with whitespaces, + * and update cursor_steps after */ + while ((tmp_pos = utils_strpos(pattern->str, "%ws%")) < cursor_steps && tmp_pos != -1) + { + utils_string_replace_first(pattern, "%ws%", whitespace); + cursor_steps = utils_strpos(pattern->str, "%cursor%"); + } + /* finally replace the next %cursor% */ + utils_string_replace_first(pattern, "%cursor%", ""); - /* finally insert the text and set the cursor */ - if (step != -1) - cur_index = step; - else + /* modify cursor_steps to take indentation count and type into account */ + + /* We're saving the relative offset to each cursor position in a simple + * linked list, including intendations between them. */ + if (i++ > 0) + { + cursor_steps += (nl_count * indent_size); + queue_append(temp_list, GINT_TO_POINTER(cursor_steps - old_cursor)); + } + else + { + nl_count = 0; + cur_index = cursor_steps; + } + old_cursor = cursor_steps; + } + /* replace remaining %ws% and %newline% which may occur after the last %cursor% */ + utils_string_replace_all(pattern, "%newline%", editor_get_eol_char(editor)); + utils_string_replace_all(pattern, "%ws", whitespace); + g_free(whitespace); + /* We create a new list, where the cursor positions for the most recent + * parsed snipped come first, followed by the remaining positions */ + if (temp_list->data) + snippet_queue = queue_concat_copy(temp_list, snippet_queue); + if (cur_index < 0) cur_index = pattern->len; - editor_insert_text_block(editor, pattern->str, pos, cur_index, -1); + /* finally insert the text and set the cursor */ + editor_insert_text_block(editor, pattern->str, pos, cur_index, -1, FALSE); sci_scroll_caret(sci); g_free(str); @@ -2169,7 +2254,7 @@ indent_str, "</tr>\n", NULL); editor_insert_text_block(editor, table, pos, -1, - count_indent_size(editor, indent)); + count_indent_size(editor, indent), TRUE); g_free(table); } Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2009-01-11 18:29:39 UTC (rev 3460) +++ trunk/src/editor.h 2009-01-11 21:05:03 UTC (rev 3461) @@ -167,6 +167,8 @@ gboolean editor_start_auto_complete(GeanyEditor *editor, gint pos, gboolean force); +void snippet_goto_next_cursor(ScintillaObject *sci, gint current_pos); + gboolean editor_complete_snippet(GeanyEditor *editor, gint pos); void editor_auto_latex(GeanyEditor *editor, gint pos); Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2009-01-11 18:29:39 UTC (rev 3460) +++ trunk/src/keybindings.c 2009-01-11 21:05:03 UTC (rev 3461) @@ -242,6 +242,8 @@ GDK_Down, GDK_MOD1_MASK, "edit_scrolllinedown", _("Scroll down the view by one line"), NULL); keybindings_set_item(group, GEANY_KEYS_EDITOR_COMPLETESNIPPET, NULL, /* handled specially in check_snippet_completion() */ GDK_Tab, 0, "edit_completesnippet", _("Complete snippet"), NULL); + keybindings_set_item(group, GEANY_KEYS_EDITOR_SNIPPET_NEXT_CURSOR, cb_func_editor_action, + 0, 0, "move_snippetnextcursor", _("Move cursor in snippet"), NULL); keybindings_set_item(group, GEANY_KEYS_EDITOR_SUPPRESSSNIPPETCOMPLETION, cb_func_editor_action, 0, 0, "edit_suppresssnippetcompletion", _("Suppress snippet completion"), NULL); keybindings_set_item(group, GEANY_KEYS_EDITOR_CONTEXTACTION, cb_func_editor_action, @@ -1725,6 +1727,10 @@ case GEANY_KEYS_EDITOR_DUPLICATELINE: duplicate_lines(doc->editor); break; + case GEANY_KEYS_EDITOR_SNIPPET_NEXT_CURSOR: + snippet_goto_next_cursor(doc->editor->sci, + sci_get_current_position(doc->editor->sci)); + break; case GEANY_KEYS_EDITOR_DELETELINE: delete_lines(doc->editor); break; Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2009-01-11 18:29:39 UTC (rev 3460) +++ trunk/src/keybindings.h 2009-01-11 21:05:03 UTC (rev 3461) @@ -139,6 +139,7 @@ GEANY_KEYS_EDITOR_AUTOCOMPLETE, GEANY_KEYS_EDITOR_CALLTIP, GEANY_KEYS_EDITOR_MACROLIST, + GEANY_KEYS_EDITOR_SNIPPET_NEXT_CURSOR, GEANY_KEYS_EDITOR_COUNT }; Modified: trunk/src/makefile.win32 =================================================================== --- trunk/src/makefile.win32 2009-01-11 18:29:39 UTC (rev 3460) +++ trunk/src/makefile.win32 2009-01-11 21:05:03 UTC (rev 3461) @@ -64,7 +64,7 @@ geanyentryaction.o geanymenubuttonaction.o geanyobject.o geanywraplabel.o highlighting.o \ interface.o keybindings.o keyfile.o \ log.o main.o msgwindow.o navqueue.o notebook.o plugins.o prefs.o printing.o project.o \ - sciwrappers.o search.o socket.o stash.o \ + queue.o sciwrappers.o search.o socket.o stash.o \ symbols.o templates.o toolbar.o tools.o treeviews.o \ ui_utils.o utils.o win32.o Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2009-01-11 18:29:39 UTC (rev 3460) +++ trunk/src/plugindata.h 2009-01-11 21:05:03 UTC (rev 3461) @@ -45,7 +45,7 @@ enum { /** The Application Programming Interface (API) version, incremented * whenever any plugin data types are modified or appended to. */ - GEANY_API_VERSION = 123, + GEANY_API_VERSION = 124, /** The Application Binary Interface (ABI) version, incremented whenever * existing fields in the plugin data types have to be changed or reordered. */ @@ -329,7 +329,7 @@ typedef struct UtilsFuncs { gboolean (*str_equal) (const gchar *a, const gchar *b); - gboolean (*string_replace_all) (GString *haystack, const gchar *needle, + guint (*string_replace_all) (GString *haystack, const gchar *needle, const gchar *replacement); GSList* (*get_file_list) (const gchar *path, guint *length, GError **error); gint (*write_file) (const gchar *filename, const gchar *text); Added: trunk/src/queue.c =================================================================== --- trunk/src/queue.c (rev 0) +++ trunk/src/queue.c 2009-01-11 21:05:03 UTC (rev 3461) @@ -0,0 +1,141 @@ +/* + * queue.c - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2009 kugel. aka Thomas Martitz <thomas47(at)arcor(dot)de> + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * $Id$ + */ + +/* + * This provides a simple single linked list, with some functons to modify it. + * Being a queue, you can append data only to the end of the list, end retrieve + * data from the beginning. Only the first node is directly visible, but with the several foreach + * functions you can iterate through the entire list. + */ + + +#include "geany.h" + +#include <stdio.h> +#include <stdlib.h> +#include "queue.h" + + +/* Allocates memory for queue_start, and sets next and data members to NULL */ +GeanyQueue *queue_init(void) +{ + return g_new0(GeanyQueue, 1); +} + + +/* Returns true if q_node is the last node in a queue */ +static gboolean queue_is_last_node(const GeanyQueue *q_node) +{ + return (q_node->next == NULL); +} + + +/* Appends a data in a new node at the end of the lst */ +void queue_append(GeanyQueue *queue_start, gpointer data) +{ + GeanyQueue *temp, *next; + + if (queue_start == NULL || data == NULL) + return; + + if (queue_start->data == NULL) + { + queue_start->data = data; + return; + } + + temp = g_new0(GeanyQueue, 1); + temp->data = data; + temp->next = NULL; + + next = queue_start; + while (! queue_is_last_node(next)) + next = next->next; + next->next = temp; +} + + +/* Removes and frees the first node in queue_start, and writes the data of the + * removed node into data. + * Returns a pointer to the new first item */ +GeanyQueue *queue_delete(GeanyQueue *queue_start, gpointer *data, const gboolean free_data) +{ + GeanyQueue *ret; + + if (NULL == queue_start) + return NULL; + + if (data != NULL) + *data = queue_start->data; + + if (free_data) + g_free(queue_start->data); + + ret = queue_start->next; + g_free(queue_start); + + return ret; +} + + +/* Removes and frees the entire queue staring at queue_start */ +void queue_destroy(GeanyQueue *queue_start) +{ + while ((queue_start = queue_delete(queue_start, NULL, FALSE))); +} + +typedef void (*ForeachFunc) (GeanyQueue *queue_start, gpointer data); + +/* Iterates through param, and calls func with the node queue_start and each node in param */ +static void queue_foreach_data_2(GeanyQueue *queue_start, ForeachFunc func, GeanyQueue *param) +{ + GeanyQueue *temp = param; + + if (!queue_start || !param) + return; + + do + { + (*func) (queue_start, (temp->data)); + } + while ((temp = temp->next)); +} + + +/* Copies the data of each node in q1, then the data of each node in q2 to a newly + * created queue, using queue_append. Frees q1 and q2. + * Returns a pointer to the created queue. */ +GeanyQueue *queue_concat_copy(GeanyQueue *q1, GeanyQueue *q2) +{ + /* q1 + q2 = q3 * + * ->1->2 + ->4->5->6 = 4->5->6->1->2 */ + GeanyQueue *ret = queue_init(); + + queue_foreach_data_2(ret, queue_append, q1); + queue_foreach_data_2(ret, queue_append, q2); + + queue_destroy(q1); + queue_destroy(q2); + + return ret; +} + Property changes on: trunk/src/queue.c ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/src/queue.h =================================================================== --- trunk/src/queue.h (rev 0) +++ trunk/src/queue.h 2009-01-11 21:05:03 UTC (rev 3461) @@ -0,0 +1,45 @@ +/* + * queue.h - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2009 kugel. aka Thomas Martitz <thomas47(at)arcor(dot)de> + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * $Id$ + */ + +#ifndef __QUEUE_H__ +#define __QUEUE_H__ + + +typedef struct _GeanyQueue +{ + gpointer data; + struct _GeanyQueue *next; +} GeanyQueue; + + +GeanyQueue *queue_init(void); + +void queue_append(GeanyQueue *queue_start, gpointer data); + +GeanyQueue *queue_delete(GeanyQueue *queue_start, gpointer *data, const gboolean free_data); + +GeanyQueue *queue_concat_copy(GeanyQueue *q1, GeanyQueue *q2); + +void queue_destroy(GeanyQueue *queue_start); + + +#endif /* __QUEUE_H__ */ Property changes on: trunk/src/queue.h ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2009-01-11 18:29:39 UTC (rev 3460) +++ trunk/src/utils.c 2009-01-11 21:05:03 UTC (rev 3461) @@ -1355,6 +1355,41 @@ } +static guint utils_string_replace_helper(GString *haystack, const gchar *needle, + const gchar *replace, const guint max_replaces) +{ + const gchar *stack, *match; + guint ret = 0; + gssize pos; + + if (haystack->len == 0) + return FALSE; + g_return_val_if_fail(NZV(needle), 0); + + stack = haystack->str; + if (! (match = strstr(stack, needle))) + return 0; + do + { + pos = match - haystack->str; + g_string_erase(haystack, pos, strlen(needle)); + + /* make next search after removed matching text. + * (we have to be careful to only use haystack->str as its address may change) */ + stack = haystack->str + pos; + + if (replace) + { + g_string_insert(haystack, pos, replace); + stack = haystack->str + pos + strlen(replace); /* skip past replacement */ + } + } + while (++ret != max_replaces && (match = strstr(stack, needle))); + + return ret; +} + + /** * Replaces all occurrences of @c needle in @c haystack with @c replace. * As of Geany 0.16, @a replace can match @a needle, so the following will work: @@ -1364,40 +1399,28 @@ * @param needle The string which should be replaced. * @param replace The replacement for @c needle. * - * @return @a TRUE if @c needle was found, else @a FALSE. + * @return @a amount of replacements done **/ -gboolean utils_string_replace_all(GString *haystack, const gchar *needle, const gchar *replace) +guint utils_string_replace_all(GString *haystack, const gchar *needle, const gchar *replace) { - const gchar *stack, *match; - gssize pos = -1; + return utils_string_replace_helper(haystack, needle, replace, 0); +} - if (haystack->len == 0) - return FALSE; - g_return_val_if_fail(NZV(needle), FALSE); - stack = haystack->str; - while (1) - { - match = strstr(stack, needle); - if (match == NULL) - break; - else - { - pos = match - haystack->str; - g_string_erase(haystack, pos, strlen(needle)); - - /* make next search after removed matching text. - * (we have to be careful to only use haystack->str as its address may change) */ - stack = haystack->str + pos; - - if (replace) - { - g_string_insert(haystack, pos, replace); - stack = haystack->str + pos + strlen(replace); /* skip past replacement */ - } - } - } - return (pos != -1); +/* + * Replaces the first occurrence of @c needle in @c haystack with @c replace. + * As of Geany 0.16, @a replace can match @a needle, so the following will work: + * @code utils_string_replace_all(text, "\n", "\r\n"); @endcode + * + * @param haystack The input string to operate on. This string is modified in place. + * @param needle The string which should be replaced. + * @param replace The replacement for @c needle. + * + * @return @a amount of replacements done + */ +guint utils_string_replace_first(GString *haystack, const gchar *needle, const gchar *replace) +{ + return utils_string_replace_helper(haystack, needle, replace, 1); } Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2009-01-11 18:29:39 UTC (rev 3460) +++ trunk/src/utils.h 2009-01-11 21:05:03 UTC (rev 3461) @@ -82,8 +82,10 @@ gchar *utils_get_hostname(void); -gboolean utils_string_replace_all(GString *str, const gchar *needle, const gchar *replace); +guint utils_string_replace_all(GString *haystack, const gchar *needle, const gchar *replace); +guint utils_string_replace_first(GString *haystack, const gchar *needle, const gchar *replace); + gchar *utils_str_replace(gchar *haystack, const gchar *needle, const gchar *replacement); gint utils_strpos(const gchar* haystack, const gchar *needle); Modified: trunk/wscript =================================================================== --- trunk/wscript 2009-01-11 18:29:39 UTC (rev 3460) +++ trunk/wscript 2009-01-11 21:05:03 UTC (rev 3461) @@ -94,7 +94,7 @@ 'src/highlighting.c', 'src/interface.c', 'src/keybindings.c', 'src/keyfile.c', 'src/log.c', 'src/main.c', 'src/msgwindow.c', 'src/navqueue.c', 'src/notebook.c', 'src/plugins.c', 'src/prefix.c', 'src/prefs.c', 'src/printing.c', 'src/project.c', - 'src/sciwrappers.c', 'src/search.c', 'src/socket.c', 'src/stash.c', + 'src/queue.c', 'src/sciwrappers.c', 'src/search.c', 'src/socket.c', 'src/stash.c', 'src/symbols.c', 'src/templates.c', 'src/toolbar.c', 'src/tools.c', 'src/treeviews.c', 'src/ui_utils.c', 'src/utils.c' ] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3460] trunk
by eht16＠users.sourceforge.net 11 Jan '09

11 Jan '09

Revision: 3460 http://geany.svn.sourceforge.net/geany/?rev=3460&view=rev Author: eht16 Date: 2009-01-11 18:29:39 +0000 (Sun, 11 Jan 2009) Log Message: ----------- Fix several compiler warnings and build errors (patch by Daniel Richard G., thanks). Modified Paths: -------------- trunk/ChangeLog trunk/configure.in trunk/plugins/splitwindow.c trunk/src/callbacks.c trunk/src/document.c trunk/src/document.h trunk/src/filetypes.c trunk/src/highlighting.c trunk/src/keybindings.c trunk/src/plugins.c trunk/src/search.c trunk/src/socket.c trunk/src/symbols.c trunk/tagmanager/read.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/ChangeLog 2009-01-11 18:29:39 UTC (rev 3460) @@ -3,6 +3,12 @@ * configure.in, wscript, src/Makefile.am, src/utils.c: Fix build with GTK 2.12 by adding GIO compile and linker flags (closes #2498580). + * configure.in, plugins/splitwindow.c, src/callbacks.c, src/document.c, + src/document.h, src/filetypes.c, src/highlighting.c, + src/keybindings.c, src/plugins.c, src/search.c, src/socket.c, + src/symbols.c, tagmanager/read.h: + Fix several compiler warnings and build errors + (patch by Daniel Richard G., thanks). 2009-01-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/configure.in 2009-01-11 18:29:39 UTC (rev 3460) @@ -137,7 +137,9 @@ PKG_CHECK_MODULES(GIO, [$gio_modules], have_gio=1, have_gio=0) AC_SUBST(GIO_CFLAGS) AC_SUBST(GIO_LIBS) -AC_DEFINE_UNQUOTED(HAVE_GIO, $have_gio, [Whether GIO is available]) +if test $have_gio = 1 ; then + AC_DEFINE(HAVE_GIO, 1, [Whether GIO is available]) +fi # --disable-deprecated switch for GTK2 purification AC_ARG_ENABLE(deprecated, [ --disable-deprecated Disable deprecated GTK functions. ], Modified: trunk/plugins/splitwindow.c =================================================================== --- trunk/plugins/splitwindow.c 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/plugins/splitwindow.c 2009-01-11 18:29:39 UTC (rev 3460) @@ -410,7 +410,7 @@ }; -void plugin_cleanup() +void plugin_cleanup(void) { if (plugin_state != STATE_UNSPLIT) on_unsplit(NULL, NULL); Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/src/callbacks.c 2009-01-11 18:29:39 UTC (rev 3460) @@ -1216,7 +1216,7 @@ if (doc != NULL) { - if (! editor_goto_line(doc->editor, val - 1)) + if (! editor_goto_line(doc->editor, (gint) val - 1)) utils_beep(); } } Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/src/document.c 2009-01-11 18:29:39 UTC (rev 3460) @@ -530,7 +530,7 @@ /* Opens a new empty document only if there are no other documents open */ -GeanyDocument *document_new_file_if_non_open() +GeanyDocument *document_new_file_if_non_open(void) { if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(main_widgets.notebook)) == 0) return document_new_file(NULL, NULL, NULL); Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/src/document.h 2009-01-11 18:29:39 UTC (rev 3460) @@ -138,7 +138,7 @@ GeanyDocument* document_new_file(const gchar *filename, GeanyFiletype *ft, const gchar *text); -GeanyDocument* document_new_file_if_non_open(); +GeanyDocument* document_new_file_if_non_open(void); GeanyDocument* document_find_by_filename(const gchar *utf8_filename); Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/src/filetypes.c 2009-01-11 18:29:39 UTC (rev 3460) @@ -654,7 +654,7 @@ gtk_widget_show((item)); -static void create_set_filetype_menu() +static void create_set_filetype_menu(void) { filetype_id ft_id; GtkWidget *filetype_menu = ui_lookup_widget(main_widgets.window, "set_filetype1_menu"); Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/src/highlighting.c 2009-01-11 18:29:39 UTC (rev 3460) @@ -564,11 +564,11 @@ SSM(sci,SCI_MARKERSETFORE, SC_MARKNUM_FOLDERMIDTAIL, 0xffffff); SSM(sci,SCI_MARKERSETBACK, SC_MARKNUM_FOLDERMIDTAIL, 0x000000); - SSM(sci, SCI_SETPROPERTY, (sptr_t) "fold", (sptr_t) "1"); - SSM(sci, SCI_SETPROPERTY, (sptr_t) "fold.compact", (sptr_t) "0"); - SSM(sci, SCI_SETPROPERTY, (sptr_t) "fold.comment", (sptr_t) "1"); - SSM(sci, SCI_SETPROPERTY, (sptr_t) "fold.preprocessor", (sptr_t) "1"); - SSM(sci, SCI_SETPROPERTY, (sptr_t) "fold.at.else", (sptr_t) "1"); + SSM(sci, SCI_SETPROPERTY, (uptr_t) "fold", (sptr_t) "1"); + SSM(sci, SCI_SETPROPERTY, (uptr_t) "fold.compact", (sptr_t) "0"); + SSM(sci, SCI_SETPROPERTY, (uptr_t) "fold.comment", (sptr_t) "1"); + SSM(sci, SCI_SETPROPERTY, (uptr_t) "fold.preprocessor", (sptr_t) "1"); + SSM(sci, SCI_SETPROPERTY, (uptr_t) "fold.at.else", (sptr_t) "1"); /* bold (3rd argument) is whether to override default foreground selection */ Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/src/keybindings.c 2009-01-11 18:29:39 UTC (rev 3460) @@ -487,7 +487,7 @@ /* before the tab changes, add the current document to the MRU list */ -static void on_notebook_switch_page() +static void on_notebook_switch_page(void) { GeanyDocument *old = document_get_current(); Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/src/plugins.c 2009-01-11 18:29:39 UTC (rev 3460) @@ -735,7 +735,7 @@ /* load active plugins at startup */ static void -load_active_plugins() +load_active_plugins(void) { guint i, len; Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/src/search.c 2009-01-11 18:29:39 UTC (rev 3460) @@ -316,7 +316,7 @@ * search dialogs. This needs to be done only once. * The monospace font should increase readibility of regular expressions containing spaces, points, * commas and similar (#1907117). */ -static void load_monospace_style() +static void load_monospace_style(void) { static const gchar *rcstyle = "style \"geany-monospace\"\n" \ @@ -601,7 +601,7 @@ } -static void create_fif_dialog() +static void create_fif_dialog(void) { GtkWidget *dir_combo, *combo, *e_combo, *entry; GtkWidget *label, *label1, *label2, *checkbox1, *checkbox2, *check_wholeword, Modified: trunk/src/socket.c =================================================================== --- trunk/src/socket.c 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/src/socket.c 2009-01-11 18:29:39 UTC (rev 3460) @@ -481,7 +481,7 @@ /* we never know how the input is encoded, so do the best auto detection we can */ if (! g_utf8_validate(buf, -1, NULL)) - utf8_filename = encodings_convert_to_utf8(buf, -1, NULL); + utf8_filename = encodings_convert_to_utf8(buf, (gsize) -1, NULL); else utf8_filename = g_strdup(buf); Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/src/symbols.c 2009-01-11 18:29:39 UTC (rev 3460) @@ -846,7 +846,7 @@ if (! doc_is_utf8) utf8_name = encodings_convert_to_utf8_from_charset(tag->name, - (gsize)-1, doc->encoding, TRUE); + (gsize) -1, doc->encoding, TRUE); else utf8_name = tag->name; @@ -889,7 +889,7 @@ ! utils_str_equal(doc->encoding, "None")) { setptr(utf8_name, - encodings_convert_to_utf8_from_charset(utf8_name, -1, doc->encoding, TRUE)); + encodings_convert_to_utf8_from_charset(utf8_name, (gsize) -1, doc->encoding, TRUE)); } return utf8_name; Modified: trunk/tagmanager/read.h =================================================================== --- trunk/tagmanager/read.h 2009-01-11 17:40:40 UTC (rev 3459) +++ trunk/tagmanager/read.h 2009-01-11 18:29:39 UTC (rev 3460) @@ -125,8 +125,8 @@ const char *const fileName, const langType language ); extern void bufferClose (void); extern void setBufPos (int new_position); -extern int getBufPos (); -extern boolean useFile (); +extern int getBufPos (void); +extern boolean useFile (void); #endif /* _READ_H */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3459] trunk
by eht16＠users.sourceforge.net 11 Jan '09

11 Jan '09

Revision: 3459 http://geany.svn.sourceforge.net/geany/?rev=3459&view=rev Author: eht16 Date: 2009-01-11 17:40:40 +0000 (Sun, 11 Jan 2009) Log Message: ----------- Fix build with GTK 2.12 by adding GIO compile and linker flags (closes #2498580). Modified Paths: -------------- trunk/ChangeLog trunk/configure.in trunk/src/Makefile.am trunk/src/utils.c trunk/wscript Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-09 18:22:23 UTC (rev 3458) +++ trunk/ChangeLog 2009-01-11 17:40:40 UTC (rev 3459) @@ -1,3 +1,10 @@ +2009-01-11 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * configure.in, wscript, src/Makefile.am, src/utils.c: + Fix build with GTK 2.12 by adding GIO compile and linker flags + (closes #2498580). + + 2009-01-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * configure.in, win32-config.h, wscript, src/main.c, src/main.h, Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2009-01-09 18:22:23 UTC (rev 3458) +++ trunk/configure.in 2009-01-11 17:40:40 UTC (rev 3459) @@ -135,6 +135,8 @@ # GIO checks gio_modules="gio-2.0 >= 2.16" PKG_CHECK_MODULES(GIO, [$gio_modules], have_gio=1, have_gio=0) +AC_SUBST(GIO_CFLAGS) +AC_SUBST(GIO_LIBS) AC_DEFINE_UNQUOTED(HAVE_GIO, $have_gio, [Whether GIO is available]) # --disable-deprecated switch for GTK2 purification Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2009-01-09 18:22:23 UTC (rev 3458) +++ trunk/src/Makefile.am 2009-01-11 17:40:40 UTC (rev 3459) @@ -72,7 +72,7 @@ utils.h -INCLUDES = -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include @GTK_CFLAGS@ +INCLUDES = -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include @GTK_CFLAGS@ @GIO_CFLAGS@ # tell automake we have a C++ file so it uses the C++ linker we need for Scintilla nodist_EXTRA_geany_SOURCES = dummy.cxx @@ -83,7 +83,7 @@ geany_SOURCES = $(SRCS) win32.c win32.h -geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ $(INTLLIBS) \ +geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ @GIO_LIBS@ $(INTLLIBS) \ -lkernel32 -limm32 -lshfolder -lshell32 -lole32 -luuid -lcomdlg32 \ -lcomctl32 -liberty -lwsock32 geany_private.res @@ -108,7 +108,7 @@ geany_SOURCES = $(SRCS) vte.c vte.h -geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ $(INTLLIBS) +geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ @GIO_LIBS@ $(INTLLIBS) AM_CFLAGS = -DGEANY_DATADIR=\""$(datadir)"\" \ -DGEANY_DOCDIR=\""$(docdir)"\" \ Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2009-01-09 18:22:23 UTC (rev 3458) +++ trunk/src/utils.c 2009-01-11 17:40:40 UTC (rev 3459) @@ -43,6 +43,7 @@ #endif #include <glib/gstdio.h> +#include <gio/gio.h> #include "prefs.h" #include "support.h" Modified: trunk/wscript =================================================================== --- trunk/wscript 2009-01-09 18:22:23 UTC (rev 3458) +++ trunk/wscript 2009-01-11 17:40:40 UTC (rev 3459) @@ -185,7 +185,7 @@ else: gtk_version = 'Unknown' # GIO check - conf.check_cfg(package='gio-2.0', uselib_store='GIO', mandatory=False) + conf.check_cfg(package='gio-2.0', uselib_store='GIO', args='--cflags --libs', mandatory=False) conf_define_from_opt('LIBDIR', Options.options.libdir, conf.env['PREFIX'] + '/lib') conf_define_from_opt('DOCDIR', Options.options.docdir, conf.env['DATADIR'] + '/doc/geany') @@ -301,7 +301,7 @@ obj.target = 'geany' obj.source = geany_sources obj.includes = '. src/ scintilla/include/ tagmanager/include/' - obj.uselib = 'GTK' + obj.uselib = 'GTK GIO' obj.uselib_local = 'scintilla tagmanager' # geanyfunctions.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3458] trunk/po
by eht16＠users.sourceforge.net 09 Jan '09

09 Jan '09

Revision: 3458 http://geany.svn.sourceforge.net/geany/?rev=3458&view=rev Author: eht16 Date: 2009-01-09 18:22:23 +0000 (Fri, 09 Jan 2009) Log Message: ----------- Fix a couple of bad mnemonics in the Find dialogs. Modified Paths: -------------- trunk/po/ChangeLog trunk/po/de.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2009-01-09 18:22:07 UTC (rev 3457) +++ trunk/po/ChangeLog 2009-01-09 18:22:23 UTC (rev 3458) @@ -1,3 +1,8 @@ +2009-01-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * de.po: Fix a couple of bad mnemonics in the Find dialogs. + + 2009-01-01 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * de.po: Minor update of German translation Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2009-01-09 18:22:07 UTC (rev 3457) +++ trunk/po/de.po 2009-01-09 18:22:23 UTC (rev 3458) @@ -3768,7 +3768,7 @@ #: ../src/search.c:214 msgid "Use _escape sequences" -msgstr "Sonderzeichen _maskieren" +msgstr "S_onderzeichen maskieren" #: ../src/search.c:219 msgid "" @@ -3784,11 +3784,11 @@ #: ../src/search.c:233 ../src/search.c:716 msgid "Match only a _whole word" -msgstr "Nur g_anze Wörter finden" +msgstr "N_ur ganze Wörter finden" #: ../src/search.c:238 msgid "Match from s_tart of word" -msgstr "Wort_anfänge finden" +msgstr "_Wortanfänge finden" #: ../src/search.c:360 msgid "_Previous" @@ -3800,7 +3800,7 @@ #: ../src/search.c:370 ../src/search.c:492 ../src/search.c:641 msgid "_Search for:" -msgstr "_Suche nach:" +msgstr "Suc_he nach:" #. Now add the multiple match options #: ../src/search.c:397 @@ -3826,7 +3826,7 @@ #. close window checkbox #: ../src/search.c:418 ../src/search.c:563 msgid "Close _dialog" -msgstr "Diesen Dialog _schließen." +msgstr "_Diesen Dialog schließen." #: ../src/search.c:423 ../src/search.c:568 msgid "Disable this option to keep the dialog open." @@ -3838,7 +3838,7 @@ #: ../src/search.c:495 msgid "Replace wit_h:" -msgstr "_Ersetzen durch:" +msgstr "Erse_tzen durch:" #. Now add the multiple replace options #: ../src/search.c:542 @@ -3847,7 +3847,7 @@ #: ../src/search.c:545 msgid "In Se_lection" -msgstr "In _Auswahl" +msgstr "I_n Auswahl" #: ../src/search.c:547 msgid "Replace all matches found in the currently selected text" @@ -3880,11 +3880,11 @@ #: ../src/search.c:705 msgid "_Recurse in subfolders" -msgstr "In _Unterverzeichnissen" +msgstr "_In Unterverzeichnissen" #: ../src/search.c:721 msgid "_Invert search results" -msgstr "_Suchmuster umkehren" +msgstr "Su_chmuster umkehren" #: ../src/search.c:726 msgid "Invert the sense of matching, to select non-matching lines." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3457] trunk
by eht16＠users.sourceforge.net 09 Jan '09

09 Jan '09

Revision: 3457 http://geany.svn.sourceforge.net/geany/?rev=3457&view=rev Author: eht16 Date: 2009-01-09 18:22:07 +0000 (Fri, 09 Jan 2009) Log Message: ----------- Add utils_is_remote_path(). Add private field 'is_remote' to GeanyDocument to indicate whether an opened file is locally accessed or via gvfs-fuse. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c trunk/src/documentprivate.h trunk/src/utils.c trunk/src/utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-09 18:21:44 UTC (rev 3456) +++ trunk/ChangeLog 2009-01-09 18:22:07 UTC (rev 3457) @@ -5,6 +5,10 @@ Add checks for GIO (GLib >= 2.16) support. Allow to specify files on the command line and from remote instances to be URIs (local and with GIO also remote URIs). + * src/document.c, src/documentprivate.h, src/utils.c, src/utils.h: + Add utils_is_remote_path(). + Add private field 'is_remote' to GeanyDocument to indicate whether + an opened file is locally accessed or via gvfs-fuse. 2009-01-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2009-01-09 18:21:44 UTC (rev 3456) +++ trunk/src/document.c 2009-01-09 18:22:07 UTC (rev 3457) @@ -1076,9 +1076,14 @@ return NULL; } - if (! reload) doc = document_create(utf8_filename); - g_return_val_if_fail(doc != NULL, NULL); /* really should not happen */ + if (! reload) + { + doc = document_create(utf8_filename); + g_return_val_if_fail(doc != NULL, NULL); /* really should not happen */ + doc->priv->is_remote = utils_is_remote_path(locale_filename); + } + sci_set_undo_collection(doc->editor->sci, FALSE); /* avoid creation of an undo action */ sci_empty_undo_buffer(doc->editor->sci); @@ -1114,7 +1119,7 @@ { /* file exists on disk, set real_path */ g_free(doc->real_path); - doc->real_path = get_real_path_from_utf8(doc->file_name); + doc->real_path = tm_get_real_path(locale_filename); /* "the" SCI signal (connect after initial setup(i.e. adding text)) */ g_signal_connect(doc->editor->sci, "sci-notify", G_CALLBACK(editor_sci_notify_cb), @@ -1453,6 +1458,13 @@ err = errno; fclose(fp); + + /* now the file is on disk, set real_path */ + if (err == 0 && doc->real_path == NULL) + { + doc->real_path = tm_get_real_path(locale_filename); + doc->priv->is_remote = utils_is_remote_path(locale_filename); + } g_free(locale_filename); return err; @@ -1548,12 +1560,6 @@ return FALSE; } - /* now the file is on disk, set real_path */ - if (doc->real_path == NULL) - { - doc->real_path = get_real_path_from_utf8(doc->file_name); - } - /* store the opened encoding for undo/redo */ store_saved_encoding(doc); Modified: trunk/src/documentprivate.h =================================================================== --- trunk/src/documentprivate.h 2009-01-09 18:21:44 UTC (rev 3456) +++ trunk/src/documentprivate.h 2009-01-09 18:22:07 UTC (rev 3457) @@ -64,10 +64,12 @@ GTrashStack *redo_actions; /* Used so Undo/Redo works for encoding changes. */ FileEncoding saved_encoding; - gboolean colourise_needed; /* use document.c:queue_colourise() instead */ - gint line_count; /* Number of lines in the document. */ - gint symbol_list_sort_mode; -} + gboolean colourise_needed; /* use document.c:queue_colourise() instead */ + gint line_count; /* Number of lines in the document. */ + gint symbol_list_sort_mode; + /* indicates whether a file is on a remote filesystem, works only with GIO/GVFS */ + gboolean is_remote; + } GeanyDocumentPrivate; #endif Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2009-01-09 18:21:44 UTC (rev 3456) +++ trunk/src/utils.c 2009-01-09 18:22:07 UTC (rev 3457) @@ -1595,3 +1595,34 @@ return (strstr(uri, "://") != NULL); } + + +/* path should be in locale encoding */ +gboolean utils_is_remote_path(const gchar *path) +{ + g_return_val_if_fail(path != NULL, FALSE); + + /* if path is an URI and it doesn't start "file://", we take it as remote */ + if (utils_is_uri(path) && strncmp(path, "file:", 5) != 0) + return TRUE; + +#ifndef G_OS_WIN32 + { + static gchar *fuse_path = NULL; + static gsize len = 0; + if (fuse_path == NULL) + { + fuse_path = g_build_filename(g_get_home_dir(), ".gvfs", NULL); + len = strlen(fuse_path); + } + /* Comparing the file path against a hardcoded path is not the most elegant solution + * but for now it is better than nothing. Ideally, g_file_new_for_path() should create + * proper GFile objects for Fuse paths, but it only does in future GVFS + * versions (gvfs 1.1.1). */ + return (strncmp(path, fuse_path, len) == 0); + } +#endif + return FALSE; +} + + Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2009-01-09 18:21:44 UTC (rev 3456) +++ trunk/src/utils.h 2009-01-09 18:22:07 UTC (rev 3457) @@ -155,4 +155,6 @@ gboolean utils_is_uri(const gchar *uri); +gboolean utils_is_remote_path(const gchar *path); + #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3456] trunk/src/document.c
by eht16＠users.sourceforge.net 09 Jan '09

09 Jan '09

Revision: 3456 http://geany.svn.sourceforge.net/geany/?rev=3456&view=rev Author: eht16 Date: 2009-01-09 18:21:44 +0000 (Fri, 09 Jan 2009) Log Message: ----------- Plug a small memleak. Modified Paths: -------------- trunk/src/document.c Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2009-01-09 18:21:30 UTC (rev 3455) +++ trunk/src/document.c 2009-01-09 18:21:44 UTC (rev 3456) @@ -1453,6 +1453,7 @@ err = errno; fclose(fp); + g_free(locale_filename); return err; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3455] trunk/wscript
by eht16＠users.sourceforge.net 09 Jan '09

09 Jan '09

Revision: 3455 http://geany.svn.sourceforge.net/geany/?rev=3455&view=rev Author: eht16 Date: 2009-01-09 18:21:30 +0000 (Fri, 09 Jan 2009) Log Message: ----------- Fix broken generation of API docs. Modified Paths: -------------- trunk/wscript Modified: trunk/wscript =================================================================== --- trunk/wscript 2009-01-09 18:21:12 UTC (rev 3454) +++ trunk/wscript 2009-01-09 18:21:30 UTC (rev 3455) @@ -185,7 +185,7 @@ else: gtk_version = 'Unknown' # GIO check - conf.check_cfg(package='gio-2.0', uselib_store='GIO') + conf.check_cfg(package='gio-2.0', uselib_store='GIO', mandatory=False) conf_define_from_opt('LIBDIR', Options.options.libdir, conf.env['PREFIX'] + '/lib') conf_define_from_opt('DOCDIR', Options.options.docdir, conf.env['DATADIR'] + '/doc/geany') @@ -366,7 +366,7 @@ # Doxyfile obj = bld.new_task_gen('subst') obj.source = 'doc/Doxyfile.in' - obj.target = 'Doxyfile' + obj.target = 'doc/Doxyfile' obj.install_path = None obj.dict = { 'VERSION' : VERSION } @@ -421,10 +421,15 @@ print 'gtk-update-icon-cache -q -f -t %s' % dir if Options.options.apidoc: - doxyfile = os.path.join(Build.bld.srcnode.abspath( \ - Build.bld.env), 'doc', 'Doxyfile') - os.chdir('doc') - launch('doxygen ' + doxyfile, 'Generating API reference documentation') + doxyfile = os.path.join(Build.bld.srcnode.abspath(Build.bld.env), 'doc', 'Doxyfile') + cmd = Configure.find_program_impl(Build.bld.env, 'doxygen') + if cmd: + os.chdir('doc') + ret = launch('%s %s' % (cmd, doxyfile), 'Generating API reference documentation') + else: + Utils.pprint('RED', + 'doxygen could not be found. Please install the doxygen package.') + sys.exit(1) if Options.options.htmldoc: # first try rst2html.py as it is the upstream default, fall back to rst2html This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3454] trunk
by eht16＠users.sourceforge.net 09 Jan '09

09 Jan '09

Revision: 3454 http://geany.svn.sourceforge.net/geany/?rev=3454&view=rev Author: eht16 Date: 2009-01-09 18:21:12 +0000 (Fri, 09 Jan 2009) Log Message: ----------- Add checks for GIO (GLib >= 2.16) support. Allow to specify files on the command line and from remote instances to be URIs (local and with GIO also remote URIs). Modified Paths: -------------- trunk/ChangeLog trunk/configure.in trunk/src/main.c trunk/src/main.h trunk/src/utils.c trunk/src/utils.h trunk/win32-config.h trunk/wscript Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-08 17:27:57 UTC (rev 3453) +++ trunk/ChangeLog 2009-01-09 18:21:12 UTC (rev 3454) @@ -1,3 +1,12 @@ +2009-01-09 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * configure.in, win32-config.h, wscript, src/main.c, src/main.h, + src/utils.c, src/utils.h: + Add checks for GIO (GLib >= 2.16) support. + Allow to specify files on the command line and from remote instances + to be URIs (local and with GIO also remote URIs). + + 2009-01-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/prefs.c, src/stash.c, src/keyfile.c: Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2009-01-08 17:27:57 UTC (rev 3453) +++ trunk/configure.in 2009-01-09 18:21:12 UTC (rev 3454) @@ -132,6 +132,10 @@ PKG_CHECK_MODULES(GTK, [$gtk_modules]) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) +# GIO checks +gio_modules="gio-2.0 >= 2.16" +PKG_CHECK_MODULES(GIO, [$gio_modules], have_gio=1, have_gio=0) +AC_DEFINE_UNQUOTED(HAVE_GIO, $have_gio, [Whether GIO is available]) # --disable-deprecated switch for GTK2 purification AC_ARG_ENABLE(deprecated, [ --disable-deprecated Disable deprecated GTK functions. ], Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2009-01-08 17:27:57 UTC (rev 3453) +++ trunk/src/main.c 2009-01-09 18:21:12 UTC (rev 3454) @@ -301,7 +301,7 @@ { gchar *result; - if (g_path_is_absolute(filename)) + if (g_path_is_absolute(filename) || utils_is_uri(filename)) result = g_strdup(filename); else { @@ -717,37 +717,46 @@ /* Used for command-line arguments at startup or from socket. * this will strip any :line:col filename suffix from locale_filename */ -gboolean main_handle_filename(gchar *locale_filename) +gboolean main_handle_filename(const gchar *locale_filename) { GeanyDocument *doc; gint line = -1, column = -1; + gchar *filename; g_return_val_if_fail(locale_filename, FALSE); - get_line_and_column_from_filename(locale_filename, &line, &column); + /* check whether the passed filename is an URI */ + filename = utils_get_path_from_uri(locale_filename); + if (filename == NULL) + return FALSE; + + get_line_and_column_from_filename(filename, &line, &column); if (line >= 0) cl_options.goto_line = line; if (column >= 0) cl_options.goto_column = column; - if (g_file_test(locale_filename, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) + if (g_file_test(filename, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) { - doc = document_open_file(locale_filename, FALSE, NULL, NULL); + doc = document_open_file(filename, FALSE, NULL, NULL); /* add recent file manually if opening_session_files is set */ if (doc != NULL && main_status.opening_session_files) ui_add_recent_file(doc->file_name); + g_free(filename); return TRUE; } else if (file_prefs.cmdline_new_files) { /* create new file with the given filename */ - gchar *utf8_filename = utils_get_utf8_from_locale(locale_filename); + gchar *utf8_filename = utils_get_utf8_from_locale(filename); doc = document_new_file(utf8_filename, NULL, NULL); if (doc != NULL) ui_add_recent_file(doc->file_name); g_free(utf8_filename); + g_free(filename); return TRUE; } + g_free(filename); return FALSE; } @@ -825,9 +834,18 @@ if (prefs.load_session) { if (load_project_from_cl) - project_load_file(argv[1]); - else - if (cl_options.load_session && !cl_options.new_instance) + { + gchar *pfile = argv[1]; + if (utils_is_uri(argv[1])) + pfile = utils_get_path_from_uri(argv[1]); + if (pfile != NULL) + { + project_load_file(pfile); + if (pfile != argv[1]) + g_free(pfile); + } + } + else if (cl_options.load_session && !cl_options.new_instance) load_session_project_file(); /* when we want a new instance, we still load project session files unless -s Modified: trunk/src/main.h =================================================================== --- trunk/src/main.h 2009-01-08 17:27:57 UTC (rev 3453) +++ trunk/src/main.h 2009-01-09 18:21:12 UTC (rev 3454) @@ -57,7 +57,7 @@ void main_quit(void); -gboolean main_handle_filename(gchar *locale_filename); +gboolean main_handle_filename(const gchar *locale_filename); void main_reload_configuration(void); Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2009-01-08 17:27:57 UTC (rev 3453) +++ trunk/src/utils.c 2009-01-09 18:21:12 UTC (rev 3454) @@ -1550,3 +1550,48 @@ } +/* Retrieves the path for the given URI. + * It returns: + * - the path which was determined by g_filename_from_uri() or GIO + * - NULL if the URI is non-local and gvfs-fuse is not installed + * - a new copy of 'uri' if it is not an URI. */ +gchar *utils_get_path_from_uri(const gchar *uri) +{ + gchar *locale_filename; + + g_return_val_if_fail(uri != NULL, NULL); + + if (! utils_is_uri(uri)) + return g_strdup(uri); + + /* this will work only for 'file://' URIs */ + locale_filename = g_filename_from_uri(uri, NULL, NULL); +#ifdef HAVE_GIO + /* g_filename_from_uri() failed, so we probably have a non-local URI */ + if (locale_filename == NULL) + { + GFile *file = g_file_new_for_uri(uri); + locale_filename = g_file_get_path(file); + g_object_unref(file); + if (locale_filename == NULL) + { + geany_debug("The URI '%s' could not be resolved to a local path. This means " + "that the URI is invalid or that you don't have gvfs-fuse installed.", uri); + return NULL; + } + } +#endif + if (locale_filename == NULL) + geany_debug("The URI '%s' could not be resolved to a local path. This means that the " + "URI is invalid or that Geany can't use GVFS (maybe it is not installed).", uri); + + return locale_filename; +} + + +gboolean utils_is_uri(const gchar *uri) +{ + g_return_val_if_fail(uri != NULL, FALSE); + + return (strstr(uri, "://") != NULL); +} Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2009-01-08 17:27:57 UTC (rev 3453) +++ trunk/src/utils.h 2009-01-09 18:21:12 UTC (rev 3454) @@ -151,4 +151,8 @@ const gchar *utils_build_path(const gchar *first, ...) G_GNUC_NULL_TERMINATED; +gchar *utils_get_path_from_uri(const gchar *uri); + +gboolean utils_is_uri(const gchar *uri); + #endif Modified: trunk/win32-config.h =================================================================== --- trunk/win32-config.h 2009-01-08 17:27:57 UTC (rev 3453) +++ trunk/win32-config.h 2009-01-09 18:21:12 UTC (rev 3454) @@ -321,3 +321,6 @@ /* Define if you want to detect a running instance */ #define HAVE_SOCKET 1 +/* Define if GIO should be used, need GLib 2.16.x or newer */ +#define HAVE_GIO 1 + Modified: trunk/wscript =================================================================== --- trunk/wscript 2009-01-08 17:27:57 UTC (rev 3453) +++ trunk/wscript 2009-01-09 18:21:12 UTC (rev 3454) @@ -184,6 +184,8 @@ have_gtk_210 = True else: gtk_version = 'Unknown' + # GIO check + conf.check_cfg(package='gio-2.0', uselib_store='GIO') conf_define_from_opt('LIBDIR', Options.options.libdir, conf.env['PREFIX'] + '/lib') conf_define_from_opt('DOCDIR', Options.options.docdir, conf.env['DATADIR'] + '/doc/geany') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3453] trunk
by ntrel＠users.sourceforge.net 08 Jan '09

08 Jan '09

Revision: 3453 http://geany.svn.sourceforge.net/geany/?rev=3453&view=rev Author: ntrel Date: 2009-01-08 17:27:57 +0000 (Thu, 08 Jan 2009) Log Message: ----------- Fix remaining spin buttons in the prefs dialog (closes #2492317). Modified Paths: -------------- trunk/ChangeLog trunk/src/prefs.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-08 17:14:18 UTC (rev 3452) +++ trunk/ChangeLog 2009-01-08 17:27:57 UTC (rev 3453) @@ -4,6 +4,8 @@ Fix using prefs dialog editor & files tab spin button values when they've just been edited and Alt-O is used to close the dialog without moving the focus. + * src/prefs.c: + Fix remaining spin buttons in the prefs dialog (closes #2492317). 2009-01-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2009-01-08 17:14:18 UTC (rev 3452) +++ trunk/src/prefs.c 2009-01-08 17:27:57 UTC (rev 3453) @@ -751,6 +751,8 @@ gtk_editable_get_chars(GTK_EDITABLE(widget), 0, -1)); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "spin_long_line"); + /* note: use stash for new code - it updates spin buttons itself */ + gtk_spin_button_update(GTK_SPIN_BUTTON(widget)); editor_prefs.long_line_column = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_folding"); @@ -806,12 +808,15 @@ editor_prefs.auto_complete_symbols = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "spin_symbol_complete_chars"); + gtk_spin_button_update(GTK_SPIN_BUTTON(widget)); editor_prefs.symbolcompletion_min_chars = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "spin_symbollistheight"); + gtk_spin_button_update(GTK_SPIN_BUTTON(widget)); editor_prefs.symbolcompletion_max_height = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "spin_line_break"); + gtk_spin_button_update(GTK_SPIN_BUTTON(widget)); editor_prefs.line_break_column = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "check_autoclose_parenthesis"); @@ -925,6 +930,7 @@ if (vte_info.have_vte) { widget = ui_lookup_widget(ui_widgets.prefs_dialog, "spin_scrollback"); + gtk_spin_button_update(GTK_SPIN_BUTTON(widget)); vc->scrollback_lines = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); widget = ui_lookup_widget(ui_widgets.prefs_dialog, "entry_shell"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[3452] trunk
by ntrel＠users.sourceforge.net 08 Jan '09

08 Jan '09

Revision: 3452 http://geany.svn.sourceforge.net/geany/?rev=3452&view=rev Author: ntrel Date: 2009-01-08 17:14:18 +0000 (Thu, 08 Jan 2009) Log Message: ----------- Fix using prefs dialog editor & files tab spin button values when they've just been edited and Alt-O is used to close the dialog without moving the focus. Modified Paths: -------------- trunk/ChangeLog trunk/src/keyfile.c trunk/src/prefs.c trunk/src/stash.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-01-06 17:13:45 UTC (rev 3451) +++ trunk/ChangeLog 2009-01-08 17:14:18 UTC (rev 3452) @@ -1,3 +1,11 @@ +2009-01-08 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/prefs.c, src/stash.c, src/keyfile.c: + Fix using prefs dialog editor & files tab spin button values when + they've just been edited and Alt-O is used to close the dialog + without moving the focus. + + 2009-01-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * tagmanager/basic.c: Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2009-01-06 17:13:45 UTC (rev 3451) +++ trunk/src/keyfile.c 2009-01-08 17:14:18 UTC (rev 3452) @@ -126,6 +126,7 @@ stash_group_add_toggle_button(group, &search_prefs.use_current_word, "pref_main_search_use_current_word", TRUE, "check_search_use_current_word"); + /* editor */ stash_group_add_toggle_button(group, &editor_prefs.indentation->detect_type, "check_detect_indent", FALSE, "check_detect_indent"); stash_group_add_toggle_button(group, &editor_prefs.use_tab_to_indent, @@ -146,6 +147,12 @@ "autocompletion_max_entries", GEANY_MAX_AUTOCOMPLETE_WORDS, "spin_autocompletion_max_entries"); + /* files */ + stash_group_add_spin_button_integer(group, (gint*)&file_prefs.mru_length, + "mru_length", GEANY_DEFAULT_MRU_LENGTH, "spin_mru"); + stash_group_add_spin_button_integer(group, &file_prefs.disk_check_timeout, + "disk_check_timeout", GEANY_DISK_CHECK_TIMEOUT, "spin_disk_check"); + /* hidden prefs (don't overwrite them so users can edit them manually) */ group = stash_group_new(PACKAGE); configuration_add_pref_group(group, FALSE); @@ -365,8 +372,6 @@ g_key_file_set_boolean(config, PACKAGE, "pref_editor_new_line", file_prefs.final_new_line); g_key_file_set_boolean(config, PACKAGE, "pref_editor_replace_tabs", file_prefs.replace_tabs); g_key_file_set_boolean(config, PACKAGE, "pref_editor_trail_space", file_prefs.strip_trailing_spaces); - g_key_file_set_integer(config, PACKAGE, "mru_length", file_prefs.mru_length); - g_key_file_set_integer(config, PACKAGE, "disk_check_timeout", file_prefs.disk_check_timeout); /* toolbar */ g_key_file_set_boolean(config, PACKAGE, "pref_toolbar_show", toolbar_prefs.visible); @@ -658,9 +663,6 @@ file_prefs.replace_tabs = utils_get_setting_boolean(config, PACKAGE, "pref_editor_replace_tabs", FALSE); file_prefs.final_new_line = utils_get_setting_boolean(config, PACKAGE, "pref_editor_new_line", TRUE); file_prefs.strip_trailing_spaces = utils_get_setting_boolean(config, PACKAGE, "pref_editor_trail_space", FALSE); - file_prefs.mru_length = utils_get_setting_integer(config, PACKAGE, "mru_length", GEANY_DEFAULT_MRU_LENGTH); - file_prefs.disk_check_timeout = utils_get_setting_integer(config, PACKAGE, - "disk_check_timeout", GEANY_DISK_CHECK_TIMEOUT); /* toolbar */ toolbar_prefs.visible = utils_get_setting_boolean(config, PACKAGE, "pref_toolbar_show", TRUE); Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2009-01-06 17:13:45 UTC (rev 3451) +++ trunk/src/prefs.c 2009-01-08 17:14:18 UTC (rev 3452) @@ -334,13 +334,7 @@ widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_tab_left"); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "spin_mru"); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), file_prefs.mru_length); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "spin_disk_check"); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), file_prefs.disk_check_timeout); - - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_new_encoding"); /* luckily the index of the combo box items match the index of the encodings array */ gtk_combo_box_set_active(GTK_COMBO_BOX(widget), file_prefs.default_new_encoding); @@ -726,12 +720,6 @@ widget = ui_lookup_widget(ui_widgets.prefs_dialog, "radio_tab_right"); file_prefs.tab_order_ltr = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "spin_mru"); - file_prefs.mru_length = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); - - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "spin_disk_check"); - file_prefs.disk_check_timeout = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); - widget = ui_lookup_widget(ui_widgets.prefs_dialog, "combo_new_encoding"); file_prefs.default_new_encoding = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); Modified: trunk/src/stash.c =================================================================== --- trunk/src/stash.c 2009-01-06 17:13:45 UTC (rev 3451) +++ trunk/src/stash.c 2009-01-08 17:14:18 UTC (rev 3452) @@ -354,6 +354,8 @@ gtk_spin_button_set_value(GTK_SPIN_BUTTON(widget), *setting); break; case PREF_UPDATE: + /* if the widget is focussed, the value might not be updated */ + gtk_spin_button_update(GTK_SPIN_BUTTON(widget)); *setting = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget)); break; } 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 January 2009