SF.net SVN: geany:[5801] branches/sm
statc at users.sourceforge.net
statc at xxxxx
Sat May 21 08:44:31 UTC 2011
Revision: 5801
http://geany.svn.sourceforge.net/geany/?rev=5801&view=rev
Author: statc
Date: 2011-05-21 08:44:31 +0000 (Sat, 21 May 2011)
Log Message:
-----------
Merge trunk (revisions 5541..5560)
Conflicts:
src/Makefile.am
wscript
Modified Paths:
--------------
branches/sm/AUTHORS
branches/sm/COMMITTERS
branches/sm/ChangeLog
branches/sm/README
branches/sm/README.Packagers
branches/sm/configure.ac
branches/sm/data/filetype_extensions.conf
branches/sm/geany.glade
branches/sm/makefile.win32
branches/sm/plugins/filebrowser.c
branches/sm/plugins/saveactions.c
branches/sm/src/Makefile.am
branches/sm/src/about.c
branches/sm/src/document.c
branches/sm/src/editor.c
branches/sm/src/editor.h
branches/sm/src/interface.c
branches/sm/src/keyfile.c
branches/sm/src/makefile.win32
branches/sm/src/sciwrappers.c
branches/sm/src/sidebar.c
branches/sm/src/symbols.c
branches/sm/src/templates.c
branches/sm/tagmanager/Makefile.am
branches/sm/tagmanager/c.c
branches/sm/tagmanager/entry.c
branches/sm/tagmanager/entry.h
branches/sm/tagmanager/fortran.c
branches/sm/tagmanager/get.c
branches/sm/tagmanager/get.h
branches/sm/tagmanager/include/tm_tag.h
branches/sm/tagmanager/js.c
branches/sm/tagmanager/lregex.c
branches/sm/tagmanager/makefile.win32
branches/sm/tagmanager/parse.c
branches/sm/tagmanager/read.c
branches/sm/tagmanager/read.h
branches/sm/tagmanager/sort.c
branches/sm/tagmanager/sql.c
branches/sm/tagmanager/strlist.c
branches/sm/tagmanager/tm_project.c
branches/sm/tagmanager/tm_source_file.c
branches/sm/tagmanager/tm_tag.c
branches/sm/tagmanager/tm_workspace.c
branches/sm/wscript
Added Paths:
-----------
branches/sm/tagmanager/mio/
branches/sm/tagmanager/mio/COPYING
branches/sm/tagmanager/mio/Makefile.am
branches/sm/tagmanager/mio/README
branches/sm/tagmanager/mio/makefile.win32
branches/sm/tagmanager/mio/mio-file.c
branches/sm/tagmanager/mio/mio-memory.c
branches/sm/tagmanager/mio/mio.c
branches/sm/tagmanager/mio/mio.h
Modified: branches/sm/AUTHORS
===================================================================
--- branches/sm/AUTHORS 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/AUTHORS 2011-05-21 08:44:31 UTC (rev 5801)
@@ -2,6 +2,7 @@
-----------
Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+Colomban Wendling <lists(dot)ban(at)herbesfolles(dot)org>
Enrico Troeger <enrico(dot)troeger(at)uvena(dot)de>
Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: branches/sm/COMMITTERS
===================================================================
--- branches/sm/COMMITTERS 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/COMMITTERS 2011-05-21 08:44:31 UTC (rev 5801)
@@ -3,6 +3,7 @@
Enrico Tröger eht16 Maintainer
Nick Treleaven ntrel Maintainer
Frank Lanitz frlan Translation Maintainer (I18N/L10N)
+Colomban Wendling colombanw Developer
Lex Trotman elextr Developer
Dominic Hopf dmaphy Developer
Eugene Arshinov statc Developer
Modified: branches/sm/ChangeLog
===================================================================
--- branches/sm/ChangeLog 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/ChangeLog 2011-05-21 08:44:31 UTC (rev 5801)
@@ -1,3 +1,33 @@
+2011-03-02 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * plugins/saveactions.c:
+ Fix wrong warning on empty backup directory setting if
+ 'Backup Copy' is not enabled at all.
+ * AUTHORS, src/about.c, README.Packagers, README:
+ Welcome Colomban Wendling, a new Geany developer.
+
+
+2011-02-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * src/templates.c:
+ Fix segfault when inserting e.g. fileheader template when the
+ template file is empty (#3070913, thanks to lphilpot).
+
+
+2011-02-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+
+ * plugins/filebrowser.c:
+ Add support for multiple file filters, separated by semicolon
+ (based on a patch by Grigory Javadyan, thanks).
+
+
+2011-02-07 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * data/filetype_extensions.conf:
+ Fix detecting Matlab and Txt2Tags extensions by default (#3167315,
+ #3154637).
+
+
2011-02-06 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
* tagmanager/latex.c:
Modified: branches/sm/README
===================================================================
--- branches/sm/README 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/README 2011-05-21 08:44:31 UTC (rev 5801)
@@ -102,7 +102,8 @@
--
-2005-2011 by Enrico Tröger, Nick Treleaven and Frank Lanitz
+2005-2011 by Enrico Tröger, Nick Treleaven, Colomban Wendling and Frank Lanitz
enrico(dot)troeger(at)uvena(dot)de
nick(dot)treleaven(at)btinternet(dot)com
+lists(dot)ban(at)herbesfolles(dot)org
frank(at)frank(dot)uvena(dot)de
Modified: branches/sm/README.Packagers
===================================================================
--- branches/sm/README.Packagers 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/README.Packagers 2011-05-21 08:44:31 UTC (rev 5801)
@@ -82,7 +82,8 @@
--
-2008-2011 by Enrico Tröger, Nick Treleaven and Frank Lanitz
+2008-2011 by Enrico Tröger, Nick Treleaven, Colomban Wendling and Frank Lanitz
enrico(dot)troeger(at)uvena(dot)de
nick(dot)treleaven(at)btinternet(dot)com
+lists(dot)ban(at)herbesfolles(dot)org
frank(at)frank(dot)uvena(dot)de
Modified: branches/sm/configure.ac
===================================================================
--- branches/sm/configure.ac 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/configure.ac 2011-05-21 08:44:31 UTC (rev 5801)
@@ -313,6 +313,7 @@
icons/scalable/Makefile
tagmanager/Makefile
tagmanager/include/Makefile
+tagmanager/mio/Makefile
scintilla/Makefile
scintilla/include/Makefile
src/Makefile
Modified: branches/sm/data/filetype_extensions.conf
===================================================================
--- branches/sm/data/filetype_extensions.conf 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/data/filetype_extensions.conf 2011-05-21 08:44:31 UTC (rev 5801)
@@ -34,7 +34,7 @@
Lisp=*.lisp;
Lua=*.lua;
Make=*.mak;*.mk;GNUmakefile;makefile;Makefile;makefile.*;Makefile.*;
-Matlab=*.m;
+Matlab/Octave=*.m;
NSIS=*.nsi;*.nsh;
Pascal=*.pas;*.pp;*.inc;*.dpr;*.dpk;
Perl=*.pl;*.perl;*.pm;*.agi;*.pod;
@@ -47,7 +47,7 @@
Sh=*.sh;configure;configure.in;configure.in.in;configure.ac;*.ksh;*.zsh;*.ash;*.bash;*.m4;
SQL=*.sql;
Tcl=*.tcl;*.tk;*.wish;
-txt2tags=*.t2t;
+Txt2tags=*.t2t;
Vala=*.vala;*.vapi;
Verilog=*.v;
VHDL=*.vhd;*.vhdl;
Modified: branches/sm/geany.glade
===================================================================
--- branches/sm/geany.glade 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/geany.glade 2011-05-21 08:44:31 UTC (rev 5801)
@@ -6640,7 +6640,7 @@
<child>
<widget class="GtkTable" id="table14">
<property name="visible">True</property>
- <property name="n_rows">3</property>
+ <property name="n_rows">4</property>
<property name="n_columns">2</property>
<property name="homogeneous">False</property>
<property name="row_spacing">3</property>
@@ -6795,6 +6795,56 @@
<property name="y_options"></property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkLabel" id="label250">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Symbol list update frequency:</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkSpinButton" id="spin_symbol_update_freq">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Minimal delay (in milliseconds) between two automatic updates of the symbol list. Note that a too short delay may have performance impact, espcially with large files. A delay of 0 disables real-time updates.</property>
+ <property name="can_focus">True</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
+ <property name="numeric">True</property>
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">250 0 10000 10 100 0</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
Modified: branches/sm/makefile.win32
===================================================================
--- branches/sm/makefile.win32 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/makefile.win32 2011-05-21 08:44:31 UTC (rev 5801)
@@ -22,6 +22,7 @@
# Note: && is needed after cd because each line is executed in a different
# shell. (cd .. is just for clarity).
all: check-tools config.h
+ cd tagmanager\mio && $(MAKE) -f makefile.win32 && cd ..\..
cd tagmanager && $(MAKE) -f makefile.win32 && cd ..
cd scintilla && $(MAKE) -f makefile.win32 && cd ..
cd plugins && $(MAKE) -f makefile.win32 && cd ..
@@ -37,13 +38,14 @@
$(CP) $< $@
deps:
- -$(RM) tagmanager\deps.mak scintilla\deps.mak plugins\deps.mak src\deps.mak
+ -$(RM) tagmanager\mio\deps.mak tagmanager\deps.mak scintilla\deps.mak plugins\deps.mak src\deps.mak
# used by src/makefile.win32 to avoid del ../file which is an error
clean-local:
-$(RM) geany_private.res geany.exe
clean: deps
+ cd tagmanager\mio && $(MAKE) -f makefile.win32 clean && cd ..\..
cd tagmanager && $(MAKE) -f makefile.win32 clean && cd ..
cd scintilla && $(MAKE) -f makefile.win32 clean && cd ..
cd plugins && $(MAKE) -f makefile.win32 clean && cd ..
Modified: branches/sm/plugins/filebrowser.c
===================================================================
--- branches/sm/plugins/filebrowser.c 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/plugins/filebrowser.c 2011-05-21 08:44:31 UTC (rev 5801)
@@ -80,7 +80,7 @@
static gchar *current_dir = NULL; /* in locale-encoding */
static gchar *open_cmd; /* in locale-encoding */
static gchar *config_file;
-static gchar *filter = NULL;
+static gchar **filter = NULL;
static gint page_number = 0;
@@ -158,14 +158,21 @@
/* Returns: whether filename should be removed. */
static gboolean check_filtered(const gchar *base_name)
{
+ gchar **filter_item;
+ guint len;
+
if (filter == NULL)
return FALSE;
-
- if (! utils_str_equal(base_name, "*") && ! g_pattern_match_simple(filter, base_name))
+
+ len = g_strv_length(filter);
+ foreach_c_array(filter_item, filter, len)
{
- return TRUE;
+ if (utils_str_equal(base_name, "*") || g_pattern_match_simple(*filter_item, base_name))
+ {
+ return FALSE;
+ }
}
- return FALSE;
+ return TRUE;
}
@@ -728,9 +735,19 @@
}
+static void clear_filter(void)
+{
+ if (filter != NULL)
+ {
+ g_strfreev(filter);
+ filter = NULL;
+ }
+}
+
+
static void on_clear_filter(GtkEntry *entry, gpointer user_data)
{
- setptr(filter, NULL);
+ clear_filter();
gtk_entry_set_text(GTK_ENTRY(filter_entry), "");
@@ -777,13 +794,11 @@
static void on_filter_activate(GtkEntry *entry, gpointer user_data)
{
- setptr(filter, g_strdup(gtk_entry_get_text(entry)));
-
- if (! NZV(filter))
+ filter = g_strsplit(gtk_entry_get_text(entry), ";", -1);
+ if (filter == NULL || g_strv_length(filter) == 0)
{
- setptr(filter, g_strdup("*"));
+ clear_filter();
}
-
refresh();
}
@@ -791,8 +806,7 @@
static void on_filter_clear(GtkEntry *entry, gint icon_pos,
GdkEvent *event, gpointer data)
{
- setptr(filter, g_strdup("*"));
-
+ clear_filter();
refresh();
}
@@ -896,7 +910,7 @@
g_signal_connect(filter_entry, "icon-release", G_CALLBACK(on_filter_clear), NULL);
}
ui_widget_set_tooltip_text(filter_entry,
- _("Filter your files with usual wildcards"));
+ _("Filter your files with usual wildcards, separate multiple filters with \";\""));
g_signal_connect(filter_entry, "activate", G_CALLBACK(on_filter_activate), NULL);
gtk_box_pack_start(GTK_BOX(filterbar), label, FALSE, FALSE, 0);
@@ -1080,7 +1094,7 @@
GtkWidget *scrollwin, *toolbar, *filterbar;
filter = NULL;
-
+
file_view_vbox = gtk_vbox_new(FALSE, 0);
toolbar = make_toolbar();
gtk_box_pack_start(GTK_BOX(file_view_vbox), toolbar, FALSE, FALSE, 0);
@@ -1252,7 +1266,7 @@
g_free(config_file);
g_free(open_cmd);
- g_free(filter);
+ clear_filter();
gtk_widget_destroy(file_view_vbox);
g_object_unref(G_OBJECT(entry_completion));
}
Modified: branches/sm/plugins/saveactions.c
===================================================================
--- branches/sm/plugins/saveactions.c 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/plugins/saveactions.c 2011-05-21 08:44:31 UTC (rev 5801)
@@ -453,15 +453,18 @@
g_key_file_set_integer(config, "backupcopy", "dir_levels", backupcopy_dir_levels);
g_key_file_set_string(config, "backupcopy", "time_fmt", text_time);
setptr(backupcopy_time_fmt, g_strdup(text_time));
- if (*text_dir != '\0' && backupcopy_set_backup_dir(text_dir))
+ if (enable_backupcopy)
{
- g_key_file_set_string(config, "backupcopy", "backup_dir", text_dir);
+ if (NZV(text_dir) && backupcopy_set_backup_dir(text_dir))
+ {
+ g_key_file_set_string(config, "backupcopy", "backup_dir", text_dir);
+ }
+ else
+ {
+ dialogs_show_msgbox(GTK_MESSAGE_ERROR,
+ _("Backup directory does not exist or is not writable."));
+ }
}
- else
- {
- dialogs_show_msgbox(GTK_MESSAGE_ERROR,
- _("Backup directory does not exist or is not writable."));
- }
if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils_mkdir(config_dir, TRUE) != 0)
Modified: branches/sm/src/Makefile.am
===================================================================
--- branches/sm/src/Makefile.am 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/src/Makefile.am 2011-05-21 08:44:31 UTC (rev 5801)
@@ -75,7 +75,7 @@
INCLUDES = -I$(top_srcdir) -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include \
- @GTK_CFLAGS@ @GIO_CFLAGS@
+ -I$(topsrcdir)/tagmanager/mio @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
@@ -86,8 +86,8 @@
geany_SOURCES = $(SRCS) win32.c win32.h
-geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ @GIO_LIBS@ \
- $(INTLLIBS) -lole32 -luuid -liberty -lwsock32 geany_private.res
+geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \
+ @GTK_LIBS@ @GIO_LIBS@ $(INTLLIBS) -lole32 -luuid -liberty -lwsock32 geany_private.res
AM_CFLAGS = -DGEANY_DATADIR=\"data\" \
-DGEANY_DOCDIR=\"\" \
@@ -113,7 +113,8 @@
geany_SOURCES = $(SRCS) vte.c vte.h
-geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a @GTK_LIBS@ @GIO_LIBS@ @SM_LIBS@ $(INTLLIBS)
+geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a ../tagmanager/mio/libmio.a \
+ @GTK_LIBS@ @GIO_LIBS@ @SM_LIBS@ $(INTLLIBS)
AM_CFLAGS = -DGEANY_DATADIR=\""$(datadir)"\" \
-DGEANY_DOCDIR=\""$(docdir)"\" \
Modified: branches/sm/src/about.c
===================================================================
--- branches/sm/src/about.c 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/src/about.c 2011-05-21 08:44:31 UTC (rev 5801)
@@ -40,7 +40,7 @@
#define INFO "<span size=\"larger\" weight=\"bold\">%s</span>"
#define CODENAME "<span weight=\"bold\">\"" GEANY_CODENAME "\"</span>"
#define BUILDDATE "<span size=\"smaller\">%s</span>"
-#define COPYRIGHT "Copyright (c) 2005-2011\nNick Treleaven\nEnrico Tröger\nFrank Lanitz\nAll rights reserved."
+#define COPYRIGHT "Copyright (c) 2005-2011\nNick Treleaven\nColomban Wendling\nEnrico Tröger\nFrank Lanitz\nAll rights reserved."
const gchar *translators[][2] = {
{ "ast", "Marcos Costales <marcoscostales at gmail.com>"},
@@ -264,7 +264,7 @@
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(credits_scrollwin),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
- table = gtk_table_new(18 + translators_len + prev_translators_len, 3, FALSE);
+ table = gtk_table_new(20 + translators_len + prev_translators_len, 3, FALSE);
gtk_table_set_col_spacings(GTK_TABLE(table), 10);
row = 0;
@@ -286,6 +286,14 @@
ROW("", row, 0, 0, 0, 0);
row++;
+ g_snprintf(buffer, sizeof(buffer), "Colomban Wendling - %s", _("developer"));
+ ROW(buffer, row, 0, 0, 0, 1);
+ row++;
+ ROW("<lists.ban at herbesfolles.org>", row, 0, 0, 0, 1);
+ row++;
+ ROW("", row, 0, 0, 0, 0);
+ row++;
+
g_snprintf(buffer, sizeof(buffer), "Enrico Tröger - %s", _("developer"));
ROW(buffer, row, 0, 0, 0, 1);
row++;
@@ -295,7 +303,7 @@
row++;
g_snprintf(buffer, sizeof(buffer), "Frank Lanitz - %s", _("translation maintainer"));
- ROW(buffer, 7, 0, 0, 0, 1);
+ ROW(buffer, row, 0, 0, 0, 1);
row++;
ROW("<frank at frank.uvena.de>", row, 0, 0, 0, 1);
row++;
Modified: branches/sm/src/document.c
===================================================================
--- branches/sm/src/document.c 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/src/document.c 2011-05-21 08:44:31 UTC (rev 5801)
@@ -2362,7 +2362,7 @@
static gboolean update_tags_from_buffer(GeanyDocument *doc)
{
gboolean result;
-#if 1
+#if 0
/* old code */
result = tm_source_file_update(doc->tm_file, TRUE, FALSE, TRUE);
#else
Modified: branches/sm/src/editor.c
===================================================================
--- branches/sm/src/editor.c 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/src/editor.c 2011-05-21 08:44:31 UTC (rev 5801)
@@ -83,6 +83,9 @@
/* holds word under the mouse or keyboard cursor */
static gchar current_word[GEANY_MAX_WORD_LENGTH];
+/* whether there is a tag list update pending */
+static gboolean document_tags_update_pending = FALSE;
+
/* Initialised in keyfile.c. */
GeanyEditorPrefs editor_prefs;
@@ -991,6 +994,29 @@
}
+static gboolean on_document_update_tags_idle(gpointer data)
+{
+ GeanyDocument *doc = data;
+
+ if (!main_status.quitting && DOC_VALID(doc))
+ document_update_tag_list(doc, TRUE);
+
+ document_tags_update_pending = FALSE;
+ return FALSE;
+}
+
+
+static void request_tag_list_update(GeanyDocument *doc)
+{
+ if (!document_tags_update_pending)
+ {
+ document_tags_update_pending = TRUE;
+ g_timeout_add_full(G_PRIORITY_LOW, editor_prefs.autocompletion_update_freq,
+ on_document_update_tags_idle, doc, NULL);
+ }
+}
+
+
static gboolean on_editor_notify(G_GNUC_UNUSED GObject *object, GeanyEditor *editor,
SCNotification *nt, G_GNUC_UNUSED gpointer data)
{
@@ -1052,6 +1078,12 @@
/* handle special fold cases, e.g. #1923350 */
fold_changed(sci, nt->line, nt->foldLevelNow, nt->foldLevelPrev);
}
+ if (editor_prefs.autocompletion_update_freq > 0 &&
+ (nt->modificationType & (SC_MOD_INSERTTEXT | SC_MOD_DELETETEXT)) &&
+ filetype_has_tags(doc->file_type))
+ {
+ request_tag_list_update(doc);
+ }
break;
case SCN_CHARADDED:
Modified: branches/sm/src/editor.h
===================================================================
--- branches/sm/src/editor.h 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/src/editor.h 2011-05-21 08:44:31 UTC (rev 5801)
@@ -146,6 +146,7 @@
gint show_virtual_space;
/* This setting may be overridden when a project is opened. Use @c editor_get_prefs(). */
gboolean long_line_enabled;
+ gint autocompletion_update_freq;
}
GeanyEditorPrefs;
Modified: branches/sm/src/interface.c
===================================================================
--- branches/sm/src/interface.c 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/src/interface.c 2011-05-21 08:44:31 UTC (rev 5801)
@@ -2712,6 +2712,9 @@
GtkWidget *spin_symbollistheight;
GtkObject *spin_autocompletion_max_entries_adj;
GtkWidget *spin_autocompletion_max_entries;
+ GtkWidget *label250;
+ GtkObject *spin_symbol_update_freq_adj;
+ GtkWidget *spin_symbol_update_freq;
GtkWidget *label177;
GtkWidget *frame38;
GtkWidget *alignment42;
@@ -3985,7 +3988,7 @@
gtk_widget_show (check_completion_drops_rest_of_word);
gtk_box_pack_start (GTK_BOX (vbox19), check_completion_drops_rest_of_word, FALSE, FALSE, 0);
- table14 = gtk_table_new (3, 2, FALSE);
+ table14 = gtk_table_new (4, 2, FALSE);
gtk_widget_show (table14);
gtk_box_pack_start (GTK_BOX (vbox19), table14, FALSE, FALSE, 0);
gtk_table_set_row_spacings (GTK_TABLE (table14), 3);
@@ -4039,6 +4042,22 @@
gtk_tooltips_set_tip (tooltips, spin_autocompletion_max_entries, _("Maximum number of entries to display in the autocompletion list"), NULL);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_autocompletion_max_entries), TRUE);
+ label250 = gtk_label_new (_("Symbol list update frequency:"));
+ gtk_widget_show (label250);
+ gtk_table_attach (GTK_TABLE (table14), label250, 0, 1, 3, 4,
+ (GtkAttachOptions) (GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_misc_set_alignment (GTK_MISC (label250), 0, 0.5);
+
+ spin_symbol_update_freq_adj = gtk_adjustment_new (250, 0, 10000, 10, 100, 0);
+ spin_symbol_update_freq = gtk_spin_button_new (GTK_ADJUSTMENT (spin_symbol_update_freq_adj), 1, 0);
+ gtk_widget_show (spin_symbol_update_freq);
+ gtk_table_attach (GTK_TABLE (table14), spin_symbol_update_freq, 1, 2, 3, 4,
+ (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+ (GtkAttachOptions) (0), 0, 0);
+ gtk_tooltips_set_tip (tooltips, spin_symbol_update_freq, _("Minimal delay (in milliseconds) between two automatic updates of the symbol list. Note that a too short delay may have performance impact, espcially with large files. A delay of 0 disables real-time updates."), NULL);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin_symbol_update_freq), TRUE);
+
label177 = gtk_label_new (_("<b>Completions</b>"));
gtk_widget_show (label177);
gtk_frame_set_label_widget (GTK_FRAME (frame18), label177);
@@ -5229,6 +5248,8 @@
GLADE_HOOKUP_OBJECT (prefs_dialog, spin_symbol_complete_chars, "spin_symbol_complete_chars");
GLADE_HOOKUP_OBJECT (prefs_dialog, spin_symbollistheight, "spin_symbollistheight");
GLADE_HOOKUP_OBJECT (prefs_dialog, spin_autocompletion_max_entries, "spin_autocompletion_max_entries");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, label250, "label250");
+ GLADE_HOOKUP_OBJECT (prefs_dialog, spin_symbol_update_freq, "spin_symbol_update_freq");
GLADE_HOOKUP_OBJECT (prefs_dialog, label177, "label177");
GLADE_HOOKUP_OBJECT (prefs_dialog, frame38, "frame38");
GLADE_HOOKUP_OBJECT (prefs_dialog, alignment42, "alignment42");
Modified: branches/sm/src/keyfile.c
===================================================================
--- branches/sm/src/keyfile.c 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/src/keyfile.c 2011-05-21 08:44:31 UTC (rev 5801)
@@ -83,6 +83,7 @@
#define GEANY_DEFAULT_FONT_EDITOR "Monospace 10"
#define GEANY_TOGGLE_MARK "~ "
#define GEANY_MAX_AUTOCOMPLETE_WORDS 30
+#define GEANY_MAX_SYMBOLS_UPDATE_FREQ 250
static gchar *scribble_text = NULL;
@@ -165,6 +166,8 @@
stash_group_add_spin_button_integer(group, (gint*)&editor_prefs.autocompletion_max_entries,
"autocompletion_max_entries", GEANY_MAX_AUTOCOMPLETE_WORDS,
"spin_autocompletion_max_entries");
+ stash_group_add_spin_button_integer(group, (gint*)&editor_prefs.autocompletion_update_freq,
+ "autocompletion_update_freq", GEANY_MAX_SYMBOLS_UPDATE_FREQ, "spin_symbol_update_freq");
stash_group_add_string(group, &editor_prefs.color_scheme,
"color_scheme", NULL);
Modified: branches/sm/src/makefile.win32
===================================================================
--- branches/sm/src/makefile.win32 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/src/makefile.win32 2011-05-21 08:44:31 UTC (rev 5801)
@@ -32,6 +32,7 @@
INCLUDEDIRS= -I.. \
-I../scintilla/include \
+ -I../tagmanager/mio \
-I../tagmanager/include \
$(GTK_INCLUDES)
@@ -92,8 +93,8 @@
$(TARGET): $(OBJS) $(RES) ../scintilla/scintilla.a ../tagmanager/tagmanager.a
$(CXX) $(OBJS) $(RES) -o $(TARGET) \
- ../scintilla/scintilla.a ../tagmanager/tagmanager.a $(ALL_GTK_LIBS) \
- $(WIN_LIBS)
+ ../scintilla/scintilla.a ../tagmanager/mio∕mio.a ../tagmanager/tagmanager.a \
+ $(ALL_GTK_LIBS) $(WIN_LIBS)
deps.mak:
$(CC) -MM $(CFLAGS) *.c >deps.mak
Modified: branches/sm/src/sciwrappers.c
===================================================================
--- branches/sm/src/sciwrappers.c 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/src/sciwrappers.c 2011-05-21 08:44:31 UTC (rev 5801)
@@ -450,6 +450,9 @@
}
+/** Gets the position at the end of a line
+ * @param sci Scintilla widget
+ * @param line Line */
gint sci_get_line_end_position(ScintillaObject *sci, gint line)
{
return SSM(sci, SCI_GETLINEENDPOSITION, line, 0);
@@ -823,6 +826,10 @@
}
+/** Sets the font for a particular style
+ * @param style The style
+ * @param font The font name
+ * @param size The font size */
void sci_set_font(ScintillaObject *sci, gint style, const gchar *font, gint size)
{
SSM(sci, SCI_STYLESETFONT, style, (sptr_t) font);
Modified: branches/sm/src/sidebar.c
===================================================================
--- branches/sm/src/sidebar.c 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/src/sidebar.c 2011-05-21 08:44:31 UTC (rev 5801)
@@ -216,7 +216,7 @@
if (doc->priv->tag_tree == NULL)
{
doc->priv->tag_store = gtk_tree_store_new(
- SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_STRING);
+ SYMBOLS_N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, TM_TYPE_TAG, G_TYPE_STRING);
doc->priv->tag_tree = gtk_tree_view_new();
prepare_taglist(doc->priv->tag_tree, doc->priv->tag_store);
gtk_widget_show(doc->priv->tag_tree);
@@ -874,6 +874,7 @@
change_focus_to_editor(doc, NULL);
}
}
+ tm_tag_unref(tag);
}
return FALSE;
}
Modified: branches/sm/src/symbols.c
===================================================================
--- branches/sm/src/symbols.c 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/src/symbols.c 2011-05-21 08:44:31 UTC (rev 5801)
@@ -900,30 +900,21 @@
}
-/* the following code surely can be improved, at the moment it collects some iters
- * for removal and after that the actual removal is done. I didn't find a way to find and remove
- * an empty row in one loop (next iter fails then) */
+/* removes toplevel items that have no children */
static void hide_empty_rows(GtkTreeStore *store)
{
- GtkTreeIter iter, *iters[MAX_SYMBOL_TYPES] = { NULL };
- guint i = 0;
+ GtkTreeIter iter;
+ gboolean cont = TRUE;
if (! gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
return; /* stop when first iter is invalid, i.e. no elements */
- do /* first collect the iters we need to delete empty rows */
+ while (cont)
{
if (! gtk_tree_model_iter_has_child(GTK_TREE_MODEL(store), &iter))
- iters[i++] = gtk_tree_iter_copy(&iter);
- } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter));
-
- /* now actually delete the collected iters */
- for (i = 0; i < MAX_SYMBOL_TYPES; i++)
- {
- if (G_UNLIKELY(iters[i] == NULL))
- break;
- gtk_tree_store_remove(store, iters[i]);
- gtk_tree_iter_free(iters[i]);
+ cont = gtk_tree_store_remove(store, &iter);
+ else
+ cont = gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
}
}
@@ -1233,7 +1224,8 @@
gpointer user_data)
{
gboolean sort_by_name = GPOINTER_TO_INT(user_data);
- const TMTag *tag_a, *tag_b;
+ TMTag *tag_a, *tag_b;
+ gint cmp;
gtk_tree_model_get(model, a, SYMBOLS_COLUMN_TAG, &tag_a, -1);
gtk_tree_model_get(model, b, SYMBOLS_COLUMN_TAG, &tag_b, -1);
@@ -1243,13 +1235,12 @@
if (tag_a && !tag_has_missing_parent(tag_a, GTK_TREE_STORE(model), a) &&
tag_b && !tag_has_missing_parent(tag_b, GTK_TREE_STORE(model), b))
{
- return sort_by_name ? compare_symbol(tag_a, tag_b) :
+ cmp = sort_by_name ? compare_symbol(tag_a, tag_b) :
compare_symbol_lines(tag_a, tag_b);
}
else
{
gchar *astr, *bstr;
- gint cmp;
gtk_tree_model_get(model, a, SYMBOLS_COLUMN_NAME, &astr, -1);
gtk_tree_model_get(model, b, SYMBOLS_COLUMN_NAME, &bstr, -1);
@@ -1263,23 +1254,28 @@
{
/* this is what g_strcmp0() does */
if (! astr)
- return -(astr != bstr);
+ cmp = -(astr != bstr);
if (! bstr)
- return astr != bstr;
+ cmp = astr != bstr;
+ else
+ {
+ cmp = strcmp(astr, bstr);
- cmp = strcmp(astr, bstr);
-
- /* sort duplicate 'ScopeName::OverloadedTagName' items by line as well */
- if (tag_a && tag_b)
- if (!sort_by_name ||
- (utils_str_equal(tag_a->name, tag_b->name) &&
- utils_str_equal(tag_a->atts.entry.scope, tag_b->atts.entry.scope)))
- cmp = compare_symbol_lines(tag_a, tag_b);
+ /* sort duplicate 'ScopeName::OverloadedTagName' items by line as well */
+ if (tag_a && tag_b)
+ if (!sort_by_name ||
+ (utils_str_equal(tag_a->name, tag_b->name) &&
+ utils_str_equal(tag_a->atts.entry.scope, tag_b->atts.entry.scope)))
+ cmp = compare_symbol_lines(tag_a, tag_b);
+ }
}
g_free(astr);
g_free(bstr);
- return cmp;
}
+ tm_tag_unref(tag_a);
+ tm_tag_unref(tag_b);
+
+ return cmp;
}
Modified: branches/sm/src/templates.c
===================================================================
--- branches/sm/src/templates.c 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/src/templates.c 2011-05-21 08:44:31 UTC (rev 5801)
@@ -508,12 +508,15 @@
/* add line_prefix to every line of comment_text */
lines = g_strsplit(comment_text->str, template_eol_char, -1);
- len = g_strv_length(lines) - 1;
- for (i = 0; i < len; i++)
+ len = g_strv_length(lines);
+ if (len > 0) /* prevent unsigned wraparound if comment_text is empty */
{
- tmp = lines[i];
- lines[i] = g_strconcat(prefix, tmp, NULL);
- g_free(tmp);
+ for (i = 0; i < len - 1; i++)
+ {
+ tmp = lines[i];
+ lines[i] = g_strconcat(prefix, tmp, NULL);
+ g_free(tmp);
+ }
}
tmp = g_strjoinv(template_eol_char, lines);
Modified: branches/sm/tagmanager/Makefile.am
===================================================================
--- branches/sm/tagmanager/Makefile.am 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/tagmanager/Makefile.am 2011-05-21 08:44:31 UTC (rev 5801)
@@ -1,8 +1,8 @@
## Process this file with automake to produce Makefile.in
# $Id$
-SUBDIRS = include
-INCLUDES = -I$(srcdir)/include $(GTK_CFLAGS)
+SUBDIRS = mio include
+INCLUDES = -I$(srcdir)/include $(GTK_CFLAGS) -I$(srcdir)/mio -I$(srcdir)
AM_CFLAGS = -DG_LOG_DOMAIN=\""Tagmanager"\"
Modified: branches/sm/tagmanager/c.c
===================================================================
--- branches/sm/tagmanager/c.c 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/tagmanager/c.c 2011-05-21 08:44:31 UTC (rev 5801)
@@ -16,6 +16,7 @@
#include <string.h>
#include <setjmp.h>
+#include <mio/mio.h>
#include "entry.h"
#include "get.h"
@@ -180,8 +181,7 @@
keywordId keyword;
vString* name; /* the name of the token */
unsigned long lineNumber; /* line number of tag */
- fpos_t filePosition; /* file position of line containing name */
- int bufferPosition; /* buffer position of line containing name */
+ MIOPos filePosition; /* file position of line containing name */
} tokenInfo;
typedef enum eImplementation
@@ -602,10 +602,7 @@
token->type = TOKEN_NONE;
token->keyword = KEYWORD_NONE;
token->lineNumber = getSourceLineNumber();
- if (useFile())
- token->filePosition = getInputFilePosition();
- else
- token->bufferPosition = getInputBufferPosition();
+ token->filePosition = getInputFilePosition();
vStringClear(token->name);
}
@@ -1236,16 +1233,8 @@
if ((TRUE == st->gotArgs) && (TRUE == Option.extensionFields.argList) &&
((TAG_FUNCTION == type) || (TAG_METHOD == type) || (TAG_PROTOTYPE == type)))
{
- if (useFile())
- {
- tag->extensionFields.arglist = getArglistFromFilePos(
+ tag->extensionFields.arglist = getArglistFromFilePos(
tag->filePosition, tag->name);
- }
- else
- {
- tag->extensionFields.arglist = getArglistFromBufferPos(
- tag->bufferPosition, tag->name);
- }
}
break;
}
@@ -1424,10 +1413,7 @@
initTagEntry (&e, vStringValue (token->name));
e.lineNumber = token->lineNumber;
- if (useFile())
- e.filePosition = token->filePosition;
- else
- e.bufferPosition = token->bufferPosition;
+ e.filePosition = token->filePosition;
e.isFileScope = isFileScope;
e.kindName = tagName (type);
e.kind = tagLetter (type);
@@ -1894,10 +1880,7 @@
{
dest->type = src->type;
dest->keyword = src->keyword;
- if (useFile())
- dest->filePosition = src->filePosition;
- else
- dest->bufferPosition = src->bufferPosition;
+ dest->filePosition = src->filePosition;
dest->lineNumber = src->lineNumber;
vStringCopy (dest->name, src->name);
}
@@ -2487,12 +2470,7 @@
}
if (st->argEndPosition == 0)
{
- if (useFile())
- st->argEndPosition = ftell(File.fp);
- else
- /* FIXME File.fpBufferPosition is wrong here, this breaks function signatures and
- * so Geany's calltips */
- st->argEndPosition = File.fpBufferPosition;
+ st->argEndPosition = mio_tell(File.mio);
}
if (! info->isNameCandidate)
Modified: branches/sm/tagmanager/entry.c
===================================================================
--- branches/sm/tagmanager/entry.c 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/tagmanager/entry.c 2011-05-21 08:44:31 UTC (rev 5801)
@@ -127,8 +127,8 @@
const char *const fileName,
const char *const pattern)
{
- const int length = fprintf (TagFile.fp, "%s%s\t%s\t/%s/\n",
- PSEUDO_TAG_PREFIX, tagName, fileName, pattern);
+ const int length = mio_printf (TagFile.mio, "%s%s\t%s\t/%s/\n",
+ PSEUDO_TAG_PREFIX, tagName, fileName, pattern);
++TagFile.numTags.added;
rememberMaxLengths (strlen (tagName), (size_t) length);
}
@@ -159,7 +159,7 @@
}
static void updateSortedFlag (const char *const line,
- FILE *const fp, fpos_t startOfLine)
+ MIO *const mio, MIOPos startOfLine)
{
const char *const tab = strchr (line, '\t');
@@ -169,27 +169,27 @@
if (line [boolOffset] == '0' || line [boolOffset] == '1')
{
- fpos_t nextLine;
+ MIOPos nextLine;
- if (fgetpos (fp, &nextLine) == -1 || fsetpos (fp, &startOfLine) == -1)
+ if (mio_getpos (mio, &nextLine) == -1 || mio_setpos (mio, &startOfLine) == -1)
error (WARNING, "Failed to update 'sorted' pseudo-tag");
else
{
- fpos_t flagLocation;
+ MIOPos flagLocation;
int c, d;
do
- c = fgetc (fp);
+ c = mio_getc (mio);
while (c != '\t' && c != '\n');
- fgetpos (fp, &flagLocation);
- d = fgetc (fp);
+ mio_getpos (mio, &flagLocation);
+ d = mio_getc (mio);
if (c == '\t' && (d == '0' || d == '1') &&
d != (int) Option.sorted)
{
- fsetpos (fp, &flagLocation);
- fputc (Option.sorted ? '1' : '0', fp);
+ mio_setpos (mio, &flagLocation);
+ mio_putc (mio, Option.sorted ? '1' : '0');
}
- fsetpos (fp, &nextLine);
+ mio_setpos (mio, &nextLine);
}
}
}
@@ -198,12 +198,12 @@
/* Look through all line beginning with "!_TAG_FILE", and update those which
* require it.
*/
-static long unsigned int updatePseudoTags (FILE *const fp)
+static long unsigned int updatePseudoTags (MIO *const mio)
{
enum { maxClassLength = 20 };
char class [maxClassLength + 1];
unsigned long linesRead = 0;
- fpos_t startOfLine;
+ MIOPos startOfLine;
size_t classLength;
const char *line;
@@ -211,8 +211,8 @@
classLength = strlen (class);
Assert (classLength < maxClassLength);
- fgetpos (fp, &startOfLine);
- line = readLine (TagFile.vLine, fp);
+ mio_getpos (mio, &startOfLine);
+ line = readLine (TagFile.vLine, mio);
while (line != NULL && line [0] == class [0])
{
++linesRead;
@@ -224,16 +224,16 @@
tab == '\t')
{
if (strcmp (classType, "_SORTED") == 0)
- updateSortedFlag (line, fp, startOfLine);
+ updateSortedFlag (line, mio, startOfLine);
}
- fgetpos (fp, &startOfLine);
+ mio_getpos (mio, &startOfLine);
}
- line = readLine (TagFile.vLine, fp);
+ line = readLine (TagFile.vLine, mio);
}
while (line != NULL) /* skip to end of file */
{
++linesRead;
- line = readLine (TagFile.vLine, fp);
+ line = readLine (TagFile.vLine, mio);
}
return linesRead;
}
@@ -247,22 +247,22 @@
static boolean isTagFile (const char *const filename)
{
boolean ok = FALSE; /* we assume not unless confirmed */
- FILE *const fp = g_fopen (filename, "rb");
+ MIO *const mio = mio_new_file_full (filename, "rb", g_fopen, fclose);
- if (fp == NULL && errno == ENOENT)
+ if (mio == NULL && errno == ENOENT)
ok = TRUE;
- else if (fp != NULL)
+ else if (mio != NULL)
{
- const char *line = readLine (TagFile.vLine, fp);
+ const char *line = readLine (TagFile.vLine, mio);
if (line == NULL)
ok = TRUE;
- fclose (fp);
+ mio_free (mio);
}
return ok;
}
-extern void copyBytes (FILE* const fromFp, FILE* const toFp, const long size)
+extern void copyBytes (MIO* const fromMio, MIO* const toMio, const long size)
{
enum { BufferSize = 1000 };
long toRead, numRead;
@@ -272,8 +272,8 @@
{
toRead = (0 < remaining && remaining < BufferSize) ?
remaining : BufferSize;
- numRead = fread (buffer, (size_t) 1, (size_t) toRead, fromFp);
- if (fwrite (buffer, (size_t)1, (size_t)numRead, toFp) < (size_t)numRead)
+ numRead = mio_read (fromMio, buffer, (size_t) 1, (size_t) toRead);
+ if (mio_write (toMio, buffer, (size_t)1, (size_t)numRead) < (size_t)numRead)
error (FATAL | PERROR, "cannot complete write");
if (remaining > 0)
remaining -= numRead;
@@ -283,20 +283,20 @@
extern void copyFile (const char *const from, const char *const to, const long size)
{
- FILE* const fromFp = g_fopen (from, "rb");
- if (fromFp == NULL)
+ MIO* const fromMio = mio_new_file_full (from, "rb", g_fopen, fclose);
+ if (fromMio == NULL)
error (FATAL | PERROR, "cannot open file to copy");
else
{
- FILE* const toFp = g_fopen (to, "wb");
- if (toFp == NULL)
+ MIO* const toMio = mio_new_file_full (to, "wb", g_fopen, fclose);
+ if (toMio == NULL)
error (FATAL | PERROR, "cannot open copy destination");
else
{
- copyBytes (fromFp, toFp, size);
- fclose (toFp);
+ copyBytes (fromMio, toMio, size);
+ mio_free (toMio);
}
- fclose (fromFp);
+ mio_free (fromMio);
}
}
@@ -311,7 +311,12 @@
/* Open the tags file.
*/
if (TagsToStdout)
- TagFile.fp = tempFile ("w", &TagFile.name);
+ {
+ FILE *fp;
+
+ fp = tempFile ("w", &TagFile.name);
+ TagFile.mio = mio_new_fp (fp, fclose);
+ }
else
{
boolean fileExists;
@@ -324,24 +329,24 @@
"\"%s\" doesn't look like a tag file; I refuse to overwrite it.",
TagFile.name);
- if (Option.append && fileExists)
- {
- TagFile.fp = g_fopen (TagFile.name, "r+");
- if (TagFile.fp != NULL)
+ if (Option.append && fileExists)
{
- TagFile.numTags.prev = updatePseudoTags (TagFile.fp);
- fclose (TagFile.fp);
- TagFile.fp = g_fopen (TagFile.name, "a+");
+ TagFile.mio = mio_new_file_full (TagFile.name, "r+", g_fopen, fclose);
+ if (TagFile.mio != NULL)
+ {
+ TagFile.numTags.prev = updatePseudoTags (TagFile.mio);
+ mio_free (TagFile.mio);
+ TagFile.mio = mio_new_file_full (TagFile.name, "a+", g_fopen, fclose);
+ }
}
- }
- else
- {
- TagFile.fp = g_fopen (TagFile.name, "w");
- if (TagFile.fp != NULL)
- addPseudoTags ();
- }
+ else
+ {
+ TagFile.mio = mio_new_file_full (TagFile.name, "w", g_fopen, fclose);
+ if (TagFile.mio != NULL)
+ addPseudoTags ();
+ }
- if (TagFile.fp == NULL)
+ if (TagFile.mio == NULL)
{
error (FATAL | PERROR, "cannot open tag file");
exit (1);
@@ -409,7 +414,6 @@
e->lineNumber = getSourceLineNumber ();
e->language = getSourceLanguageName ();
e->filePosition = getInputFilePosition ();
- e->bufferPosition = getInputBufferPosition ();
e->sourceFileName = getSourceFileTagPath ();
e->name = name;
}
Modified: branches/sm/tagmanager/entry.h
===================================================================
--- branches/sm/tagmanager/entry.h 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/tagmanager/entry.h 2011-05-21 08:44:31 UTC (rev 5801)
@@ -15,7 +15,7 @@
*/
#include "general.h" /* must always come first */
-#include <stdio.h>
+#include <mio/mio.h>
#include "vstring.h"
@@ -33,12 +33,12 @@
typedef struct eTagFile {
char *name;
char *directory;
- FILE *fp;
+ MIO *mio;
struct sNumTags { unsigned long added, prev; } numTags;
struct sMax { size_t line, tag, file; } max;
struct sEtags {
char *name;
- FILE *fp;
+ MIO *mio;
size_t byteCount;
} etags;
vString *vLine;
@@ -55,7 +55,7 @@
typedef struct sTagEntryInfo {
boolean lineNumberEntry;/* pattern or line number entry */
unsigned long lineNumber; /* line number of tag */
- fpos_t filePosition; /* file position of line containing tag */
+ MIOPos filePosition; /* file position of line containing tag */
int bufferPosition; /* buffer position of line containing tag */
const char* language; /* language of source file */
boolean isFileScope; /* is tag visibile only within source file? */
@@ -88,7 +88,7 @@
*/
extern void freeTagFileResources (void);
extern const char *tagFileName (void);
-extern void copyBytes (FILE* const fromFp, FILE* const toFp, const long size);
+extern void copyBytes (MIO* const fromMio, MIO* const toMio, const long size);
extern void copyFile (const char *const from, const char *const to, const long size);
extern void openTagFile (void);
extern void closeTagFile (const boolean resize);
Modified: branches/sm/tagmanager/fortran.c
===================================================================
--- branches/sm/tagmanager/fortran.c 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/tagmanager/fortran.c 2011-05-21 08:44:31 UTC (rev 5801)
@@ -19,6 +19,7 @@
#include <limits.h>
#include <ctype.h> /* to define tolower () */
#include <setjmp.h>
+#include <mio/mio.h>
#include "entry.h"
#include "keyword.h"
@@ -183,8 +184,7 @@
vString* string;
struct sTokenInfo *secondary;
unsigned long lineNumber;
- fpos_t filePosition;
- int bufferPosition; /* buffer position of line containing name */
+ MIOPos filePosition;
} tokenInfo;
/*
@@ -423,10 +423,7 @@
token->string = vStringNew ();
token->secondary = NULL;
token->lineNumber = getSourceLineNumber ();
- if (useFile())
- token->filePosition = getInputFilePosition ();
- else
- token->bufferPosition = getInputBufferPosition ();
+ token->filePosition = getInputFilePosition ();
return token;
}
@@ -480,10 +477,7 @@
e.lineNumberEntry = (boolean) (Option.locate != EX_PATTERN);
e.lineNumber = token->lineNumber;
- if (useFile())
- e.filePosition = token->filePosition;
- else
- e.bufferPosition = token->bufferPosition;
+ e.filePosition = token->filePosition;
e.isFileScope = isFileScope (token->tag);
e.kindName = FortranKinds [token->tag].name;
e.kind = FortranKinds [token->tag].letter;
@@ -959,10 +953,7 @@
c = getChar ();
token->lineNumber = getSourceLineNumber ();
- if (useFile())
- token->filePosition = getInputFilePosition ();
- else
- token->bufferPosition = getInputBufferPosition ();
+ token->filePosition = getInputFilePosition ();
switch (c)
{
Modified: branches/sm/tagmanager/get.c
===================================================================
--- branches/sm/tagmanager/get.c 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/tagmanager/get.c 2011-05-21 08:44:31 UTC (rev 5801)
@@ -314,14 +314,8 @@
e.kind = 'd';
if (parameterized)
{
- if (useFile()) {
- e.extensionFields.arglist = getArglistFromFilePos(getInputFilePosition()
- , e.name);
- }
- else {
- e.extensionFields.arglist = getArglistFromBufferPos(getInputBufferPosition()
- , e.name);
- }
+ e.extensionFields.arglist = getArglistFromFilePos(getInputFilePosition()
+ , e.name);
}
makeTagEntry (&e);
if (parameterized)
@@ -715,63 +709,30 @@
return c;
}
-extern char *getArglistFromBufferPos(int startPosition, const char *tokenName)
+extern char *getArglistFromFilePos(MIOPos startPosition, const char *tokenName)
{
- int bufferOriginalPosition;
+ MIOPos originalPosition;
char *result = NULL;
char *arglist = NULL;
long pos1, pos2;
- /* FIXME startPosition as well as getBufPos() are mostly wrong here */
- pos2 = getBufPos();
+ pos2 = mio_tell(File.mio);
- if (!useFile()) {
- bufferOriginalPosition = getBufPos ();
- setBufPos(startPosition);
- pos1 = File.fpBufferPosition;
- }
- else
- return NULL;
+ mio_getpos(File.mio, &originalPosition);
+ mio_setpos(File.mio, &startPosition);
+ pos1 = mio_tell(File.mio);
if (pos2 > pos1)
{
result = (char *) g_malloc(sizeof(char ) * (pos2 - pos1 + 2));
- if (result != NULL)
+ if (result != NULL && mio_read(File.mio, result, sizeof(char), pos2 - pos1 + 1) > 0)
{
- memcpy(result, &File.fpBuffer[getBufPos()], pos2 - pos1 + 1);
result[pos2-pos1+1] = '\0';
arglist = getArglistFromStr(result, tokenName);
- g_free(result);
}
- }
- setBufPos (bufferOriginalPosition);
- return arglist;
-}
-
-extern char *getArglistFromFilePos(fpos_t startPosition, const char *tokenName)
-{
- fpos_t originalPosition;
- char *result = NULL;
- char *arglist = NULL;
- long pos1, pos2;
-
- pos2 = ftell(File.fp);
-
- fgetpos(File.fp, &originalPosition);
- fsetpos(File.fp, &startPosition);
- pos1 = ftell(File.fp);
-
- if (pos2 > pos1)
- {
- result = (char *) g_malloc(sizeof(char ) * (pos2 - pos1 + 2));
- if (result != NULL && fread(result, sizeof(char), pos2 - pos1 + 1, File.fp) > 0)
- {
- result[pos2-pos1+1] = '\0';
- arglist = getArglistFromStr(result, tokenName);
- }
g_free(result);
}
- fsetpos(File.fp, &originalPosition);
+ mio_setpos(File.mio, &originalPosition);
return arglist;
}
Modified: branches/sm/tagmanager/get.h
===================================================================
--- branches/sm/tagmanager/get.h 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/tagmanager/get.h 2011-05-21 08:44:31 UTC (rev 5801)
@@ -45,8 +45,7 @@
extern void cppUngetc (const int c);
extern int cppGetc (void);
extern int skipOverCComment (void);
-extern char *getArglistFromFilePos(fpos_t startPosition, const char *tokenName);
-extern char *getArglistFromBufferPos(int startPosition, const char *tokenName);
+extern char *getArglistFromFilePos(MIOPos startPosition, const char *tokenName);
extern char *getArglistFromStr(char *buf, const char *name);
#endif /* _GET_H */
Modified: branches/sm/tagmanager/include/tm_tag.h
===================================================================
--- branches/sm/tagmanager/include/tm_tag.h 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/tagmanager/include/tm_tag.h 2011-05-21 08:44:31 UTC (rev 5801)
@@ -30,6 +30,7 @@
*/
#include "tm_source_file.h"
+#include <glib-object.h>
#ifdef __cplusplus
extern "C"
@@ -147,6 +148,7 @@
gboolean inactive; /*!< Whether this file is to be parsed */
} file;
} atts;
+ gint refcount; /*!< the reference count of the tag */
} TMTag;
/*!
@@ -158,6 +160,12 @@
*/
typedef int (*TMTagCompareFunc) (const void *ptr1, const void *ptr2);
+/*! The GType for a TMTag */
+#define TM_TYPE_TAG (tm_tag_get_type())
+
+/*! Gets the GType for a TMTag */
+GType tm_tag_get_type(void) G_GNUC_CONST;
+
/*!
Initializes a TMTag structure with information from a tagEntryInfo struct
used by the ctags parsers. Note that the TMTag structure must be malloc()ed
@@ -306,15 +314,29 @@
\sa tm_tag_free()
*/
void tm_tag_destroy(TMTag *tag);
-#endif
/*!
Destroys all data in the tag and frees the tag structure as well.
\param tag Pointer to a TMTag structure
*/
void tm_tag_free(gpointer tag);
+#endif
/*!
+ Drops a reference from a TMTag. If the reference count reaches 0, this function
+ destroys all data in the tag and frees the tag structure as well.
+ \param tag Pointer to a TMTag structure
+*/
+void tm_tag_unref(TMTag *tag);
+
+/*!
+ Adds a reference to a TMTag.
+ \param tag Pointer to a TMTag structure
+ \return the passed-in TMTag
+*/
+TMTag *tm_tag_ref(TMTag *tag);
+
+/*!
Returns the type of tag as a string
\param tag The tag whose type is required
*/
Modified: branches/sm/tagmanager/js.c
===================================================================
--- branches/sm/tagmanager/js.c 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/tagmanager/js.c 2011-05-21 08:44:31 UTC (rev 5801)
@@ -21,6 +21,7 @@
#include "general.h" /* must always come first */
#include <ctype.h> /* to define isalpha () */
#include <setjmp.h>
+#include <mio/mio.h>
#ifdef DEBUG
#include <stdio.h>
#endif
@@ -107,10 +108,9 @@
vString * string;
vString * scope;
unsigned long lineNumber;
- fpos_t filePosition;
+ MIOPos filePosition;
int nestLevel;
boolean ignoreTag;
- int bufferPosition; /* buffer position of line containing name */
} tokenInfo;
/*
@@ -198,10 +198,7 @@
token->nestLevel = 0;
token->ignoreTag = FALSE;
token->lineNumber = getSourceLineNumber ();
- if (useFile())
- token->filePosition = getInputFilePosition ();
- else
- token->bufferPosition = getInputBufferPosition ();
+ token->filePosition = getInputFilePosition ();
return token;
}
@@ -357,11 +354,8 @@
{
c = fileGetc ();
token->lineNumber = getSourceLineNumber ();
- if (useFile())
- token->filePosition = getInputFilePosition ();
- else
- token->bufferPosition = getInputBufferPosition ();
- }
+ token->filePosition = getInputFilePosition ();
+ }
while (c == '\t' || c == ' ' || c == '\n');
switch (c)
@@ -384,10 +378,7 @@
token->type = TOKEN_STRING;
parseString (token->string, c);
token->lineNumber = getSourceLineNumber ();
- if (useFile())
- token->filePosition = getInputFilePosition ();
- else
- token->bufferPosition = getInputBufferPosition ();
+ token->filePosition = getInputFilePosition ();
break;
case '\\':
@@ -396,10 +387,7 @@
fileUngetc (c);
token->type = TOKEN_CHARACTER;
token->lineNumber = getSourceLineNumber ();
- if (useFile())
- token->filePosition = getInputFilePosition ();
- else
- token->bufferPosition = getInputBufferPosition ();
+ token->filePosition = getInputFilePosition ();
break;
case '/':
@@ -442,10 +430,7 @@
{
parseIdentifier (token->string, c);
token->lineNumber = getSourceLineNumber ();
- if (useFile())
- token->filePosition = getInputFilePosition ();
- else
- token->bufferPosition = getInputBufferPosition ();
+ token->filePosition = getInputFilePosition ();
token->keyword = analyzeToken (token->string);
if (isKeyword (token, KEYWORD_NONE))
token->type = TOKEN_IDENTIFIER;
@@ -460,10 +445,7 @@
{
dest->nestLevel = src->nestLevel;
dest->lineNumber = src->lineNumber;
- if (useFile())
- dest->filePosition = src->filePosition;
- else
- dest->bufferPosition = src->bufferPosition;
+ dest->filePosition = src->filePosition;
dest->type = src->type;
dest->keyword = src->keyword;
vStringCopy(dest->string, src->string);
Modified: branches/sm/tagmanager/lregex.c
===================================================================
--- branches/sm/tagmanager/lregex.c 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/tagmanager/lregex.c 2011-05-21 08:44:31 UTC (rev 5801)
@@ -20,6 +20,7 @@
#include <string.h>
#include <glib.h>
+#include <mio/mio.h>
#ifdef HAVE_REGCOMP
# include <ctype.h>
@@ -410,15 +411,15 @@
else
{
const char* regexfile = parameter + 1;
- FILE* const fp = fopen (regexfile, "r");
- if (fp == NULL)
+ MIO* const mio = mio_new_file (regexfile, "r");
+ if (mio == NULL)
printf ("regex: %s\n", regexfile);
else
{
vString* const regex = vStringNew ();
- while (readLine (regex, fp))
+ while (readLine (regex, mio))
addLanguageRegex (language, vStringValue (regex));
- fclose (fp);
+ mio_free (mio);
vStringDelete (regex);
}
}
Modified: branches/sm/tagmanager/makefile.win32
===================================================================
--- branches/sm/tagmanager/makefile.win32 2011-05-21 08:42:15 UTC (rev 5800)
+++ branches/sm/tagmanager/makefile.win32 2011-05-21 08:44:31 UTC (rev 5801)
@@ -22,7 +22,7 @@
-I$(PREFIX)/include/gettext \
-I$(PREFIX)/include
-INCLUDEDIRS=-I include $(GTK_INCLUDES)
+INCLUDEDIRS=-I include -I mio -I . $(GTK_INCLUDES)
CBASEFLAGS=-Wall -pipe -mms-bitfields -DPACKAGE=\"geany\" -DG_OS_WIN32 -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS)
ifdef DEBUG
Added: branches/sm/tagmanager/mio/COPYING
===================================================================
--- branches/sm/tagmanager/mio/COPYING (rev 0)
+++ branches/sm/tagmanager/mio/COPYING 2011-05-21 08:44:31 UTC (rev 5801)
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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 3 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, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
Added: branches/sm/tagmanager/mio/Makefile.am
===================================================================
--- branches/sm/tagmanager/mio/Makefile.am (rev 0)
+++ branches/sm/tagmanager/mio/Makefile.am 2011-05-21 08:44:31 UTC (rev 5801)
@@ -0,0 +1,13 @@
+# $id$
+
+noinst_LIBRARIES = libmio.a
+
+AM_CPPFLAGS = -DG_LOG_DOMAIN=\"MIO\" #-DMIO_DEBUG
+AM_CFLAGS = $(GTK_CFLAGS)
+
+libmio_a_SOURCES = mio.c
+
+EXTRA_DIST = \
+ mio.h \
+ mio-file.c
+ mio-memory.c
Added: branches/sm/tagmanager/mio/README
===================================================================
--- branches/sm/tagmanager/mio/README (rev 0)
+++ branches/sm/tagmanager/mio/README 2011-05-21 08:44:31 UTC (rev 5801)
@@ -0,0 +1,3 @@
+These files are from the MIO library, http://gitorious.org/mio
+
+See COPYING for the MIO license.
Copied: branches/sm/tagmanager/mio/makefile.win32 (from rev 5800, branches/sm/tagmanager/makefile.win32)
===================================================================
--- branches/sm/tagmanager/mio/makefile.win32 (rev 0)
+++ branches/sm/tagmanager/mio/makefile.win32 2011-05-21 08:44:31 UTC (rev 5801)
@@ -0,0 +1,48 @@
+
+.SUFFIXES: .cxx .c .o .h .a
+CC = gcc
+AR = ar
+RANLIB = ranlib
+PREFIX = C:\libs
+RM = del
+-include ../../localwin32.mk
+
+COMPLIB=mio.a
+
+GTK_INCLUDES= \
+ -I$(PREFIX)/include/gtk-2.0 \
+ -I$(PREFIX)/lib/gtk-2.0/include \
+ -I$(PREFIX)/include/atk-1.0 \
+ -I$(PREFIX)/include/pango-1.0 \
+ -I$(PREFIX)/include/cairo \
+ -I$(PREFIX)/include/glib-2.0 \
+ -I$(PREFIX)/lib/glib-2.0/include \
+ -I$(PREFIX)/include/gettext \
+ -I$(PREFIX)/include
+
+INCLUDEDIRS=-I include $(GTK_INCLUDES)
+
+CBASEFLAGS=-Wall -pipe -mms-bitfields -DPACKAGE=\"geany\" -DG_OS_WIN32 -Wno-missing-braces -Wno-char-subscripts $(INCLUDEDIRS)
+ifdef DEBUG
+CFLAGS= -O0 -g $(CBASEFLAGS)
+else
+CFLAGS=-O2 $(CBASEFLAGS)
+endif
+
+.c.o:
+ $(CC) $(CFLAGS) -w -c $<
+
+all: $(COMPLIB)
+
+clean:
+ -$(RM) deps.mak *.o $(COMPLIB)
+
+$(COMPLIB): mio.o
+ $(AR) rc $@ $^
+ $(RANLIB) $@
+
+deps.mak:
+ $(CC) -MM $(CFLAGS) *.c >deps.mak
+
+# Generate header dependencies with "make deps.mak"
+include deps.mak
Added: branches/sm/tagmanager/mio/mio-file.c
===================================================================
--- branches/sm/tagmanager/mio/mio-file.c (rev 0)
+++ branches/sm/tagmanager/mio/mio-file.c 2011-05-21 08:44:31 UTC (rev 5801)
@@ -0,0 +1,174 @@
+/*
+ * MIO, an I/O abstraction layer replicating C file I/O API.
+ * Copyright (C) 2010 Colomban Wendling <ban at herbesfolles.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+/* file IO implementation */
+
+#include <glib.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <errno.h>
+
+#include "mio.h"
+
+
+#define FILE_SET_VTABLE(mio) \
+ G_STMT_START { \
+ mio->v_free = file_free; \
+ mio->v_read = file_read; \
+ mio->v_write = file_write; \
+ mio->v_getc = file_getc; \
+ mio->v_gets = file_gets; \
+ mio->v_ungetc = file_ungetc; \
+ mio->v_putc = file_putc; \
+ mio->v_puts = file_puts; \
+ mio->v_vprintf = file_vprintf; \
+ mio->v_clearerr = file_clearerr; \
+ mio->v_eof = file_eof; \
+ mio->v_error = file_error; \
+ mio->v_seek = file_seek; \
+ mio->v_tell = file_tell; \
+ mio->v_rewind = file_rewind; \
+ mio->v_getpos = file_getpos; \
+ mio->v_setpos = file_setpos; \
+ } G_STMT_END
+
+
+static void
+file_free (MIO *mio)
+{
+ if (mio->impl.file.close_func) {
+ mio->impl.file.close_func (mio->impl.file.fp);
+ }
+ mio->impl.file.close_func = NULL;
+ mio->impl.file.fp = NULL;
+}
+
+static gsize
+file_read (MIO *mio,
+ void *ptr,
+ gsize size,
+ gsize nmemb)
+{
+ return fread (ptr, size, nmemb, mio->impl.file.fp);
+}
+
+static gsize
+file_write (MIO *mio,
+ const void *ptr,
+ gsize size,
+ gsize nmemb)
+{
+ return fwrite (ptr, size, nmemb, mio->impl.file.fp);
+}
+
+static gint
+file_putc (MIO *mio,
+ gint c)
+{
+ return fputc (c, mio->impl.file.fp);
+}
+
+static gint
+file_puts (MIO *mio,
+ const gchar *s)
+{
+ return fputs (s, mio->impl.file.fp);
+}
+
+static gint
+file_vprintf (MIO *mio,
+ const gchar *format,
+ va_list ap)
+{
+ return vfprintf (mio->impl.file.fp, format, ap);
+}
+
+static gint
+file_getc (MIO *mio)
+{
+ return fgetc (mio->impl.file.fp);
+}
+
+static gint
+file_ungetc (MIO *mio,
+ gint ch)
+{
+ return ungetc (ch, mio->impl.file.fp);
+}
+
+static gchar *
+file_gets (MIO *mio,
+ gchar *s,
+ gsize size)
+{
+ return fgets (s, (int)size, mio->impl.file.fp);
+}
+
+static void
+file_clearerr (MIO *mio)
+{
+ clearerr (mio->impl.file.fp);
+}
+
+static gint
+file_eof (MIO *mio)
+{
+ return feof (mio->impl.file.fp);
+}
+
+static gint
+file_error (MIO *mio)
+{
+ return ferror (mio->impl.file.fp);
+}
+
+static gint
+file_seek (MIO *mio,
+ glong offset,
+ gint whence)
+{
+ return fseek (mio->impl.file.fp, offset, whence);
+}
+
+static glong
+file_tell (MIO *mio)
+{
+ return ftell (mio->impl.file.fp);
+}
+
+static void
+file_rewind (MIO *mio)
+{
+ rewind (mio->impl.file.fp);
+}
+
+static gint
+file_getpos (MIO *mio,
+ MIOPos *pos)
+{
+ return fgetpos (mio->impl.file.fp, &pos->impl.file);
+}
+
+static gint
+file_setpos (MIO *mio,
+ MIOPos *pos)
+{
+ return fsetpos (mio->impl.file.fp, &pos->impl.file);
+}
Added: branches/sm/tagmanager/mio/mio-memory.c
===================================================================
--- branches/sm/tagmanager/mio/mio-memory.c (rev 0)
+++ branches/sm/tagmanager/mio/mio-memory.c 2011-05-21 08:44:31 UTC (rev 5801)
@@ -0,0 +1,481 @@
+/*
+ * MIO, an I/O abstraction layer replicating C file I/O API.
+ * Copyright (C) 2010 Colomban Wendling <ban at herbesfolles.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+/* memory IO implementation */
+
+#include <glib.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+#include "mio.h"
+
+
+#define MEM_SET_VTABLE(mio) \
+ G_STMT_START { \
+ mio->v_free = mem_free; \
+ mio->v_read = mem_read; \
+ mio->v_write = mem_write; \
+ mio->v_getc = mem_getc; \
+ mio->v_gets = mem_gets; \
+ mio->v_ungetc = mem_ungetc; \
+ mio->v_putc = mem_putc; \
+ mio->v_puts = mem_puts; \
+ mio->v_vprintf = mem_vprintf; \
+ mio->v_clearerr = mem_clearerr; \
+ mio->v_eof = mem_eof; \
+ mio->v_error = mem_error; \
+ mio->v_seek = mem_seek; \
+ mio->v_tell = mem_tell; \
+ mio->v_rewind = mem_rewind; \
+ mio->v_getpos = mem_getpos; \
+ mio->v_setpos = mem_setpos; \
+ } G_STMT_END
+
+
+/* minimal reallocation chunk size */
+#define MIO_CHUNK_SIZE 4096
+
+
+static void
+mem_free (MIO *mio)
+{
+ if (mio->impl.mem.free_func) {
+ mio->impl.mem.free_func (mio->impl.mem.buf);
+ }
+ mio->impl.mem.buf = NULL;
+ mio->impl.mem.pos = 0;
+ mio->impl.mem.size = 0;
+ mio->impl.mem.allocated_size = 0;
+ mio->impl.mem.realloc_func = NULL;
+ mio->impl.mem.free_func = NULL;
+ mio->impl.mem.eof = FALSE;
+ mio->impl.mem.error = FALSE;
+}
+
+static gsize
+mem_read (MIO *mio,
+ void *ptr,
+ gsize size,
+ gsize nmemb)
+{
+ gsize n_read = 0;
+
+ if (size != 0 && nmemb != 0) {
+ if (mio->impl.mem.ungetch != EOF) {
+ *((guchar *)ptr) = (guchar)mio->impl.mem.ungetch;
+ mio->impl.mem.ungetch = EOF;
+ mio->impl.mem.pos++;
+ if (size == 1) {
+ n_read++;
+ } else if (mio->impl.mem.pos + (size - 1) <= mio->impl.mem.size) {
+ memcpy (&(((guchar *)ptr)[1]),
+ &mio->impl.mem.buf[mio->impl.mem.pos], size - 1);
+ mio->impl.mem.pos += size - 1;
+ n_read++;
+ }
+ }
+ for (; n_read < nmemb; n_read++) {
+ if (mio->impl.mem.pos + size > mio->impl.mem.size) {
+ break;
+ } else {
+ memcpy (&(((guchar *)ptr)[n_read * size]),
+ &mio->impl.mem.buf[mio->impl.mem.pos], size);
+ mio->impl.mem.pos += size;
+ }
+ }
+ if (mio->impl.mem.pos >= mio->impl.mem.size) {
+ mio->impl.mem.eof = TRUE;
+ }
+ }
+
+ return n_read;
+}
+
+/*
+ * mem_try_resize:
+ * @mio: A #MIO object of the type %MIO_TYPE_MEMORY
+ * @new_size: Requested new size
+ *
+ * Tries to resize the underlying buffer of an in-memory #MIO object.
+ * This supports both growing and shrinking.
+ *
+ * Returns: %TRUE on success, %FALSE otherwise.
+ */
+static gboolean
+mem_try_resize (MIO *mio,
+ gsize new_size)
+{
+ gboolean success = FALSE;
+
+ if (mio->impl.mem.realloc_func) {
+ if (G_UNLIKELY (new_size == G_MAXSIZE)) {
+ #ifdef EOVERFLOW
+ errno = EOVERFLOW;
+ #endif
+ } else {
+ if (new_size > mio->impl.mem.size) {
+ if (new_size <= mio->impl.mem.allocated_size) {
+ mio->impl.mem.size = new_size;
+ success = TRUE;
+ } else {
+ gsize newsize;
+ guchar *newbuf;
+
+ newsize = MAX (mio->impl.mem.allocated_size + MIO_CHUNK_SIZE,
+ new_size);
+ newbuf = mio->impl.mem.realloc_func (mio->impl.mem.buf, newsize);
+ if (newbuf) {
+ mio->impl.mem.buf = newbuf;
+ mio->impl.mem.allocated_size = newsize;
+ mio->impl.mem.size = new_size;
+ success = TRUE;
+ }
+ }
+ } else {
+ guchar *newbuf;
+
+ newbuf = mio->impl.mem.realloc_func (mio->impl.mem.buf, new_size);
+ if (G_LIKELY (newbuf || new_size == 0)) {
+ mio->impl.mem.buf = newbuf;
+ mio->impl.mem.allocated_size = new_size;
+ mio->impl.mem.size = new_size;
+ success = TRUE;
+ }
+ }
+ }
+ }
+
+ return success;
+}
+
+/*
+ * mem_try_ensure_space:
+ * @mio: A #MIO object
+ * @n: Requested size from the current (cursor) position
+ *
+ * Tries to ensure there is enough space for @n bytes to be written from the
+ * current cursor position.
+ *
+ * Returns: %TRUE if there is enough space, %FALSE otherwise.
+ */
+static gboolean
+mem_try_ensure_space (MIO *mio,
+ gsize n)
+{
+ gboolean success = TRUE;
+
+ if (mio->impl.mem.pos + n > mio->impl.mem.size) {
+ success = mem_try_resize (mio, mio->impl.mem.pos + n);
+ }
+
+ return success;
+}
+
+static gsize
+mem_write (MIO *mio,
+ const void *ptr,
+ gsize size,
+ gsize nmemb)
+{
+ gsize n_written = 0;
+
+ if (size != 0 && nmemb != 0) {
+ if (mem_try_ensure_space (mio, size * nmemb)) {
+ memcpy (&mio->impl.mem.buf[mio->impl.mem.pos], ptr, size * nmemb);
+ mio->impl.mem.pos += size * nmemb;
+ n_written = nmemb;
+ }
+ }
+
+ return n_written;
+}
+
+static gint
+mem_putc (MIO *mio,
+ gint c)
+{
+ gint rv = EOF;
+
+ if (mem_try_ensure_space (mio, 1)) {
+ mio->impl.mem.buf[mio->impl.mem.pos] = (guchar)c;
+ mio->impl.mem.pos++;
+ rv = (gint)((guchar)c);
+ }
+
+ return rv;
+}
+
+static gint
+mem_puts (MIO *mio,
+ const gchar *s)
+{
+ gint rv = EOF;
+ gsize len;
+
+ len = strlen (s);
+ if (mem_try_ensure_space (mio, len)) {
+ memcpy (&mio->impl.mem.buf[mio->impl.mem.pos], s, len);
+ mio->impl.mem.pos += len;
+ rv = 1;
+ }
+
+ return rv;
+}
+
+static gint
+mem_vprintf (MIO *mio,
+ const gchar *format,
+ va_list ap)
+{
+ gint rv = -1;
+ gint n;
+ gchar tmp;
+ gsize old_pos;
+ gsize old_size;
+ va_list ap_copy;
+
+ old_pos = mio->impl.mem.pos;
+ old_size = mio->impl.mem.size;
+ va_copy (ap_copy, ap);
+ /* compute the size we will need into the buffer */
+ n = vsnprintf (&tmp, 1, format, ap_copy);
+ va_end (ap_copy);
+ if (n >= 0 && mem_try_ensure_space (mio, ((guint)n) + 1)) {
+ guchar c;
+
+ /* backup character at n+1 that will be overwritten by a \0 ... */
+ c = mio->impl.mem.buf[mio->impl.mem.pos + (guint)n];
+ rv = vsnprintf ((gchar *)&mio->impl.mem.buf[mio->impl.mem.pos],
+ (guint)n + 1, format, ap);
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list