Commits February 2008

commits@lists.geany.org

4 participants
75 discussions

SF.net SVN: geany: [2268] trunk
by eht16＠users.sourceforge.net 20 Feb '08

20 Feb '08

Revision: 2268 http://geany.svn.sourceforge.net/geany/?rev=2268&view=rev Author: eht16 Date: 2008-02-20 04:36:59 -0800 (Wed, 20 Feb 2008) Log Message: ----------- Apply patch from Yura Siamashka to fix cross-compiling (thanks). Modified Paths: -------------- trunk/ChangeLog trunk/configure.in trunk/scintilla/ScintillaGTK.cxx trunk/src/Makefile.am Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-02-20 11:24:23 UTC (rev 2267) +++ trunk/ChangeLog 2008-02-20 12:36:59 UTC (rev 2268) @@ -3,6 +3,8 @@ * plugins/*, src/*, tagmanager/*: Apply patch from Daniel Richard G. to fix to fix several compiler warnings, C89 violations and minor code problems (thanks). + * configure.in, scintilla/ScintillaGTK.cxx, src/Makefile.am: + Apply patch from Yura Siamashka to fix cross-compiling (thanks). 2008-02-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2008-02-20 11:24:23 UTC (rev 2267) +++ trunk/configure.in 2008-02-20 12:36:59 UTC (rev 2268) @@ -117,28 +117,6 @@ AC_ARG_ENABLE(deprecated, [ --disable-deprecated Disable deprecated GTK functions. ], [GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], []) -# socket support -AC_ARG_ENABLE(socket, AC_HELP_STRING([--enable-socket],[enable if you want to detect a running instance [[default=yes]]]), - [want_socket="$enableval"], [want_socket="yes"]) - -if test "x$want_socket" = "xyes"; then - AC_DEFINE(HAVE_SOCKET, 1, [Define if you want to detect a running instance]) - # this should bring in libsocket on Solaris: - AC_SEARCH_LIBS([connect],[socket],[],[],[]) -fi - -# VTE support -AC_ARG_ENABLE(vte, AC_HELP_STRING([--enable-vte], - [enable if you want virtual termninal support [[default=yes]]]), - [want_vte="$enableval"], [want_vte="yes"]) -if test "x$want_vte" = "xyes"; then - AC_DEFINE(HAVE_VTE, 1, [Define if you want VTE support]) -fi -AC_ARG_WITH(vte-module-path, AC_HELP_STRING([--with-vte-module-path=PATH], - [Path to a loadable libvte [[default=None]]]), [AC_DEFINE_UNQUOTED([VTE_MODULE_PATH], - ["$withval"], [Path to a loadable libvte])]) - - # Plugins support AC_ARG_ENABLE(plugins, [AC_HELP_STRING([--disable-plugins], [compile without plugin support [[default=no]]])], , enable_plugins=yes) @@ -155,13 +133,45 @@ AC_CHECK_FILE([/dev/random], AC_DEFINE([HAVE_DEVRANDOM], [1], [Define that you found /dev/random])) fi -if test "x$host" = "xi386-mingw32msvc"; then +case "${host}" in + *mingw*) AC_DEFINE_UNQUOTED([WIN32], 1, [we are cross compiling for WIN32]) want_vte="no" + want_socket="no" AC_EXEEXT + AM_CONDITIONAL(MINGW, true) + ;; + *) + AM_CONDITIONAL(MINGW, false) + ;; +esac + +dnl skip check if already decided +if test "x$want_socket" = "x"; then + # socket support + AC_ARG_ENABLE(socket, AC_HELP_STRING([--enable-socket],[enable if you want to detect a running instance [[default=yes]]]), + [want_socket="$enableval"], [want_socket="yes"]) + + if test "x$want_socket" = "xyes"; then + AC_DEFINE(HAVE_SOCKET, 1, [Define if you want to detect a running instance]) + # this should bring in libsocket on Solaris: + AC_SEARCH_LIBS([connect],[socket],[],[],[]) + fi fi -AM_CONDITIONAL(MINGW, test "x$host" = "xi386-mingw32msvc") +dnl skip check if already decided +if test "x$want_vte" = "x"; then + # VTE support + AC_ARG_ENABLE(vte, AC_HELP_STRING([--enable-vte], + [enable if you want virtual termninal support [[default=yes]]]), + [want_vte="$enableval"], [want_vte="yes"]) + if test "x$want_vte" = "xyes"; then + AC_DEFINE(HAVE_VTE, 1, [Define if you want VTE support]) + fi + AC_ARG_WITH(vte-module-path, AC_HELP_STRING([--with-vte-module-path=PATH], + [Path to a loadable libvte [[default=None]]]), [AC_DEFINE_UNQUOTED([VTE_MODULE_PATH], + ["$withval"], [Path to a loadable libvte])]) +fi GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0` Modified: trunk/scintilla/ScintillaGTK.cxx =================================================================== --- trunk/scintilla/ScintillaGTK.cxx 2008-02-20 11:24:23 UTC (rev 2267) +++ trunk/scintilla/ScintillaGTK.cxx 2008-02-20 12:36:59 UTC (rev 2268) @@ -15,7 +15,7 @@ #include "Platform.h" #if PLAT_GTK_WIN32 -#include "Windows.h" +#include "windows.h" #endif #include "Scintilla.h" Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2008-02-20 11:24:23 UTC (rev 2267) +++ trunk/src/Makefile.am 2008-02-20 12:36:59 UTC (rev 2268) @@ -49,19 +49,22 @@ if MINGW # build Geany for Windows on non-Windows systems (cross-compile) -WINDRES = /usr/local/cross-tools/bin/i386-mingw32msvc-windres +WINDRES = $(host)-windres geany_SOURCES = $(SRCS) win32.c win32.h geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a -lstdc++ @GTK_LIBS@ \ $(INTLLIBS) -lgdi32 -limm32 -lshell32 -lole32 -luuid -liberty -lcomdlg32 -lcomctl32 \ geany_private.res -AM_CFLAGS = -mms-bitfields -geany_LDFLAGS = -mwindows +AM_CFLAGS = -DGEANY_DATADIR=\"data\" \ + -DGEANY_LOCALEDIR=\"data\" \ + -DGEANY_LIBDIR=\"\" \ + -DGEANY_PREFIX=\"\" \ +geany_LDFLAGS = -mwindows -mms-bitfields INCLUDES = -I$(srcdir)/../scintilla/include -I$(srcdir)/../tagmanager/include -DENABLE_NLS \ -I/usr/local/cross-tools/include @GTK_CFLAGS@ -geany_windres.res: +geany_private.res: $(WINDRES) -i ../geany_private.rc --input-format=rc -o geany_private.res -O coff; clean-local: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2267] trunk
by eht16＠users.sourceforge.net 20 Feb '08

20 Feb '08

Revision: 2267 http://geany.svn.sourceforge.net/geany/?rev=2267&view=rev Author: eht16 Date: 2008-02-20 03:24:23 -0800 (Wed, 20 Feb 2008) Log Message: ----------- Apply patch from Daniel Richard G. to fix to fix several compiler warnings, C89 violations and minor code problems (thanks). Modified Paths: -------------- trunk/ChangeLog trunk/plugins/autosave.c trunk/plugins/classbuilder.c trunk/plugins/demoplugin.c trunk/plugins/export.c trunk/plugins/filebrowser.c trunk/plugins/htmlchars.c trunk/plugins/vcdiff.c trunk/src/build.c trunk/src/build.h trunk/src/callbacks.c trunk/src/dialogs.c trunk/src/dialogs.h trunk/src/document.c trunk/src/document.h trunk/src/editor.c trunk/src/editor.h trunk/src/encodings.c trunk/src/encodings.h trunk/src/filetypes.h trunk/src/geanyobject.h trunk/src/highlighting.c trunk/src/highlighting.h trunk/src/keybindings.c trunk/src/keybindings.h trunk/src/keyfile.c trunk/src/keyfile.h trunk/src/main.c trunk/src/main.h trunk/src/msgwindow.c trunk/src/msgwindow.h trunk/src/navqueue.c trunk/src/navqueue.h trunk/src/notebook.c trunk/src/notebook.h trunk/src/plugindata.h trunk/src/plugins.c trunk/src/plugins.h trunk/src/prefix.c trunk/src/prefs.c trunk/src/project.c trunk/src/project.h trunk/src/sciwrappers.c trunk/src/search.c trunk/src/search.h trunk/src/socket.c trunk/src/socket.h trunk/src/symbols.c trunk/src/symbols.h trunk/src/templates.c trunk/src/tools.c trunk/src/tools.h trunk/src/treeviews.c trunk/src/treeviews.h trunk/src/ui_utils.c trunk/src/ui_utils.h trunk/src/utils.c trunk/src/utils.h trunk/src/vte.c trunk/src/vte.h trunk/tagmanager/c.c trunk/tagmanager/docbook.c trunk/tagmanager/haskell.c trunk/tagmanager/include/tm_workspace.h trunk/tagmanager/sort.c trunk/tagmanager/tm_workspace.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/ChangeLog 2008-02-20 11:24:23 UTC (rev 2267) @@ -1,3 +1,10 @@ +2008-02-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * plugins/*, src/*, tagmanager/*: + Apply patch from Daniel Richard G. to fix to fix several + compiler warnings, C89 violations and minor code problems (thanks). + + 2008-02-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/vte.c: Apply patch from Jeff Pohlmeyer to mark the VTE also as Modified: trunk/plugins/autosave.c =================================================================== --- trunk/plugins/autosave.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/plugins/autosave.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -79,7 +79,7 @@ } -void set_timeout() +void set_timeout(void) { if (src_id != G_MAXUINT) g_source_remove(src_id); @@ -195,7 +195,7 @@ } -void cleanup() +void cleanup(void) { g_source_remove(src_id); g_free(config_file); Modified: trunk/plugins/classbuilder.c =================================================================== --- trunk/plugins/classbuilder.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/plugins/classbuilder.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -803,7 +803,7 @@ } -void cleanup() +void cleanup(void) { gtk_widget_destroy(plugin_fields->menu_item); } Modified: trunk/plugins/demoplugin.c =================================================================== --- trunk/plugins/demoplugin.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/plugins/demoplugin.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -70,7 +70,7 @@ GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, - welcome_text); + "%s", welcome_text); gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), _("(From the %s plugin)"), info()->name); @@ -146,7 +146,7 @@ /* Called by Geany before unloading the plugin. * Here any UI changes should be removed, memory freed and any other finalization done. * Be sure to leave Geany as it was before init(). */ -void cleanup() +void cleanup(void) { // remove the menu item added in init() gtk_widget_destroy(plugin_fields->menu_item); Modified: trunk/plugins/export.c =================================================================== --- trunk/plugins/export.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/plugins/export.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -737,7 +737,7 @@ } -void cleanup() +void cleanup(void) { gtk_widget_destroy(plugin_fields->menu_item); } Modified: trunk/plugins/filebrowser.c =================================================================== --- trunk/plugins/filebrowser.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/plugins/filebrowser.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -60,7 +60,7 @@ { FILEVIEW_COLUMN_ICON = 0, FILEVIEW_COLUMN_NAME, - FILEVIEW_N_COLUMNS, + FILEVIEW_N_COLUMNS }; static gboolean show_hidden_files = FALSE; @@ -163,7 +163,7 @@ // adds ".." to the start of the file list -static void add_top_level_entry() +static void add_top_level_entry(void) { GtkTreeIter iter; @@ -178,7 +178,7 @@ } -static void clear() +static void clear(void) { gtk_list_store_clear(file_store); @@ -190,7 +190,7 @@ // recreate the tree model from current_dir. -static void refresh() +static void refresh(void) { gchar *utf8_dir; GSList *list; @@ -217,14 +217,14 @@ } -static void on_go_home() +static void on_go_home(void) { setptr(current_dir, g_strdup(g_get_home_dir())); refresh(); } -static gchar *get_default_dir() +static gchar *get_default_dir(void) { const gchar *dir = NULL; @@ -237,7 +237,7 @@ } -static void on_current_path() +static void on_current_path(void) { gchar *fname; gchar *dir; @@ -260,7 +260,7 @@ } -static void on_go_up() +static void on_go_up(void) { // remove the highest directory part (which becomes the basename of current_dir) setptr(current_dir, g_path_get_dirname(current_dir)); @@ -495,7 +495,7 @@ } -static GtkWidget *create_popup_menu() +static GtkWidget *create_popup_menu(void) { GtkWidget *item, *menu, *image; @@ -629,7 +629,7 @@ } -static void prepare_file_view() +static void prepare_file_view(void) { GtkCellRenderer *text_renderer, *icon_renderer; GtkTreeViewColumn *column; @@ -671,7 +671,7 @@ } -static GtkWidget *make_toolbar() +static GtkWidget *make_toolbar(void) { GtkWidget *wid, *toolbar; GtkTooltips *tooltips = GTK_TOOLTIPS(p_support->lookup_widget( @@ -756,7 +756,7 @@ } -static void completion_create() +static void completion_create(void) { entry_completion = gtk_entry_completion_new(); @@ -915,7 +915,7 @@ } -void cleanup() +void cleanup(void) { g_free(config_file); g_free(open_cmd); Modified: trunk/plugins/htmlchars.c =================================================================== --- trunk/plugins/htmlchars.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/plugins/htmlchars.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -61,7 +61,7 @@ static gboolean sc_insert(GtkTreeModel *model, GtkTreeIter *iter); -static void tools_show_dialog_insert_special_chars() +static void tools_show_dialog_insert_special_chars(void) { if (sc_dialog == NULL) { @@ -79,7 +79,7 @@ gtk_widget_set_name(sc_dialog, "GeanyDialog"); height = GEANY_WINDOW_MINIMAL_HEIGHT; - gtk_window_set_default_size(GTK_WINDOW(sc_dialog), height * 0.8, height); + gtk_window_set_default_size(GTK_WINDOW(sc_dialog), height * 8 / 10, height); gtk_dialog_set_default_response(GTK_DIALOG(sc_dialog), GTK_RESPONSE_CANCEL); label = gtk_label_new(_("Choose a special character from the list below and double click on it or use the button to insert it at the current cursor position.")); @@ -521,7 +521,7 @@ /* Destroy widgets */ -void cleanup() +void cleanup(void) { gtk_widget_destroy(plugin_fields->menu_item); Modified: trunk/plugins/vcdiff.c =================================================================== --- trunk/plugins/vcdiff.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/plugins/vcdiff.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -271,11 +271,11 @@ if (force_encoding) { text = p_encoding->convert_to_utf8_from_charset( - std_output, -1, force_encoding, TRUE); + std_output, (gsize)-1, force_encoding, TRUE); } else { - text = p_encoding->convert_to_utf8(std_output, -1, &detect_enc); + text = p_encoding->convert_to_utf8(std_output, (gsize)-1, &detect_enc); } if (text) { @@ -454,7 +454,7 @@ static GtkWidget *menu_vcdiff_dir = NULL; static GtkWidget *menu_vcdiff_project = NULL; -static void update_menu_items() +static void update_menu_items(void) { document *doc; gboolean have_file; @@ -525,7 +525,7 @@ /* Called by Geany before unloading the plugin. */ -void cleanup() +void cleanup(void) { // remove the menu item added in init() gtk_widget_destroy(plugin_fields->menu_item); Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/build.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -1384,7 +1384,7 @@ } -static void show_includes_arguments_tex() +static void show_includes_arguments_tex(void) { GtkWidget *dialog, *label, *entries[4], *vbox, *table; gint idx = document_get_cur_idx(); @@ -1551,7 +1551,7 @@ } -static void show_includes_arguments_gen() +static void show_includes_arguments_gen(void) { GtkWidget *dialog, *label, *entries[3], *vbox; GtkWidget *ft_table = NULL; @@ -1943,7 +1943,7 @@ static void -show_make_custom() +show_make_custom(void) { static GtkWidget *dialog = NULL; // keep dialog for combo history Modified: trunk/src/build.h =================================================================== --- trunk/src/build.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/build.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -62,9 +62,9 @@ -void build_init(); +void build_init(void); -void build_finalize(); +void build_finalize(void); gboolean build_parse_make_dir(const gchar *string, gchar **prefix); Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/callbacks.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -93,7 +93,7 @@ CallbacksData callbacks_data = {-1}; -static gboolean check_no_unsaved() +static gboolean check_no_unsaved(void) { guint i; @@ -108,7 +108,7 @@ } -static gboolean account_for_unsaved() +static gboolean account_for_unsaved(void) { gint p; @@ -139,7 +139,7 @@ // should only be called from on_exit_clicked -static void quit_app() +static void quit_app(void) { guint i; Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/dialogs.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -63,7 +63,7 @@ }; #if ! GEANY_USE_WIN32_DIALOG -static GtkWidget *add_file_open_extra_widget(); +static GtkWidget *add_file_open_extra_widget(void); #endif @@ -163,7 +163,7 @@ #if ! GEANY_USE_WIN32_DIALOG -static void create_open_file_dialog() +static void create_open_file_dialog(void) { GtkWidget *filetype_combo, *encoding_combo; GtkWidget *viewbtn; @@ -471,7 +471,7 @@ #if ! GEANY_USE_WIN32_DIALOG -static void create_save_file_dialog() +static void create_save_file_dialog(void) { GtkWidget *vbox, *check_open_new_tab, *rename_btn; GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips")); @@ -823,7 +823,7 @@ gint response, GtkWidget *entry) { - gboolean persistent = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(dialog), "has_combo")); + gboolean persistent = (gboolean) GPOINTER_TO_INT(g_object_get_data(G_OBJECT(dialog), "has_combo")); if (response == GTK_RESPONSE_ACCEPT) { Modified: trunk/src/dialogs.h =================================================================== --- trunk/src/dialogs.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/dialogs.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -33,22 +33,22 @@ typedef void (*InputCallback)(const gchar *); -void dialogs_show_open_file(); +void dialogs_show_open_file(void); -gboolean dialogs_show_save_as(); +gboolean dialogs_show_save_as(void); gboolean dialogs_show_unsaved_file(gint idx); -void dialogs_show_open_font(); +void dialogs_show_open_font(void); -void dialogs_show_word_count(); +void dialogs_show_word_count(void); void dialogs_show_color(gchar *colour); GtkWidget *dialogs_show_input(const gchar *title, const gchar *label_text, const gchar *default_text, gboolean persistent, InputCallback input_cb); -void dialogs_show_goto_line(); +void dialogs_show_goto_line(void); void dialogs_show_file_properties(gint idx); Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/document.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -354,7 +354,7 @@ /* returns the next free place(i.e. index) in the document list, * or -1 if the current doc_array is full */ -static gint document_get_new_idx() +static gint document_get_new_idx(void) { guint i; @@ -1294,9 +1294,9 @@ // encoding, it will be converted to doc_list[idx].encoding below and this conversion // also changes the BOM data = (gchar*) g_malloc(len + 3); // 3 chars for BOM - data[0] = 0xef; - data[1] = 0xbb; - data[2] = 0xbf; + data[0] = (gchar) 0xef; + data[1] = (gchar) 0xbb; + data[2] = (gchar) 0xbf; sci_get_text(doc_list[idx].sci, len, data + 3); len += 3; } Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/document.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -131,33 +131,28 @@ gint document_find_by_filename(const gchar *filename, gboolean is_tm_filename); - gint document_find_by_sci(ScintillaObject *sci); - gint document_get_notebook_page(gint doc_idx); gint document_get_n_idx(guint page_num); -gint document_get_cur_idx(); +gint document_get_cur_idx(void); -document *document_get_current(); +document *document_get_current(void); +void document_init_doclist(void); -void document_init_doclist(); +void document_finalize(void); -void document_finalize(); - void document_set_text_changed(gint idx); void document_apply_update_prefs(gint idx); - gboolean document_remove(guint page_num); - gint document_new_file(const gchar *filename, filetype *ft, const gchar *text); gint document_clone(gint old_idx, const gchar *utf8_filename); @@ -174,13 +169,10 @@ void document_open_files(const GSList *filenames, gboolean readonly, filetype *ft, const gchar *forced_enc); - gboolean document_reload_file(gint idx, const gchar *forced_enc); - gboolean document_save_file(gint idx, gboolean force); - gboolean document_search_bar_find(gint idx, const gchar *text, gint flags, gboolean inc); gint document_find_text(gint idx, const gchar *text, gint flags, gboolean search_backwards, @@ -254,14 +246,12 @@ void document_undo_add(gint idx, guint type, gpointer data); - GdkColor *document_get_status(gint idx); +void document_delay_colourise(void); -void document_delay_colourise(); +void document_colourise_new(void); -void document_colourise_new(); - void document_insert_colour(gint idx, const gchar *colour); void document_set_use_tabs(gint idx, gboolean use_tabs); Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/editor.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -77,7 +77,7 @@ gpointer user_data) { gint idx = GPOINTER_TO_INT(user_data); - editor_info.click_pos = sci_get_position_from_xy(doc_list[idx].sci, event->x, event->y, FALSE); + editor_info.click_pos = sci_get_position_from_xy(doc_list[idx].sci, (gint)event->x, (gint)event->y, FALSE); if (event->button == 1) { @@ -1997,7 +1997,7 @@ brace_pos++; if (! utils_isbrace(sci_get_char_at(sci, brace_pos), editor_prefs.brace_match_ltgt)) { - SSM(sci, SCI_BRACEBADLIGHT, -1, 0); + SSM(sci, SCI_BRACEBADLIGHT, (uptr_t)-1, 0); return; } } Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/editor.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -133,7 +133,7 @@ void editor_scroll_to_line(ScintillaObject *sci, gint line, gfloat percent_of_view); -void editor_finalize(); +void editor_finalize(void); /* General editing functions */ Modified: trunk/src/encodings.c =================================================================== --- trunk/src/encodings.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/encodings.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -53,6 +53,9 @@ #endif +GeanyEncoding encodings[GEANY_ENCODINGS_MAX]; + + #define fill(Order, Group, Idx, Charset, Name) \ encodings[Idx].idx = Idx; \ encodings[Idx].order = Order; \ @@ -479,7 +482,7 @@ gchar *utf8_content; gboolean check_regex = FALSE; gboolean check_locale = FALSE; - guint i; + gint i; if ((gint)size == -1) { @@ -488,7 +491,7 @@ #ifdef HAVE_REGCOMP // first try to read the encoding from the file content - for (i = 0; i < G_N_ELEMENTS(pregs) && ! check_regex; i++) + for (i = 0; i < (gint) G_N_ELEMENTS(pregs) && ! check_regex; i++) { if ((regex_charset = regex_match(&pregs[i], buffer, size)) != NULL) check_regex = TRUE; @@ -500,7 +503,7 @@ for (i = 0; i < GEANY_ENCODINGS_MAX; i++) { - if (i == (guint) encodings[GEANY_ENCODING_NONE].idx || i == (guint) -1) + if (i == encodings[GEANY_ENCODING_NONE].idx || i == -1) continue; if (check_regex) @@ -522,7 +525,7 @@ if (charset == NULL) continue; - geany_debug("Trying to convert %d bytes of data from %s into UTF-8.", (gint) size, charset); + geany_debug("Trying to convert %" G_GSIZE_FORMAT " bytes of data from %s into UTF-8.", size, charset); utf8_content = encodings_convert_to_utf8_from_charset(buffer, size, charset, FALSE); if (utf8_content != NULL) Modified: trunk/src/encodings.h =================================================================== --- trunk/src/encodings.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/encodings.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -179,7 +179,7 @@ } GeanyEncodingIndex; -GeanyEncoding encodings[GEANY_ENCODINGS_MAX]; +extern GeanyEncoding encodings[GEANY_ENCODINGS_MAX]; GeanyEncodingIndex encodings_scan_unicode_bom(const gchar *string, gsize len, guint *bom_len); Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/filetypes.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -88,9 +88,9 @@ struct build_actions { - gboolean can_compile:1; - gboolean can_link:1; - gboolean can_exec:1; + gboolean can_compile; + gboolean can_link; + gboolean can_exec; }; struct build_programs @@ -128,10 +128,10 @@ filetype *filetypes_get_from_uid(gint uid); /* Calls filetypes_init_types() and creates the filetype menu. */ -void filetypes_init(); +void filetypes_init(void); /* Create the filetype array and fill it with the known filetypes. */ -void filetypes_init_types(); +void filetypes_init_types(void); /* Detect the filetype for document idx, checking for a shebang, then filename extension. */ filetype *filetypes_detect_from_file(gint idx); @@ -141,17 +141,17 @@ filetype *filetypes_detect_from_filename(const gchar *utf8_filename); /* frees the array and all related pointers */ -void filetypes_free_types(); +void filetypes_free_types(void); void filetypes_load_config(gint ft_id); -void filetypes_save_commands(); +void filetypes_save_commands(void); void filetypes_select_radio_item(const filetype *ft); GtkFileFilter *filetypes_create_file_filter(filetype *ft); -GtkFileFilter *filetypes_create_file_filter_all_source(); +GtkFileFilter *filetypes_create_file_filter_all_source(void); gchar *filetypes_get_conf_extension(gint filetype_idx); Modified: trunk/src/geanyobject.h =================================================================== --- trunk/src/geanyobject.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/geanyobject.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -76,7 +76,7 @@ void (*document_activate)(gint idx); void (*project_open)(GKeyFile *keyfile); void (*project_save)(GKeyFile *keyfile); - void (*project_close)(); + void (*project_close)(void); }; GType geany_object_get_type (void); Modified: trunk/src/highlighting.c =================================================================== --- trunk/src/highlighting.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/highlighting.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -73,9 +73,9 @@ typedef struct { // can take values 1 or 2 (or 3) - guchar marker:2; - guchar lines:2; - guchar draw_line:3; + guint marker:2; + guint lines:2; + guint draw_line:3; } FoldingStyle; static struct @@ -582,10 +582,10 @@ static void styleset_c_like_init(GKeyFile *config, GKeyFile *config_home, gint filetype_idx) { - HighlightingStyle uuid = {0x404080, 0xffffff, FALSE, FALSE}; - HighlightingStyle operator = {0x301010, 0xffffff, FALSE, FALSE}; - HighlightingStyle verbatim = {0x301010, 0xffffff, FALSE, FALSE}; - HighlightingStyle regex = {0x105090, 0xffffff, FALSE, FALSE}; + static HighlightingStyle uuid = {0x404080, 0xffffff, FALSE, FALSE}; + static HighlightingStyle operator = {0x301010, 0xffffff, FALSE, FALSE}; + static HighlightingStyle verbatim = {0x301010, 0xffffff, FALSE, FALSE}; + static HighlightingStyle regex = {0x105090, 0xffffff, FALSE, FALSE}; StyleEntry entries[] = { Modified: trunk/src/highlighting.h =================================================================== --- trunk/src/highlighting.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/highlighting.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -33,8 +33,8 @@ { gint foreground; gint background; - gboolean bold:1; - gboolean italic:1; + gboolean bold; + gboolean italic; } HighlightingStyle; Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/keybindings.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -46,6 +46,8 @@ #include "vte.h" +KeyBinding *keys[GEANY_MAX_KEYS]; + static const gboolean swap_alt_tab_order = FALSE; @@ -103,10 +105,10 @@ // common function for keybindings using current word static void cb_func_current_word(guint key_id); -static void add_menu_accels(); +static void add_menu_accels(void); -static void init_default_kb() +static void init_default_kb(void) { // init all fields of keys with default values keys[GEANY_KEYS_MENU_NEW] = fill(cb_func_file_action, @@ -331,7 +333,7 @@ } -static void load_user_kb() +static void load_user_kb(void) { gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "keybindings.conf", NULL); gchar *val; @@ -570,7 +572,7 @@ gtk_widget_set_name(dialog, "GeanyDialog"); height = GEANY_WINDOW_MINIMAL_HEIGHT; - gtk_window_set_default_size(GTK_WINDOW(dialog), height * 0.8, height); + gtk_window_set_default_size(GTK_WINDOW(dialog), height * 8 / 10, height); gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CANCEL); label3 = gtk_label_new(_("The following keyboard shortcuts are configurable:")); Modified: trunk/src/keybindings.h =================================================================== --- trunk/src/keybindings.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/keybindings.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -185,7 +185,7 @@ } GeanyKeyCommand; -KeyBinding *keys[GEANY_MAX_KEYS]; +extern KeyBinding *keys[GEANY_MAX_KEYS]; void keybindings_init(void); @@ -197,7 +197,7 @@ /* just write the content of the keys array to the config file */ void keybindings_write_to_file(void); -void keybindings_show_shortcuts(); +void keybindings_show_shortcuts(void); /* central keypress event handler, almost all keypress events go to this function */ gboolean keybindings_got_event(GtkWidget *widget, GdkEventKey *event, gpointer user_data); Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/keyfile.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -160,8 +160,11 @@ g_key_file_set_string_list(config, "plugins", "active_plugins", (const gchar**)app->active_plugins, g_strv_length(app->active_plugins)); else + { // use an empty dummy array to override maybe exisiting value - g_key_file_set_string_list(config, "plugins", "active_plugins", (const gchar*[1]){ "" }, 1); + const gchar *dummy[] = { "" }; + g_key_file_set_string_list(config, "plugins", "active_plugins", dummy, 1); + } } #endif @@ -375,7 +378,7 @@ } -void configuration_save() +void configuration_save(void) { GKeyFile *config = g_key_file_new(); gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "geany.conf", NULL); @@ -744,7 +747,7 @@ /* * Save current session in default configuration file */ -void configuration_save_default_session() +void configuration_save_default_session(void) { gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "geany.conf", NULL); gchar *data; @@ -768,7 +771,7 @@ /* * Only reload the session part of the default configuration */ -void configuration_reload_default_session() +void configuration_reload_default_session(void) { gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "geany.conf", NULL); GKeyFile *config = g_key_file_new(); @@ -782,7 +785,7 @@ } -gboolean configuration_load() +gboolean configuration_load(void) { gchar *configfile = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "geany.conf", NULL); GKeyFile *config = g_key_file_new(); @@ -813,7 +816,7 @@ /* Open session files * Note: notebook page switch handler and adding to recent files list is always disabled * for all files opened within this function */ -gboolean configuration_open_files() +gboolean configuration_open_files(void) { gint i; guint pos; @@ -901,7 +904,7 @@ /* set some settings which are already read from the config file, but need other things, like the * realisation of the main window */ -void configuration_apply_settings() +void configuration_apply_settings(void) { if (scribble_text) { // update the scribble widget, because now it's realized @@ -936,7 +939,7 @@ /* Generate the config files in "data/" from defaults */ -void configuration_generate_data_files() +void configuration_generate_data_files(void) { gchar *cur_dir, *gen_dir; @@ -997,7 +1000,7 @@ #endif -void configuration_read_filetype_extensions() +void configuration_read_filetype_extensions(void) { guint i; gsize len = 0; @@ -1034,7 +1037,7 @@ } -void configuration_read_snippets() +void configuration_read_snippets(void) { gsize i, j, len = 0, len_keys = 0; gchar *sysconfigfile, *userconfigfile; Modified: trunk/src/keyfile.h =================================================================== --- trunk/src/keyfile.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/keyfile.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -26,31 +26,31 @@ #define GEANY_KEYFILE_H 1 -void configuration_save(); +void configuration_save(void); -gboolean configuration_load(); +gboolean configuration_load(void); -gboolean configuration_open_files(); +gboolean configuration_open_files(void); -void configuration_reload_default_session(); +void configuration_reload_default_session(void); -void configuration_save_default_session(); +void configuration_save_default_session(void); void configuration_load_session_files(GKeyFile *config); void configuration_save_session_files(GKeyFile *config); -void configuration_read_filetype_extensions(); +void configuration_read_filetype_extensions(void); -void configuration_read_snippets(); +void configuration_read_snippets(void); /* set some settings which are already read from the config file, but need other things, like the * realisation of the main window */ -void configuration_apply_settings(); +void configuration_apply_settings(void); #ifdef GEANY_DEBUG /* Generate the config files in "data/" from defaults */ -void configuration_generate_data_files(); +void configuration_generate_data_files(void); #endif #endif Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/main.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -419,7 +419,7 @@ } -static void setup_paths() +static void setup_paths(void) { gchar *data_dir; gchar *doc_dir; @@ -448,7 +448,7 @@ } -static void locale_init() +static void locale_init(void) { #ifdef ENABLE_NLS gchar *locale_dir = NULL; @@ -615,7 +615,7 @@ // Returns 0 if config dir is OK. -static gint setup_config_dir() +static gint setup_config_dir(void) { gint mkdir_result = 0; gchar *tmp = app->configdir; @@ -705,7 +705,7 @@ } -static void load_project_file() +static void load_project_file(void) { gchar *locale_filename; @@ -721,7 +721,7 @@ } -static void load_settings() +static void load_settings(void) { configuration_load(); // let cmdline options overwrite configuration settings Modified: trunk/src/main.h =================================================================== --- trunk/src/main.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/main.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -49,6 +49,6 @@ gchar *get_argv_filename(const gchar *filename); -void main_quit(); +void main_quit(void); #endif Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/msgwindow.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -595,8 +595,11 @@ * *filename must be freed unless it is NULL. */ void msgwin_parse_compiler_error_line(const gchar *string, const gchar *dir, gchar **filename, gint *line) { - ParseData data = {string, build_info.dir, NULL, 0, 0, 0}; + ParseData data = {NULL, NULL, NULL, 0, 0, 0}; + data.string = string; + data.dir = build_info.dir; + *filename = NULL; *line = -1; Modified: trunk/src/msgwindow.h =================================================================== --- trunk/src/msgwindow.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/msgwindow.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -40,7 +40,7 @@ MSG_COMPILER, MSG_MESSAGE, MSG_SCRATCH, - MSG_VTE, + MSG_VTE } MessageWindowTabNum; @@ -63,9 +63,9 @@ extern MessageWindow msgwindow; -void msgwin_init(); +void msgwin_init(void); -void msgwin_finalize(); +void msgwin_finalize(void); void msgwin_show_hide(gboolean show); @@ -87,11 +87,11 @@ void msgwin_menu_add_common_items(GtkMenu *menu); -gboolean msgwin_goto_compiler_file_line(); +gboolean msgwin_goto_compiler_file_line(void); void msgwin_parse_compiler_error_line(const gchar *string, const gchar *dir, gchar **filename, gint *line); -gboolean msgwin_goto_messages_file_line(); +gboolean msgwin_goto_messages_file_line(void); #endif Modified: trunk/src/navqueue.c =================================================================== --- trunk/src/navqueue.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/navqueue.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -71,7 +71,7 @@ } -static void adjust_buttons() +static void adjust_buttons(void) { if (g_queue_get_length(navigation_queue) < 2) { Modified: trunk/src/navqueue.h =================================================================== --- trunk/src/navqueue.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/navqueue.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -27,16 +27,16 @@ #define GEANY_NAVQUEUE_H 1 -void navqueue_init(); +void navqueue_init(void); -void navqueue_free(); +void navqueue_free(void); gboolean navqueue_goto_line(gint old_idx, gint new_idx, gint line); -void navqueue_go_back(); +void navqueue_go_back(void); -void navqueue_go_forward(); +void navqueue_go_forward(void); #endif Modified: trunk/src/notebook.c =================================================================== --- trunk/src/notebook.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/notebook.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -74,7 +74,7 @@ static void notebook_tab_close_clicked_cb(GtkButton *button, gpointer user_data); -static void setup_tab_dnd(); +static void setup_tab_dnd(void); static void focus_sci(GtkWidget *widget, gpointer user_data) @@ -280,7 +280,7 @@ // call this after the number of tabs in app->notebook changes. -static void tab_count_changed() +static void tab_count_changed(void) { switch (gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook))) { Modified: trunk/src/notebook.h =================================================================== --- trunk/src/notebook.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/notebook.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -24,7 +24,7 @@ #ifndef GEANY_NOTEBOOK_H #define GEANY_NOTEBOOK_H 1 -void notebook_init(); +void notebook_init(void); /* Returns page number of notebook page, or -1 on error */ gint notebook_new_tab(gint doc_idx); Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/plugindata.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -72,7 +72,7 @@ /* Sets the plugin name and a brief description of what it is. */ #define PLUGIN_INFO(p_name, p_description, p_version, p_author) \ - PluginInfo *info() \ + PluginInfo *info(void) \ { \ static PluginInfo p_info; \ \ @@ -160,10 +160,10 @@ typedef struct DocumentFuncs { gint (*new_file) (const gchar *filename, struct filetype *ft, const gchar *text); - gint (*get_cur_idx) (); + gint (*get_cur_idx) (void); gint (*get_n_idx) (guint i); gint (*find_by_filename) (const gchar *filename, gboolean is_tm_filename); - struct document* (*get_current) (); + struct document* (*get_current) (void); gboolean (*save_file)(gint idx, gboolean force); gint (*open_file)(const gchar *locale_filename, gboolean readonly, struct filetype *ft, const gchar *forced_enc); @@ -262,7 +262,7 @@ { gboolean (*show_question) (const gchar *text, ...); void (*show_msgbox) (gint type, const gchar *text, ...); - gboolean (*show_save_as) (); + gboolean (*show_save_as) (void); } DialogFuncs; Modified: trunk/src/plugins.c =================================================================== --- trunk/src/plugins.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/plugins.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -73,10 +73,10 @@ gulong *signal_ids; // signal IDs to disconnect when unloading gsize signal_ids_len; - PluginInfo* (*info) (); /* Returns plugin name, description */ + PluginInfo* (*info) (void); /* Returns plugin name, description */ void (*init) (GeanyData *data); /* Called when the plugin is enabled */ void (*configure) (GtkWidget *parent); /* plugin configure dialog, optionally */ - void (*cleanup) (); /* Called when the plugin is disabled or when Geany exits */ + void (*cleanup) (void); /* Called when the plugin is disabled or when Geany exits */ } Plugin; @@ -240,7 +240,7 @@ static void -geany_data_init() +geany_data_init(void) { geany_data.app = app; geany_data.tools_menu = lookup_widget(app->window, "tools1_menu"); @@ -387,7 +387,7 @@ { Plugin *plugin; GModule *module; - PluginInfo* (*info)(); + PluginInfo* (*info)(void); PluginFields **plugin_fields; GeanyData **p_geany_data; @@ -554,7 +554,7 @@ #endif -static void load_plugin_paths() +static void load_plugin_paths(void) { gchar *path; @@ -650,7 +650,7 @@ static gint plugin_has_menu(Plugin *a, Plugin *b) { - if (((PluginFields)a->fields).menu_item != NULL) + if (a->fields.menu_item != NULL) return 0; return 1; Modified: trunk/src/plugins.h =================================================================== --- trunk/src/plugins.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/plugins.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -28,13 +28,13 @@ #ifdef HAVE_PLUGINS -void plugins_init(); +void plugins_init(void); -void plugins_free(); +void plugins_free(void); -void plugins_create_active_list(); +void plugins_create_active_list(void); -void plugins_update_tools_menu(); +void plugins_update_tools_menu(void); void plugins_update_document_sensitive(gboolean enabled); Modified: trunk/src/prefix.c =================================================================== --- trunk/src/prefix.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/prefix.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -287,4 +287,8 @@ return newpath; } +#else /* ENABLE_BINRELOC */ + +typedef int iso_c_forbids_an_empty_source_file; + #endif /* ENABLE_BINRELOC */ Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/prefs.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -87,10 +87,10 @@ { KB_TREE_ACTION, KB_TREE_SHORTCUT, - KB_TREE_INDEX, + KB_TREE_INDEX }; -static void init_kb_tree() +static void init_kb_tree(void) { GtkCellRenderer *renderer; GtkTreeViewColumn *column; @@ -124,7 +124,7 @@ } -static void init_keybindings() +static void init_keybindings(void) { GtkTreeIter parent, iter; gint i; Modified: trunk/src/project.c =================================================================== --- trunk/src/project.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/project.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -75,7 +75,7 @@ static gboolean update_config(const PropertyDialogElements *e); static void on_file_save_button_clicked(GtkButton *button, PropertyDialogElements *e); static void on_file_open_button_clicked(GtkButton *button, PropertyDialogElements *e); -static gboolean close_open_project(); +static gboolean close_open_project(void); static gboolean load_config(const gchar *filename); static gboolean write_config(gboolean emit_signal); static void on_name_entry_changed(GtkEditable *editable, PropertyDialogElements *e); @@ -299,7 +299,7 @@ // Called when opening, closing and updating projects. -static void update_ui() +static void update_ui(void) { ui_set_window_title(-1); build_menu_update(-1); Modified: trunk/src/project.h =================================================================== --- trunk/src/project.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/project.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -54,28 +54,28 @@ extern ProjectPrefs project_prefs; -void project_new(); +void project_new(void); -void project_open(); +void project_open(void); void project_close(gboolean open_default); -void project_properties(); +void project_properties(void); gboolean project_load_file(const gchar *locale_file_name); -gchar *project_get_base_path(); +gchar *project_get_base_path(void); -gchar *project_get_make_dir(); +gchar *project_get_make_dir(void); void project_save_prefs(GKeyFile *config); void project_load_prefs(GKeyFile *config); -void project_setup_prefs(); +void project_setup_prefs(void); -void project_apply_prefs(); +void project_apply_prefs(void); #endif Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/sciwrappers.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -807,7 +807,7 @@ gint sci_target_replace(ScintillaObject *sci, const gchar *text, gboolean regex) { - return SSM(sci, (regex) ? SCI_REPLACETARGETRE : SCI_REPLACETARGET, -1, (sptr_t) text); + return SSM(sci, (regex) ? SCI_REPLACETARGETRE : SCI_REPLACETARGET, (uptr_t) -1, (sptr_t) text); } Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/search.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -108,7 +108,7 @@ search_find_in_files(const gchar *search_text, const gchar *dir, const gchar *opts); -void search_init() +void search_init(void) { widgets.find_dialog = NULL; widgets.replace_dialog = NULL; @@ -120,7 +120,7 @@ #define FREE_WIDGET(wid) \ if (wid && GTK_IS_WIDGET(wid)) gtk_widget_destroy(wid); -void search_finalize() +void search_finalize(void) { FREE_WIDGET(widgets.find_dialog); FREE_WIDGET(widgets.replace_dialog); @@ -257,7 +257,7 @@ } -void search_show_find_dialog() +void search_show_find_dialog(void) { gint idx = document_get_cur_idx(); gchar *sel = NULL; @@ -376,7 +376,7 @@ } -void search_show_replace_dialog() +void search_show_replace_dialog(void) { gint idx = document_get_cur_idx(); gchar *sel = NULL; @@ -1012,7 +1012,7 @@ } -static GString *get_grep_options() +static GString *get_grep_options(void) { gboolean fgrep = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON( lookup_widget(widgets.find_in_files_dialog, "radio_fgrep"))); Modified: trunk/src/search.h =================================================================== --- trunk/src/search.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/search.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -47,13 +47,13 @@ extern SearchPrefs search_prefs; -void search_init(); +void search_init(void); -void search_finalize(); +void search_finalize(void); -void search_show_find_dialog(); +void search_show_find_dialog(void); -void search_show_replace_dialog(); +void search_show_replace_dialog(void); void search_show_find_in_files_dialog(const gchar *dir); Modified: trunk/src/socket.c =================================================================== --- trunk/src/socket.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/socket.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -91,10 +91,13 @@ #endif +struct socket_info_struct socket_info; + + #ifdef G_OS_WIN32 static gint socket_fd_connect_inet (gushort port); static gint socket_fd_open_inet (gushort port); -static void socket_init_win32(); +static void socket_init_win32 (void); #else static gint socket_fd_connect_unix (const gchar *path); static gint socket_fd_open_unix (const gchar *path); @@ -160,7 +163,7 @@ #ifndef G_OS_WIN32 -static void remove_socket_link_full() +static void remove_socket_link_full(void) { gchar real_path[512]; gsize len; @@ -457,7 +460,7 @@ } -static void socket_init_win32() +static void socket_init_win32(void) { WSADATA wsadata; Modified: trunk/src/socket.h =================================================================== --- trunk/src/socket.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/socket.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -26,20 +26,22 @@ #define GEANY_SOCKET_H 1 -struct +struct socket_info_struct { gboolean ignore_socket; gchar *file_name; GIOChannel *read_ioc; gint lock_socket; gint lock_socket_tag; -} socket_info; +}; +extern struct socket_info_struct socket_info; + gint socket_init(gint argc, gchar **argv); gboolean socket_lock_input_cb(GIOChannel *source, GIOCondition condition, gpointer data); -gint socket_finalize(); +gint socket_finalize(void); #endif Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/symbols.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -83,7 +83,7 @@ static gchar *user_tags_dir; -static void html_tags_loaded(); +static void html_tags_loaded(void); static void load_user_tags(filetype_id ft_id); /* tags_ignore is a NULL-terminated array of strings, read from ~/.geany/ignore.tags. @@ -91,7 +91,7 @@ * by the C/C++ parser, see -I command line option of ctags for details. */ gchar **c_tags_ignore = NULL; -static void load_c_ignore_tags() +static void load_c_ignore_tags(void) { gchar *path = g_strconcat(app->configdir, G_DIR_SEPARATOR_S "ignore.tags", NULL); gchar *content; @@ -158,7 +158,7 @@ // HTML tagfile is just a list of entities for autocompletion (e.g. '&') -static void html_tags_loaded() +static void html_tags_loaded(void) { TagFileInfo *tfi; @@ -244,7 +244,7 @@ } -GString *symbols_get_macro_list() +GString *symbols_get_macro_list(void) { guint j, i; const GPtrArray *tags; @@ -319,7 +319,7 @@ } -const gchar **symbols_get_html_entities() +const gchar **symbols_get_html_entities(void) { if (html_entities == NULL) html_tags_loaded(); // if not yet created, force creation of the array but shouldn't occur @@ -328,7 +328,7 @@ } -void symbols_finalize() +void symbols_finalize(void) { g_strfreev(html_entities); g_strfreev(c_tags_ignore); @@ -411,7 +411,7 @@ if (tag->type & tag_types) { if (! doc_is_utf8) utf8_name = encodings_convert_to_utf8_from_charset(tag->name, - -1, doc_list[idx].encoding, TRUE); + (gsize)-1, doc_list[idx].encoding, TRUE); else utf8_name = tag->name; if (utf8_name == NULL) @@ -462,7 +462,7 @@ } tv_iters; -static void init_tag_iters() +static void init_tag_iters(void) { // init all GtkTreeIters with -1 to make them invalid to avoid crashes when switching between // filetypes(e.g. config file to Python crashes Geany without this) @@ -965,7 +965,7 @@ } -void symbols_show_load_tags_dialog() +void symbols_show_load_tags_dialog(void) { GtkWidget *dialog; GtkFileFilter *filter; @@ -1037,7 +1037,7 @@ } -static GHashTable *init_user_tags() +static GHashTable *init_user_tags(void) { GSList *file_list; GHashTable *lang_hash; Modified: trunk/src/symbols.h =================================================================== --- trunk/src/symbols.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/symbols.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -37,17 +37,17 @@ const GList *symbols_get_tag_list(gint idx, guint tag_types); -GString *symbols_get_macro_list(); +GString *symbols_get_macro_list(void); -const gchar **symbols_get_html_entities(); +const gchar **symbols_get_html_entities(void); -void symbols_finalize(); +void symbols_finalize(void); gboolean symbols_recreate_tag_list(gint idx, gboolean sort_by_name); gint symbols_generate_global_tags(gint argc, gchar **argv, gboolean want_preprocess); -void symbols_show_load_tags_dialog(); +void symbols_show_load_tags_dialog(void); gboolean symbols_goto_tag(const gchar *name, gboolean definition); Modified: trunk/src/templates.c =================================================================== --- trunk/src/templates.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/templates.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -333,7 +333,7 @@ // template items for the new file menu -static void create_new_menu_items() +static void create_new_menu_items(void) { GtkWidget *template_menu = lookup_widget(app->window, "menu_new_with_template1_menu"); filetype_id ft_id; Modified: trunk/src/tools.c =================================================================== --- trunk/src/tools.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/tools.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -209,7 +209,7 @@ } -static void cc_show_dialog_custom_commands() +static void cc_show_dialog_custom_commands(void) { GtkWidget *dialog, *label, *vbox, *button; guint i; @@ -389,7 +389,7 @@ } -void tools_create_insert_custom_command_menu_items() +void tools_create_insert_custom_command_menu_items(void) { GtkMenu *menu_edit = GTK_MENU(lookup_widget(app->window, "send_selection_to2_menu")); GtkMenu *menu_popup = GTK_MENU(lookup_widget(app->popup_menu, "send_selection_to1_menu")); @@ -509,7 +509,7 @@ } -void tools_word_count() +void tools_word_count(void) { GtkWidget *dialog, *label, *vbox, *table; gint idx; Modified: trunk/src/tools.h =================================================================== --- trunk/src/tools.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/tools.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -25,12 +25,12 @@ #ifndef GEANY_TOOLS_H #define GEANY_TOOLS_H 1 -void tools_create_insert_custom_command_menu_items(); +void tools_create_insert_custom_command_menu_items(void); void tools_execute_custom_command(gint idx, const gchar *command); -void tools_word_count(); +void tools_word_count(void); void tools_color_chooser(gchar *color); Modified: trunk/src/treeviews.c =================================================================== --- trunk/src/treeviews.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/treeviews.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -232,7 +232,7 @@ /* does some preparing things to the open files list widget */ -static void prepare_openfiles() +static void prepare_openfiles(void) { GtkCellRenderer *renderer; GtkTreeViewColumn *column; @@ -356,7 +356,7 @@ } -static void create_taglist_popup_menu() +static void create_taglist_popup_menu(void) { GtkWidget *item; @@ -423,7 +423,7 @@ } -static void create_openfiles_popup_menu() +static void create_openfiles_popup_menu(void) { GtkWidget *item; Modified: trunk/src/treeviews.h =================================================================== --- trunk/src/treeviews.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/treeviews.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -42,10 +42,10 @@ SYMBOLS_COLUMN_ICON, SYMBOLS_COLUMN_NAME, SYMBOLS_COLUMN_LINE, - SYMBOLS_N_COLUMNS, + SYMBOLS_N_COLUMNS }; -void treeviews_init(); +void treeviews_init(void); void treeviews_update_tag_list(gint idx, gboolean update); @@ -53,7 +53,7 @@ void treeviews_openfiles_update(gint idx); -void treeviews_openfiles_update_all(); +void treeviews_openfiles_update_all(void); void treeviews_select_openfiles_item(gint idx); Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/ui_utils.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -59,7 +59,7 @@ static gchar *menu_item_get_text(GtkMenuItem *menu_item); -static void update_recent_menu(); +static void update_recent_menu(void); static void recent_file_loaded(const gchar *utf8_filename); static void recent_file_activate_cb (GtkMenuItem *menuitem, @@ -262,7 +262,7 @@ } -void ui_set_fullscreen() +void ui_set_fullscreen(void) { if (ui_prefs.fullscreen) { @@ -361,7 +361,7 @@ } -void ui_update_fold_items() +void ui_update_fold_items(void) { ui_widget_show_hide(lookup_widget(app->window, "menu_fold_all1"), editor_prefs.folding); ui_widget_show_hide(lookup_widget(app->window, "menu_unfold_all1"), editor_prefs.folding); @@ -403,7 +403,7 @@ } -void ui_create_insert_menu_items() +void ui_create_insert_menu_items(void) { GtkMenu *menu_edit = GTK_MENU(lookup_widget(app->window, "insert_include2_menu")); GtkMenu *menu_popup = GTK_MENU(lookup_widget(app->popup_menu, "insert_include1_menu")); @@ -470,7 +470,7 @@ } -void ui_create_insert_date_menu_items() +void ui_create_insert_date_menu_items(void) { GtkMenu *menu_edit = GTK_MENU(lookup_widget(app->window, "insert_date1_menu")); GtkMenu *menu_popup = GTK_MENU(lookup_widget(app->popup_menu, "insert_date2_menu")); @@ -542,7 +542,7 @@ } -static void init_document_widgets() +static void init_document_widgets(void) { /* Cache the document-sensitive widgets so we don't have to keep looking them up * when using ui_document_buttons_update(). */ @@ -594,7 +594,7 @@ } -void ui_document_buttons_update() +void ui_document_buttons_update(void) { guint i; gboolean enable = gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)) ? TRUE : FALSE; @@ -621,7 +621,7 @@ } -void ui_sidebar_show_hide() +void ui_sidebar_show_hide(void) { GtkWidget *widget; @@ -720,7 +720,7 @@ } -void ui_update_toolbar_items() +void ui_update_toolbar_items(void) { // show toolbar GtkWidget *widget = lookup_widget(app->window, "menu_show_toolbar1"); @@ -833,7 +833,7 @@ } -void ui_create_recent_menu() +void ui_create_recent_menu(void) { GtkWidget *tmp; guint i; @@ -973,7 +973,7 @@ } -static void update_recent_menu() +static void update_recent_menu(void) { GtkWidget *tmp; static GtkMenuToolButton *menu = NULL; @@ -1028,7 +1028,7 @@ } -void ui_show_markers_margin() +void ui_show_markers_margin(void) { gint i, idx, max = gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)); @@ -1040,7 +1040,7 @@ } -void ui_show_linenumber_margin() +void ui_show_linenumber_margin(void) { gint i, idx, max = gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)); @@ -1397,7 +1397,7 @@ } -void ui_init() +void ui_init(void) { init_document_widgets(); } Modified: trunk/src/ui_utils.h =================================================================== --- trunk/src/ui_utils.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/ui_utils.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -100,7 +100,7 @@ /* End of 'generic' functions */ -void ui_init(); +void ui_init(void); void ui_set_statusbar(gboolean log, const gchar *format, ...) G_GNUC_PRINTF (2, 3); @@ -113,7 +113,7 @@ void ui_set_editor_font(const gchar *font_name); -void ui_set_fullscreen(); +void ui_set_fullscreen(void); void ui_update_popup_reundo_items(gint idx); @@ -127,27 +127,27 @@ void ui_update_insert_include_item(gint idx, gint item); -void ui_update_fold_items(); +void ui_update_fold_items(void); -void ui_create_insert_menu_items(); +void ui_create_insert_menu_items(void); -void ui_create_insert_date_menu_items(); +void ui_create_insert_date_menu_items(void); void ui_save_buttons_toggle(gboolean enable); -void ui_document_buttons_update(); +void ui_document_buttons_update(void); -void ui_sidebar_show_hide(); +void ui_sidebar_show_hide(void); void ui_document_show_hide(gint idx); void ui_update_toolbar_icons(GtkIconSize size); -void ui_update_toolbar_items(); +void ui_update_toolbar_items(void); GdkPixbuf *ui_new_pixbuf_from_inline(gint img, gboolean small_img); @@ -155,20 +155,20 @@ GtkWidget *ui_new_image_from_inline(gint img, gboolean small_img); -void ui_create_recent_menu(); +void ui_create_recent_menu(void); void ui_add_recent_file(const gchar *utf8_filename); -void ui_show_markers_margin(); +void ui_show_markers_margin(void); -void ui_show_linenumber_margin(); +void ui_show_linenumber_margin(void); void ui_update_tab_status(gint idx); -typedef gboolean TVMatchCallback(); +typedef gboolean TVMatchCallback(void); gboolean ui_tree_view_find_next(GtkTreeView *treeview, TVMatchCallback cb); Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/utils.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -719,7 +719,7 @@ } -gchar *utils_get_hostname() +gchar *utils_get_hostname(void) { #ifdef G_OS_WIN32 return win32_get_hostname(); @@ -769,7 +769,7 @@ # define DIR_SEP "" #endif -gint utils_make_settings_dir() +gint utils_make_settings_dir(void) { gint saved_errno = 0; gchar *conf_file = g_strconcat(app->configdir, G_DIR_SEPARATOR_S, "geany.conf", NULL); @@ -1118,7 +1118,7 @@ /* Get directory from current file in the notebook. * Returns dir string that should be freed or NULL, depending on whether current file is valid. * Returned string is in UTF-8 encoding */ -gchar *utils_get_current_file_dir_utf8() +gchar *utils_get_current_file_dir_utf8(void) { gint cur_idx = document_get_cur_idx(); @@ -1139,7 +1139,7 @@ /* very simple convenience function */ -void utils_beep() +void utils_beep(void) { if (prefs.beep_on_errors) gdk_beep(); } @@ -1240,7 +1240,7 @@ // Returns: newly allocated string with the current time formatted HH:MM:SS. -gchar *utils_get_current_time_string() +gchar *utils_get_current_time_string(void) { const time_t tp = time(NULL); const struct tm *tmval = localtime(&tp); @@ -1778,7 +1778,7 @@ /* Get project or default startup directory (if set), or NULL. */ -const gchar *utils_get_default_dir_utf8() +const gchar *utils_get_default_dir_utf8(void) { if (app->project && NZV(app->project->base_path)) { Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/utils.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -82,9 +82,9 @@ gchar utils_brace_opposite(gchar ch); -gchar *utils_get_hostname(); +gchar *utils_get_hostname(void); -gint utils_make_settings_dir(); +gint utils_make_settings_dir(void); gboolean utils_string_replace_all(GString *str, const gchar *needle, const gchar *replace); @@ -108,18 +108,18 @@ gchar *utils_get_hex_from_color(GdkColor *color); -const gchar *utils_get_default_dir_utf8(); +const gchar *utils_get_default_dir_utf8(void); -gchar *utils_get_current_file_dir_utf8(); +gchar *utils_get_current_file_dir_utf8(void); -void utils_beep(); +void utils_beep(void); gchar *utils_make_human_readable_str(unsigned long long size, gulong block_size, gulong display_unit); gint utils_strtod(const gchar *source, gchar **end, gboolean with_route); -gchar *utils_get_current_time_string(); +gchar *utils_get_current_time_string(void); GIOChannel *utils_set_up_io_channel(gint fd, GIOCondition cond, gboolean nblock, GIOFunc func, gpointer data); Modified: trunk/src/vte.c =================================================================== --- trunk/src/vte.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/vte.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -46,6 +46,7 @@ VteInfo vte_info; +VteConfig *vc; extern gchar **environ; static pid_t pid; @@ -63,7 +64,7 @@ #define VTE_TERMINAL(obj) (GTK_CHECK_CAST((obj), VTE_TYPE_TERMINAL, VteTerminal)) #define VTE_TYPE_TERMINAL (vf->vte_terminal_get_type()) -static void create_vte(); +static void create_vte(void); static void vte_start(GtkWidget *widget); static gboolean vte_button_pressed(GtkWidget *widget, GdkEventButton *event, gpointer user_data); static gboolean vte_keyrelease(GtkWidget *widget, GdkEventKey *event, gpointer data); @@ -87,7 +88,7 @@ TARGET_TEXT, TARGET_COMPOUND_TEXT, TARGET_STRING, - TARGET_TEXT_PLAIN, + TARGET_TEXT_PLAIN }; static const GtkTargetEntry dnd_targets[] = @@ -140,7 +141,7 @@ } -static void override_menu_key() +static void override_menu_key(void) { if (gtk_menu_key_accel == NULL) // for restoring the default value g_object_get(G_OBJECT(gtk_settings_get_default()), "gtk-menu-bar-accel", @@ -206,7 +207,7 @@ } -static void create_vte() +static void create_vte(void) { GtkWidget *vte, *scrollbar, *hbox, *frame; @@ -532,7 +533,7 @@ /* Taken from Terminal by os-cillation: terminal_screen_get_working_directory, thanks. * Determines the working directory using various OS-specific mechanisms. */ -const gchar* vte_get_working_directory() +const gchar* vte_get_working_directory(void) { gchar buffer[4096 + 1]; gchar *file; @@ -631,7 +632,7 @@ } -void vte_append_preferences_tab() +void vte_append_preferences_tab(void) { if (vte_info.have_vte) { Modified: trunk/src/vte.h =================================================================== --- trunk/src/vte.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/src/vte.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -63,7 +63,7 @@ GdkColor *colour_fore; GdkColor *colour_back; } VteConfig; -VteConfig *vc; +extern VteConfig *vc; void vte_init(void); @@ -78,7 +78,7 @@ void vte_cwd(const gchar *filename, gboolean force); -void vte_append_preferences_tab(); +void vte_append_preferences_tab(void); /* void vte_drag_data_received(GtkWidget *widget, GdkDragContext *drag_context, gint x, gint y, Modified: trunk/tagmanager/c.c =================================================================== --- trunk/tagmanager/c.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/tagmanager/c.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -434,7 +434,7 @@ */ /* Debugging functions added by Biswa */ -#if DEBUG_C +#if defined(DEBUG_C) && DEBUG_C static char *tokenTypeName[] = { "none", "args", "'}'", "'{'", "','", "'::'", "keyword", "name", "package", "paren-name", "';'", "spec", "*", "[]", "count" Modified: trunk/tagmanager/docbook.c =================================================================== --- trunk/tagmanager/docbook.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/tagmanager/docbook.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -32,7 +32,7 @@ K_SECT1, K_SECT2, K_SECT3, - K_APPENDIX, + K_APPENDIX } docbookKind; static kindOption DocBookKinds [] = { Modified: trunk/tagmanager/haskell.c =================================================================== --- trunk/tagmanager/haskell.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/tagmanager/haskell.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -51,7 +51,7 @@ */ -static void skip_rest_of_line() +static void skip_rest_of_line(void) { int c; do { @@ -71,7 +71,7 @@ return i; } -static int get_next_char() +static int get_next_char(void) { int c, nxt; c = fileGetc(); Modified: trunk/tagmanager/include/tm_workspace.h =================================================================== --- trunk/tagmanager/include/tm_workspace.h 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/tagmanager/include/tm_workspace.h 2008-02-20 11:24:23 UTC (rev 2267) @@ -56,7 +56,7 @@ a workspace is created. Subsequent calls to the function will return the created workspace. */ -const TMWorkspace *tm_get_workspace(); +const TMWorkspace *tm_get_workspace(void); /*! Adds a work object (source file or project) to the workspace. \param work_object The work object to add to the project. Modified: trunk/tagmanager/sort.c =================================================================== --- trunk/tagmanager/sort.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/tagmanager/sort.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -111,7 +111,7 @@ if (fp != NULL) fclose (fp); if (msg == NULL) - error (FATAL | PERROR, cannotSort); + error (FATAL | PERROR, "%s", cannotSort); else error (FATAL, "%s: %s", msg, cannotSort); } Modified: trunk/tagmanager/tm_workspace.c =================================================================== --- trunk/tagmanager/tm_workspace.c 2008-02-18 19:51:34 UTC (rev 2266) +++ trunk/tagmanager/tm_workspace.c 2008-02-20 11:24:23 UTC (rev 2267) @@ -29,7 +29,7 @@ static TMWorkspace *theWorkspace = NULL; guint workspace_class_id = 0; -static gboolean tm_create_workspace() +static gboolean tm_create_workspace(void) { workspace_class_id = tm_work_object_register(tm_workspace_free, tm_workspace_update , tm_workspace_find_object); @@ -709,7 +709,7 @@ return function_tag; } return NULL; -}; +} const GPtrArray *tm_workspace_get_parents(const gchar *name) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2266] trunk
by eht16＠users.sourceforge.net 18 Feb '08

18 Feb '08

Revision: 2266 http://geany.svn.sourceforge.net/geany/?rev=2266&view=rev Author: eht16 Date: 2008-02-18 11:51:34 -0800 (Mon, 18 Feb 2008) Log Message: ----------- Add support for reading tags(only for C/C++) from a file which should be ignored while parsing the file (ctags command line option -I). Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/src/symbols.c trunk/src/symbols.h trunk/tagmanager/options.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-02-18 17:18:50 UTC (rev 2265) +++ trunk/ChangeLog 2008-02-18 19:51:34 UTC (rev 2266) @@ -3,6 +3,10 @@ * src/vte.c: Apply patch from Jeff Pohlmeyer to mark the VTE also as clean when Ctrl-C is pressed (thanks). * src/socket.c: Fix compiler warnings on Windows. + * doc/geany.html, doc/geany.txt, src/symbols.c, src/symbols.h, + tagmanager/options.c: + Add support for reading tags(only for C/C++) from a file which should + be ignored while parsing the file (ctags command line option -I). 2008-02-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-02-18 17:18:50 UTC (rev 2265) +++ trunk/doc/geany.html 2008-02-18 19:51:34 UTC (rev 2266) @@ -221,94 +221,95 @@ <li><a class="reference" href="#generating-a-global-tags-file" id="id53" name="id53">Generating a global tags file</a></li> </ul> </li> +<li><a class="reference" href="#ignore-tags" id="id54" name="id54">Ignore tags</a></li> </ul> </li> -<li><a class="reference" href="#preferences" id="id54" name="id54">Preferences</a><ul> -<li><a class="reference" href="#general-tab-in-preferences-dialog" id="id55" name="id55">General tab in preferences dialog</a></li> -<li><a class="reference" href="#interface-tab-in-preferences-dialog" id="id56" name="id56">Interface tab in preferences dialog</a></li> -<li><a class="reference" href="#toolbar-tab-in-preferences-dialog" id="id57" name="id57">Toolbar tab in preferences dialog</a></li> -<li><a class="reference" href="#display-tab-in-preferences-dialog" id="id58" name="id58">Display tab in preferences dialog</a></li> -<li><a class="reference" href="#editor-tab-in-preferences-dialog" id="id59" name="id59">Editor tab in preferences dialog</a></li> -<li><a class="reference" href="#files-tab-in-preferences-dialog" id="id60" name="id60">Files tab in preferences dialog</a></li> -<li><a class="reference" href="#tools-tab-in-preferences-dialog" id="id61" name="id61">Tools tab in preferences dialog</a></li> -<li><a class="reference" href="#template-tab-in-preferences-dialog" id="id62" name="id62">Template tab in preferences dialog</a></li> -<li><a class="reference" href="#keybinding-tab-in-preferences-dialog" id="id63" name="id63">Keybinding tab in preferences dialog</a></li> -<li><a class="reference" href="#printing-tab-in-preferences-dialog" id="id64" name="id64">Printing tab in preferences dialog</a></li> -<li><a class="reference" href="#vte-tab-in-preferences-dialog" id="id65" name="id65">VTE tab in preferences dialog</a></li> +<li><a class="reference" href="#preferences" id="id55" name="id55">Preferences</a><ul> +<li><a class="reference" href="#general-tab-in-preferences-dialog" id="id56" name="id56">General tab in preferences dialog</a></li> +<li><a class="reference" href="#interface-tab-in-preferences-dialog" id="id57" name="id57">Interface tab in preferences dialog</a></li> +<li><a class="reference" href="#toolbar-tab-in-preferences-dialog" id="id58" name="id58">Toolbar tab in preferences dialog</a></li> +<li><a class="reference" href="#display-tab-in-preferences-dialog" id="id59" name="id59">Display tab in preferences dialog</a></li> +<li><a class="reference" href="#editor-tab-in-preferences-dialog" id="id60" name="id60">Editor tab in preferences dialog</a></li> +<li><a class="reference" href="#files-tab-in-preferences-dialog" id="id61" name="id61">Files tab in preferences dialog</a></li> +<li><a class="reference" href="#tools-tab-in-preferences-dialog" id="id62" name="id62">Tools tab in preferences dialog</a></li> +<li><a class="reference" href="#template-tab-in-preferences-dialog" id="id63" name="id63">Template tab in preferences dialog</a></li> +<li><a class="reference" href="#keybinding-tab-in-preferences-dialog" id="id64" name="id64">Keybinding tab in preferences dialog</a></li> +<li><a class="reference" href="#printing-tab-in-preferences-dialog" id="id65" name="id65">Printing tab in preferences dialog</a></li> +<li><a class="reference" href="#vte-tab-in-preferences-dialog" id="id66" name="id66">VTE tab in preferences dialog</a></li> </ul> </li> -<li><a class="reference" href="#project-management" id="id66" name="id66">Project Management</a><ul> -<li><a class="reference" href="#new-project" id="id67" name="id67">New Project</a></li> -<li><a class="reference" href="#project-properties" id="id68" name="id68">Project Properties</a><ul> -<li><a class="reference" href="#make-in-base-path" id="id69" name="id69">Make in base path</a></li> -<li><a class="reference" href="#run-command" id="id70" name="id70">Run command</a></li> +<li><a class="reference" href="#project-management" id="id67" name="id67">Project Management</a><ul> +<li><a class="reference" href="#new-project" id="id68" name="id68">New Project</a></li> +<li><a class="reference" href="#project-properties" id="id69" name="id69">Project Properties</a><ul> +<li><a class="reference" href="#make-in-base-path" id="id70" name="id70">Make in base path</a></li> +<li><a class="reference" href="#run-command" id="id71" name="id71">Run command</a></li> </ul> </li> -<li><a class="reference" href="#open-project" id="id71" name="id71">Open Project</a></li> -<li><a class="reference" href="#close-project" id="id72" name="id72">Close Project</a></li> +<li><a class="reference" href="#open-project" id="id72" name="id72">Open Project</a></li> +<li><a class="reference" href="#close-project" id="id73" name="id73">Close Project</a></li> </ul> </li> -<li><a class="reference" href="#build-system" id="id73" name="id73">Build system</a><ul> -<li><a class="reference" href="#compile" id="id74" name="id74">Compile</a></li> -<li><a class="reference" href="#build" id="id75" name="id75">Build</a></li> -<li><a class="reference" href="#make-all" id="id76" name="id76">Make all</a></li> -<li><a class="reference" href="#make-custom-target" id="id77" name="id77">Make custom target</a></li> -<li><a class="reference" href="#make-object" id="id78" name="id78">Make object</a></li> -<li><a class="reference" href="#execute" id="id79" name="id79">Execute</a></li> -<li><a class="reference" href="#stopping-running-processes" id="id80" name="id80">Stopping running processes</a><ul> -<li><a class="reference" href="#terminal-emulators" id="id81" name="id81">Terminal emulators</a></li> +<li><a class="reference" href="#build-system" id="id74" name="id74">Build system</a><ul> +<li><a class="reference" href="#compile" id="id75" name="id75">Compile</a></li> +<li><a class="reference" href="#build" id="id76" name="id76">Build</a></li> +<li><a class="reference" href="#make-all" id="id77" name="id77">Make all</a></li> +<li><a class="reference" href="#make-custom-target" id="id78" name="id78">Make custom target</a></li> +<li><a class="reference" href="#make-object" id="id79" name="id79">Make object</a></li> +<li><a class="reference" href="#execute" id="id80" name="id80">Execute</a></li> +<li><a class="reference" href="#stopping-running-processes" id="id81" name="id81">Stopping running processes</a><ul> +<li><a class="reference" href="#terminal-emulators" id="id82" name="id82">Terminal emulators</a></li> </ul> </li> -<li><a class="reference" href="#set-includes-and-arguments" id="id82" name="id82">Set Includes and Arguments</a><ul> -<li><a class="reference" href="#one-step-compilation" id="id83" name="id83">One step compilation</a></li> +<li><a class="reference" href="#set-includes-and-arguments" id="id83" name="id83">Set Includes and Arguments</a><ul> +<li><a class="reference" href="#one-step-compilation" id="id84" name="id84">One step compilation</a></li> </ul> </li> -<li><a class="reference" href="#indicators" id="id84" name="id84">Indicators</a></li> +<li><a class="reference" href="#indicators" id="id85" name="id85">Indicators</a></li> </ul> </li> -<li><a class="reference" href="#printing-support" id="id85" name="id85">Printing support</a></li> -<li><a class="reference" href="#plugins" id="id86" name="id86">Plugins</a></li> -<li><a class="reference" href="#keybindings" id="id87" name="id87">Keybindings</a><ul> -<li><a class="reference" href="#switching-documents" id="id88" name="id88">Switching documents</a></li> -<li><a class="reference" href="#configurable-keybindings" id="id89" name="id89">Configurable keybindings</a></li> +<li><a class="reference" href="#printing-support" id="id86" name="id86">Printing support</a></li> +<li><a class="reference" href="#plugins" id="id87" name="id87">Plugins</a></li> +<li><a class="reference" href="#keybindings" id="id88" name="id88">Keybindings</a><ul> +<li><a class="reference" href="#switching-documents" id="id89" name="id89">Switching documents</a></li> +<li><a class="reference" href="#configurable-keybindings" id="id90" name="id90">Configurable keybindings</a></li> </ul> </li> </ul> </li> -<li><a class="reference" href="#configuration-files" id="id90" name="id90">Configuration files</a><ul> -<li><a class="reference" href="#global-configuration-file" id="id91" name="id91">Global configuration file</a></li> -<li><a class="reference" href="#filetype-definition-files" id="id92" name="id92">Filetype definition files</a><ul> -<li><a class="reference" href="#format" id="id93" name="id93">Format</a><ul> -<li><a class="reference" href="#styling-section" id="id94" name="id94">[styling] Section</a></li> -<li><a class="reference" href="#keywords-section" id="id95" name="id95">[keywords] Section</a></li> -<li><a class="reference" href="#settings-section" id="id96" name="id96">[settings] Section</a></li> -<li><a class="reference" href="#build-settings-section" id="id97" name="id97">[build_settings] Section</a></li> +<li><a class="reference" href="#configuration-files" id="id91" name="id91">Configuration files</a><ul> +<li><a class="reference" href="#global-configuration-file" id="id92" name="id92">Global configuration file</a></li> +<li><a class="reference" href="#filetype-definition-files" id="id93" name="id93">Filetype definition files</a><ul> +<li><a class="reference" href="#format" id="id94" name="id94">Format</a><ul> +<li><a class="reference" href="#styling-section" id="id95" name="id95">[styling] Section</a></li> +<li><a class="reference" href="#keywords-section" id="id96" name="id96">[keywords] Section</a></li> +<li><a class="reference" href="#settings-section" id="id97" name="id97">[settings] Section</a></li> +<li><a class="reference" href="#build-settings-section" id="id98" name="id98">[build_settings] Section</a></li> </ul> </li> -<li><a class="reference" href="#special-file-filetypes-common" id="id98" name="id98">Special file filetypes.common</a></li> +<li><a class="reference" href="#special-file-filetypes-common" id="id99" name="id99">Special file filetypes.common</a></li> </ul> </li> -<li><a class="reference" href="#filetype-extensions" id="id99" name="id99">Filetype extensions</a></li> -<li><a class="reference" href="#templates" id="id100" name="id100">Templates</a><ul> -<li><a class="reference" href="#template-metadata" id="id101" name="id101">Template metadata</a></li> -<li><a class="reference" href="#filetype-templates" id="id102" name="id102">Filetype templates</a></li> -<li><a class="reference" href="#customizing-templates" id="id103" name="id103">Customizing templates</a><ul> -<li><a class="reference" href="#template-wildcards" id="id104" name="id104">Template wildcards</a></li> +<li><a class="reference" href="#filetype-extensions" id="id100" name="id100">Filetype extensions</a></li> +<li><a class="reference" href="#templates" id="id101" name="id101">Templates</a><ul> +<li><a class="reference" href="#template-metadata" id="id102" name="id102">Template metadata</a></li> +<li><a class="reference" href="#filetype-templates" id="id103" name="id103">Filetype templates</a></li> +<li><a class="reference" href="#customizing-templates" id="id104" name="id104">Customizing templates</a><ul> +<li><a class="reference" href="#template-wildcards" id="id105" name="id105">Template wildcards</a></li> </ul> </li> </ul> </li> </ul> </li> -<li><a class="reference" href="#contributing-to-this-document" id="id105" name="id105">Contributing to this document</a></li> -<li><a class="reference" href="#scintilla-keyboard-commands" id="id106" name="id106">Scintilla keyboard commands</a><ul> -<li><a class="reference" href="#keyboard-commands" id="id107" name="id107">Keyboard commands</a></li> +<li><a class="reference" href="#contributing-to-this-document" id="id106" name="id106">Contributing to this document</a></li> +<li><a class="reference" href="#scintilla-keyboard-commands" id="id107" name="id107">Scintilla keyboard commands</a><ul> +<li><a class="reference" href="#keyboard-commands" id="id108" name="id108">Keyboard commands</a></li> </ul> </li> -<li><a class="reference" href="#hidden-preferences" id="id108" name="id108">Hidden preferences</a></li> -<li><a class="reference" href="#compile-time-options" id="id109" name="id109">Compile-time options</a></li> -<li><a class="reference" href="#gnu-general-public-license" id="id110" name="id110">GNU General Public License</a></li> -<li><a class="reference" href="#license-for-scintilla-and-scite" id="id111" name="id111">License for Scintilla and SciTE</a></li> +<li><a class="reference" href="#hidden-preferences" id="id109" name="id109">Hidden preferences</a></li> +<li><a class="reference" href="#compile-time-options" id="id110" name="id110">Compile-time options</a></li> +<li><a class="reference" href="#gnu-general-public-license" id="id111" name="id111">GNU General Public License</a></li> +<li><a class="reference" href="#license-for-scintilla-and-scite" id="id112" name="id112">License for Scintilla and SciTE</a></li> </ul> </div> <div class="section"> @@ -1319,9 +1320,32 @@ upgrading Geany.</p> </div> </div> +<div class="section"> +<h3><a class="toc-backref" href="#id54" id="ignore-tags" name="ignore-tags">Ignore tags</a></h3> +<p>You can also ignore certain tags if they would lead to wrong parsing of +the code. Simply create a file called "ignore.tags" in your Geany +configuration directory (usually <tt class="docutils literal"><span class="pre">~/.geany/</span></tt>). Then list all tags +you want to ignore in this file, separated by spaces and/or newlines.</p> +<p>More detailed information about the usage from the Exuberant Ctags +manual page:</p> +<pre class="literal-block"> +Specifies a list of identifiers which are to be specially handled +while parsing C and C++ source files. This option is specifically +provided to handle special cases arising through the use of +preprocessor macros. When the identifiers listed are simple identifiers, +these identifiers will be ignored during parsing of the source files. +If an identifier is suffixed with a '+' character, ctags will also +ignore any parenthesis-enclosed argument list which may immediately +follow the identifier in the source files. +If two identifiers are separated with the '=' character, the first +identifiers is replaced by the second identifiers for parsing purposes. +</pre> +<p>For even more detailed information please read the manual page of +Exuberant Ctags.</p> </div> +</div> <div class="section"> -<h2><a class="toc-backref" href="#id54" id="preferences" name="preferences">Preferences</a></h2> +<h2><a class="toc-backref" href="#id55" id="preferences" name="preferences">Preferences</a></h2> <p>You may adjust Geany's settings using the Edit --> Preferences dialog. Any changes you make there can be applied by hitting either the Apply or the Ok button. These settings will persist between Geany @@ -1339,12 +1363,12 @@ (if present) comes after the screenshot of that tab.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id55" id="general-tab-in-preferences-dialog" name="general-tab-in-preferences-dialog">General tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id56" id="general-tab-in-preferences-dialog" name="general-tab-in-preferences-dialog">General tab in preferences dialog</a></h3> <p>General tab in preferences dialog</p> <img alt="./images/pref_dialog_gen.png" src="./images/pref_dialog_gen.png" /> </div> <div class="section"> -<h3><a class="toc-backref" href="#id56" id="interface-tab-in-preferences-dialog" name="interface-tab-in-preferences-dialog">Interface tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id57" id="interface-tab-in-preferences-dialog" name="interface-tab-in-preferences-dialog">Interface tab in preferences dialog</a></h3> <p>Interface tab in preferences dialog</p> <img alt="./images/pref_dialog_interface.png" src="./images/pref_dialog_interface.png" /> <p>The documents list and the editor tabs are two different ways @@ -1354,17 +1378,17 @@ whether or not editor tabs are visible).</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id57" id="toolbar-tab-in-preferences-dialog" name="toolbar-tab-in-preferences-dialog">Toolbar tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id58" id="toolbar-tab-in-preferences-dialog" name="toolbar-tab-in-preferences-dialog">Toolbar tab in preferences dialog</a></h3> <p>Toolbar tab in preferences dialog</p> <img alt="./images/pref_dialog_toolbar.png" src="./images/pref_dialog_toolbar.png" /> </div> <div class="section"> -<h3><a class="toc-backref" href="#id58" id="display-tab-in-preferences-dialog" name="display-tab-in-preferences-dialog">Display tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id59" id="display-tab-in-preferences-dialog" name="display-tab-in-preferences-dialog">Display tab in preferences dialog</a></h3> <p>This is for visual elements displayed in the editor window.</p> <img alt="./images/pref_dialog_display.png" src="./images/pref_dialog_display.png" /> </div> <div class="section"> -<h3><a class="toc-backref" href="#id59" id="editor-tab-in-preferences-dialog" name="editor-tab-in-preferences-dialog">Editor tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id60" id="editor-tab-in-preferences-dialog" name="editor-tab-in-preferences-dialog">Editor tab in preferences dialog</a></h3> <p>Editor tab in preferences dialog</p> <img alt="./images/pref_dialog_edit.png" src="./images/pref_dialog_edit.png" /> <p>Line wrapping refers to the display of the text in the @@ -1372,22 +1396,22 @@ insert newlines into your document while you type.)</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id60" id="files-tab-in-preferences-dialog" name="files-tab-in-preferences-dialog">Files tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id61" id="files-tab-in-preferences-dialog" name="files-tab-in-preferences-dialog">Files tab in preferences dialog</a></h3> <p>Files tab in preferences dialog</p> <img alt="./images/pref_dialog_files.png" src="./images/pref_dialog_files.png" /> </div> <div class="section"> -<h3><a class="toc-backref" href="#id61" id="tools-tab-in-preferences-dialog" name="tools-tab-in-preferences-dialog">Tools tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id62" id="tools-tab-in-preferences-dialog" name="tools-tab-in-preferences-dialog">Tools tab in preferences dialog</a></h3> <p>Tools tab in preferences dialog</p> <img alt="./images/pref_dialog_tools.png" src="./images/pref_dialog_tools.png" /> </div> <div class="section"> -<h3><a class="toc-backref" href="#id62" id="template-tab-in-preferences-dialog" name="template-tab-in-preferences-dialog">Template tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id63" id="template-tab-in-preferences-dialog" name="template-tab-in-preferences-dialog">Template tab in preferences dialog</a></h3> <p>Template tab in preferences dialog</p> <img alt="./images/pref_dialog_templ.png" src="./images/pref_dialog_templ.png" /> </div> <div class="section"> -<h3><a class="toc-backref" href="#id63" id="keybinding-tab-in-preferences-dialog" name="keybinding-tab-in-preferences-dialog">Keybinding tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id64" id="keybinding-tab-in-preferences-dialog" name="keybinding-tab-in-preferences-dialog">Keybinding tab in preferences dialog</a></h3> <p>Keybinding tab in preferences dialog</p> <img alt="./images/pref_dialog_keys.png" src="./images/pref_dialog_keys.png" /> <p>There are some handy commands in here that are not, by default, @@ -1398,18 +1422,18 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id64" id="printing-tab-in-preferences-dialog" name="printing-tab-in-preferences-dialog">Printing tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id65" id="printing-tab-in-preferences-dialog" name="printing-tab-in-preferences-dialog">Printing tab in preferences dialog</a></h3> <p>Printing tab in preferences dialog</p> <img alt="./images/pref_dialog_printing.png" src="./images/pref_dialog_printing.png" /> </div> <div class="section"> -<h3><a class="toc-backref" href="#id65" id="vte-tab-in-preferences-dialog" name="vte-tab-in-preferences-dialog">VTE tab in preferences dialog</a></h3> +<h3><a class="toc-backref" href="#id66" id="vte-tab-in-preferences-dialog" name="vte-tab-in-preferences-dialog">VTE tab in preferences dialog</a></h3> <p>VTE tab in preferences dialog</p> <img alt="./images/pref_dialog_vte.png" src="./images/pref_dialog_vte.png" /> </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id66" id="project-management" name="project-management">Project Management</a></h2> +<h2><a class="toc-backref" href="#id67" id="project-management" name="project-management">Project Management</a></h2> <p>Project Management is optional in Geany. Currently it can be used for:</p> <ul class="simple"> <li>Storing and opening session files on a project basis.</li> @@ -1427,7 +1451,7 @@ file that was in use at the end of the last session will be reopened.</p> <p>Below are the commands used to create, modify, open and close projects.</p> <div class="section"> -<h3><a class="toc-backref" href="#id67" id="new-project" name="new-project">New Project</a></h3> +<h3><a class="toc-backref" href="#id68" id="new-project" name="new-project">New Project</a></h3> <p>To create a new project, fill in the <em>Name</em> field. By default this will setup a new project file <tt class="docutils literal"><span class="pre">~/projects/name.geany</span></tt>. Usually it's best to store all your project files in the same directory (they are @@ -1437,7 +1461,7 @@ structure contained in it.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id68" id="project-properties" name="project-properties">Project Properties</a></h3> +<h3><a class="toc-backref" href="#id69" id="project-properties" name="project-properties">Project Properties</a></h3> <p>You can set an optional description for the project, but it is not used elsewhere by Geany.</p> <p>The <em>Base path</em> field is used as the directory to run the Make and Make @@ -1446,13 +1470,13 @@ The specified path can be an absolute path or relative to the project's file name.</p> <div class="section"> -<h4><a class="toc-backref" href="#id69" id="make-in-base-path" name="make-in-base-path">Make in base path</a></h4> +<h4><a class="toc-backref" href="#id70" id="make-in-base-path" name="make-in-base-path">Make in base path</a></h4> <p>This setting makes the <em>Build->Make</em> command use the project's base path. Uncheck this if you want to use the current file's directory instead.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id70" id="run-command" name="run-command">Run command</a></h4> +<h4><a class="toc-backref" href="#id71" id="run-command" name="run-command">Run command</a></h4> <p>The <em>Run command</em> overrides the default run command. You can set this to the executable or main script file for the project, and append any command-line arguments.</p> @@ -1465,7 +1489,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id71" id="open-project" name="open-project">Open Project</a></h3> +<h3><a class="toc-backref" href="#id72" id="open-project" name="open-project">Open Project</a></h3> <p>The Open command displays a standard file chooser, starting in <tt class="docutils literal"><span class="pre">~/projects</span></tt>. Choose a project file named with the <tt class="docutils literal"><span class="pre">.geany</span></tt> extension.</p> @@ -1473,14 +1497,14 @@ open files and open the session files associated with the project.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id72" id="close-project" name="close-project">Close Project</a></h3> +<h3><a class="toc-backref" href="#id73" id="close-project" name="close-project">Close Project</a></h3> <p>Project file settings are saved when the project is closed.</p> <p>When project session support is enabled, Geany will close the project session files and open any previously closed default session files.</p> </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id73" id="build-system" name="build-system">Build system</a></h2> +<h2><a class="toc-backref" href="#id74" id="build-system" name="build-system">Build system</a></h2> <p>Geany has an integrated build system. Firstly this means that the current source file will be saved before it is processed. This is for convenience so that you don't need to keep saving small changes @@ -1504,7 +1528,7 @@ <li>Set Includes and Arguments</li> </ul> <div class="section"> -<h3><a class="toc-backref" href="#id74" id="compile" name="compile">Compile</a></h3> +<h3><a class="toc-backref" href="#id75" id="compile" name="compile">Compile</a></h3> <p>The Compile command has different uses for different kinds of files.</p> <p>For compilable languages such as C and C++, the Compile command is setup to compile the current source file into a binary object file.</p> @@ -1514,7 +1538,7 @@ will run the file in its language interpreter.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id75" id="build" name="build">Build</a></h3> +<h3><a class="toc-backref" href="#id76" id="build" name="build">Build</a></h3> <p>For compilable languages such as C and C++, the Build command will link the current source file's equivalent object file into an executable. If the object file does not exist, the source will be compiled and linked @@ -1522,7 +1546,7 @@ <p>Interpreted languages do not use the Build command.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id76" id="make-all" name="make-all">Make all</a></h3> +<h3><a class="toc-backref" href="#id77" id="make-all" name="make-all">Make all</a></h3> <p>This effectively runs "make all" in the same directory as the current file.</p> <div class="note"> @@ -1532,19 +1556,19 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id77" id="make-custom-target" name="make-custom-target">Make custom target</a></h3> +<h3><a class="toc-backref" href="#id78" id="make-custom-target" name="make-custom-target">Make custom target</a></h3> <p>This is similar to running 'Make all' but you will be prompted for the make target name to be passed to the Make tool. For example, typing 'clean' in the dialog prompt will run "make clean".</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id78" id="make-object" name="make-object">Make object</a></h3> +<h3><a class="toc-backref" href="#id79" id="make-object" name="make-object">Make object</a></h3> <p>Make object will run "make current_file.o" in the same directory as the current file, using its prefix for 'current_file'. It is useful for compiling just the current file without building the whole project.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id79" id="execute" name="execute">Execute</a></h3> +<h3><a class="toc-backref" href="#id80" id="execute" name="execute">Execute</a></h3> <p>Execute will run the corresponding executable file, shell script or interpreted script in a terminal window. Note that the Terminal tool path must be correctly set in the Tools tab of the Preferences dialog - @@ -1555,7 +1579,7 @@ output from the program before the terminal window is closed.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id80" id="stopping-running-processes" name="stopping-running-processes">Stopping running processes</a></h3> +<h3><a class="toc-backref" href="#id81" id="stopping-running-processes" name="stopping-running-processes">Stopping running processes</a></h3> <p>When there is a running program, the Run button in the toolbar becomes a stop button and you can stop the current action. This works by sending a signal to the process (and its child process(es)) @@ -1564,7 +1588,7 @@ cannot be stopped. This can happen when the process creates more than one child process.</p> <div class="section"> -<h4><a class="toc-backref" href="#id81" id="terminal-emulators" name="terminal-emulators">Terminal emulators</a></h4> +<h4><a class="toc-backref" href="#id82" id="terminal-emulators" name="terminal-emulators">Terminal emulators</a></h4> <p>Xterm is known to work properly. If you are using "Terminal" (the terminal program of Xfce), you should add the command line option <tt class="docutils literal"><span class="pre">--disable-server</span></tt> otherwise the started process cannot be @@ -1573,7 +1597,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id82" id="set-includes-and-arguments" name="set-includes-and-arguments">Set Includes and Arguments</a></h3> +<h3><a class="toc-backref" href="#id83" id="set-includes-and-arguments" name="set-includes-and-arguments">Set Includes and Arguments</a></h3> <p>By default the Compile and Build commands invoke the compiler and linker with only the basic arguments needed by all programs. Using Set Includes and Arguments you can add any include paths and compile @@ -1590,14 +1614,14 @@ different settings, then writing a Makefile and using the Make commands is recommended.</p> <div class="section"> -<h4><a class="toc-backref" href="#id83" id="one-step-compilation" name="one-step-compilation">One step compilation</a></h4> +<h4><a class="toc-backref" href="#id84" id="one-step-compilation" name="one-step-compilation">One step compilation</a></h4> <p>If you are using the Build command to compile and link in one step, you will need to set both the compiler arguments and the linker arguments in the linker command setting.</p> </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id84" id="indicators" name="indicators">Indicators</a></h3> +<h3><a class="toc-backref" href="#id85" id="indicators" name="indicators">Indicators</a></h3> <p>Indicators are red squiggly underlines which are used to highlight errors which occured while compiling the current file. So you can easily see where your code failed to compile. To remove the indicators, @@ -1607,7 +1631,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id85" id="printing-support" name="printing-support">Printing support</a></h2> +<h2><a class="toc-backref" href="#id86" id="printing-support" name="printing-support">Printing support</a></h2> <p>Since Geany 0.13 there is full printing support using GTK's printing API. The printed page(s) will look nearly the same as on your screen in Geany. Additionally, there are some options to modify the printed page(s). You @@ -1655,7 +1679,7 @@ gtklp or similar programs can be used.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id86" id="plugins" name="plugins">Plugins</a></h2> +<h2><a class="toc-backref" href="#id87" id="plugins" name="plugins">Plugins</a></h2> <p>Plugins are loaded at startup, if the <em>Enable plugin support</em> general preference is set. There is also a command-line option, <tt class="docutils literal"><span class="pre">-p</span></tt>, which prevents plugins being loaded. Plugins are scanned in @@ -1675,13 +1699,13 @@ provides some.</p> </div> <div class="section"> -<h2><a class="toc-backref" href="#id87" id="keybindings" name="keybindings">Keybindings</a></h2> +<h2><a class="toc-backref" href="#id88" id="keybindings" name="keybindings">Keybindings</a></h2> <p>Geany supports the default keyboard shortcuts for the Scintilla editing widget. For a list of these commands, see <a class="reference" href="#scintilla-keyboard-commands">Scintilla keyboard commands</a>. The Scintilla keyboard shortcuts will be overridden by any custom keybindings with the same keyboard shortcut.</p> <div class="section"> -<h3><a class="toc-backref" href="#id88" id="switching-documents" name="switching-documents">Switching documents</a></h3> +<h3><a class="toc-backref" href="#id89" id="switching-documents" name="switching-documents">Switching documents</a></h3> <p>There are a few non-configurable bindings to switch between documents, listed below. These can also be overridden by custom keybindings.</p> <table border="1" class="docutils"> @@ -1711,7 +1735,7 @@ </table> </div> <div class="section"> -<h3><a class="toc-backref" href="#id89" id="configurable-keybindings" name="configurable-keybindings">Configurable keybindings</a></h3> +<h3><a class="toc-backref" href="#id90" id="configurable-keybindings" name="configurable-keybindings">Configurable keybindings</a></h3> <p>For all actions listed below you can define your own keybindings. Open the Preferences dialog, select the desired action and click on change. In the opening dialog you can press any key combination you @@ -2214,9 +2238,9 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id90" id="configuration-files" name="configuration-files">Configuration files</a></h1> +<h1><a class="toc-backref" href="#id91" id="configuration-files" name="configuration-files">Configuration files</a></h1> <div class="section"> -<h2><a class="toc-backref" href="#id91" id="global-configuration-file" name="global-configuration-file">Global configuration file</a></h2> +<h2><a class="toc-backref" href="#id92" id="global-configuration-file" name="global-configuration-file">Global configuration file</a></h2> <p>You can use a global configuration file for Geany which will be used if the user starts Geany for the first time and an user's configuration file was not yet created or in case an user deleted the configuration @@ -2236,7 +2260,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id92" id="filetype-definition-files" name="filetype-definition-files">Filetype definition files</a></h2> +<h2><a class="toc-backref" href="#id93" id="filetype-definition-files" name="filetype-definition-files">Filetype definition files</a></h2> <p>All colour definitions and other filetype specific settings are stored in the filetype definition files. Those settings are colours for syntax highlighting, general settings like comment characters or @@ -2264,9 +2288,9 @@ to change. All missing settings will be read from the corresponding global definition file in <tt class="docutils literal"><span class="pre">$prefix/share/geany</span></tt>.</p> <div class="section"> -<h3><a class="toc-backref" href="#id93" id="format" name="format">Format</a></h3> +<h3><a class="toc-backref" href="#id94" id="format" name="format">Format</a></h3> <div class="section"> -<h4><a class="toc-backref" href="#id94" id="styling-section" name="styling-section">[styling] Section</a></h4> +<h4><a class="toc-backref" href="#id95" id="styling-section" name="styling-section">[styling] Section</a></h4> <p>In this section the colours for syntax highlighting are defined. The format is always: key=forground_colour;background_colour;bold;italic</p> <p>Colours have to be specified as RGB hex values prefixed by @@ -2276,7 +2300,7 @@ value is something other than "true" or "false", "false" is assumed.</p> </div> <div class="section"> -<h4><a class="toc-backref" href="#id95" id="keywords-section" name="keywords-section">[keywords] Section</a></h4> +<h4><a class="toc-backref" href="#id96" id="keywords-section" name="keywords-section">[keywords] Section</a></h4> <p>This section contains keys for different keyword lists specific to the filetype. Some filetypes do not support keywords, so adding a new key will not work. You can only add or remove keywords to/from @@ -2287,7 +2311,7 @@ </div> </div> <div class="section"> -<h4><a class="toc-backref" href="#id96" id="settings-section" name="settings-section">[settings] Section</a></h4> +<h4><a class="toc-backref" href="#id97" id="settings-section" name="settings-section">[settings] Section</a></h4> <dl class="docutils"> <dt>extension</dt> <dd><p class="first">This is the default file extension used when saving files, not @@ -2348,7 +2372,7 @@ </dl> </div> <div class="section"> -<h4><a class="toc-backref" href="#id97" id="build-settings-section" name="build-settings-section">[build_settings] Section</a></h4> +<h4><a class="toc-backref" href="#id98" id="build-settings-section" name="build-settings-section">[build_settings] Section</a></h4> <dl class="docutils"> <dt>compiler</dt> <dd><p class="first">This item specifies the command to compile source code files. But @@ -2381,7 +2405,7 @@ </div> </div> <div class="section"> -<h3><a class="toc-backref" href="#id98" id="special-file-filetypes-common" name="special-file-filetypes-common">Special file filetypes.common</a></h3> +<h3><a class="toc-backref" href="#id99" id="special-file-filetypes-common" name="special-file-filetypes-common">Special file filetypes.common</a></h3> <p>There is a special filetype definition file called filetypes.common. This file defines some general non-filetype-specific settings.</p> @@ -2491,7 +2515,7 @@ </div> </div> <div class="section"> -<h2><a class="toc-backref" href="#id99" id="filetype-extensions" name="filetype-extensions">Filetype extensions</a></h2> +<h2><a class="toc-backref" href="#id100" id="filetype-extensions" name="filetype-extensions">Filetype extensions</a></h2> <p>To change the default filetype extension used when saving a new file, see <a class="reference" href="#filetype-definition-files">Filetype definition files</a>.</p> <p>You can override the list of file extensions that Geany uses for each @@ -2517,7 +2541,7 @@ </pre> </div> <div class="section"> -<h2><a class="toc-backref" href="#id100" id="templates" name="templates">Templates</a></h2> +<h2><a class="toc-backref" href="#id101" id="templates" name="templates">Templates</a></h2> <p>Geany supports the following templates:</p> <ul class="simple"> <li>ChangeLog entry</li> @@ -2540,7 +2564,7 @@ function description won't contain the correct function name but "unknown" instead.</p> <div class="section"> -<h3><a class="toc-backref" href="#id101" id="template-metadata" name="template-metadata">Template metadata</a></h3> +<h3><a class="toc-backref" href="#id102" id="template-metadata" name="template-metadata">Template metadata</a></h3> <p>Metadata can be used with all templates, but by default user set metadata is only used for the ChangeLog and File header templates.</p> <p>In the configuration dialog you can find a tab "Templates" (see @@ -2550,7 +2574,7 @@ at startup.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id102" id="filetype-templates" name="filetype-templates">Filetype templates</a></h3> +<h3><a class="toc-backref" href="#id103" id="filetype-templates" name="filetype-templates">Filetype templates</a></h3> <p>Filetype templates are templates used as the basis of a new file. To use them, choose the <em>New (with Template)</em> menu item from the <em>File</em> menu.</p> @@ -2571,7 +2595,7 @@ the New command is used without a filetype. This is empty by default.</p> </div> <div class="section"> -<h3><a class="toc-backref" href="#id103" id="customizing-templates" name="customizing-templates">Customizing templates</a></h3> +<h3><a class="toc-backref" href="#id104" id="customizing-templates" name="customizing-templates">Customizing templates</a></h3> <p>Each template can be customized to your needs. The templates are stored in the <tt class="docutils literal"><span class="pre">~/.geany/templates/</span></tt> directory (see the section called <a class="reference" href="#command-line-options">Command line options</a> for further information about the configuration @@ -2579,7 +2603,7 @@ Geany ;-) ) and edit the template to your needs. There are some wildcards which will be automatically replaced by Geany at startup.</p> <div class="section"> -<h4><a class="toc-backref" href="#id104" id="template-wildcards" name="template-wildcards">Template wildcards</a></h4> +<h4><a class="toc-backref" href="#id105" id="template-wildcards" name="template-wildcards">Template wildcards</a></h4> <p>All wildcards must be enclosed by "{" and "}", e.g. {date}.</p> <table border="1" class="docutils"> <colgroup> @@ -2688,7 +2712,7 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id105" id="contributing-to-this-document" name="contributing-to-this-document">Contributing to this document</a></h1> +<h1><a class="toc-backref" href="#id106" id="contributing-to-this-document" name="contributing-to-this-document">Contributing to this document</a></h1> <p>This document (<tt class="docutils literal"><span class="pre">geany.txt</span></tt>) is written in <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> (or "reST"). The source file for it is located in Geany's <tt class="docutils literal"><span class="pre">doc</span></tt> subdirectory. If you intend on making changes, you should grab the @@ -2708,7 +2732,7 @@ and Fedora systems.</p> </div> <div class="section"> -<h1><a class="toc-backref" href="#id106" id="scintilla-keyboard-commands" name="scintilla-keyboard-commands">Scintilla keyboard commands</a></h1> +<h1><a class="toc-backref" href="#id107" id="scintilla-keyboard-commands" name="scintilla-keyboard-commands">Scintilla keyboard commands</a></h1> <p>Copyright © 1998, 2006 Neil Hodgson <neilh(at)scintilla(dot)org></p> <p>This appendix is distributed under the terms of the License for Scintilla and SciTE. A copy of this license can be found in the file @@ -2717,7 +2741,7 @@ Scintilla and SciTE</a>.</p> <p>20 June 2006</p> <div class="section"> -<h2><a class="toc-backref" href="#id107" id="keyboard-commands" name="keyboard-commands">Keyboard commands</a></h2> +<h2><a class="toc-backref" href="#id108" id="keyboard-commands" name="keyboard-commands">Keyboard commands</a></h2> <p>Keyboard commands for Scintilla mostly follow common Windows and GTK+ conventions. All move keys (arrows, page up/down, home and end) allows to extend or reduce the stream selection when holding the @@ -2817,7 +2841,7 @@ </div> </div> <div class="section"> -<h1><a class="toc-backref" href="#id108" id="hidden-preferences" name="hidden-preferences">Hidden preferences</a></h1> +<h1><a class="toc-backref" href="#id109" id="hidden-preferences" name="hidden-preferences">Hidden preferences</a></h1> <p>There are some uncommon preferences that are not shown in the Preferences dialog. These can be set by editing <tt class="docutils literal"><span class="pre">~/.geany/geany.conf</span></tt>, then restarting Geany. Search for the key name, then edit the value. Example:</p> @@ -2887,7 +2911,7 @@ </table> </div> <div class="section"> -<h1><a class="toc-backref" href="#id109" id="compile-time-options" name="compile-time-options">Compile-time options</a></h1> +<h1><a class="toc-backref" href="#id110" id="compile-time-options" name="compile-time-options">Compile-time options</a></h1> <p>There are some options which can only be changed at compile time. To change these options, edit the file src/geany.h. Look for a block of lines starting with <tt class="docutils literal"><span class="pre">#define</span> <span class="pre">GEANY_*</span></tt>. Any definitions which are @@ -3037,7 +3061,7 @@ </table> </div> <div class="section"> -<h1><a class="toc-backref" href="#id110" id="gnu-general-public-license" name="gnu-general-public-license">GNU General Public License</a></h1> +<h1><a class="toc-backref" href="#id111" id="gnu-general-public-license" name="gnu-general-public-license">GNU General Public License</a></h1> <pre class="literal-block"> GNU GENERAL PUBLIC LICENSE Version 2, June 1991 @@ -3382,7 +3406,7 @@ </pre> </div> <div class="section"> -<h1><a class="toc-backref" href="#id111" id="license-for-scintilla-and-scite" name="license-for-scintilla-and-scite">License for Scintilla and SciTE</a></h1> +<h1><a class="toc-backref" href="#id112" id="license-for-scintilla-and-scite" name="license-for-scintilla-and-scite">License for Scintilla and SciTE</a></h1> <p>Copyright 1998-2003 by Neil Hodgson <neilh(at)scintilla(dot)org></p> <p>All Rights Reserved</p> <p>Permission to use, copy, modify, and distribute this software and @@ -3402,7 +3426,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2008-02-16 11:20 UTC. +Generated on: 2008-02-18 19:50 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2008-02-18 17:18:50 UTC (rev 2265) +++ trunk/doc/geany.txt 2008-02-18 19:51:34 UTC (rev 2266) @@ -1124,7 +1124,32 @@ upgrading Geany. +Ignore tags +^^^^^^^^^^^ +You can also ignore certain tags if they would lead to wrong parsing of +the code. Simply create a file called "ignore.tags" in your Geany +configuration directory (usually ``~/.geany/``). Then list all tags +you want to ignore in this file, separated by spaces and/or newlines. + +More detailed information about the usage from the Exuberant Ctags +manual page:: + + Specifies a list of identifiers which are to be specially handled + while parsing C and C++ source files. This option is specifically + provided to handle special cases arising through the use of + preprocessor macros. When the identifiers listed are simple identifiers, + these identifiers will be ignored during parsing of the source files. + If an identifier is suffixed with a '+' character, ctags will also + ignore any parenthesis-enclosed argument list which may immediately + follow the identifier in the source files. + If two identifiers are separated with the '=' character, the first + identifiers is replaced by the second identifiers for parsing purposes. + +For even more detailed information please read the manual page of +Exuberant Ctags. + + Preferences ----------- Modified: trunk/src/symbols.c =================================================================== --- trunk/src/symbols.c 2008-02-18 17:18:50 UTC (rev 2265) +++ trunk/src/symbols.c 2008-02-18 19:51:34 UTC (rev 2266) @@ -86,7 +86,25 @@ static void html_tags_loaded(); static void load_user_tags(filetype_id ft_id); +/* tags_ignore is a NULL-terminated array of strings, read from ~/.geany/ignore.tags. + * This file contains a space or newline separated list of symbols which should be ignored + * by the C/C++ parser, see -I command line option of ctags for details. */ +gchar **c_tags_ignore = NULL; +static void load_c_ignore_tags() +{ + gchar *path = g_strconcat(app->configdir, G_DIR_SEPARATOR_S "ignore.tags", NULL); + gchar *content; + + if (g_file_get_contents(path, &content, NULL, NULL)) + { + c_tags_ignore = g_strsplit_set(content, " \n\r", -1); + g_free(content); + } + g_free(path); +} + + // Ensure that the global tags file for the file_type_idx filetype is loaded. void symbols_global_tags_loaded(gint file_type_idx) { @@ -98,6 +116,13 @@ load_user_tags(file_type_idx); + // load ignore list for C/C++ parser + if ((file_type_idx == GEANY_FILETYPES_C || file_type_idx == GEANY_FILETYPES_CPP) && + c_tags_ignore == NULL) + { + load_c_ignore_tags(); + } + switch (file_type_idx) { case GEANY_FILETYPES_PHP: @@ -306,6 +331,7 @@ void symbols_finalize() { g_strfreev(html_entities); + g_strfreev(c_tags_ignore); } Modified: trunk/src/symbols.h =================================================================== --- trunk/src/symbols.h 2008-02-18 17:18:50 UTC (rev 2265) +++ trunk/src/symbols.h 2008-02-18 19:51:34 UTC (rev 2266) @@ -26,6 +26,7 @@ #define GEANY_SYMBOLS_H 1 extern const guint TM_GLOBAL_TYPE_MASK; +extern gchar **c_tags_ignore; void symbols_global_tags_loaded(gint file_type_idx); Modified: trunk/tagmanager/options.c =================================================================== --- trunk/tagmanager/options.c 2008-02-18 17:18:50 UTC (rev 2265) +++ trunk/tagmanager/options.c 2008-02-18 19:51:34 UTC (rev 2266) @@ -24,6 +24,7 @@ #include "options.h" #include "parse.h" +#include <glib.h> #define CTAGS_ENVIRONMENT "CTAGS" @@ -150,6 +151,8 @@ return FALSE; } +// get the tags_ignore list, exported by Geany's symbols.h +gchar **c_tags_ignore; /* Determines whether or not "name" should be ignored, per the ignore list. */ @@ -157,7 +160,49 @@ boolean *const pIgnoreParens, const char **const replacement) { - return FALSE; + boolean result = FALSE; + + if (c_tags_ignore != NULL) + { + const size_t nameLen = strlen (name); + unsigned int i; + guint len = g_strv_length (c_tags_ignore); + + if (pIgnoreParens != NULL) + *pIgnoreParens = FALSE; + + for (i = 0 ; i < len ; ++i) + { + vString *token = vStringNewInit (c_tags_ignore[i]); + + if (strncmp (vStringValue (token), name, nameLen) == 0) + { + const size_t tokenLen = vStringLength (token); + + if (nameLen == tokenLen) + { + result = TRUE; + break; + } + else if (tokenLen == nameLen + 1 && + vStringChar (token, tokenLen - 1) == '+') + { + result = TRUE; + if (pIgnoreParens != NULL) + *pIgnoreParens = TRUE; + break; + } + else if (vStringChar (token, nameLen) == '=') + { + if (replacement != NULL) + *replacement = vStringValue (token) + nameLen + 1; + break; + } + } + vStringDelete (token); + } + } + return result; } void addIgnoreListFromFile (const char *const fileName) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2265] trunk
by eht16＠users.sourceforge.net 18 Feb '08

18 Feb '08

Revision: 2265 http://geany.svn.sourceforge.net/geany/?rev=2265&view=rev Author: eht16 Date: 2008-02-18 09:18:50 -0800 (Mon, 18 Feb 2008) Log Message: ----------- Apply patch from Jeff Pohlmeyer to mark the VTE also as clean when Ctrl-C is pressed (thanks). Modified Paths: -------------- trunk/ChangeLog trunk/src/vte.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-02-18 17:17:55 UTC (rev 2264) +++ trunk/ChangeLog 2008-02-18 17:18:50 UTC (rev 2265) @@ -1,3 +1,10 @@ +2008-02-18 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/vte.c: Apply patch from Jeff Pohlmeyer to mark the VTE also as + clean when Ctrl-C is pressed (thanks). + * src/socket.c: Fix compiler warnings on Windows. + + 2008-02-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * configure.in, doc/Doxyfile.in, doc/Makefile.am, doc/plugins.dox, Modified: trunk/src/vte.c =================================================================== --- trunk/src/vte.c 2008-02-18 17:17:55 UTC (rev 2264) +++ trunk/src/vte.c 2008-02-18 17:18:50 UTC (rev 2265) @@ -274,7 +274,8 @@ { if (event->keyval == GDK_Return || event->keyval == GDK_ISO_Enter || - event->keyval == GDK_KP_Enter) + event->keyval == GDK_KP_Enter || + ((event->keyval == GDK_c) && (event->state & GDK_CONTROL_MASK))) { clean = TRUE; // assume any text on the prompt has been executed when pressing Enter/Return } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2264] trunk/src/socket.c
by eht16＠users.sourceforge.net 18 Feb '08

18 Feb '08

Revision: 2264 http://geany.svn.sourceforge.net/geany/?rev=2264&view=rev Author: eht16 Date: 2008-02-18 09:17:55 -0800 (Mon, 18 Feb 2008) Log Message: ----------- Fix compiler warnings on Windows. Modified Paths: -------------- trunk/src/socket.c Modified: trunk/src/socket.c =================================================================== --- trunk/src/socket.c 2008-02-17 18:00:42 UTC (rev 2263) +++ trunk/src/socket.c 2008-02-18 17:17:55 UTC (rev 2264) @@ -159,6 +159,7 @@ } +#ifndef G_OS_WIN32 static void remove_socket_link_full() { gchar real_path[512]; @@ -176,6 +177,7 @@ } g_unlink(socket_info.file_name); } +#endif /* (Unix domain) socket support to replace the old FIFO code This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

17 Feb '08

Revision: 2263 http://geany.svn.sourceforge.net/geany/?rev=2263&view=rev Author: eht16 Date: 2008-02-17 10:00:42 -0800 (Sun, 17 Feb 2008) Log Message: ----------- Add support for generating API reference documentation using doxygen. This is the first step, it is far away from being complete. Add make target "api-doc" to generate the reference documentation. Add documentation comments to a few functions. Move basic plugin documentation from plugindata.h to doc/plugins.dox. Modified Paths: -------------- trunk/ChangeLog trunk/configure.in trunk/doc/Makefile.am trunk/src/dialogs.c trunk/src/dialogs.h trunk/src/document.c trunk/src/document.h trunk/src/encodings.c trunk/src/encodings.h trunk/src/plugindata.h trunk/src/utils.c trunk/src/utils.h Added Paths: ----------- trunk/doc/Doxyfile.in trunk/doc/plugins.dox Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-02-16 11:21:24 UTC (rev 2262) +++ trunk/ChangeLog 2008-02-17 18:00:42 UTC (rev 2263) @@ -1,3 +1,16 @@ +2008-02-17 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * configure.in, doc/Doxyfile.in, doc/Makefile.am, doc/plugins.dox, + src/dialogs.c, src/dialogs.h, src/document.c, src/document.h, + src/encodings.c, src/encodings.h, src/plugindata.h, src/utils.c, + src/utils.h: + Add support for generating API reference documentation using doxygen. + This is the first step, it is far away from being complete. + Add make target "api-doc" to generate the reference documentation. + Add documentation comments to a few functions. + Move basic plugin documentation from plugindata.h to doc/plugins.dox. + + 2008-02-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * doc/geany.html, doc/geany.txt: Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2008-02-16 11:21:24 UTC (rev 2262) +++ trunk/configure.in 2008-02-17 18:00:42 UTC (rev 2263) @@ -232,6 +232,7 @@ doc/geany.1 geany.spec geany.desktop.in +doc/Doxyfile ]) echo "----------------------------------------" Added: trunk/doc/Doxyfile.in =================================================================== --- trunk/doc/Doxyfile.in (rev 0) +++ trunk/doc/Doxyfile.in 2008-02-17 18:00:42 UTC (rev 2263) @@ -0,0 +1,270 @@ +# Doxyfile 1.5.4 + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- +DOXYFILE_ENCODING = UTF-8 +PROJECT_NAME = Geany +PROJECT_NUMBER = @VERSION@ +OUTPUT_DIRECTORY = ./ +CREATE_SUBDIRS = NO +OUTPUT_LANGUAGE = English +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +ABBREVIATE_BRIEF = "The $name class " \ + "The $name widget " \ + "The $name file " \ + is \ + provides \ + specifies \ + contains \ + represents \ + a \ + an \ + the +ALWAYS_DETAILED_SEC = NO +INLINE_INHERITED_MEMB = NO +FULL_PATH_NAMES = NO +STRIP_FROM_PATH = +STRIP_FROM_INC_PATH = +SHORT_NAMES = NO +JAVADOC_AUTOBRIEF = YES +QT_AUTOBRIEF = NO +MULTILINE_CPP_IS_BRIEF = NO +DETAILS_AT_TOP = NO +INHERIT_DOCS = YES +SEPARATE_MEMBER_PAGES = NO +TAB_SIZE = 4 +# ALIASES taken from pidgin +ALIASES = "signal=- @ref " \ + "signaldef=@subsection " \ + "endsignaldef= " \ + "signalproto=@code " \ + "endsignalproto=@endcode " \ + "signaldesc=@par Description: " \ + "signals=@b Signals: " \ + "endsignals= " +OPTIMIZE_OUTPUT_FOR_C = YES +OPTIMIZE_OUTPUT_JAVA = NO +BUILTIN_STL_SUPPORT = NO +CPP_CLI_SUPPORT = NO +SIP_SUPPORT = NO +DISTRIBUTE_GROUP_DOC = NO +SUBGROUPING = YES +TYPEDEF_HIDES_STRUCT = YES +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- +EXTRACT_ALL = NO +EXTRACT_PRIVATE = NO +EXTRACT_STATIC = NO +EXTRACT_LOCAL_CLASSES = YES +EXTRACT_LOCAL_METHODS = NO +EXTRACT_ANON_NSPACES = NO +HIDE_UNDOC_MEMBERS = YES +HIDE_UNDOC_CLASSES = YES +HIDE_FRIEND_COMPOUNDS = NO +HIDE_IN_BODY_DOCS = YES +INTERNAL_DOCS = NO +CASE_SENSE_NAMES = YES +HIDE_SCOPE_NAMES = NO +SHOW_INCLUDE_FILES = NO +INLINE_INFO = NO +SORT_MEMBER_DOCS = YES +SORT_BRIEF_DOCS = YES +SORT_BY_SCOPE_NAME = NO +GENERATE_TODOLIST = YES +GENERATE_TESTLIST = NO +GENERATE_BUGLIST = YES +GENERATE_DEPRECATEDLIST= NO +ENABLED_SECTIONS = +MAX_INITIALIZER_LINES = 30 +SHOW_USED_FILES = NO +SHOW_DIRECTORIES = NO +FILE_VERSION_FILTER = +#--------------------------------------------------------------------------- +# configuration options related to warning and progress messages +#--------------------------------------------------------------------------- +QUIET = NO +WARNINGS = YES +WARN_IF_UNDOCUMENTED = YES +WARN_IF_DOC_ERROR = YES +WARN_NO_PARAMDOC = YES +WARN_FORMAT = "$file:$line: $text " +WARN_LOGFILE = +#--------------------------------------------------------------------------- +# configuration options related to the input files +#--------------------------------------------------------------------------- +INPUT = ../src/ ./ +INPUT_ENCODING = UTF-8 +FILE_PATTERNS = *.c \ + *.cc \ + *.cxx \ + *.cpp \ + *.c++ \ + *.h \ + *.hh \ + *.hxx \ + *.hpp \ + *.h++ \ + *.dox \ + *.py \ + *.C \ + *.CC \ + *.C++ \ + *.H \ + *.HH \ + *.H++ \ + *.dox \ +RECURSIVE = NO +EXCLUDE = +EXCLUDE_SYMLINKS = NO +EXCLUDE_PATTERNS = +EXCLUDE_SYMBOLS = +EXAMPLE_PATH = +EXAMPLE_PATTERNS = * +EXAMPLE_RECURSIVE = NO +IMAGE_PATH = +INPUT_FILTER = +FILTER_PATTERNS = +FILTER_SOURCE_FILES = NO +#--------------------------------------------------------------------------- +# configuration options related to source browsing +#--------------------------------------------------------------------------- +SOURCE_BROWSER = NO +INLINE_SOURCES = NO +STRIP_CODE_COMMENTS = YES +REFERENCED_BY_RELATION = NO +REFERENCES_RELATION = NO +REFERENCES_LINK_SOURCE = YES +USE_HTAGS = NO +VERBATIM_HEADERS = NO +#--------------------------------------------------------------------------- +# configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- +ALPHABETICAL_INDEX = NO +COLS_IN_ALPHA_INDEX = 5 +IGNORE_PREFIX = +#--------------------------------------------------------------------------- +# configuration options related to the HTML output +#--------------------------------------------------------------------------- +GENERATE_HTML = YES +HTML_OUTPUT = reference/ +HTML_FILE_EXTENSION = .html +HTML_HEADER = +HTML_FOOTER = +HTML_STYLESHEET = +HTML_ALIGN_MEMBERS = YES +GENERATE_HTMLHELP = NO +HTML_DYNAMIC_SECTIONS = NO +CHM_FILE = +HHC_LOCATION = +GENERATE_CHI = NO +BINARY_TOC = NO +TOC_EXPAND = NO +DISABLE_INDEX = NO +ENUM_VALUES_PER_LINE = 4 +GENERATE_TREEVIEW = NO +TREEVIEW_WIDTH = 250 +#--------------------------------------------------------------------------- +# configuration options related to the LaTeX output +#--------------------------------------------------------------------------- +GENERATE_LATEX = NO +LATEX_OUTPUT = latex +LATEX_CMD_NAME = latex +MAKEINDEX_CMD_NAME = makeindex +COMPACT_LATEX = NO +PAPER_TYPE = a4wide +EXTRA_PACKAGES = +LATEX_HEADER = +PDF_HYPERLINKS = NO +USE_PDFLATEX = NO +LATEX_BATCHMODE = NO +LATEX_HIDE_INDICES = NO +#--------------------------------------------------------------------------- +# configuration options related to the RTF output +#--------------------------------------------------------------------------- +GENERATE_RTF = NO +RTF_OUTPUT = rtf +COMPACT_RTF = NO +RTF_HYPERLINKS = NO +RTF_STYLESHEET_FILE = +RTF_EXTENSIONS_FILE = +#--------------------------------------------------------------------------- +# configuration options related to the man page output +#--------------------------------------------------------------------------- +GENERATE_MAN = NO +MAN_OUTPUT = man +MAN_EXTENSION = .3 +MAN_LINKS = NO +#--------------------------------------------------------------------------- +# configuration options related to the XML output +#--------------------------------------------------------------------------- +GENERATE_XML = NO +XML_OUTPUT = xml +XML_SCHEMA = +XML_DTD = +XML_PROGRAMLISTING = YES +#--------------------------------------------------------------------------- +# configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- +GENERATE_AUTOGEN_DEF = NO +#--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- +GENERATE_PERLMOD = NO +PERLMOD_LATEX = NO +PERLMOD_PRETTY = YES +PERLMOD_MAKEVAR_PREFIX = +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- +ENABLE_PREPROCESSING = YES +MACRO_EXPANSION = YES +EXPAND_ONLY_PREDEF = YES +SEARCH_INCLUDES = NO +INCLUDE_PATH = +INCLUDE_FILE_PATTERNS = +# make G_GNUC_PRINTF a no-op unless doxygen would ignore functions with varargs +PREDEFINED = "G_GNUC_PRINTF(x,y)=" +EXPAND_AS_DEFINED = +SKIP_FUNCTION_MACROS = NO +#--------------------------------------------------------------------------- +# Configuration::additions related to external references +#--------------------------------------------------------------------------- +TAGFILES = +GENERATE_TAGFILE = +ALLEXTERNALS = NO +EXTERNAL_GROUPS = YES +PERL_PATH = /usr/bin/perl +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- +CLASS_DIAGRAMS = NO +MSCGEN_PATH = +HIDE_UNDOC_RELATIONS = YES +HAVE_DOT = NO +CLASS_GRAPH = YES +COLLABORATION_GRAPH = YES +GROUP_GRAPHS = YES +UML_LOOK = NO +TEMPLATE_RELATIONS = NO +INCLUDE_GRAPH = YES +INCLUDED_BY_GRAPH = YES +CALL_GRAPH = NO +CALLER_GRAPH = NO +GRAPHICAL_HIERARCHY = YES +DIRECTORY_GRAPH = YES +DOT_IMAGE_FORMAT = png +DOT_PATH = +DOTFILE_DIRS = +DOT_GRAPH_MAX_NODES = 50 +MAX_DOT_GRAPH_DEPTH = 1000 +DOT_TRANSPARENT = YES +DOT_MULTI_TARGETS = NO +GENERATE_LEGEND = YES +DOT_CLEANUP = YES +#--------------------------------------------------------------------------- +# Configuration::additions related to the search engine +#--------------------------------------------------------------------------- +SEARCHENGINE = NO Property changes on: trunk/doc/Doxyfile.in ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: trunk/doc/Makefile.am =================================================================== --- trunk/doc/Makefile.am 2008-02-16 11:21:24 UTC (rev 2262) +++ trunk/doc/Makefile.am 2008-02-17 18:00:42 UTC (rev 2263) @@ -1,7 +1,7 @@ man_MANS=geany.1 DOCDIR = $(DESTDIR)/$(datadir)/doc/@PACKAGE@ IMAGE_FILES = images/*.png -EXTRA_DIST = geany.html geany.css geany.txt geany.1 \ +EXTRA_DIST = geany.html geany.css geany.txt geany.1 plugins.dox \ $(srcdir)/$(IMAGE_FILES) pdf: geany.txt @@ -10,6 +10,9 @@ rm -f geany.tex geany.aux geany.log geany.out mv $(srcdir)/geany.pdf geany-$(VERSION).pdf +api-doc: Doxyfile + doxygen >/dev/null + doc: geany.txt rst2html -stg --stylesheet=geany.css $(srcdir)/geany.txt geany.html Added: trunk/doc/plugins.dox =================================================================== --- trunk/doc/plugins.dox (rev 0) +++ trunk/doc/plugins.dox 2008-02-17 18:00:42 UTC (rev 2263) @@ -0,0 +1,266 @@ +/* + * plugins.dox - this file is part of Geany, a fast and lightweight IDE + * + * Copyright 2008 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2008 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * $Id$ + * + * This file contains additional plugin documentation like the signal system and a small howto. + * It is best viewed when filetype is set to C or C++. + */ + + +/** + * + * @mainpage Geany Plugin API Documentation + * + * @author Enrico Tröger, Nick Treleaven + * @date $Date$ + * + * @section Intro + * This is the Geany API documentation. It is far from being complete and should be + * considered as a work in progress. + * We will try to %document as many functions and structs as possible. + * + * For additional documentation of things like plugin signals or a simple plugin please + * see Related Pages. + * + * + * + * @page symbols Plugin Symbols + * + * The following symbols (functions) should be exported by every plugin. Some of them + * are optional, i.e. they can be omitted, others are required and must be defined. + * + * - @code version_check() @endcode + * Use VERSION_CHECK() macro instead. Required by Geany. + * + * - @code PluginInfo* info() @endcode + * Use PLUGIN_INFO() macro to define it. Required by Geany. + * + * - @code GeanyData* geany_data @endcode + * Geany owned fields and functions. + * + * - @code PluginFields* plugin_fields @endcode + * Plugin owned fields, including flags. + * + * - @code GeanyCallback geany_callbacks[] @endcode + * An array for connecting GeanyObject events, which should be terminated with + * {NULL, NULL, FALSE, NULL}. See @link signals Signal documentation @endlink. + * + * - @code void configure(GtkWidget *parent) @endcode + * Called when the plugin should show a configure dialog to let the user set some basic + * plugin configuration. Optionally, can be omitted when not needed. + * + * - @code void init(GeanyData *data) @endcode + * Called after loading the plugin. data is the same as geany_data. + * + * - @code void cleanup() @endcode + * Called before unloading the plugin. Required for normal plugins - it should undo + * everything done in init() - e.g. destroy menu items, free memory. + * + * + * + * @page signals Plugin Signals + * + * + * @section Usage + * + * To use plugin signals in Geany, you simply create a GeanyCallback array, list the signals + * you want to listen to and create the appropiate signal callbacks for each signal. + * @note The GeanyCallback array has be ended with a final NULL entry. + * + * The following code demonstrates how to use signals in Geany plugins. The code can be inserted + * in your plugin code at any desired position. + * + * @code +static void on_document_open(GObject *obj, gint idx, gpointer user_data) +{ + printf("Example: %s was opened\n", DOC_FILENAME(idx)); +} + +GeanyCallback geany_callbacks[] = +{ + { "document-open", (GCallback) &on_document_open, FALSE, NULL }, + { NULL, NULL, FALSE, NULL } +}; + * @endcode + * + * @section Signals + * + * @signaldef document-new + * @signalproto + * void user_function(GObject *obj, gint idx, gpointer user_data); + * @endsignalproto + * @signaldesc + * Sent when a new %document is created. + * @param obj a GeanyObject instance, should be ignored. + * @param idx the index of the new %document. + * @param user_data user data. + * @endsignaldef + * + * @signaldef document-open + * @signalproto + * void user_function(GObject *obj, gint idx, gpointer user_data); + * @endsignalproto + * @signaldesc + * Sent when a new %document is opened. + * @param obj a GeanyObject instance, should be ignored. + * @param idx the index of the opened %document. + * @param user_data user data. + * @endsignaldef + * + * @signaldef document-save + * @signalproto + * void user_function(GObject *obj, gint idx, gpointer user_data); + * @endsignalproto + * @signaldesc + * Sent when a new %document is saved. + * @param obj a GeanyObject instance, should be ignored. + * @param idx the index of the saved %document. + * @param user_data user data. + * @endsignaldef + * + * @signaldef document-activate + * @signalproto + * void user_function(GObject *obj, gint idx, gpointer user_data); + * @endsignalproto + * @signaldesc + * Sent when switching notebook pages. + * @param obj a GeanyObject instance, should be ignored. + * @param idx the index of the new %document. + * @param user_data user data. + * @endsignaldef + * + * @signaldef project-open + * @signalproto + * void user_function(GObject *obj, GKeyFile *config, gpointer user_data); + * @endsignalproto + * @signaldesc + * Sent after a project is opened but before session files are loaded. + * @param obj a GeanyObject instance, should be ignored. + * @param config an exising GKeyFile object which can be used to read and write data. + * It must not be closed or freed. + * @param user_data user data. + * @endsignaldef + * + * @signaldef project-save + * @signalproto + * void user_function(GObject *obj, GKeyFile *config, gpointer user_data); + * @endsignalproto + * @signaldesc + * Sent when a project is saved(happens when the project is created, the properties + * dialog is closed or Geany is exited). This signal is emitted shortly before Geany + * will write the contents of the GKeyFile to the disc. + * @param obj a GeanyObject instance, should be ignored. + * @param config an exising GKeyFile object which can be used to read and write data. + * It must not be closed or freed. + * @param user_data user data. + * @endsignaldef + * + * @signaldef project-close + * @signalproto + * void user_function(GObject *obj, GKeyFile *config, gpointer user_data); + * @endsignalproto + * @signaldesc + * Sent after a project is closed. + * @param obj a GeanyObject instance, should be ignored. + * @param config an exising GKeyFile object which can be used to read and write data. + * It must not be closed or freed. + * @param user_data user data. + * @endsignaldef + * + * + * + * @page howto Plugin Howto + * + * @section intro Introduction + * + * Since Geany 0.12 there is a plugin interface to extend Geany's functionality and + * add new features. This %document gives a briefly overview about how to add new + * plugins by writing a simple "Hello World" plugin in C. + * + * + * @section start Getting started + * + * @subsection structure Plugin structure + * + * Every plugin must contain some essential symbols unless it won't work. A complete + * list of all necessary and optional symbols can be found in + * @link symbols Plugin Symbols @endlink. + * Every plugin should include "geany.h" and "plugindata.h" which provide necessary + * preprocessor macros and other basic information. + * There are two important preprocessor macros which need to be used at the beginning: + * PLUGIN_INFO() and VERSION_CHECK(). + * + * PLUGIN_INFO() tells Geany about basic plugin information like name, description, + * version and author of the plugin. + * + * VERSION_CHECK() checks for compatibility of the API version which the plugin uses with + * the used Geany sources. Furthermore, it also checks the binary compatiblity of the plugin + * with Geany. + * + * A few functions are necessary to let Geany work with the plugin, at least init() must + * exist in the plugin. cleanup() should also be used to free allocated memory or destroy + * created widgets. + * + * @subsection buildenv Build environment + * + * To be able to write plugins for Geany, you need the source code and some development + * packages for GTK and its dependencies. I will only describe the way to compile and + * build plugins on Unix-like systems [1]. + * If you already have the Geany source code and compiled it from them, you can skip the + * following. + * + * First you need to get the source code of Geany from the website at + * http://geany.uvena.de/Download/Releases [2]. Then install the development files for GTK + * and its dependencies. The easiest way to do this is to use your distribution's package + * management system, e.g. on Debian and Ubuntu systems you can use + * @code apt-get install libgtk2.0-dev intltool @endcode + * This will install all necessary files to be able to compile Geany and plugins. On other + * distributions, the package names and commands to use may differ. + * + * Basically, we are done at this point and could continue with writing the plugin code. + * You don't need necessarily to configure and build the Geany sources when the sources + * have the same version as your running Geany installation. But if the version of the + * sources differ from your Geany installation or especially when you used the source code + * from the Subversion repository, we strongly recommend to configure and build these + * sources and use it. To do so, run @code + ./configure && make + su -c "make install" + * @endcode + * in your Geany source directory. This will build and install Geany on your system. + * + * [1] For Windows, it is basically the same but you might have some more work on setting up + * the general build environment(compiler, GTK development files, ...). This is described on + * Geany's website at http://geany.uvena.de/Support/BuildingOnWin32. + * + * [2] You can also use the bleedging edge source code from our Subversion repository. + * More information about this can be found at http://geany.uvena.de/Download/SVN. + * + * @section helloworld "Hello World" + * + * We want to write a really simple "Hello World" plugin which opens a message dialog + * and just prints "Hello World". + * + * + * ... to be continued ... + * + * + **/ Property changes on: trunk/doc/plugins.dox ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2008-02-16 11:21:24 UTC (rev 2262) +++ trunk/src/dialogs.c 2008-02-17 18:00:42 UTC (rev 2263) @@ -581,8 +581,11 @@ #endif -/* Show the Save As dialog for the current notebook page. - * Returns: TRUE if the file was saved. */ +/** + * Show the Save As dialog for the current notebook page. + * + * @return @a TRUE if the file was saved, otherwise @a FALSE. + **/ gboolean dialogs_show_save_as() { gboolean result; @@ -607,6 +610,16 @@ } +/** + * Show a message box of the type @c type with @c text. + * On Unix-like systems a GTK message dialog box is shown, on Win32 systems a native Windows + * message dialog box is shown. + * + * @param type A GtkMessageType, can be one of: GTK_MESSAGE_INFO, GTK_MESSAGE_WARNING, + * GTK_MESSAGE_QUESTION, GTK_MESSAGE_ERROR + * @param text Printf()-style format string. + * @param ... Arguments for the @c text format string. + **/ void dialogs_show_msgbox(gint type, const gchar *text, ...) { #ifndef G_OS_WIN32 @@ -1300,7 +1313,7 @@ static gboolean show_question(GtkWidget *parent, const gchar *yes_btn, const gchar *no_btn, - const gchar *question_text, const gchar *extra_text) + const gchar *question_text, const gchar *extra_text) { gboolean ret = FALSE; #ifdef G_OS_WIN32 @@ -1337,6 +1350,16 @@ } +/** + * Show a question message box with @c text and Yes/No buttons. + * On Unix-like systems a GTK message dialog box is shown, on Win32 systems a native Windows + * message dialog box is shown. + * + * @param text Printf()-style format string. + * @param ... Arguments for the @c text format string. + * + * @return @a TRUE if the user answered with Yes, otherwise @a FALSE. + **/ gboolean dialogs_show_question(const gchar *text, ...) { gboolean ret = FALSE; Modified: trunk/src/dialogs.h =================================================================== --- trunk/src/dialogs.h 2008-02-16 11:21:24 UTC (rev 2262) +++ trunk/src/dialogs.h 2008-02-17 18:00:42 UTC (rev 2263) @@ -21,7 +21,12 @@ * $Id$ */ +/** + * @file dialogs.h + * File related dialogs, miscellaneous dialogs, font dialog. + **/ + #ifndef GEANY_DIALOGS_H #define GEANY_DIALOGS_H 1 Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-02-16 11:21:24 UTC (rev 2262) +++ trunk/src/document.c 2008-02-17 18:00:42 UTC (rev 2263) @@ -22,8 +22,8 @@ */ /* - * Document related actions: new, save, open, etc. - * Also Scintilla search actions. + * Document related actions: new, save, open, etc. + * Also Scintilla search actions. */ #include "geany.h" @@ -121,10 +121,17 @@ } -/* filename is in UTF-8 for non-TagManager filenames. - * is_tm_filename should only be used when passing a TagManager filename, - * which is therefore locale-encoded and already a realpath(). - * Returns: the document index which has the given filename. */ +/** + * Find and retrieve the index of the given filename @a filename in the %document list. + * + * @param filename The filename to search (in UTF-8 encoding for non-TagManager filenames, + * else in locale encoding). + * @param is_tm_filename Whether the passed @a filename is a TagManager filename and therefore + * locale-encoded and already a realpath(). + * + * @return The %document index which has the given filename @a filename or @c -1 + * if @a filename is not open. + **/ gint document_find_by_filename(const gchar *filename, gboolean is_tm_filename) { guint i; @@ -187,7 +194,14 @@ } -/* returns the index of the given notebook page in the document list */ +/** + * Find and retrieve the index of the given notebook page @a page_num in the %document list. + * + * @param page_num The notebook page number to search. + * + * @return The index of the given notebook page @a page_num in the %document list or @c -1 + * if no documents are opened. + **/ gint document_get_n_idx(guint page_num) { ScintillaObject *sci; @@ -200,7 +214,12 @@ } -/* returns the index of the current notebook page in the document list */ +/** + * Find and retrieve the index of the current %document. + * + * @return The index of the current notebook page in the %document list or @c -1 + * if no documents are opened. + **/ gint document_get_cur_idx() { gint cur_page = gtk_notebook_get_current_page(GTK_NOTEBOOK(app->notebook)); @@ -217,7 +236,11 @@ } -/* returns NULL if no documents are open */ +/** + * Find and retrieve the current %document. + * + * @return A pointer to the current %document or @c NULL if there are no opened documents. + **/ document *document_get_current() { gint idx = document_get_cur_idx(); @@ -238,6 +261,13 @@ } +/** + * Update the tab labels, the status bar, the window title and some save-sensitive buttons + * according to the document's save state. + * This is called by Geany mostly when opening or saving files. + * + * @param idx The %document index to operate on. + **/ void document_set_text_changed(gint idx) { if (DOC_IDX_VALID(idx) && ! main_status.quitting) @@ -478,7 +508,14 @@ } -/* removes the given notebook tab and clears the related entry in the document list */ +/** + * Remove the given notebook tab at @a page_num and clear all related information + * in the document list. + * + * @param page_num The notebook page number to remove. + * + * @return @a TRUE if the document was actually removed or @a FALSE otherwise. + **/ gboolean document_remove(guint page_num) { gint idx = document_get_n_idx(page_num); @@ -516,7 +553,11 @@ build_menu_update(-1); } } - else geany_debug("Error: idx: %d page_num: %d", idx, page_num); + else + { + geany_debug("Error: idx: %d page_num: %d", idx, page_num); + return FALSE; + } return TRUE; } @@ -531,12 +572,16 @@ } -/* Create a new document. - * filename is either the UTF-8 file name, or NULL. - * If ft is NULL and filename is not NULL, then the filetype will be guessed - * from the given filename. - * text is the contents of the new file in valid UTF-8 encoding, or NULL. - * Returns: idx of new file in doc_list. */ +/** + * Creates a new %document. + * After all, the "document-new" signal is emitted for plugins. + * + * @param filename The file name in UTF-8 encoding, or @c NULL to open a file as "untitled". + * @param ft The filetype to set or @c NULL to detect it from @a filename if not @c NULL. + * @param text The initial content of the file (in UTF-8 encoding), or @c NULL. + * + * @return The index of the new file in the @ref doc_list array. + **/ gint document_new_file(const gchar *filename, filetype *ft, const gchar *text) { gint idx = document_create_new_sci(filename); @@ -597,11 +642,30 @@ } -/* This is a wrapper for document_open_file_full(), see that function for details. - * Do not use this when opening multiple files (unless using document_delay_colourise()). */ +/** + * Open a %document specified by @a locale_filename. + * After all, the "document-open" signal is emitted for plugins. + * + * When opening more than one file, either: + * -# Use document_open_files(). + * -# Call document_delay_colourise() before document_open_file() and + * document_colourise_new() after opening all files. + * + * This avoids unnecessary recolourising, saving significant processing when a lot of files + * are open of a %filetype that supports user typenames, e.g. C. + * + * @param locale_filename The filename of the %document to load, in locale encoding. + * @param readonly Whether to open the %document in read-only mode. + * @param ft The %filetype for the %document or @c NULL to auto-detect the %filetype. + * @param forced_enc The file encoding to use or @c NULL to auto-detect the file encoding. + * + * @return The index of the opened file or -1 if an error occurred. + **/ gint document_open_file(const gchar *locale_filename, gboolean readonly, filetype *ft, const gchar *forced_enc) { + /* This is a wrapper for document_open_file_full(). + * Do not use this when opening multiple files (unless using document_delay_colourise()). */ return document_open_file_full(-1, locale_filename, 0, readonly, ft, forced_enc); } @@ -1087,8 +1151,18 @@ } -/* Takes a linked list of filename URIs and opens each file, ensuring the newly opened - * documents and existing documents (if necessary) are only colourised once. */ +/** + * Opens each file in the list @a filenames, ensuring the newly opened documents and + * existing documents (if necessary) are only colourised once. + * Internally, document_open_file() is called for every list item. + * + * @param filenames A list of filenames to load, in locale encoding. + * @param readonly Whether to open the %document in read-only mode. + * @param ft The %filetype for the %document or @c NULL to auto-detect the %filetype. + * @param forced_enc The file encoding to use or @c NULL to auto-detect the file encoding. + * + * @return The index of the opened file or -1 if an error occurred. + **/ void document_open_files(const GSList *filenames, gboolean readonly, filetype *ft, const gchar *forced_enc) { @@ -1104,9 +1178,15 @@ } -/* Reload document with index idx. - * forced_enc can be NULL to detect the file encoding. - * Returns: TRUE if successful. */ +/** + * Reloads the %document with the given index @a idx with the specified file encoding + * @a forced_enc or @c NULL to auto-detect the file encoding. + * + * @param idx The %document index for the file to reload. + * @param forced_enc The file encoding to use or @c NULL to auto-detect the file encoding. + * + * @return @a TRUE if the %document was actually reloaded or @a FALSE otherwise. + **/ gboolean document_reload_file(gint idx, const gchar *forced_enc) { gint pos = 0; @@ -1170,9 +1250,19 @@ } -/* This saves the file. - * When force is set then it is always saved, even if it is unchanged(useful when using Save As) - * It returns whether the file could be saved or not. */ +/** + * Save the %document specified by @a idx. Saving includes replacing tabs by spaces, + * stripping trailing spaces and adding a final new line at the end of the file (all only if + * user enabled these features). The filetype is set again or auto-detected if it wasn't + * set yet. After all, the "document-save" signal is emitted for plugins. + * + * If the file is not modified, this functions does nothing unless force is set to @c TRUE. + * + * @param idx The %document index for the file to save. + * @param force Whether to save the file even if it is not modified (e.g. for Save As). + * + * @return @c TRUE if the file was saved or @c FALSE if the file could not or should not be saved. + **/ gboolean document_save_file(gint idx, gboolean force) { gchar *data; @@ -2161,6 +2251,14 @@ } +/** + * Sets the encoding of a %document. + * This function only set the encoding of the %document, it does not any conversions. The new + * encoding is used when e.g. saving the file. + * + * @param idx The index of the %document. + * @param new_encoding The encoding to be set for the %document. + **/ void document_set_encoding(gint idx, const gchar *new_encoding) { if (! DOC_IDX_VALID(idx) || new_encoding == NULL || Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2008-02-16 11:21:24 UTC (rev 2262) +++ trunk/src/document.h 2008-02-17 18:00:42 UTC (rev 2263) @@ -21,7 +21,13 @@ * $Id$ */ +/** + * @file document.h + * Document related actions: new, save, open, etc. + * Also Scintilla search actions. + **/ + #ifndef GEANY_DOCUMENT_H #define GEANY_DOCUMENT_H 1 @@ -36,72 +42,105 @@ } FileEncoding; -/* Structure for representing an open tab with all its related stuff. */ +/** + * Structure for representing an open tab with all its properties. + **/ typedef struct document { + /** General flag to represent this document is active and all properties are set correctly. */ gboolean is_valid; + /** Whether this %document support source code symbols(tags) to show in the sidebar. */ gboolean has_tags; - // the filename is encoded in UTF-8, but every GLibC function expect the locale representation + /** The UTF-8 encoded file name. Be careful glibc and GLib functions expect the locale + representation of the file name which can be different from this. + For conversion into locale encoding for use with file functions of GLib, you can use + @ref utils_get_locale_from_utf8. */ gchar *file_name; + /** The encoding of the %document, must be a valid string representation of an encoding, can + * be retrieved with @ref encodings_get_charset_from_index. */ gchar *encoding; + /** Internally used flag to indicate whether the file of this %document has a byte-order-mark. */ gboolean has_bom; + /** The filetype for this %document, it's only a reference to one of the elements of the global + * filetypes array. */ filetype *file_type; + /** TMWorkObject object for this %document. */ TMWorkObject *tm_file; + /** The Scintilla object for this %document. */ ScintillaObject *sci; + /** GtkLabel shown in the notebook header. */ GtkWidget *tab_label; + /** GtkLabel shown in the notebook right-click menu. */ GtkWidget *tabmenu_label; + /** GtkTreeView object for this %document within the Open Files treeview of the sidebar. */ GtkWidget *tag_tree; + /** GtkTreeStore object for this %document within the Open Files treeview of the sidebar. */ GtkTreeStore *tag_store; - GtkTreeIter iter; // open files item for this document + /** Iter for this %document within the Open Files treeview of the sidebar. */ + GtkTreeIter iter; + /** Whether this %document is read-only. */ gboolean readonly; + /** Whether this %document has been changed since it was last saved. */ gboolean changed; + /** %Document-specific line wrapping setting. */ gboolean line_wrapping; + /** %Document-specific indentation setting. */ gboolean auto_indent; - gfloat scroll_percent; // % to scroll view by on paint, if positive. - time_t last_check; // to remember the last disk check + /** Percentage to scroll view by on paint, if positive. */ + gfloat scroll_percent; + /** Time of the last disk check. */ + time_t last_check; + /** Modification time of this %document on disk. */ time_t mtime; + /** Internally used by the Undo/Redo management code. */ GTrashStack *undo_actions; + /** Internally used by the Undo/Redo management code. */ GTrashStack *redo_actions; + /** Internally used. */ FileEncoding saved_encoding; + /** %Document-specific tab setting. */ gboolean use_tabs; } document; -/* dynamic array of document elements to hold all information of the notebook tabs */ +// Dynamic array of document elements to hold all information of the notebook tabs. extern GArray *doc_array; -/* doc_list wraps doc_array so it can be used with C array syntax. - * Example: doc_list[0].sci = NULL; */ +/** + * doc_list wraps doc_array so it can be used with C array syntax. + * Example: doc_list[0].sci = NULL; + **/ #define doc_list ((document *)doc_array->data) -#define DOC_IDX_VALID(idx) \ - ((idx) >= 0 && (guint)(idx) < doc_array->len && doc_list[idx].is_valid) +/** + * DOC_IDX_VALID checks whether the passed index points to a valid %document object by checking + * important properties. It returns FALSE if the index is not valid and then this index + * must not be used. + **/ +#define DOC_IDX_VALID(doc_idx) \ + ((doc_idx) >= 0 && (guint)(doc_idx) < doc_array->len && doc_list[doc_idx].is_valid) +/** + * DOC_FILENAME) returns the filename of the %document corresponding to the passed index or + * GEANY_STRING_UNTITLED (e.g. _("untitled")) if the %document's filename was not yet set. + * This macro never returns NULL. + **/ #define DOC_FILENAME(doc_idx) \ - ((doc_list[doc_idx].file_name != NULL) ? \ - (doc_list[doc_idx].file_name) : GEANY_STRING_UNTITLED) + ((doc_list[doc_idx].file_name != NULL) ? (doc_list[doc_idx].file_name) : GEANY_STRING_UNTITLED) -/* returns the document index which has the given filename. - * is_tm_filename is needed when passing TagManager filenames because they are - * dereferenced, and would not match the link filename. */ gint document_find_by_filename(const gchar *filename, gboolean is_tm_filename); -/* returns the document index which has sci */ gint document_find_by_sci(ScintillaObject *sci); -/* returns the index of the notebook page from the document index */ gint document_get_notebook_page(gint doc_idx); -/* returns the index of the given notebook page in the document list */ gint document_get_n_idx(guint page_num); -/* returns the index of the current notebook page in the document list */ gint document_get_cur_idx(); -/* returns NULL if no documents are open */ document *document_get_current(); @@ -113,33 +152,25 @@ void document_set_text_changed(gint idx); -// Apply just the prefs that can change in the Preferences dialog void document_apply_update_prefs(gint idx); -/* removes the given notebook tab and clears the related entry in the document list */ gboolean document_remove(guint page_num); -/* See document.c. */ gint document_new_file(const gchar *filename, filetype *ft, const gchar *text); gint document_clone(gint old_idx, const gchar *utf8_filename); -/* See document.c. */ gint document_open_file(const gchar *locale_filename, gboolean readonly, filetype *ft, const gchar *forced_enc); gint document_open_file_full(gint idx, const gchar *filename, gint pos, gboolean readonly, filetype *ft, const gchar *forced_enc); -/* Takes a new line separated list of filename URIs and opens each file. - * length is the length of the string or -1 if it should be detected */ void document_open_file_list(const gchar *data, gssize length); -/* Takes a linked list of filename URIs and opens each file, ensuring the newly opened - * documents and existing documents (if necessary) are only colourised once. */ void document_open_files(const GSList *filenames, gboolean readonly, filetype *ft, const gchar *forced_enc); @@ -147,16 +178,11 @@ gboolean document_reload_file(gint idx, const gchar *forced_enc); -/* This saves the file. - * When force is set then it is always saved, even if it is unchanged(useful when using Save As) - * It returns whether the file could be saved or not. */ gboolean document_save_file(gint idx, gboolean force); gboolean document_search_bar_find(gint idx, const gchar *text, gint flags, gboolean inc); -/* General search function, used from the find dialog. - * Returns -1 on failure or the start position of the matching text. */ gint document_find_text(gint idx, const gchar *text, gint flags, gboolean search_backwards, gboolean scroll, GtkWidget *parent); @@ -173,7 +199,6 @@ void document_update_tag_list(gint idx, gboolean update); -/* sets the filetype of the document (sets syntax highlighting and tagging) */ void document_set_filetype(gint idx, filetype *type); gchar *document_get_eol_mode(gint idx); Modified: trunk/src/encodings.c =================================================================== --- trunk/src/encodings.c 2008-02-16 11:21:24 UTC (rev 2262) +++ trunk/src/encodings.c 2008-02-17 18:00:42 UTC (rev 2263) @@ -178,18 +178,17 @@ } -/* - * gtk_status_icon_get_stock: - * @idx: #GeanyEncodingIndex to retrieve the corresponding character set +/** + * Gets the character set name of the specified index e.g. for use with + * @ref document_set_encoding(). * - * Gets the character set name of the specified index e.g. for use with - * document_set_encoding. + * @param idx @ref GeanyEncodingIndex to retrieve the corresponding character set. * - * Return value: charset according to idx, - * or %NULL if the index is invalid. * - * Since: 0.13 - */ + * @return The charset according to idx, or @c NULL if the index is invalid. + * + * @since 0.13 + **/ const gchar* encodings_get_charset_from_index(gint idx) { g_return_val_if_fail(idx >= 0 && idx < GEANY_ENCODINGS_MAX, NULL); @@ -406,19 +405,18 @@ } -/* - * encodings_convert_to_utf8_from_charset: - * @buffer: the input string to convert - * @size: the length of the string, or -1 if the string is nul-terminated - * @charset: the charset to be used for conversion - * @fast: TRUE to only convert the input and skip extended checks on the converted string +/** + * Tries to convert @a buffer into UTF-8 encoding from the encoding specified with @a charset. + * If @a fast is not set, additional checks to validate the converted string are performed. * - * Tries to convert @buffer into UTF-8 encoding from the encoding specified with @charset. - * If @fast is not set, additional checks to validate the converted string are performed. + * @param buffer The input string to convert. + * @param size The length of the string, or -1 if the string is nul-terminated. + * @param charset The charset to be used for conversion. + * @param fast @c TRUE to only convert the input and skip extended checks on the converted string. * - * Return value: If the conversion was successful, a newly allocated nul-terminated string, - * which must be freed with g_free(). Otherwise %NULL. - */ + * @return If the conversion was successful, a newly allocated nul-terminated string, + * which must be freed with g_free(). Otherwise @c NULL. + **/ gchar *encodings_convert_to_utf8_from_charset(const gchar *buffer, gsize size, const gchar *charset, gboolean fast) { @@ -462,18 +460,17 @@ } -/* - * encodings_convert_to_utf8: - * @buffer: the input string to convert - * @size: the length of the string, or -1 if the string is nul-terminated. - * @used_encoding: return location of the detected encoding of the input string, or %NULL +/** + * Tries to convert @a buffer into UTF-8 encoding and store the detected original encoding in + * @a used_encoding. * - * Tries to convert @buffer into UTF-8 encoding and store the detected original encoding in - * @used_encoding. + * @param buffer the input string to convert. + * @param size the length of the string, or -1 if the string is nul-terminated. + * @param used_encoding return location of the detected encoding of the input string, or @c NULL. * - * Return value: If the conversion was successful, a newly allocated nul-terminated string, - * which must be freed with g_free(). Otherwise %NULL. - */ + * @return If the conversion was successful, a newly allocated nul-terminated string, + * which must be freed with g_free(). Otherwise @c NULL. + **/ gchar *encodings_convert_to_utf8(const gchar *buffer, gsize size, gchar **used_encoding) { gchar *locale_charset = NULL; Modified: trunk/src/encodings.h =================================================================== --- trunk/src/encodings.h 2008-02-16 11:21:24 UTC (rev 2262) +++ trunk/src/encodings.h 2008-02-17 18:00:42 UTC (rev 2263) @@ -22,6 +22,11 @@ */ +/** + * @file encodings.h + * Encoding conversion and Byte Order Mark (BOM) handling. + **/ + /* * Modified by the gedit Team, 2002. See the gedit AUTHORS file for a * list of people on the gedit Team. @@ -47,12 +52,19 @@ GEANY_ENCODING_GROUPS_MAX } GeanyEncodingGroup; + +/** Structure to represent an encoding to be used in Geany. */ typedef struct { + /** The index of the encoding, must be one of GeanyEncodingIndex. */ gint idx; + /** Internally used member for grouping */ gint order; + /** Internally used member for grouping */ GeanyEncodingGroup group; + /** String representation of the encoding, e.g. "ISO-8859-3" */ gchar *charset; + /** Translatable and descriptive name of the encoding, e.g. "South European" */ gchar *name; } GeanyEncoding; @@ -85,6 +97,10 @@ * Copyright (C) 2002 Red Hat, Inc. */ +/** + * @enum GeanyEncodingIndex + * List of known and supported encodings. + **/ typedef enum { GEANY_ENCODING_ISO_8859_1, Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2008-02-16 11:21:24 UTC (rev 2262) +++ trunk/src/plugindata.h 2008-02-17 18:00:42 UTC (rev 2263) @@ -25,70 +25,13 @@ #ifndef PLUGIN_H #define PLUGIN_H -/** - * Public symbols supported: - * - * version_check() - * Use VERSION_CHECK() macro instead. Required by Geany. - * - * PluginInfo* info() - * Use PLUGIN_INFO() macro to define it. Required by Geany. - * - * GeanyData* geany_data - * Geany owned fields and functions. - * - * PluginFields* plugin_fields - * Plugin owned fields, including flags. - * - * GeanyCallback geany_callbacks[] - * An array for connecting GeanyObject events, which should be terminated with - * {NULL, NULL, FALSE, NULL}. See signals below. - * - * void configure(GtkWidget *parent) - * Called when the plugin should show a configure dialog to let the user set some basic - * plugin configuration. Optionally, can be omitted when not needed. - * - * void init(GeanyData *data) - * Called after loading the plugin. data is the same as geany_data. - * - * void cleanup() - * Called before unloading the plugin. Required for normal plugins - it should undo - * everything done in init() - e.g. destroy menu items, free memory. - */ /** - * Signals: - * - * "document-new" - * Sent when a new document is created. - * Handler: void user_function(GObject *obj, gint idx, gpointer user_data); - * - * "document-open" - * Sent when a file is opened. - * Handler: void user_function(GObject *obj, gint idx, gpointer user_data); - * - * "document-save" - * Sent when a file is saved. - * Handler: void user_function(GObject *obj, gint idx, gpointer user_data); - * - * "document-activate" - * Sent when switching notebook pages. - * Handler: void user_function(GObject *obj, gint idx, gpointer user_data); - * - * "project-open" - * Sent after a project is opened but before session files are loaded. - * Handler: void user_function(GObject *obj, GKeyFile *config, gpointer user_data); - * - * "project-save" - * Sent when a project is saved(happens when the project is created, the properties - * dialog is closed or Geany is exited). This signal is emitted shortly before Geany - * will write the contents of the GKeyFile to the disc. - * Handler: void user_function(GObject *obj, GKeyFile *config, gpointer user_data); - * - * "project-close" - * Sent after a project is closed. - * Handler: void user_function(GObject *obj, gpointer user_data); - */ + * @file plugindata.h + * This file defines the plugin API, the interface between Geany and its plugins. + * For detailed documentation of the plugin system please read the plugin + * API documentation. + **/ /* The API version should be incremented whenever any plugin data types below are @@ -142,17 +85,23 @@ } -/* For geany_callbacks array - see top of file. */ +/** callback array entry */ typedef struct GeanyCallback { + /** The name of signal, must be an existing signal. For a list of available signals, + * please see the @link signals Signal documentation @endlink. */ gchar *signal_name; + /** A callback function which is called when the signal is emitted. */ GCallback callback; + /** Set to TRUE to connect your handler with g_signal_connect_after(). */ gboolean after; + /** The user data passed to the signal handler. */ gpointer user_data; } GeanyCallback; + typedef enum { PLUGIN_IS_DOCUMENT_SENSITIVE = 1 << 0 // if menu_item should be disabled when there are no documents Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2008-02-16 11:21:24 UTC (rev 2262) +++ trunk/src/utils.c 2008-02-17 18:00:42 UTC (rev 2263) @@ -223,6 +223,17 @@ } +/** + * Write the given @c text into a file with @c filename. + * If the file doesn't exist, it will be created. + * If it already exists, it will be overwritten. + * + * @param filename The filename of the file to write, in locale encoding. + * @param text The text to write into the file. + * + * @return 0 if the directory was successfully created, otherwise the @c errno of the + * failed operation is returned. + **/ gint utils_write_file(const gchar *filename, const gchar *text) { FILE *fp; @@ -639,12 +650,18 @@ } -/* (taken from libexo from os-cillation) - * NULL-safe string comparison. Returns TRUE if both a and b are - * NULL or if a and b refer to valid strings which are equal. - */ +/** + * @a NULL-safe string comparison. Returns @a TRUE if both @c a and @c b are @a NULL + * or if @c a and @c b refer to valid strings which are equal. + * + * @param a Pointer to first string or @a NULL. + * @param b Pointer to first string or @a NULL. + * + * @return @a TRUE if @c a equals @c b, else @a FALSE. + **/ gboolean utils_str_equal(const gchar *a, const gchar *b) { + /* (taken from libexo from os-cillation) */ if (a == NULL && b == NULL) return TRUE; else if (a == NULL || b == NULL) return FALSE; @@ -656,8 +673,13 @@ } -/* removes the extension from filename and return the result in - * a newly allocated string */ +/** + * Remove the extension from @c filename and return the result in a newly allocated string. + * + * @param filename The filename to operate on. + * + * @return A newly-allocated string, should be freed when no longer needed. + **/ gchar *utils_remove_ext_from_filename(const gchar *filename) { gchar *last_dot = strrchr(filename, '.'); @@ -938,8 +960,20 @@ } -/* Wrapper functions for Key-File-Parser from GLib in keyfile.c to reduce code size */ -gint utils_get_setting_integer(GKeyFile *config, const gchar *section, const gchar *key, const gint default_value) +/** + * Convenience function for g_key_file_get_integer() to add a default value argument. + * + * @param config A GKeyFile object. + * @param section The group name to look in for the key. + * @param key The key to find. + * @param default_value The default value which will be returned when @c section or @c key + * don't exist. + * + * @return The value associated with c key as an integer, or the given default value if the value + * could not be retrieved. + **/ +gint utils_get_setting_integer(GKeyFile *config, const gchar *section, const gchar *key, + const gint default_value) { gint tmp; GError *error = NULL; @@ -956,7 +990,20 @@ } -gboolean utils_get_setting_boolean(GKeyFile *config, const gchar *section, const gchar *key, const gboolean default_value) +/** + * Convenience function for g_key_file_get_boolean() to add a default value argument. + * + * @param config A GKeyFile object. + * @param section The group name to look in for the key. + * @param key The key to find. + * @param default_value The default value which will be returned when @c section or @c key + * don't exist. + * + * @return The value associated with c key as a boolean, or the given default value if the value + * could not be retrieved. + **/ +gboolean utils_get_setting_boolean(GKeyFile *config, const gchar *section, const gchar *key, + const gboolean default_value) { gboolean tmp; GError *error = NULL; @@ -973,7 +1020,20 @@ } -gchar *utils_get_setting_string(GKeyFile *config, const gchar *section, const gchar *key, const gchar *default_value) +/** + * Convenience function for g_key_file_get_string() to add a default value argument. + * + * @param config A GKeyFile object. + * @param section The group name to look in for the key. + * @param key The key to find. + * @param default_value The default value which will be returned when @c section or @c key + * don't exist. + * + * @return A newly allocated string, or the given default value if the value could not be + * retrieved. + **/ +gchar *utils_get_setting_string(GKeyFile *config, const gchar *section, const gchar *key, + const gchar *default_value) { gchar *tmp; GError *error = NULL; @@ -1086,8 +1146,8 @@ /* taken from busybox, thanks */ -gchar *utils_make_human_readable_str(unsigned long long size, unsigned long block_size, - unsigned long display_unit) +gchar *utils_make_human_readable_str(unsigned long long size, gulong block_size, + gulong display_unit) { /* The code will adjust for additional (appended) units. */ static const gchar zero_and_units[] = { '0', 0, 'K', 'M', 'G', 'T' }; @@ -1179,7 +1239,7 @@ } -// Returns: new string with the current time formatted HH:MM:SS. +// Returns: newly allocated string with the current time formatted HH:MM:SS. gchar *utils_get_current_time_string() { const time_t tp = time(NULL); @@ -1402,7 +1462,15 @@ } -/* Null-safe with fallback encoding conversion. */ +/** + * Converts the given UTF-8 encoded string into locale encoding. + * On Windows platforms, it does nothing and instead it just returns a copy of the input string. + * + * @param utf8_text UTF-8 encoded text. + * + * @return The converted string in locale encoding, or a copy of the input string if conversion + * failed. Should be freed with g_free(). If @a utf8_text is @c NULL, @c NULL is returned. + **/ gchar *utils_get_locale_from_utf8(const gchar *utf8_text) { #ifdef G_OS_WIN32 @@ -1422,7 +1490,15 @@ } -/* Null-safe with fallback encoding conversion. */ +/** + * Converts the given string (in locale encoding) into UTF-8 encoding. + * On Windows platforms, it does nothing and instead it just returns a copy of the input string. + * + * @param locale_text Text in locale encoding. + * + * @return The converted string in UTF-8 encoding, or a copy of the input string if conversion + * failed. Should be freed with g_free(). If @a locale_text is @c NULL, @c NULL is returned. + **/ gchar *utils_get_utf8_from_locale(const gchar *locale_text) { #ifdef G_OS_WIN32 @@ -1575,6 +1651,16 @@ #endif +/** + * Create a directory if it doesn't already exist. + * Create intermediate parent directories as needed, too. + * + * @param path The path of the directory to create, in locale encoding. + * @param create_parent_dirs Whether to create intermediate parent directories if necessary. + * + * @return 0 if the directory was successfully created, otherwise the @c errno of the + * failed operation is returned. + **/ gint utils_mkdir(const gchar *path, gboolean create_parent_dirs) { gint mode = 0700; @@ -1590,12 +1676,19 @@ } -/* Gets a sorted list of files from the specified directory. - * Locale encoding is expected for path and used for the file list. - * The list and the data in the list should be freed after use. - * Returns: The list or NULL if no files found. - * length will point to the number of non-NULL data items in the list, unless NULL. - * error is the location for storing a possible error, or NULL. */ +/** + * Gets a sorted list of files from the specified directory. + * Locale encoding is expected for path and used for the file list. The list and the data + * in the list should be freed after use. + * + * @param path The path of the directory to scan, in locale encoding. + * @param length The location to store the number of non-@a NULL data items in the list, + * unless @a NULL. + * @param error The is the location for storing a possible error, or @a NULL. + * + * @return A newly allocated list or @a NULL if no files found. The list and its data should be + * freed when no longer needed. + **/ GSList *utils_get_file_list(const gchar *path, guint *length, GError **error) { GSList *list = NULL; @@ -1648,10 +1741,18 @@ } -/* Replaces all occurrences of needle in str with replace. - * Currently this is not safe if replace matches needle. - * Returns: TRUE if needle was found. */ -gboolean utils_string_replace_all(GString *str, const gchar *needle, const gchar *replace) +/** + * Replaces all occurrences of @c needle in @c haystack with @c replace. + * Currently this is not safe if @c replace matches @c needle, so @c needle and @c replace + * must not be equal. + * + * @param haystack The input string to operate on. This string is modified in place. + * @param needle The string which should be replaced. + * @param replace The replacement for @c needle. + * + * @return @a TRUE if @c needle was found, else @a FALSE. + **/ +gboolean utils_string_replace_all(GString *haystack, const gchar *needle, const gchar *replace) { const gchar *c; gssize pos = -1; @@ -1661,15 +1762,15 @@ while (1) { - c = strstr(str->str, needle); + c = strstr(haystack->str, needle); if (c == NULL) break; else { - pos = c - str->str; - g_string_erase(str, pos, strlen(needle)); + pos = c - haystack->str; + g_string_erase(haystack, pos, strlen(needle)); if (replace) - g_string_insert(str, pos, replace); + g_string_insert(haystack, pos, replace); } } return (pos != -1); Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2008-02-16 11:21:24 UTC (rev 2262) +++ trunk/src/utils.h 2008-02-17 18:00:42 UTC (rev 2263) @@ -21,18 +21,24 @@ * $Id$ */ +/** + * @file: utils.h + * General utility functions, non-GTK related. + */ #ifndef GEANY_UTILS_H #define GEANY_UTILS_H 1 -// Returns: TRUE if ptr points to a non-zero value. +/** Returns: TRUE if @a ptr points to a non-zero value. */ #define NZV(ptr) \ ((ptr) && (ptr)[0]) -/* Free's ptr (if not NULL), then assigns result to it. - * result can be an expression using the 'old' value of ptr. - * It prevents a memory leak compared with: ptr = func(ptr); */ -#define setptr(ptr, result)\ +/** + * Free's @a ptr (if not @c NULL), then assigns @a result to it. + * @a result can be an expression using the 'old' value of @a ptr. + * It prevents a memory leak compared with: @code ptr = func(ptr); @endcode + **/ +#define setptr(ptr, result) \ {\ gpointer setptr_tmp = ptr;\ ptr = result;\ @@ -42,7 +48,6 @@ void utils_start_browser(const gchar *uri); -/* taken from anjuta, to determine the EOL mode of the file */ gint utils_get_line_endings(gchar* buffer, glong size); gboolean utils_isbrace(gchar c, gboolean include_angles); @@ -59,13 +64,10 @@ gboolean utils_check_disk_status(gint idx, gboolean force); -//gchar *utils_get_current_tag(gint idx, gint direction); gint utils_get_current_function(gint idx, const gchar **tagname); -/* returns the end-of-line character(s) length of the specified editor */ gint utils_get_eol_char_len(gint idx); -/* returns the end-of-line character(s) of the specified editor */ const gchar *utils_get_eol_char(gint idx); gboolean utils_atob(const gchar *str); @@ -74,31 +76,22 @@ gdouble utils_scale_round(gdouble val, gdouble factor); -/* (taken from libexo from os-cillation) - * NULL-safe string comparison. Returns TRUE if both a and b are - * NULL or if a and b refer to valid strings which are equal. - */ gboolean utils_str_equal(const gchar *a, const gchar *b); -/* removes the extension from filename and return the result in - * a newly allocated string */ gchar *utils_remove_ext_from_filename(const gchar *filename); - gchar utils_brace_opposite(gchar ch); gchar *utils_get_hostname(); gint utils_make_settings_dir(); - gboolean utils_string_replace_all(GString *str, const gchar *needle, const gchar *replace); gchar *utils_str_replace(gchar *haystack, const gchar *needle, const gchar *replacement); gint utils_strpos(const gchar* haystack, const gchar * needle); - gchar *utils_get_date_time(const gchar *format, time_t *time_to_use); gchar *utils_get_initials(gchar *name); @@ -121,15 +114,11 @@ void utils_beep(); -gchar *utils_make_human_readable_str(unsigned long long size, unsigned long block_size, - unsigned long display_unit); +gchar *utils_make_human_readable_str(unsigned long long size, gulong block_size, + gulong display_unit); -/* utils_strtod() converts a string containing a hex colour ("0x00ff00") into an integer. - * Basically, it is the same as strtod() would do, but it does not understand hex colour values, - * before ANSI-C99. With with_route set, it takes strings of the format "#00ff00". */ gint utils_strtod(const gchar *source, gchar **end, gboolean with_route); -// returned string must be freed. gchar *utils_get_current_time_string(); GIOChannel *utils_set_up_io_channel(gint fd, GIOCondition cond, gboolean nblock, @@ -137,37 +126,20 @@ gchar **utils_read_file_in_array(const gchar *filename); -/* Contributed by Stefan Oltmanns, thanks. - * Replaces \\, \r, \n, \t and \uXXX by their real counterparts */ gboolean utils_str_replace_escape(gchar *string); -/* Wraps a string in place, replacing a space with a newline character. - * wrapstart is the minimum position to start wrapping or -1 for default */ gboolean utils_wrap_string(gchar *string, gint wrapstart); -/* Simple wrapper for g_locale_from_utf8; returns a copy of utf8_text on failure. */ gchar *utils_get_locale_from_utf8(const gchar *utf8_text); -/* Simple wrapper for g_locale_to_utf8; returns a copy of locale_text on failure. */ gchar *utils_get_utf8_from_locale(const gchar *locale_text); - -/* Frees all passed pointers if they are *ALL* non-NULL. - * Do not use if any pointers may be NULL. - * The first argument is nothing special, it will also be freed. - * The list must be ended with NULL. */ void utils_free_pointers(gpointer first, ...) G_GNUC_NULL_TERMINATED; -/* Creates a string array deep copy of a series of non-NULL strings. - * The first argument is nothing special. - * The list must be ended with NULL. - * If first is NULL, NULL is returned. */ gchar **utils_strv_new(gchar *first, ...) G_GNUC_NULL_TERMINATED; - gint utils_mkdir(const gchar *path, gboolean create_parent_dirs); -/* Gets a sorted list of files in the specified directory. */ GSList *utils_get_file_list(const gchar *path, guint *length, GError **error); gboolean utils_str_has_upper(const gchar *str); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2262] trunk
by eht16＠users.sourceforge.net 16 Feb '08

16 Feb '08

Revision: 2262 http://geany.svn.sourceforge.net/geany/?rev=2262&view=rev Author: eht16 Date: 2008-02-16 03:21:24 -0800 (Sat, 16 Feb 2008) Log Message: ----------- Apply patch from Daniel Richard G. to add support for +NNN command line arguments and for recognising filename:line:column: format on the command line (thanks). Modified Paths: -------------- trunk/ChangeLog trunk/THANKS trunk/doc/geany.1.in trunk/doc/geany.html trunk/doc/geany.txt trunk/src/main.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-02-16 11:19:27 UTC (rev 2261) +++ trunk/ChangeLog 2008-02-16 11:21:24 UTC (rev 2262) @@ -1,3 +1,13 @@ +2008-02-16 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * doc/geany.html, doc/geany.txt: + Fix slightly wrong documentation for show_editor_scrollbars. + * THANKS, doc/geany.1.in, doc/geany.html, doc/geany.txt, src/main.c: + Apply patch from Daniel Richard G. to add support for +NNN command + line arguments and for recognising filename:line:column: format on + the command line (thanks). + + 2008-02-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * tagmanager/python.c: Fix parsing bug when there is text after the Modified: trunk/THANKS =================================================================== --- trunk/THANKS 2008-02-16 11:19:27 UTC (rev 2261) +++ trunk/THANKS 2008-02-16 11:21:24 UTC (rev 2262) @@ -40,6 +40,7 @@ Catalin Marinas <catalin(dot)marinas(at)gmail(dot)com> - newline strips trailing spaces patch Bo Lorentsen <bl(at)lue(dot)dk> - project session patch Yura Siamashka <yurand2(at)gmail(dot)com> - many patches +Daniel Richard G. <skunk(at)iskunk(dot)org> - some patches Translators: ------------ Modified: trunk/doc/geany.1.in =================================================================== --- trunk/doc/geany.1.in 2008-02-16 11:19:27 UTC (rev 2261) +++ trunk/doc/geany.1.in 2008-02-16 11:21:24 UTC (rev 2262) @@ -3,7 +3,7 @@ Geany \(em a small and lightweight IDE .SH "SYNOPSIS" .PP -\fBgeany\fR [\fBoption\fP] [\fBfiles ...\fP] +\fBgeany\fR [\fBoption\fP] [\fP+number\fP] [\fBfiles ...\fP] .SH "DESCRIPTION" .PP Geany is a small and fast editor with basic features of an integrated development environment. @@ -13,55 +13,65 @@ .PP Homepage: http://geany.uvena.de .SH "OPTIONS" -.IP "\fB\fP \fB\-\-column\fP " 10 +.IP "\fB\fP \fBfiles ...\fP " 10 +A space-separated list of filenames. Absolute and relative filenames can be used. Geany also +recognises line and column information when appended to the filename with colons, e.g. +"geany foo.bar:10:5" will open the file foo.bar and place the cursor in line 10 at column 5. +.IP "\fB\fP \fB\+number\fP " 10 +Set initial line +.I number +for the first opened file (same as --line, do not put a space +between the + sign and the number). E.g. "geany +7 foo.bar" will open the file foo.bar and +place the cursor in line 7. +.IP "\fB\fP \fB\-\-column\fP " 10 Set initial column number for the first opened file (useful in conjunction with --line). -.IP "\fB-c\fP \fB\-\-config\fP " 10 +.IP "\fB-c\fP, \fB\-\-config\fP " 10 Use an alternate configuration directory. Default configuration directory is ~/.geany/ and there resides geany.conf and some template files. -.IP "\fB-d\fP \fB\-\-debug\fP " 10 +.IP "\fB-d\fP, \fB\-\-debug\fP " 10 Run Geany in debug mode, which means being verbose and printing lots of information. -.IP "\fB\fP \fB\-\-ft\-names\fP " 10 +.IP "\fB\fP, \fB\-\-ft\-names\fP " 10 Print a list of Geany's internal filetype names (useful snippets configuration). -.IP "\fB-g\fP \fB\-\-generate\-tags\fP " 10 +.IP "\fB-g\fP, \fB\-\-generate\-tags\fP " 10 Generate a global tags file (see documentation). -.IP "\fB-P\fP \fB\-\-no\-preprocessing\fP " 10 +.IP "\fB-P\fP, \fB\-\-no\-preprocessing\fP " 10 Don't preprocess C/C++ files when generating tags. -.IP "\fB-i\fP \fB\-\-new-instance\fP " 10 +.IP "\fB-i\fP, \fB\-\-new-instance\fP " 10 Don't open files in a running instance, force opening a new instance. Only available if Geany was compiled with support for Sockets. -.IP "\fB-l\fP \fB\-\-line\fP " 10 +.IP "\fB-l\fP, \fB\-\-line\fP " 10 Set initial line number for the first opened file. -.IP "\fB-m\fP \fB\-\-no-msgwin\fP " 10 +.IP "\fB-m\fP, \fB\-\-no-msgwin\fP " 10 Don't show the message window. Use this option if you don't need compiler messages or VTE support. -.IP "\fB-n\fP \fB\-\-no-ctags\fP " 10 +.IP "\fB-n\fP, \fB\-\-no-ctags\fP " 10 Don't load symbol completion and call tip data. Use this option, if you don't want to use them. For more information please see documentation. -.IP "\fB-p\fP \fB\-\-no-plugins\fP " 10 +.IP "\fB-p\fP, \fB\-\-no-plugins\fP " 10 Don't load plugin support. -.IP "\fB\fP \fB\-\-print-prefix\fP " 10 +.IP "\fB\fP \fB\-\-print-prefix\fP " 10 Print installation prefix, the data directory, the lib directory and the locale directory (in this order) to stdout, each per line. This is mainly intended for plugin authors to detect installation paths. -.IP "\fB-s\fP \fB\-\-no-session\fP " 10 +.IP "\fB-s\fP, \fB\-\-no-session\fP " 10 Don't load the previous session's files. -.IP "\fB-t\fP \fB\-\-no-terminal\fP " 10 +.IP "\fB-t\fP, \fB\-\-no-terminal\fP " 10 Don't load terminal support. Use this option, if you don't want to load the virtual terminal emulator widget at startup. If you don't have libvte.so.4 installed, then terminal-support is automatically disabled. Only available if Geany was compiled with support for VTE. -.IP "\fB\fP \fB\-\-vte-lib\fP " 10 +.IP "\fB\fP \fB\-\-vte-lib\fP " 10 Specify explicitly the path including filename or only the filename to the VTE library, e.g. /usr/lib/libvte.so or libvte.so. This option is only needed, when the autodetection doesn't work. Only available if Geany was compiled with support for VTE. -.IP "\fB-v\fP \fB\-\-version\fP " 10 +.IP "\fB-v\fP, \fB\-\-version\fP " 10 Show version information and exit. -.IP "\fB-?\fP \fB\-\-help\fP " 10 +.IP "\fB-?\fP, \fB\-\-help\fP " 10 Show help information and exit. .PP Geany supports all generic GTK options, a list is available on the help screen. .SH "AUTHOR" .PP -This manual page was written by the Geany develoepr team. Permission is +This manual page was written by the Geany developer team. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2. .PP Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-02-16 11:19:27 UTC (rev 2261) +++ trunk/doc/geany.html 2008-02-16 11:21:24 UTC (rev 2262) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2008-02-15" /> +<meta name="date" content="2008-02-16" /> <style type="text/css"> /* @@ -133,7 +133,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2008-02-15</td></tr> +<td>2008-02-16</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.14</td></tr> </tbody> @@ -436,6 +436,13 @@ </thead> <tbody valign="top"> <tr><td><em>none</em></td> +<td>+number</td> +<td>Set initial line number for the first opened file +(same as --line, do not put a space between the + sign +and the number). E.g. "geany +7 foo.bar" will open the +file foo.bar and place the cursor in line 7.</td> +</tr> +<tr><td><em>none</em></td> <td>--column</td> <td>Set initial column number for the first opened file.</td> </tr> @@ -527,7 +534,11 @@ <td>[files ...]</td> <td>Open all given files at startup. This option causes Geany to ignore loading stored files from the last -session (if enabled).</td> +session (if enabled). +Geany also recognises line and column information when +appended to the filename with colons, e.g. +"geany foo.bar:10:5" will open the file foo.bar and +place the cursor in line 10 at column 5.</td> </tr> </tbody> </table> @@ -3391,7 +3402,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2008-02-16 11:18 UTC. +Generated on: 2008-02-16 11:20 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2008-02-16 11:19:27 UTC (rev 2261) +++ trunk/doc/geany.txt 2008-02-16 11:21:24 UTC (rev 2262) @@ -177,6 +177,11 @@ ============ ======================= ================================================= Short option Long option Function ============ ======================= ================================================= +*none* +number Set initial line number for the first opened file + (same as --line, do not put a space between the + sign + and the number). E.g. "geany +7 foo.bar" will open the + file foo.bar and place the cursor in line 7. + *none* --column Set initial column number for the first opened file. -c dir_name --config=directory_name Use an alternate configuration directory. Default @@ -234,6 +239,10 @@ *none* [files ...] Open all given files at startup. This option causes Geany to ignore loading stored files from the last session (if enabled). + Geany also recognises line and column information when + appended to the filename with colons, e.g. + "geany foo.bar:10:5" will open the file foo.bar and + place the cursor in line 10 at column 5. ============ ======================= ================================================= Geany supports all generic GTK options, a list is available on the Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2008-02-16 11:19:27 UTC (rev 2261) +++ trunk/src/main.c 2008-02-16 11:21:24 UTC (rev 2262) @@ -112,6 +112,7 @@ #ifdef HAVE_PLUGINS static gboolean no_plugins = FALSE; #endif +static gboolean dummy = FALSE; // in alphabetical order of short options static GOptionEntry entries[] = @@ -139,6 +140,7 @@ { "vte-lib", 0, 0, G_OPTION_ARG_FILENAME, &lib_vte, N_("Filename of libvte.so"), NULL }, #endif { "version", 'v', 0, G_OPTION_ARG_NONE, &show_version, N_("Show version and exit"), NULL }, + { "dummy", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &dummy, NULL, NULL }, // for +NNN line number arguments { NULL, 0, 0, 0, NULL, NULL, NULL } }; @@ -365,6 +367,58 @@ } +/* get a :line:column specifier from the end of a filename (if present), + * return the line/column values, and remove the specifier from the string + * (Note that *line and *column must both be set to -1 initially) */ +static void get_line_and_column_from_filename(gchar *filename, gint *line, gint *column) +{ + gsize i; + gint colon_count = 0; + gboolean have_number = FALSE; + gsize len; + + g_assert(*line == -1 && *column == -1); + + if (! NZV(filename)) + return; + + len = strlen(filename); + for (i = len - 1; i >= 1; i--) + { + gboolean is_colon = filename[i] == ':'; + gboolean is_digit = g_ascii_isdigit(filename[i]); + + if (! is_colon && ! is_digit) + break; + + if (is_colon) + { + if (++colon_count > 1) + break; /* bail on 2+ colons in a row */ + } + else + colon_count = 0; + + if (is_digit) + have_number = TRUE; + + if (is_colon && have_number) + { + gint number = atoi(&filename[i + 1]); + + filename[i] = '\0'; + have_number = FALSE; + + *column = *line; + *line = number; + } + + if (*column >= 0) + break; /* line and column are set, so we're done */ + } +} + + static void setup_paths() { gchar *data_dir; @@ -424,7 +478,24 @@ { GError *error = NULL; GOptionContext *context; + gint i; + // first initialise cl_options fields with default values + cl_options.load_session = TRUE; + cl_options.goto_line = -1; + cl_options.goto_column = -1; + + // the GLib option parser can't handle the +NNN (line number) option, + // so we grab that here and replace it with a no-op */ + for (i = 1; i < (*argc); i++) + { + if ((*argv)[i][0] != '+') + continue; + + cl_options.goto_line = atoi((*argv)[i] + 1); + (*argv)[i] = "--dummy"; + } + context = g_option_context_new(_("[FILES...]")); g_option_context_add_main_entries(context, entries, GETTEXT_PACKAGE); g_option_group_set_translation_domain(g_option_context_get_main_group(context), GETTEXT_PACKAGE); @@ -432,11 +503,6 @@ g_option_context_parse(context, argc, argv, &error); g_option_context_free(context); - // first initialise cl_options fields with default values - cl_options.load_session = TRUE; - cl_options.goto_line = -1; - cl_options.goto_column = -1; - if (error != NULL) { g_printerr("Geany: %s\n", error->message); @@ -520,8 +586,6 @@ if (ft_names) { - int i; - printf("Geany's internal filetype names:\n"); filetypes_init_types(); for (i = 0; i < GEANY_MAX_FILE_TYPES; i++) @@ -597,6 +661,17 @@ { gchar *filename = get_argv_filename(argv[i]); + if (filename != NULL) + { + gint line = -1, column = -1; + + get_line_and_column_from_filename(filename, &line, &column); + if (line >= 0) + cl_options.goto_line = line; + if (column >= 0) + cl_options.goto_column = column; + } + if (filename != NULL && g_file_test(filename, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2261] trunk/doc
by eht16＠users.sourceforge.net 16 Feb '08

16 Feb '08

Revision: 2261 http://geany.svn.sourceforge.net/geany/?rev=2261&view=rev Author: eht16 Date: 2008-02-16 03:19:27 -0800 (Sat, 16 Feb 2008) Log Message: ----------- Fix slightly wrong documentation for show_editor_scrollbars. Modified Paths: -------------- trunk/doc/geany.html trunk/doc/geany.txt Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-02-15 16:34:30 UTC (rev 2260) +++ trunk/doc/geany.html 2008-02-16 11:19:27 UTC (rev 2261) @@ -6,7 +6,7 @@ <meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> -<meta name="date" content="2008-02-04" /> +<meta name="date" content="2008-02-15" /> <style type="text/css"> /* @@ -133,7 +133,7 @@ <br />Nick Treleaven <br />Frank Lanitz</td></tr> <tr><th class="docinfo-name">Date:</th> -<td>2008-02-04</td></tr> +<td>2008-02-15</td></tr> <tr><th class="docinfo-name">Version:</th> <td>0.14</td></tr> </tbody> @@ -2836,8 +2836,9 @@ <td>false</td> </tr> <tr><td>show_editor_scrollbars</td> -<td>Whether to display scrollbars when the -editor window is bigger than the display.</td> +<td>Whether to display scrollbars. If set to +false, the horizontal and vertical +scrollbars are hidden completely.</td> <td>true</td> </tr> <tr><td>use_tab_to_indent</td> @@ -3390,7 +3391,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2008-02-15 16:25 UTC. +Generated on: 2008-02-16 11:18 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2008-02-15 16:34:30 UTC (rev 2260) +++ trunk/doc/geany.txt 2008-02-16 11:19:27 UTC (rev 2261) @@ -2492,8 +2492,9 @@ ============================== ============================================ ================== **[editor]** brace_match_ltgt Whether to highlight <, > angle brackets. false -show_editor_scrollbars Whether to display scrollbars when the true - editor window is bigger than the display. +show_editor_scrollbars Whether to display scrollbars. If set to true + false, the horizontal and vertical + scrollbars are hidden completely. use_tab_to_indent Whether pressing tab when a line is selected true will indent the line. use_gtk_word_boundaries Whether to look for the end of a word when true This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2260] trunk
by eht16＠users.sourceforge.net 15 Feb '08

15 Feb '08

Revision: 2260 http://geany.svn.sourceforge.net/geany/?rev=2260&view=rev Author: eht16 Date: 2008-02-15 08:34:30 -0800 (Fri, 15 Feb 2008) Log Message: ----------- Add hidden preference to disable scrolling past end of document. Modified Paths: -------------- trunk/ChangeLog trunk/doc/geany.html trunk/doc/geany.txt trunk/src/document.c trunk/src/editor.h trunk/src/keyfile.c trunk/src/plugindata.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-02-15 16:32:27 UTC (rev 2259) +++ trunk/ChangeLog 2008-02-15 16:34:30 UTC (rev 2260) @@ -4,6 +4,9 @@ end of a multi line comment (closes #1894084). * src/socket.c: Apply patch from Daniel Richard G. to update some source code comments (thanks). + * doc/geany.html, doc/geany.txt, src/document.c, src/editor.h, + src/keyfile.c: + Add hidden preference to disable scrolling past end of document. 2008-02-13 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2008-02-15 16:32:27 UTC (rev 2259) +++ trunk/doc/geany.html 2008-02-15 16:34:30 UTC (rev 2260) @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -<meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" /> +<meta name="generator" content="Docutils 0.4.1: http://docutils.sourceforge.net/" /> <title>Geany</title> <meta name="authors" content="Enrico Tröger Nick Treleaven Frank Lanitz" /> <meta name="date" content="2008-02-04" /> @@ -135,7 +135,7 @@ <tr><th class="docinfo-name">Date:</th> <td>2008-02-04</td></tr> <tr><th class="docinfo-name">Version:</th> -<td>0.13</td></tr> +<td>0.14</td></tr> </tbody> </table> <p>Copyright © 2005-2008</p> @@ -2635,7 +2635,7 @@ </tr> <tr><td>geanyversion</td> <td>The actual Geany version, e.g. -"Geany 0.13".</td> +"Geany 0.14".</td> <td>filetypes, file header, function description, ChangeLog entry, bsd, gpl</td> @@ -2686,7 +2686,7 @@ look, run "<tt class="docutils literal"><span class="pre">make</span> <span class="pre">doc</span></tt>" in the subdirectory <tt class="docutils literal"><span class="pre">doc</span></tt> of Geany's source directory. This regenerates the <tt class="docutils literal"><span class="pre">geany.html</span></tt> file. To generate a PDF file, use the command "<tt class="docutils literal"><span class="pre">make</span> <span class="pre">pdf</span></tt>" which should generate a file called -geany-0.13.pdf.</p> +geany-0.14.pdf.</p> <p>After you are happy with your changes, create a patch:</p> <pre class="literal-block"> % svn diff geany.txt > foo.patch @@ -2857,6 +2857,10 @@ an existing line.</td> <td>false</td> </tr> +<tr><td>scroll_stop_at_last_line</td> +<td>Disable scrolling past end of document</td> +<td>false</td> +</tr> <tr><td><strong>[interface]</strong></td> <td> </td> <td> </td> @@ -3386,7 +3390,7 @@ <div class="footer"> <hr class="footer" /> <a class="reference" href="geany.txt">View document source</a>. -Generated on: 2008-02-04 13:23 UTC. +Generated on: 2008-02-15 16:25 UTC. Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source. </div> Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2008-02-15 16:32:27 UTC (rev 2259) +++ trunk/doc/geany.txt 2008-02-15 16:34:30 UTC (rev 2260) @@ -1,4 +1,4 @@ -.. |(version)| replace:: 0.13 +.. |(version)| replace:: 0.14 ======= Geany @@ -2502,6 +2502,7 @@ commands`_). auto_complete_whilst_editing Whether to allow autocompletion when editing false an existing line. +scroll_stop_at_last_line Disable scrolling past end of document false **[interface]** show_symbol_list_expanders Whether to show or hide the small expander true icons on the symbol list treeview (only Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2008-02-15 16:32:27 UTC (rev 2259) +++ trunk/src/document.c 2008-02-15 16:34:30 UTC (rev 2260) @@ -422,7 +422,8 @@ sci_set_caret_policy_x(sci, CARET_JUMPS | CARET_EVEN, 0); //sci_set_caret_policy_y(sci, CARET_JUMPS | CARET_EVEN, 0); SSM(sci, SCI_AUTOCSETSEPARATOR, '\n', 0); - SSM(sci, SCI_SETENDATLASTLINE, FALSE, 0); // allow scrolling past end of document + // (dis)allow scrolling past end of document + SSM(sci, SCI_SETENDATLASTLINE, editor_prefs.scroll_stop_at_last_line, 0); // signal for insert-key(works without too, but to update the right status bar) //g_signal_connect((GtkWidget*) sci, "key-press-event", Modified: trunk/src/editor.h =================================================================== --- trunk/src/editor.h 2008-02-15 16:32:27 UTC (rev 2259) +++ trunk/src/editor.h 2008-02-15 16:34:30 UTC (rev 2260) @@ -51,9 +51,10 @@ gint long_line_type; gint long_line_column; gchar *long_line_color; - gboolean show_markers_margin; // view menu - gboolean show_linenumber_margin; // view menu - gboolean show_scrollbars; // hidden pref + gboolean show_markers_margin; // view menu + gboolean show_linenumber_margin; // view menu + gboolean show_scrollbars; // hidden pref + gboolean scroll_stop_at_last_line; // hidden pref // behaviour gboolean line_wrapping; Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2008-02-15 16:32:27 UTC (rev 2259) +++ trunk/src/keyfile.c 2008-02-15 16:34:30 UTC (rev 2260) @@ -368,6 +368,7 @@ write_hidden_pref_boolean(config, PACKAGE, "brace_match_ltgt", editor_prefs.brace_match_ltgt); write_hidden_pref_boolean(config, PACKAGE, "use_gtk_word_boundaries", editor_prefs.use_gtk_word_boundaries); write_hidden_pref_boolean(config, PACKAGE, "auto_complete_whilst_editing", editor_prefs.auto_complete_whilst_editing); + write_hidden_pref_boolean(config, PACKAGE, "scroll_stop_at_last_line", editor_prefs.scroll_stop_at_last_line); #if GTK_CHECK_VERSION(2, 12, 0) write_hidden_pref_boolean(config, PACKAGE, "show_symbol_list_expanders", prefs.show_symbol_list_expanders); #endif @@ -525,6 +526,7 @@ editor_prefs.newline_strip = utils_get_setting_boolean(config, PACKAGE, "pref_editor_newline_strip", FALSE); editor_prefs.use_gtk_word_boundaries = utils_get_setting_boolean(config, PACKAGE, "use_gtk_word_boundaries", TRUE); editor_prefs.auto_complete_whilst_editing = utils_get_setting_boolean(config, PACKAGE, "auto_complete_whilst_editing", FALSE); + editor_prefs.scroll_stop_at_last_line = utils_get_setting_boolean(config, PACKAGE, "scroll_stop_at_last_line", FALSE); // Files // use current locale encoding as default for new files (should be UTF-8 in most cases) Modified: trunk/src/plugindata.h =================================================================== --- trunk/src/plugindata.h 2008-02-15 16:32:27 UTC (rev 2259) +++ trunk/src/plugindata.h 2008-02-15 16:34:30 UTC (rev 2260) @@ -93,7 +93,7 @@ /* The API version should be incremented whenever any plugin data types below are * modified or appended to. */ -static const gint api_version = 42; +static const gint api_version = 43; /* The ABI version should be incremented whenever existing fields in the plugin * data types below have to be changed or reordered. It should stay the same if fields This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [2259] trunk
by eht16＠users.sourceforge.net 15 Feb '08

15 Feb '08

Revision: 2259 http://geany.svn.sourceforge.net/geany/?rev=2259&view=rev Author: eht16 Date: 2008-02-15 08:32:27 -0800 (Fri, 15 Feb 2008) Log Message: ----------- Apply patch from Daniel Richard G. to update some source code comments (thanks). Modified Paths: -------------- trunk/ChangeLog trunk/src/socket.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2008-02-15 16:31:46 UTC (rev 2258) +++ trunk/ChangeLog 2008-02-15 16:32:27 UTC (rev 2259) @@ -1,3 +1,11 @@ +2008-02-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * tagmanager/python.c: Fix parsing bug when there is text after the + end of a multi line comment (closes #1894084). + * src/socket.c: Apply patch from Daniel Richard G. to update some + source code comments (thanks). + + 2008-02-13 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/keybindings.h: Fix broken compilation with GTK < 2.10. Modified: trunk/src/socket.c =================================================================== --- trunk/src/socket.c 2008-02-15 16:31:46 UTC (rev 2258) +++ trunk/src/socket.c 2008-02-15 16:32:27 UTC (rev 2259) @@ -42,10 +42,10 @@ * At the moment the commands open, line and column are available. * * About the socket files on Unix-like systems: - * Geany creates a socket in /tmp(or any other directory returned by g_get_tmp_dir()) and it creates + * Geany creates a socket in /tmp (or any other directory returned by g_get_tmp_dir()) and * a symlink in the current configuration to the created socket file. The symlink is named - * geany_socket.dispnum (dispnum is the number of the active X display). - * If the socket file in the temporara directory could not be created, Geany creates the socket file + * geany_socket_<hostname>_<displayname> (displayname is the name of the active X display). + * If the socket file cannot be created in the temporary directory, Geany creates the socket file * directly in the configuration directory as a fallback. * */ @@ -167,7 +167,7 @@ real_path[0] = '\0'; // read the contents of the symbolic link socket_info.file_name and delete it - // readlink should return something like "/tmp/geany_socket.1202396669" + // readlink should return something like "/tmp/geany_socket.499602d2" len = readlink(socket_info.file_name, real_path, sizeof(real_path) - 1); if ((gint) len > 0) { @@ -336,12 +336,12 @@ g_get_tmp_dir(), G_DIR_SEPARATOR, g_random_int()); if (utils_is_file_writeable(real_path) != 0) - { // if real_path is not writable for us, fall back to /home/user/.geany/geany_socket + { // if real_path is not writable for us, fall back to ~/.geany/geany_socket_*_* // instead of creating a symlink and print a warning g_warning("Socket %s could not be written, using %s as fallback.", real_path, path); setptr(real_path, g_strdup(path)); } - // create a symlink in e.g. /home/user/.geany/geany_socket to /tmp/geany_socket.1202396669 + // create a symlink in e.g. ~/.geany/geany_socket_hostname__0 to /tmp/geany_socket.499602d2 else if (symlink(real_path, path) != 0) { perror("symlink"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits February 2008